From faa332c1cd40006a59d75eb67ab79de149427825 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:33:59 +0100 Subject: [PATCH 1/9] rewrite code --- Sprint-3/2-practice-tdd/count.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..4f693b6038 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 (let char of stringOfCharacters) { + if (char === findCharacter) { + count ++; + } + } + return count +} -module.exports = countChar; +module.exports = countChar; \ No newline at end of file From b3be32183bfdae5ec65c5d141b0e6c97832cb74d Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:35:31 +0100 Subject: [PATCH 2/9] rewrite tests --- Sprint-3/2-practice-tdd/count.test.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf7..146d7845e0 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 detect no instances of a given character", () => { + const str = "aaaaa"; + const char = "b"; + const count = countChar(str, char); + expect(count).toEqual(0); +}) From c3429056dd97bfb8952e76957a5386a70a957b41 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:38:13 +0100 Subject: [PATCH 3/9] rewrite code --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 29 ++++++++++++++++++- 1 file changed, 28 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..a65541fc7b 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,32 @@ function getOrdinalNumber(num) { - return "1st"; + if (num % 100 === 11) { + return `${num}th`; + } else if (num % 100 === 12) { + return `${num}th`; + } else if (num % 100 === 13) { + return `${num}th`; + } else if (num % 10 === 1) { + return `${num}st`; + } else if (num % 10 === 2) { + return `${num}nd` + } else if (num % 10 === 3) { + return `${num}rd` + } else { + return `${num}th` + } } module.exports = getOrdinalNumber; + +console.log(getOrdinalNumber(1)); +console.log(getOrdinalNumber(2)); +console.log(getOrdinalNumber(3)); +console.log(getOrdinalNumber(4)); +console.log(getOrdinalNumber(11)); +console.log(getOrdinalNumber(12)); +console.log(getOrdinalNumber(13)); +console.log(getOrdinalNumber(21)); +console.log(getOrdinalNumber(52)); +console.log(getOrdinalNumber(63)); +console.log(getOrdinalNumber(111)) + From bd77971f41a80a6813f6ffc0c2a14c3fc2c0bc02 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:40:09 +0100 Subject: [PATCH 4/9] rewrite tests --- .../2-practice-tdd/get-ordinal-number.test.js | 35 +++++++++++++++++++ 1 file changed, 35 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..555ea97a6d 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,38 @@ 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 return 'nd' for numbers ending with 2`, () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(122)).toEqual("122nd"); +}); + +//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 add 'rd' for numbers ending with 3`, () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(123)).toEqual("123rd"); +}); + +//Case 4: Numbers ending with 11, 12, 13. +// When the number ends with 11, 12 and 13, +// Then the function should return a string by appending "th" to the number. +test(`should add 'th' to exceptions like 11, 12 and 13`, () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + +//Case 5: All other numbers that are not ending with 1, 2, 3, and that are not 11, 12, and 13. +// the function should return corresponding string with "th" at the end +test(`should add 'th' to every case that is not exceptional`, () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(555)).toEqual("555th"); + expect(getOrdinalNumber(6666)).toEqual("6666th"); +}); From 822c364aa8b464f9adc73d2e378eb2ffebf95fae Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:41:38 +0100 Subject: [PATCH 5/9] rewrite code --- Sprint-3/2-practice-tdd/repeat-str.js | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 2af0a2cea7..a25dc21a9b 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,7 +1,20 @@ -function repeatStr() { - // Your implementation of this function must *not* call String.prototype.repeat (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat). - // The goal is to re-implement that function, not to use it. - return "hellohellohello"; +function repeatStr(str, num) { + var result = ""; + var i; + if (num < 0) { + throw new Error("negative numbers are not valid"); + } else if (num === 0) { + result = ""; + } else { + for (i = 0; i < num; i++) { + result += str; + } + } + return result; } -module.exports = repeatStr; +//console.log(repeatStr("hello", -1)); +//console.log(repeatStr("hello", 0)); +//console.log(repeatStr("hello", 5)) + +module.exports = repeatStr; \ No newline at end of file From 6dddbf94e2a5794c5a348b19e4c7daed5beabee7 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Fri, 17 Jul 2026 17:43:37 +0100 Subject: [PATCH 6/9] repeat-str.test.js --- Sprint-3/2-practice-tdd/repeat-str.test.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Sprint-3/2-practice-tdd/repeat-str.test.js b/Sprint-3/2-practice-tdd/repeat-str.test.js index a3fc1196c4..abee6186ca 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,13 +20,31 @@ 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 just original string", () => { + 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 for 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 when negative number is entered", () => { + const str = "hello"; + const count = -1; + + expect(() => repeatStr(str, count)).toThrow("negative numbers are not valid"); +}); \ No newline at end of file From 6dace3cc8ee5ebee56b9ca8b52a457b17137eabd Mon Sep 17 00:00:00 2001 From: vmoratti Date: Wed, 22 Jul 2026 12:44:22 +0100 Subject: [PATCH 7/9] remove space after 'count' variable --- Sprint-3/2-practice-tdd/count.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 4f693b6038..26cc44da1f 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -2,10 +2,10 @@ function countChar(stringOfCharacters, findCharacter) { let count = 0; for (let char of stringOfCharacters) { if (char === findCharacter) { - count ++; + count++; } } return count } -module.exports = countChar; \ No newline at end of file +module.exports = countChar; From 6230cc6d77567da0ed98a3a740fa5a6473c5afc8 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Wed, 22 Jul 2026 14:08:43 +0100 Subject: [PATCH 8/9] Fix ordinal number logic for 11, 12, and 13 Updated the getOrdinalNumber function to correctly handle numbers ending in 11, 12, and 13 as 'th'. Added additional test cases for validation. --- Sprint-3/2-practice-tdd/get-ordinal-number.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index a65541fc7b..0ab406ff01 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,9 +1,5 @@ function getOrdinalNumber(num) { - if (num % 100 === 11) { - return `${num}th`; - } else if (num % 100 === 12) { - return `${num}th`; - } else if (num % 100 === 13) { + if (num % 100 === 11 || num % 100 === 12 || num % 100 === 13) { return `${num}th`; } else if (num % 10 === 1) { return `${num}st`; @@ -22,9 +18,12 @@ console.log(getOrdinalNumber(1)); console.log(getOrdinalNumber(2)); console.log(getOrdinalNumber(3)); console.log(getOrdinalNumber(4)); +console.log(getOrdinalNumber(5)); +console.log(getOrdinalNumber(6)); console.log(getOrdinalNumber(11)); console.log(getOrdinalNumber(12)); console.log(getOrdinalNumber(13)); +console.log(getOrdinalNumber(14)); console.log(getOrdinalNumber(21)); console.log(getOrdinalNumber(52)); console.log(getOrdinalNumber(63)); From bb5dd8332683e8ab5de54de15d32e999c5e96ab9 Mon Sep 17 00:00:00 2001 From: vmoratti Date: Wed, 22 Jul 2026 14:17:50 +0100 Subject: [PATCH 9/9] Refactor repeatStr function by cleaning up code Removed unnecessary checks for zero and commented-out test cases. --- Sprint-3/2-practice-tdd/repeat-str.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index a25dc21a9b..6ce47d2875 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -3,8 +3,6 @@ function repeatStr(str, num) { var i; if (num < 0) { throw new Error("negative numbers are not valid"); - } else if (num === 0) { - result = ""; } else { for (i = 0; i < num; i++) { result += str; @@ -13,8 +11,4 @@ function repeatStr(str, num) { return result; } -//console.log(repeatStr("hello", -1)); -//console.log(repeatStr("hello", 0)); -//console.log(repeatStr("hello", 5)) - -module.exports = repeatStr; \ No newline at end of file +module.exports = repeatStr;