diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..443e7d207 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,8 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + return [...stringOfCharacters].reduce( + (acc, curr) => acc + (curr === findCharacter ? 1 : 0), + 0 + ); } 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..df692b909 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, since there are no occurrences of a character", () => { + const char = "a"; + const str = "AABBFFSAA"; + 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 f95d71db1..02d566d14 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,24 @@ function getOrdinalNumber(num) { - return "1st"; + const last2Digits = String(num).slice(-2); + if (["11", "12", "13"].includes(last2Digits)) return `${num}th`; + + const lastDigit = String(num).slice(-1); + const restOfNum = String(num).slice(0, -1); + let ordinalResult = ""; + switch (lastDigit) { + case "1": + ordinalResult = `${num}st`; + break; + case "2": + ordinalResult = `${num}nd`; + break; + case "3": + ordinalResult = `${num}rd`; + break; + default: + ordinalResult = `${num}th`; + } + return ordinalResult; } 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..eea071483 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,41 @@ 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(31562)).toEqual("31562nd"); + expect(getOrdinalNumber(2322)).toEqual("2322nd"); +}); + +// 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(3243)).toEqual("3243rd"); + expect(getOrdinalNumber(5462133)).toEqual("5462133rd"); +}); + +// 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 with 11, 12 or 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(2111)).toEqual("2111th"); + expect(getOrdinalNumber(2113)).toEqual("2113th"); + expect(getOrdinalNumber(524312)).toEqual("524312th"); +}); + +// Case 4: Numbers not ending in 1, 2 and 3 +// When the number ends with 0, 4, 5, 6, 7, 8, 9 +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for numbers not ending in 1, 2 and 3", () => { + expect(getOrdinalNumber(19)).toEqual("19th"); + expect(getOrdinalNumber(2118)).toEqual("2118th"); + expect(getOrdinalNumber(2110)).toEqual("2110th"); + expect(getOrdinalNumber(524334)).toEqual("524334th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..2e224ff02 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,6 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) throw new Error("Can not repeat negative times."); + return str.repeat(count); } 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..0b2ca5640 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,13 +20,30 @@ 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 repeat the string count times", () => { + 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 repeat the string count times", () => { + 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 repeat the string count times", () => { + const str = "hello"; + const count = -3; + expect(() => repeatStr(str, count)).toThrow("Can not repeat negative times."); +});