From 0141efbdaf63726981fd93b7fbd13dbe4fbdbc23 Mon Sep 17 00:00:00 2001 From: Ales-Os-Dev_Lab Date: Fri, 6 Mar 2026 09:31:40 +0000 Subject: [PATCH 1/5] (count.js) Implement character counting logic in countChar function and (count.test.js) add test for zero occurrences --- Sprint-3/2-practice-tdd/count.js | 14 +++++++++++++- Sprint-3/2-practice-tdd/count.test.js | 7 +++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..c559ce5fa 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,17 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + // 1. Assign a variable to keep track of the count + let count = 0; + + // 2. Loop through all chars in the string + for (let char = 0; char < stringOfCharacters.length; char++) { + // 3. Check if the current char matches the one we are looking for + if (stringOfCharacters[char] === findCharacter) { + count++; // If it's a match, add 1 to our tally + } + } + + // 4. Return the final tally after the loop finishes + 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 179ea0ddf..02c25489b 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,10 @@ 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("should return 0 when the character does not occur in the string", () => { + const str = "Will this work?"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); From ac7e1c8a5c68ceb46537b54efe11d691e90f611d Mon Sep 17 00:00:00 2001 From: Ales-Os-Dev_Lab Date: Fri, 6 Mar 2026 21:47:54 +0000 Subject: [PATCH 2/5] Implement getOrdinalNumber function to return correct ordinal suffixes --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..932141d10 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,26 @@ function getOrdinalNumber(num) { - return "1st"; + // Calculate the remainder when divided by 100 to check for 11, 12, 13 + const lastTwoDigits = number % 100; + + // Calculate the remainder when divided by 10 to get the single last digit + const lastDigit = number % 10; + + // 1. The "teen" exceptions (11th, 12th, 13th) + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return number + "th"; + } + + // 2. Apply standard rules based on last digit + if (lastDigit === 1) { + return number + "st"; + } else if (lastDigit === 2) { + return number + "nd"; + } else if (lastDigit === 3) { + return number + "rd"; + } else { + // Cover 0, 4, 5, 6, 7, 8, and 9 + return number + "th"; + } } module.exports = getOrdinalNumber; From 1a5ddc6ba5ce9f7a79b98c00b8db5e38461e2b68 Mon Sep 17 00:00:00 2001 From: Ales-Os-Dev_Lab Date: Fri, 6 Mar 2026 22:17:20 +0000 Subject: [PATCH 3/5] Add tests for ordinal number suffixes in getOrdinalNumber function --- .../2-practice-tdd/get-ordinal-number.test.js | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) 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 adfa58560..c6ef759ff 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,43 @@ 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 2: Numbers ending with 2 (but not 12) +// When the number ends with 2, except those ending with 12, +// Then the function should return a string by appending "nd" to the number. +test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(172)).toEqual("172nd"); +}); + +// 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 "rd" to the number. +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(4393)).toEqual("4393rd"); +}); + +// Case 4: Numbers ending with 11, 12, or 13 +// 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, or 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + +// Case 5: Numbers ending with 0, 4, 5, 6, 7, 8, or 9 +// When the number ends with 0, 4, 5, 6, 7, 8, or 9, +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for numbers ending with 0, 4, 5, 6, 7, 8, or 9", () => { + expect(getOrdinalNumber(150)).toEqual("150th"); + expect(getOrdinalNumber(6584)).toEqual("6584th"); + expect(getOrdinalNumber(85)).toEqual("85th"); + expect(getOrdinalNumber(659326)).toEqual("659326th"); + expect(getOrdinalNumber(567)).toEqual("567th"); + expect(getOrdinalNumber(888)).toEqual("888th"); + expect(getOrdinalNumber(6589)).toEqual("6589th"); +}); From d4aba95f7b778c063682d798637de8a6ff6c9b5b Mon Sep 17 00:00:00 2001 From: Ales-Os-Dev_Lab Date: Sat, 7 Mar 2026 09:37:35 +0000 Subject: [PATCH 4/5] Implement repeatStr function to handle string repetition based on input count --- Sprint-3/2-practice-tdd/repeat-str.js | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..b7bbf9d41 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,25 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(stringToRepeat, numberOfRepetitions) { + // Handle count of 0 + if (numberOfRepetitions === 0) { + return ""; + } + + // Handle count of 1 + if (numberOfRepetitions === 1) { + return stringToRepeat; + } + + // Handle multiple repetitions (> than 1) + if (numberOfRepetitions > 1) { + let finalString = ""; + + // loop for repeating the string and concatenating it to the final string + for (let repetition = 0; repetition < numberOfRepetitions; repetition++) { + finalString = finalString + stringToRepeat; + } + + return finalString; + } } module.exports = repeatStr; From 5939d1256a5f9dd12e7afac6220c0246faddaa9a Mon Sep 17 00:00:00 2001 From: Ales-Os-Dev_Lab Date: Sat, 7 Mar 2026 09:50:00 +0000 Subject: [PATCH 5/5] Add tests for edge cases in repeatStr function: handle count of 1, 0, and negative values --- Sprint-3/2-practice-tdd/repeat-str.test.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c..603dcbd8a 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -21,12 +21,32 @@ test("should repeat the string count times", () => { // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. +test("should return the original string when count is 1", () => { + const str = "CYF"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("CYF"); +}); + // 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 return an empty string when count is 0", () => { + const str = "test"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + // 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 throw an error when count is negative", () => { + const str = "error"; + const count = -1; + expect(() => repeatStr(str, count)).toThrow("Negative count is not valid"); +});