diff --git a/practice-tdd/count.js b/practice-tdd/count.js index 5518c5712..6167d6444 100644 --- a/practice-tdd/count.js +++ b/practice-tdd/count.js @@ -1,3 +1,3 @@ export function countChar(stringOfCharacters, findCharacter) { - return 5 + return stringOfCharacters.split(findCharacter).length - 1; } diff --git a/practice-tdd/count.test.js b/practice-tdd/count.test.js index cb3aaae59..0575330cc 100644 --- a/practice-tdd/count.test.js +++ b/practice-tdd/count.test.js @@ -22,3 +22,10 @@ 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 count multiple occurrences of a character", () => { + const str = "aaaaa"; + const char = "b"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); diff --git a/practice-tdd/get-ordinal-number.js b/practice-tdd/get-ordinal-number.js index 5c6291f5e..2610dc26c 100644 --- a/practice-tdd/get-ordinal-number.js +++ b/practice-tdd/get-ordinal-number.js @@ -1,3 +1,23 @@ export function getOrdinalNumber(num) { - return "1st"; + const numStr = num.toString(); + const numLength = numStr.length; + const pattern1 = /^(11|12|13)$/; + const pattern2 = /^0$/; + const pattern3 = /^(4|5|6|7|8|9)$/; + const last2digits = numStr.slice(-2); + const last1digit = numStr.slice(-1); + + if (numStr[numLength - 1] == "1" && numStr[numLength - 2] != "1") { + return `${numStr}st`; + } else if (numStr[numLength - 1] == "2" && numStr[numLength - 2] != "1") { + return `${numStr}nd`; + } else if (numStr[numLength - 1] == "3" && numStr[numLength - 2] != "1") { + return `${numStr}rd`; + } else if ( + pattern1.test(last2digits) || + pattern2.test(last1digit) || + pattern3.test(last1digit) + ) { + return `${numStr}th`; + } } diff --git a/practice-tdd/get-ordinal-number.test.js b/practice-tdd/get-ordinal-number.test.js index e23174a18..2129d3efb 100644 --- a/practice-tdd/get-ordinal-number.test.js +++ b/practice-tdd/get-ordinal-number.test.js @@ -18,3 +18,21 @@ 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(33)).toEqual("33rd"); + expect(getOrdinalNumber(143)).toEqual("143rd"); +}); + +test("should append 'th' for numbers ending with [0][4-9] and [11-13]", () => { + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(120)).toEqual("120th"); + expect(getOrdinalNumber(134)).toEqual("134th"); +}); diff --git a/practice-tdd/repeat-str.js b/practice-tdd/repeat-str.js index af273f3b0..e6393e171 100644 --- a/practice-tdd/repeat-str.js +++ b/practice-tdd/repeat-str.js @@ -1,5 +1,12 @@ -export function repeatStr() { +export function repeatStr(word, n) { // 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"; + if (n >= 0) { + let nWords = ""; + for (let i = 0; i < n; i++) { + nWords = nWords + word; + } + return nWords; + } + throw new Error("Error"); } diff --git a/practice-tdd/repeat-str.test.js b/practice-tdd/repeat-str.test.js index 8a7036102..3347b54f8 100644 --- a/practice-tdd/repeat-str.test.js +++ b/practice-tdd/repeat-str.test.js @@ -21,12 +21,34 @@ 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 repeat the string one time", () => { + 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 if count is zero", () => { + 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 integer", () => { + const str = "hello"; + const count = -5; + expect(() => { + repeatStr(str, count); + }).toThrow("Error"); +});