From 2cd9c14c1b5f919fdaf84c73efd52b489b2f5a64 Mon Sep 17 00:00:00 2001 From: Damian_Dunkley Date: Wed, 25 Feb 2026 14:21:47 +0000 Subject: [PATCH 1/5] updates for sprint 3 2-practice-tdd, Count and repeat --- Sprint-3/2-practice-tdd/count.js | 9 ++++++++- Sprint-3/2-practice-tdd/count.test.js | 8 ++++++++ Sprint-3/2-practice-tdd/repeat-str.js | 11 +++++++++-- Sprint-3/2-practice-tdd/repeat-str.test.js | 19 +++++++++++++++++-- 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..0585c5794 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,12 @@ 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 179ea0ddf..f03cbbc59 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,11 @@ 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 character does not occur in 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/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..1a8a52c55 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("Count must be a non-negative integer"); + } + let result = ""; + for (let i = 0; i < count; i++) { + result += str; + } + return result; } 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 a3fc1196c..ed53138a8 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,13 +20,28 @@ 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("Count must be a non-negative integer"); +} ); From 2727638622fdb7a696fc3569bb7fff3808a1b99e Mon Sep 17 00:00:00 2001 From: Damian_Dunkley Date: Wed, 25 Feb 2026 14:28:09 +0000 Subject: [PATCH 2/5] updates for sprint 3 2-practice-tdd, get ordinal no.s --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 15 +++++++- .../2-practice-tdd/get-ordinal-number.test.js | 36 +++++++++++++++++++ 2 files changed, 50 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..da50a721c 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"; + // return "1st"; + if (num % 100 >= 11 && num % 100 <= 13) { + return num + "th"; + } + if (num % 10 === 1) { + return num + "st"; + } + if (num % 10 === 2) { + return num + "nd"; + } + if (num % 10 === 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 adfa58560..9d3b640a7 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,39 @@ 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(132)).toEqual("132nd"); +}); +// 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(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"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); +// Case 5: All other numbers +// When the number does not end with 1, 2, or 3 (and is not 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"); +}); From f2e5ebaadf5e2d179381226f98b4dd6e5243cc2a Mon Sep 17 00:00:00 2001 From: Damian_Dunkley Date: Wed, 25 Feb 2026 14:55:08 +0000 Subject: [PATCH 3/5] updates for sprint 3 3-dead-code exercise 1 --- Sprint-3/3-dead-code/exercise-1.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sprint-3/3-dead-code/exercise-1.js b/Sprint-3/3-dead-code/exercise-1.js index 4d09f15fa..aade4870c 100644 --- a/Sprint-3/3-dead-code/exercise-1.js +++ b/Sprint-3/3-dead-code/exercise-1.js @@ -1,13 +1,13 @@ // Find the instances of unreachable and redundant code - remove them! // The sayHello function should continue to work for any reasonable input it's given. -let testName = "Jerry"; +//let testName = "Jerry"; const greeting = "hello"; function sayHello(greeting, name) { - const greetingStr = greeting + ", " + name + "!"; + //const greetingStr = greeting + ", " + name + "!"; return `${greeting}, ${name}!`; - console.log(greetingStr); + // console.log(greetingStr); } testName = "Aman"; From dc0987a3df64b960b1c20171385af57d003d4c87 Mon Sep 17 00:00:00 2001 From: Damian_Dunkley Date: Wed, 25 Feb 2026 15:01:23 +0000 Subject: [PATCH 4/5] updates for sprint 3 3-dead-code exercise 2 --- Sprint-3/3-dead-code/exercise-2.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Sprint-3/3-dead-code/exercise-2.js b/Sprint-3/3-dead-code/exercise-2.js index 56d7887c4..f35d4c30d 100644 --- a/Sprint-3/3-dead-code/exercise-2.js +++ b/Sprint-3/3-dead-code/exercise-2.js @@ -2,12 +2,12 @@ // The countAndCapitalisePets function should continue to work for any reasonable input it's given, and you shouldn't modify the pets variable. const pets = ["parrot", "hamster", "horse", "dog", "hamster", "cat", "hamster"]; -const capitalisedPets = pets.map((pet) => pet.toUpperCase()); +//const capitalisedPets = pets.map((pet) => pet.toUpperCase()); const petsStartingWithH = pets.filter((pet) => pet[0] === "h"); -function logPets(petsArr) { - petsArr.forEach((pet) => console.log(pet)); -} +//function logPets(petsArr) { + //petsArr.forEach((pet) => console.log(pet)); +//} function countAndCapitalisePets(petsArr) { const petCount = {}; From a893b0973eb5c561c56bb18a64df585979a7245e Mon Sep 17 00:00:00 2001 From: Damian_Dunkley Date: Wed, 25 Feb 2026 15:37:44 +0000 Subject: [PATCH 5/5] removing practice-tdd from branch --- Sprint-3/2-practice-tdd/count.js | 9 +---- Sprint-3/2-practice-tdd/count.test.js | 8 ----- Sprint-3/2-practice-tdd/get-ordinal-number.js | 15 +------- .../2-practice-tdd/get-ordinal-number.test.js | 36 ------------------- Sprint-3/2-practice-tdd/repeat-str.js | 11 ++---- Sprint-3/2-practice-tdd/repeat-str.test.js | 19 ++-------- 6 files changed, 6 insertions(+), 92 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 0585c5794..95b6ebb7d 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,12 +1,5 @@ function countChar(stringOfCharacters, findCharacter) { - // - let count = 0; - for (let i = 0; i < stringOfCharacters.length; i++) { - if (stringOfCharacters[i] === findCharacter) { - count++; - } - } - return count; + return 5 } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index f03cbbc59..179ea0ddf 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,11 +22,3 @@ 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 character does not occur in 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.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index da50a721c..f95d71db1 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,18 +1,5 @@ function getOrdinalNumber(num) { - // return "1st"; - if (num % 100 >= 11 && num % 100 <= 13) { - return num + "th"; - } - if (num % 10 === 1) { - return num + "st"; - } - if (num % 10 === 2) { - return num + "nd"; - } - if (num % 10 === 3) { - return num + "rd"; - } - return num + "th"; + return "1st"; } 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 9d3b640a7..adfa58560 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -18,39 +18,3 @@ 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(132)).toEqual("132nd"); -}); -// 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(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"); - expect(getOrdinalNumber(111)).toEqual("111th"); - expect(getOrdinalNumber(112)).toEqual("112th"); - expect(getOrdinalNumber(113)).toEqual("113th"); -}); -// Case 5: All other numbers -// When the number does not end with 1, 2, or 3 (and is not 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"); -}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 1a8a52c55..3838c7b00 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,12 +1,5 @@ -function repeatStr(str, count) { - if (count < 0) { - throw new Error("Count must be a non-negative integer"); - } - let result = ""; - for (let i = 0; i < count; i++) { - result += str; - } - return result; +function repeatStr() { + return "hellohellohello"; } 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 ed53138a8..a3fc1196c 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,28 +20,13 @@ 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("Count must be a non-negative integer"); -} );