From c382bec677f971f2cbb71fbee1978beb47850a1b Mon Sep 17 00:00:00 2001 From: abduhasen Date: Wed, 4 Mar 2026 22:50:20 +0000 Subject: [PATCH 1/4] sprint 3 practice-tdd complete --- Sprint-3/2-practice-tdd/count.js | 8 +++++- Sprint-3/2-practice-tdd/count.test.js | 17 ++++++++++++ Sprint-3/2-practice-tdd/get-ordinal-number.js | 20 ++++++++++++-- .../2-practice-tdd/get-ordinal-number.test.js | 24 +++++++++++++++++ Sprint-3/2-practice-tdd/repeat-str.js | 11 +++++--- Sprint-3/2-practice-tdd/repeat-str.test.js | 26 +++++++++++++++---- 6 files changed, 95 insertions(+), 11 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..d59e425d6b 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,11 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } + } + return count; } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf7..8478e350b9 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,20 @@ test("should count multiple occurrences of a character", () => { // And a character `char` that does not exist within `str`. // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of `char` were found. +test("it should return 0 because the character doesn't occurrences", () => { + const str = "The character have no match"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); +// Scenario: 1 Occurrences +// Given the input string `str`, +// And a character `char` that have 1 character exist in `str`. +// When the function is called with these inputs, +// Then it should return 1, indicating that 1 occurrences of `char` were found. +test("it should return 1 because the character occurrences 1 time", () => { + const str = "code your future"; + const char = "f"; + const count = countChar(str, char); + expect(count).toEqual(1); +}); diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db13..ea1bb375be 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,21 @@ -function getOrdinalNumber(num) { - return "1st"; +function getOrdinalNumber(number) { + const lastTwoDigits = number % 100; + if (lastTwoDigits === 11 || lastTwoDigits === 12 || lastTwoDigits === 13) { + return number + "th"; + } + const lastDigit = number % 10; + let suffix; + if (lastDigit === 1) { + suffix = "st"; + } else if (lastDigit === 2) { + suffix = "nd"; + } else if (lastDigit === 3) { + suffix = "rd"; + } else { + suffix = "th"; + } + + return number + suffix; } module.exports = getOrdinalNumber; diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index adfa58560f..792934b2a5 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,27 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); +// Case 1: Numbers ending with 1 (but not 11) +// When the number ends with 1, except those ending with 11, +// Then the function should return a string by appending "st" to the number. +test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(42)).toEqual("42nd"); + expect(getOrdinalNumber(1752)).toEqual("1752nd"); +}); +// Case 1: Numbers ending with 1 (but not 11) +// When the number ends with 1, except those ending with 11, +// Then the function should return a string by appending "st" to the number. +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(83)).toEqual("83rd"); + expect(getOrdinalNumber(653)).toEqual("653rd"); +}); +// Case 1: Numbers ending with 1 (but not 11) +// When the number ends with 1, except those ending with 11, +// Then the function should return a string by appending "st" to the number. +test("should append 'th' for numbers not ending with 1, 2 and 3 ", () => { + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(38)).toEqual("38th"); + expect(getOrdinalNumber(15678)).toEqual("15678th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b003..e840693eb5 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,10 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(word, times) { + if (times > 0) { + return word.repeat(times); + } else if (times < 0) { + return "Error:negative number not allowed"; + } else { + return ""; + } } - module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c4..b7f89a2f93 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -10,9 +10,9 @@ const repeatStr = require("./repeat-str"); // Then it should return a string that contains the original `str` repeated `count` times. test("should repeat the string count times", () => { - const str = "hello"; - const count = 3; - const repeatedStr = repeatStr(str, count); + let word = "hello"; + let times = 3; + const repeatedStr = repeatStr(word, times); expect(repeatedStr).toEqual("hellohellohello"); }); @@ -20,13 +20,29 @@ test("should repeat the string count times", () => { // Given a target string `str` and a `count` equal to 1, // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. - +test("should repeat the string count times", () => { + let word = "code your future"; + let times = 1; + const repeatedStr = repeatStr(word, times); + expect(repeatedStr).toEqual("code your future"); +}); // Case: Handle count of 0: // Given a target string `str` and a `count` equal to 0, // When the repeatStr function is called with these inputs, // Then it should return an empty string. - +test("should repeat the string is empty ", () => { + let word = "hello"; + let times = 0; + const repeatedStr = repeatStr(word, times); + expect(repeatedStr).toBe(""); +}); // Case: Handle negative count: // Given a target string `str` and a negative integer `count`, // When the repeatStr function is called with these inputs, // Then it should throw an error, as negative counts are not valid. +test("should repeat the string return negative number not allowed ", () => { + let word = "hello"; + let times = -3; + const repeatedStr = repeatStr(word, times); + expect(repeatedStr).toBe("Error:negative number not allowed"); +}); From 3fd455aa550749ac7cf45b39ae3091a215d32f6f Mon Sep 17 00:00:00 2001 From: abduhasen Date: Sat, 14 Mar 2026 14:51:02 +0000 Subject: [PATCH 2/4] fixing test descriptions (adding brief description `should` and `when` ) based on mentor feedback --- Sprint-3/2-practice-tdd/count.test.js | 4 +-- .../2-practice-tdd/get-ordinal-number.test.js | 27 +++++++++++++------ Sprint-3/2-practice-tdd/repeat-str.test.js | 8 +++--- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 8478e350b9..fce6662b9f 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,7 +22,7 @@ test("should count multiple occurrences of a character", () => { // And a character `char` that does not exist within `str`. // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of `char` were found. -test("it should return 0 because the character doesn't occurrences", () => { +test("returns 0 when the character does not exist in the string", () => { const str = "The character have no match"; const char = "z"; const count = countChar(str, char); @@ -33,7 +33,7 @@ test("it should return 0 because the character doesn't occurrences", () => { // And a character `char` that have 1 character exist in `str`. // When the function is called with these inputs, // Then it should return 1, indicating that 1 occurrences of `char` were found. -test("it should return 1 because the character occurrences 1 time", () => { +test("returns 1 when the character appears once in the string", () => { const str = "code your future"; const char = "f"; const count = countChar(str, char); diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js index 792934b2a5..fdc373b03d 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -18,27 +18,38 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); -// Case 1: Numbers ending with 1 (but not 11) -// When the number ends with 1, except those ending with 11, +// Case 2: Numbers ending with 2 (but not 12) +// When the number ends with 1, except those ending with 12, // Then the function should return a string by appending "st" to the number. test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { expect(getOrdinalNumber(2)).toEqual("2nd"); expect(getOrdinalNumber(42)).toEqual("42nd"); expect(getOrdinalNumber(1752)).toEqual("1752nd"); }); -// Case 1: Numbers ending with 1 (but not 11) -// When the number ends with 1, except those ending with 11, +// Case 3: Numbers ending with 3 (but not 13) +// When the number ends with 3, except those ending with 13, // Then the function should return a string by appending "st" to the number. test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { expect(getOrdinalNumber(3)).toEqual("3rd"); expect(getOrdinalNumber(83)).toEqual("83rd"); expect(getOrdinalNumber(653)).toEqual("653rd"); }); -// Case 1: Numbers ending with 1 (but not 11) -// When the number ends with 1, except those ending with 11, -// Then the function should return a string by appending "st" to the number. -test("should append 'th' for numbers not ending with 1, 2 and 3 ", () => { +// Case 4: Numbers ending with 4 through 9 +// When the number does not end with 1, 2 or 3, +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for all other numbers that do not end with 1, 2 or 3", () => { expect(getOrdinalNumber(5)).toEqual("5th"); expect(getOrdinalNumber(38)).toEqual("38th"); expect(getOrdinalNumber(15678)).toEqual("15678th"); }); +//Case 5: Numbers ending with 11, 12 and 13 (special exceptions) +// When the number ends with 11, 12 or 13, +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for numbers ending with 11, 12 and 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index b7f89a2f93..a360b05cd4 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -9,7 +9,7 @@ const repeatStr = require("./repeat-str"); // When the repeatStr function is called with these inputs, // Then it should return a string that contains the original `str` repeated `count` times. -test("should repeat the string count times", () => { +test("should return the string the given number of count when count is a positive number", () => { let word = "hello"; let times = 3; const repeatedStr = repeatStr(word, times); @@ -20,7 +20,7 @@ test("should repeat the string count times", () => { // Given a target string `str` and a `count` equal to 1, // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. -test("should repeat the string count times", () => { +test("should return the original string without repetition when count is 1", () => { let word = "code your future"; let times = 1; const repeatedStr = repeatStr(word, times); @@ -30,7 +30,7 @@ test("should repeat the string count times", () => { // Given a target string `str` and a `count` equal to 0, // When the repeatStr function is called with these inputs, // Then it should return an empty string. -test("should repeat the string is empty ", () => { +test("should return an empty string when the number of times is 0", () => { let word = "hello"; let times = 0; const repeatedStr = repeatStr(word, times); @@ -40,7 +40,7 @@ test("should repeat the string is empty ", () => { // Given a target string `str` and a negative integer `count`, // When the repeatStr function is called with these inputs, // Then it should throw an error, as negative counts are not valid. -test("should repeat the string return negative number not allowed ", () => { +test("should return a string 'negative number not allowed' when negative number passed", () => { let word = "hello"; let times = -3; const repeatedStr = repeatStr(word, times); From 49def27f285321005647444d3932c7ab41189c17 Mon Sep 17 00:00:00 2001 From: abduhasen Date: Sat, 14 Mar 2026 16:16:09 +0000 Subject: [PATCH 3/4] -fixing the function repeat -fix the repeat-str test --- Sprint-3/2-practice-tdd/repeat-str.js | 10 +++++----- Sprint-3/2-practice-tdd/repeat-str.test.js | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index e840693eb5..5dec0e7d47 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,10 +1,10 @@ function repeatStr(word, times) { - if (times > 0) { - return word.repeat(times); - } else if (times < 0) { - return "Error:negative number not allowed"; - } else { + if (times < 0) { + throw new Error("negative number is not allowed"); + } else if (times === 0) { return ""; + } else { + return word.repeat(times); } } module.exports = repeatStr; diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a360b05cd4..eec24767d2 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -42,7 +42,8 @@ test("should return an empty string when the number of times is 0", () => { // Then it should throw an error, as negative counts are not valid. test("should return a string 'negative number not allowed' when negative number passed", () => { let word = "hello"; - let times = -3; - const repeatedStr = repeatStr(word, times); - expect(repeatedStr).toBe("Error:negative number not allowed"); + let times = -1; + expect(() => { + repeatStr("hello", -1); + }).toThrow("negative number is not allowed"); }); From 9ff8f84ef0801aa8009e86442af50f38d191f18c Mon Sep 17 00:00:00 2001 From: abduhasen Date: Sat, 14 Mar 2026 16:33:25 +0000 Subject: [PATCH 4/4] fixing the description --- Sprint-3/2-practice-tdd/repeat-str.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index eec24767d2..8be48f7170 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -40,7 +40,7 @@ test("should return an empty string when the number of times is 0", () => { // Given a target string `str` and a negative integer `count`, // When the repeatStr function is called with these inputs, // Then it should throw an error, as negative counts are not valid. -test("should return a string 'negative number not allowed' when negative number passed", () => { +test("should throw an error when a negative number is passed", () => { let word = "hello"; let times = -1; expect(() => {