diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..674911bc3 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,13 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } else { + return 0; + } + } + 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..031afae65 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,6 @@ 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' if character does not exist", () => { + expect(countChar("edak", "s")).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..f937a49a3 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,19 @@ function getOrdinalNumber(num) { - return "1st"; + const numStr = num.toString(); + const numLength = numStr.length; + if (numStr[numLength - 2] === "1" && numStr[numLength - 1] === "1") { + return num + "th"; + } else if (numStr[numLength - 1] === "1") { + return num + "st"; + } else if (numStr[numLength - 2] === "1" && numStr[numLength - 1] === "3") { + return num + "th"; + } else if (numStr[numLength - 1] === "3") { + return num + "rd"; + } else if (numStr[numLength - 1] === "2") { + return num + "nd"; + } else { + 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..4a65d6acb 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,43 @@ 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 11 +test("should return 'th' for numbers ending with 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(211)).toEqual("211th"); + expect(getOrdinalNumber(1011)).toEqual("1011th"); +}); + +//case:3 Numbers ending with 3 but not 13 +test("Should return 'rd' for numbers ending with 3", () => { + expect(getOrdinalNumber(73)).toEqual("73rd"); + expect(getOrdinalNumber(93)).toEqual("93rd"); + expect(getOrdinalNumber(43)).toEqual("43rd"); + expect(getOrdinalNumber(2003)).toEqual("2003rd"); +}); + +//case:4 expect Numbers ending with 13 to return th +test(" should return 'th' for numbers ending with 13", () => { + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(413)).toEqual("413th"); + expect(getOrdinalNumber(613)).toEqual("613th"); +}); +//case 4: expect number ending with 2 to return nd +test(" should return 'nd' for numbers ending with 2", () => { + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(42)).toEqual("42nd"); + expect(getOrdinalNumber(102)).toEqual("102nd"); +}); + +// case 5: expect number not included in the above case to return th +test("should return 'th' for numbers ending with 4, 5,6,7,8,9,0", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(5)).toEqual("5th"); + 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"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..a75425eb5 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,11 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count >= 1) { + return str.repeat(count); + } else if (count === 0) { + return ""; + } else { + throw new Error("Invalid 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..125cacd56 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -20,13 +20,23 @@ 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 original string without repetition ", () => { + expect(repeatStr("edak", 1)).toEqual("edak"); +}); // 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 value of 0", () => { + expect(repeatStr("edak", 0)).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 and error if count value is negative integer", () => { + expect(() => repeatStr("edak", -1)).toThrow("Invalid count"); +});