diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..d59e425d6b 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 i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } + } + 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 179ea0ddf7..fce6662b9f 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,20 @@ 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("returns 0 when the character does not exist in the string", () => { + const str = "The character have no match"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); +// Scenario: 1 Occurrences +// Given the input string `str`, +// And a character `char` that have 1 character exist in `str`. +// When the function is called with these inputs, +// Then it should return 1, indicating that 1 occurrences of `char` were found. +test("returns 1 when the character appears once in the string", () => { + const str = "code your future"; + const char = "f"; + const count = countChar(str, char); + expect(count).toEqual(1); +}); diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db13..ea1bb375be 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,21 @@ -function getOrdinalNumber(num) { - return "1st"; +function getOrdinalNumber(number) { + const lastTwoDigits = number % 100; + if (lastTwoDigits === 11 || lastTwoDigits === 12 || lastTwoDigits === 13) { + return number + "th"; + } + const lastDigit = number % 10; + let suffix; + if (lastDigit === 1) { + suffix = "st"; + } else if (lastDigit === 2) { + suffix = "nd"; + } else if (lastDigit === 3) { + suffix = "rd"; + } else { + suffix = "th"; + } + + return number + suffix; } 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 adfa58560f..fdc373b03d 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 1, except those ending with 12, +// Then the function should return a string by appending "st" to the number. +test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(42)).toEqual("42nd"); + expect(getOrdinalNumber(1752)).toEqual("1752nd"); +}); +// 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 "st" to the number. +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(83)).toEqual("83rd"); + expect(getOrdinalNumber(653)).toEqual("653rd"); +}); +// Case 4: Numbers ending with 4 through 9 +// When the number does not end with 1, 2 or 3, +// Then the function should return a string by appending "th" to the number. +test("should append 'th' for all other numbers that do not end with 1, 2 or 3", () => { + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(38)).toEqual("38th"); + expect(getOrdinalNumber(15678)).toEqual("15678th"); +}); +//Case 5: Numbers ending with 11, 12 and 13 (special exceptions) +// 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 ending with 11, 12 and 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b003..5dec0e7d47 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,10 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(word, times) { + if (times < 0) { + throw new Error("negative number is not allowed"); + } else if (times === 0) { + return ""; + } else { + return word.repeat(times); + } } - 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 a3fc1196c4..8be48f7170 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -9,10 +9,10 @@ const repeatStr = require("./repeat-str"); // When the repeatStr function is called with these inputs, // Then it should return a string that contains the original `str` repeated `count` times. -test("should repeat the string count times", () => { - const str = "hello"; - const count = 3; - const repeatedStr = repeatStr(str, count); +test("should return the string the given number of count when count is a positive number", () => { + let word = "hello"; + let times = 3; + const repeatedStr = repeatStr(word, times); expect(repeatedStr).toEqual("hellohellohello"); }); @@ -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 return the original string without repetition when count is 1", () => { + let word = "code your future"; + let times = 1; + const repeatedStr = repeatStr(word, times); + expect(repeatedStr).toEqual("code your future"); +}); // 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 when the number of times is 0", () => { + let word = "hello"; + let times = 0; + const repeatedStr = repeatStr(word, times); + expect(repeatedStr).toBe(""); +}); // 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 a negative number is passed", () => { + let word = "hello"; + let times = -1; + expect(() => { + repeatStr("hello", -1); + }).toThrow("negative number is not allowed"); +});