From d36de13dc3bdf9c302fabebaa1cbd8bbd3faf6a2 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 10 Mar 2026 23:04:04 +0000 Subject: [PATCH 1/7] Mod-2-Sprint-3-2-practice-tdd exercise 1 done --- Sprint-2/Project-CLI-Treasure-Hunt | 1 + Sprint-3/2-practice-tdd/count.js | 10 ++++++++-- Sprint-3/2-practice-tdd/count.test.js | 6 ++++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 160000 Sprint-2/Project-CLI-Treasure-Hunt diff --git a/Sprint-2/Project-CLI-Treasure-Hunt b/Sprint-2/Project-CLI-Treasure-Hunt new file mode 160000 index 000000000..4374e4e6b --- /dev/null +++ b/Sprint-2/Project-CLI-Treasure-Hunt @@ -0,0 +1 @@ +Subproject commit 4374e4e6b862b0a110e806b6115f3f6b3c22b26a diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..d4849ac1a 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 (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 179ea0ddf..864b6ad32 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 a character does not occur in the string", () => { + const str = "aaaaa"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); \ No newline at end of file From 205610dc9e4bf1676a40fdbaec8f022756ec098d Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 10 Mar 2026 23:24:11 +0000 Subject: [PATCH 2/7] test+code repeat-str.js --- Sprint-3/2-practice-tdd/repeat-str.js | 13 ++++++++++--- Sprint-3/2-practice-tdd/repeat-str.test.js | 18 ++++++++++++++++++ 2 files changed, 28 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..abe2dc3ba 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,12 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) { + throw new Error("Negative counts are not valid"); + } + 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 diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c..589bc55a0 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -21,12 +21,30 @@ 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 = "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 empty string on count of 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 on negative count", () => { + expect(() => repeatStr("hello", -1)).toThrow(); +}); From 7d1faf535334dbfcd742d707d346b50bf71ba42b Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 10 Mar 2026 23:58:23 +0000 Subject: [PATCH 3/7] last one for practice TDD --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 22 ++++++++++++++-- .../2-practice-tdd/get-ordinal-number.test.js | 25 +++++++++++++++++++ 2 files changed, 45 insertions(+), 2 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..2aab18d27 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,23 @@ function getOrdinalNumber(num) { - return "1st"; + if (num === 0) { + return "0"; + } + const lastTwoDigits = num % 100; + const lastDigit = num % 10; + + if (lastTwoDigits === 11 || lastTwoDigits === 12 || lastTwoDigits === 13) { + return `${num}th`; + } + if (lastDigit === 1) { + return `${num}st`; + } + if (lastDigit === 2) { + return `${num}nd`; + } + if (lastDigit === 3) { + return `${num}rd`; + } + return `${num}th`; } -module.exports = getOrdinalNumber; +module.exports = getOrdinalNumber; \ No newline at end of file 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..a439a19fc 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,28 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +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 '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 not append any suffix for the number 0 and return 0", () => { + expect(getOrdinalNumber(0)).toEqual("0"); +}); + +test("should append 'th' for numbers ending with 4-9 or 0, including those ending with 11-13", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(200)).toEqual("200th"); +}); From 5fb5bbffb54f5c89307431e314ff77771a2f353b Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Wed, 11 Mar 2026 00:54:49 +0000 Subject: [PATCH 4/7] Remove Sprint-2 submodule reference from Sprint-3 branch --- Sprint-2/Project-CLI-Treasure-Hunt | 1 - 1 file changed, 1 deletion(-) delete mode 160000 Sprint-2/Project-CLI-Treasure-Hunt diff --git a/Sprint-2/Project-CLI-Treasure-Hunt b/Sprint-2/Project-CLI-Treasure-Hunt deleted file mode 160000 index 4374e4e6b..000000000 --- a/Sprint-2/Project-CLI-Treasure-Hunt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4374e4e6b862b0a110e806b6115f3f6b3c22b26a From 8222fda9d56c1dec2cb3684d81d2b3a8048ec50a Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Thu, 12 Mar 2026 00:43:41 +0000 Subject: [PATCH 5/7] Changed order of tests in repeat-str.test.js so that the test for 0 comes first. --- Sprint-3/2-practice-tdd/repeat-str.test.js | 36 ++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index 589bc55a0..7d8891def 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -4,6 +4,30 @@ const repeatStr = require("./repeat-str"); // When the repeatStr function is called with these inputs, // Then it should: +// 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 empty string on count of 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +// 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 empty string on count of 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + // Case: handle multiple repetitions: // Given a target string `str` and a positive integer `count` greater than 1, // When the repeatStr function is called with these inputs, @@ -28,18 +52,6 @@ test("should return the original string when count is 1", () => { 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 empty string on count of 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, From 2256f87c8b60f4da09e2746d17cfef770ae82102 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Thu, 12 Mar 2026 13:49:13 +0000 Subject: [PATCH 6/7] In get-ordinal-number: if statement replaced by switch statement --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 28 ++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index 2aab18d27..bbb88126c 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,23 +1,25 @@ function getOrdinalNumber(num) { - if (num === 0) { + if (num === 0) { return "0"; } + const lastTwoDigits = num % 100; const lastDigit = num % 10; - if (lastTwoDigits === 11 || lastTwoDigits === 12 || lastTwoDigits === 13) { - return `${num}th`; - } - if (lastDigit === 1) { - return `${num}st`; - } - if (lastDigit === 2) { - return `${num}nd`; - } - if (lastDigit === 3) { - return `${num}rd`; + switch (true) { + case lastTwoDigits === 11: + case lastTwoDigits === 12: + case lastTwoDigits === 13: + return `${num}th`; + case lastDigit === 1: + return `${num}st`; + case lastDigit === 2: + return `${num}nd`; + case lastDigit === 3: + return `${num}rd`; + default: + return `${num}th`; } - return `${num}th`; } module.exports = getOrdinalNumber; \ No newline at end of file From 0644d6f1604d76e80fb2398d2a74ced9ac1dc019 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Thu, 12 Mar 2026 14:23:56 +0000 Subject: [PATCH 7/7] In repeat-str.js now first testing if number is 0 already --- Sprint-3/2-practice-tdd/repeat-str.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index abe2dc3ba..86d0ec512 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -2,6 +2,9 @@ function repeatStr(str, count) { if (count < 0) { throw new Error("Negative counts are not valid"); } + if (count === 0) { + return ""; + } let result = ""; for (let i = 0; i < count; i++) { result += str;