diff --git a/practice-tdd/count.js b/practice-tdd/count.js index 5518c5712..c9d37f147 100644 --- a/practice-tdd/count.js +++ b/practice-tdd/count.js @@ -1,3 +1,9 @@ export function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let character of stringOfCharacters) { + if (character === findCharacter) { + count++; + } + } + return count; } diff --git a/practice-tdd/count.test.js b/practice-tdd/count.test.js index cb3aaae59..99677c8c9 100644 --- a/practice-tdd/count.test.js +++ b/practice-tdd/count.test.js @@ -22,3 +22,17 @@ 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 doesn't occur", () => { + const str = "salam"; + const char = "b"; + + const count = countChar(str, char); + expect(count).toEqual(0); +}); +test("should return 0 when the string is empty", () => { + const str = ""; + const char = "b"; + + const count = countChar(str, char); + expect(count).toEqual(0); +}); \ No newline at end of file diff --git a/practice-tdd/get-ordinal-number.js b/practice-tdd/get-ordinal-number.js index 5c6291f5e..9b7e531f7 100644 --- a/practice-tdd/get-ordinal-number.js +++ b/practice-tdd/get-ordinal-number.js @@ -1,3 +1,10 @@ export function getOrdinalNumber(num) { - return "1st"; + if (num % 10 === 1 && num % 100 !== 11) { + return num + "st"; + } else if (num % 10 === 2 && num % 100 !== 12) { + return num + "nd"; + } else if (num % 10 === 3 && num % 100 !== 13) { + return num + "rd"; + } + return num + "th"; } diff --git a/practice-tdd/get-ordinal-number.test.js b/practice-tdd/get-ordinal-number.test.js index e23174a18..d52171fb2 100644 --- a/practice-tdd/get-ordinal-number.test.js +++ b/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 2 (but not 12) +test("should append 'nd' for numbers ending with 2, except 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) +test("should append 'rd' for numbers ending with 3, except 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(133)).toEqual("133rd"); +}); +// Case 4: Numbers ending with "th" including the special case (11,12,13) +test(`Numbers ending with "th" including the special case (11,12,13)`, () => { + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(14)).toEqual("14th"); + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(4)).toEqual("4th"); +}); +// Case 5: Numbers greater than 100 ending with "th" +test(`Numbers greater than 100 ending with "th"`, () => { + expect(getOrdinalNumber(100)).toEqual("100th"); + expect(getOrdinalNumber(104)).toEqual("104th"); + expect(getOrdinalNumber(110)).toEqual("110th"); + expect(getOrdinalNumber(255)).toEqual("255th"); + expect(getOrdinalNumber(999)).toEqual("999th"); + expect(getOrdinalNumber(1000)).toEqual("1000th"); +}); +// Case 6: Numbers greater than 100 with the special case (111, 112, 113) +test(`Numbers greater than 100 ending in 11, 12, 13 use "th"`, () => { + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); + expect(getOrdinalNumber(211)).toEqual("211th"); + expect(getOrdinalNumber(312)).toEqual("312th"); + expect(getOrdinalNumber(1013)).toEqual("1013th"); +}); \ No newline at end of file diff --git a/practice-tdd/repeat-str.js b/practice-tdd/repeat-str.js index af273f3b0..b7b171789 100644 --- a/practice-tdd/repeat-str.js +++ b/practice-tdd/repeat-str.js @@ -1,5 +1,12 @@ -export function repeatStr() { +export function repeatStr(str, count) { // 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 (count < 0) { + return "negative counts are not valid"; + } + let result = ""; + for (let i = 0; i < count; i++) { + result = result + str; + } + return result; } diff --git a/practice-tdd/repeat-str.test.js b/practice-tdd/repeat-str.test.js index 8a7036102..1be049b24 100644 --- a/practice-tdd/repeat-str.test.js +++ b/practice-tdd/repeat-str.test.js @@ -15,18 +15,51 @@ test("should repeat the string count times", () => { const repeatedStr = repeatStr(str, count); expect(repeatedStr).toEqual("hellohellohello"); }); - +test("should return an empty string when repeating an empty string multiple times", () => { + const str = ""; + const count = 3; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); // Case: handle count of 1: // 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 `str` without repetition", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("hello"); +}); +test("should return an empty string when the string is empty and count is 1", () => { + const str = ""; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); // 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", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); +test("should return an empty string when the string is empty and count is 0", () => { + const str = ""; + 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 return an error, as negative counts are not valid", () => { + const str = "hello"; + const count = -1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("negative counts are not valid"); +});