From 4b6af7560313efcaaca1de27c39eb9280d6ac0a5 Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sat, 7 Mar 2026 22:29:42 +0000 Subject: [PATCH 1/7] fixed the branch issue of practise-tdd for seperate PR --- Sprint-3/2-practice-tdd/count.test.js | 6 ++++ .../2-practice-tdd/get-ordinal-number.test.js | 29 +++++++++++++++++++ Sprint-3/2-practice-tdd/repeat-str.test.js | 16 ++++++++++ 3 files changed, 51 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf..10156ee7d 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,9 @@ 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 = "hello world"; + const char = "x"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); 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..e541e561f 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,32 @@ 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) +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"); +}); +test("should append 'th' for numbers ending with 2 that are also ending with 12", () => { + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(112)).toEqual("112th"); +}); + +// Case 3: Numbers ending with 3 (but not 13) +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"); +}); +test("should append 'th' for numbers ending with 3 that are also ending with 13", () => { + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); + +// Case 4: All other numbers +test("should append 'th' for all other numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(5)).toEqual("5th"); +}); \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c..f0c886847 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -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 return the original string when count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("hello"); +}); // 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 = "hello"; + 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 = "hello"; + const count = -1; + expect(() => repeatStr(str, count)).toThrow(); +}); \ No newline at end of file From 4bfa7d6d1a59bf15565ce0eb3d87c172819fd71b Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 17:05:30 +0000 Subject: [PATCH 2/7] fixed indenation in arrow function --- Sprint-3/2-practice-tdd/repeat-str.test.js | 3 ++- 1 file changed, 2 insertions(+), 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 f0c886847..6ddd1916e 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 count 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 throw an error when count is negative", () => { const str = "hello"; +test("should throw an error when count is negative", () => { + const str = "hello"; const count = -1; expect(() => repeatStr(str, count)).toThrow(); }); \ No newline at end of file From ce9617ee6bb035cc2d53349b353c7ebc929913eb Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 17:11:31 +0000 Subject: [PATCH 3/7] update test description to be more specific and informative --- Sprint-3/2-practice-tdd/get-ordinal-number.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e541e561f..0bec4a392 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -43,7 +43,7 @@ test("should append 'th' for numbers ending with 3 that are also ending with 13" }); // Case 4: All other numbers -test("should append 'th' for all other numbers", () => { +test("should append 'th' for numbers that do not follow the 1, 2, 3 rule (e.g., 4, 5, 6...)", () => { expect(getOrdinalNumber(4)).toEqual("4th"); expect(getOrdinalNumber(5)).toEqual("5th"); }); \ No newline at end of file From 3d45811831f499fb349079009b4ef655354bdc60 Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 17:18:21 +0000 Subject: [PATCH 4/7] simplify descriptions and add test for numbers ending with 11 --- Sprint-3/2-practice-tdd/get-ordinal-number.test.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 0bec4a392..bc3037657 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -37,8 +37,12 @@ test("should append 'rd' for numbers ending with 3, except those ending with 13" expect(getOrdinalNumber(23)).toEqual("23rd"); expect(getOrdinalNumber(133)).toEqual("133rd"); }); -test("should append 'th' for numbers ending with 3 that are also ending with 13", () => { +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"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); expect(getOrdinalNumber(113)).toEqual("113th"); }); From 2f7741ecdd2f7850bc3e8b26c14579f8362cd21e Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 17:36:02 +0000 Subject: [PATCH 5/7] add implementation and correctly handle st, nd, rd, th suffixes including 11, 12, 13 --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 12 +++++++++++- Sprint-3/2-practice-tdd/get-ordinal-number.test.js | 11 +++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..f43ea4799 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,15 @@ function getOrdinalNumber(num) { - return "1st"; + const lastTwo = num % 100; // handle teen exceptions + if (lastTwo === 11 || lastTwo === 12 || lastTwo === 13) { + return num + "th"; + } + + const lastDigit = num % 10; + if (lastDigit === 1) return num + "st"; + if (lastDigit === 2) return num + "nd"; + if (lastDigit === 3) return num + "rd"; + + return num + "th"; } 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 bc3037657..5e29069fb 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -47,7 +47,14 @@ test("should append 'th' for numbers ending with 11, 12, or 13", () => { }); // Case 4: All other numbers -test("should append 'th' for numbers that do not follow the 1, 2, 3 rule (e.g., 4, 5, 6...)", () => { + + test("should append 'th' for numbers that do not follow the 1, 2, 3 rule", () => { + // Single digits 4-10 expect(getOrdinalNumber(4)).toEqual("4th"); expect(getOrdinalNumber(5)).toEqual("5th"); -}); \ No newline at end of file + expect(getOrdinalNumber(6)).toEqual("6th"); + expect(getOrdinalNumber(7)).toEqual("7th"); + expect(getOrdinalNumber(8)).toEqual("8th"); + expect(getOrdinalNumber(9)).toEqual("9th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + }); \ No newline at end of file From 0f8bc3b4f29b715879ea7c3499a564513394d866 Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 19:52:22 +0000 Subject: [PATCH 6/7] implement function to count character occurrences, including case-sensitive and non-alphabet characters --- Sprint-3/2-practice-tdd/count.js | 17 +++++++++++++++-- Sprint-3/2-practice-tdd/count.test.js | 24 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..e660fa6be 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,18 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + if (typeof stringOfCharacters !== "string") { + throw new Error("First argument must be a string"); + } + if (typeof findCharacter !== "string" || findCharacter.length !== 1) { + throw new Error("Second argument must be a single character"); + } + + let count = 0; + for (const char of stringOfCharacters) { + if (char === findCharacter) { + count++; + } + } + return count; } -module.exports = countChar; +module.exports = countChar; \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 10156ee7d..f3a5144a6 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -28,3 +28,27 @@ test("should return 0 when the character does not occur in the string", () => { const count = countChar(str, char); expect(count).toEqual(0); }); + +// Case: Case sensitivity +test("should count characters in a case-sensitive way", () => { + const str = "Hello World"; + const char = "h"; // lowercase 'h' does not match 'H' + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Case: Non-alphabet characters +test("should count non-alphabet characters", () => { + const str = "123!@#123!"; + const char = "1"; + const count = countChar(str, char); + expect(count).toEqual(2); +}); + +// Case: Spaces +test("should count spaces correctly", () => { + const str = "a b c d e f g"; + const char = " "; + const count = countChar(str, char); + expect(count).toEqual(6); +}); \ No newline at end of file From a36b12723aeaf8e780d0102e10cf166f503c7415 Mon Sep 17 00:00:00 2001 From: Fayaz Date: Sun, 8 Mar 2026 19:57:29 +0000 Subject: [PATCH 7/7] implemented string repetition with validation for count --- Sprint-3/2-practice-tdd/repeat-str.js | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..a86cffe95 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,22 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) { + throw new Error("Count cannot be negative"); + } + + if (count === 0) { + return ""; + } + + if (count === 1) { + return str; + } + + let result = ""; + for (let i = 0; i < count; i++) { + result += str; + } + + return result; } -module.exports = repeatStr; +module.exports = repeatStr; \ No newline at end of file