From 7e6b8d85bb57882d3f0d760a0a4595c1863c6d3f Mon Sep 17 00:00:00 2001 From: Zadri Date: Sun, 15 Mar 2026 14:53:01 +0000 Subject: [PATCH 1/5] add logic for countChar --- Sprint-3/2-practice-tdd/count.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..c99547c6d8 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,13 @@ 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; From 60369d65a7249edacbf4796642318b3a581984c3 Mon Sep 17 00:00:00 2001 From: Zadri Date: Sun, 15 Mar 2026 15:11:44 +0000 Subject: [PATCH 2/5] implement function countChar --- Sprint-3/2-practice-tdd/count.test.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf7..0ee50aef3b 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -1,5 +1,15 @@ // implement a function countChar that counts the number of times a character occurs in a string const countChar = require("./count"); +function countChar(stringOfCharacters, findCharacters){ + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++){ + if (stringOfCharacters[i] === findCharacters){ + count++; + } + } + return count; + +} // Given a string `str` and a single character `char` to search for, // When the countChar function is called with these inputs, // Then it should: From 50749d952da7d3c27b1151a93b73042c94db9092 Mon Sep 17 00:00:00 2001 From: Zadri Date: Sun, 15 Mar 2026 15:35:14 +0000 Subject: [PATCH 3/5] add no occurences test for function countChar --- Sprint-3/2-practice-tdd/count.test.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 0ee50aef3b..8b88027777 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -1,19 +1,11 @@ // implement a function countChar that counts the number of times a character occurs in a string -const countChar = require("./count"); -function countChar(stringOfCharacters, findCharacters){ - let count = 0; - for (let i = 0; i < stringOfCharacters.length; i++){ - if (stringOfCharacters[i] === findCharacters){ - count++; - } - } - return count; - +const countChar = require("./count");{ } // Given a string `str` and a single character `char` to search for, // When the countChar function is called with these inputs, // Then it should: + // Scenario: Multiple Occurrences // Given the input string `str`, // And a character `char` that occurs one or more times in `str` (e.g., 'a' in 'aaaaa'), @@ -32,3 +24,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 is not present in the string", () => { + const str = "aaaaa"; + const char = "b"; + const count = countChar(str, char); + expect(count).toEqual(0); + +}); \ No newline at end of file From 97a5210973b9ee2f6e0ea5a6936ae284fb7e7521 Mon Sep 17 00:00:00 2001 From: Zadri Date: Sun, 15 Mar 2026 15:43:19 +0000 Subject: [PATCH 4/5] implement getOrdinalNumber function --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 15 ++++++++++++++- 1 file changed, 14 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 f95d71db13..c08f255302 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,18 @@ function getOrdinalNumber(num) { - return "1st"; + const lastDigits = num % 100; + if (lastDigits >= 11 && lastDigits <= 13) { + return num + "th"; + } + switch (lastDigits % 10) { + case 1: + return num + "st"; + case 2: + return num + "nd"; + case 3: + return num + "rd"; + default: + return num + "th"; + } } module.exports = getOrdinalNumber; From 761fb1d203848fcb60cd62c51862d30a00509271 Mon Sep 17 00:00:00 2001 From: Zadri Date: Sun, 15 Mar 2026 16:13:34 +0000 Subject: [PATCH 5/5] refactor tests for countChar and getOrdinalNumber --- .../2-practice-tdd/get-ordinal-number.test.js | 38 +++++++++++++++++++ 1 file changed, 38 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 adfa58560f..9c1915a6cf 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -17,4 +17,42 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(1)).toEqual("1st"); 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(132)).toEqual("132nd"); +}); + +// Case 3: Numbers ending with 3 (but not 13) +// When the case ends with 3, expect 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(133)).toEqual("133rd"); +}); + +// 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: ALL other numbers +// When the number does not end with 1, 2, 3, 11, 12, or 13, +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for all other numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(14)).toEqual("14th"); + expect(getOrdinalNumber(100)).toEqual("100th"); });