diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..7f8190b7a 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,21 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + return 5; +} + +module.exports = countChar; + +// fixed version of the function + +function countChar(stringOfCharacters, findCharacter) { + let count = 0; + + for (let char of stringOfCharacters) { + if (char === 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 179ea0ddf..54e986fa2 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,27 @@ 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. + +//completed version + +const countChar = require("./countChar"); + +// Scenario: Multiple Occurrences +test("should count multiple occurrences of a character", () => { + const str = "aaaaa"; + const char = "a"; + + const count = countChar(str, char); + + expect(count).toEqual(5); +}); + +// Scenario: No Occurrences +test("should return 0 when character is not found", () => { + const str = "hello"; + const char = "z"; + + 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..d34c6236c 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -3,3 +3,22 @@ function getOrdinalNumber(num) { } module.exports = getOrdinalNumber; + +//correct version of the function + +function getOrdinalNumber(num) { + const lastDigit = num % 10; + const lastTwoDigits = num % 100; + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return num + "th"; + } + + if (lastDigit === 1) return num + "st"; + if (lastDigit === 2) return num + "nd"; + if (lastDigit === 3) return num + "rd"; + + 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..9a89b3f6b 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"); }); + +//fixed and completed version + +const getOrdinalNumber = require("./get-ordinal-number"); + +// st cases (except 11) +test("should return 'st' for numbers ending in 1 except 11", () => { + expect(getOrdinalNumber(1)).toEqual("1st"); + expect(getOrdinalNumber(21)).toEqual("21st"); + expect(getOrdinalNumber(31)).toEqual("31st"); +}); + +// nd cases (except 12) +test("should return 'nd' for numbers ending in 2 except 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(32)).toEqual("32nd"); +}); + +// rd cases (except 13) +test("should return 'rd' for numbers ending in 3 except 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(33)).toEqual("33rd"); +}); + +// th cases (everything else) +test("should return 'th' for numbers ending in 4-9 and special teens (11-13)", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(14)).toEqual("14th"); + expect(getOrdinalNumber(100)).toEqual("100th"); +}); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 2af0a2cea..80ed22086 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -5,3 +5,17 @@ function repeatStr() { } module.exports = repeatStr; + +//fixed + +function repeatStr(str, count) { + let result = ""; + + for (let i = 0; i < count; i++) { + result += str; + } + + return result; +} + +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..262dd52f8 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -30,3 +30,28 @@ test("should repeat the string count times", () => { // 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 the original string when count is 1", () => { + const str = "hello"; + const count = 1; + + const repeatedStr = repeatStr(str, count); + + expect(repeatedStr).toEqual("hello"); +}); + +test("should return an empty string when count is 0", () => { + const str = "hello"; + const count = 0; + + const repeatedStr = repeatStr(str, count); + + expect(repeatedStr).toEqual(""); +}); + +test("should throw an error when count is negative", () => { + const str = "hello"; + const count = -1; + + expect(() => repeatStr(str, count)).toThrow(); +});