diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..523753cc0 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,18 @@ +// our function; function countChar(stringOfCharacters, findCharacter) { - return 5 + if (!stringOfCharacters || !findCharacter) { + return 0; + } + let numberOfChar = 0; + for (let wantedChar of stringOfCharacters) { + if (wantedChar === findCharacter) { + numberOfChar++; + } + if (numberOfChar === 0) { + return `0 ${findCharacter} found.` + } + } + return numberOfChar; } 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..6bbef9e31 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -22,3 +22,9 @@ 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 there is not a character occurrence", () => { + const str = "aaaaa"; + const char = "b"; + const count = countChar(str, char); + expect(count).toEqual(`0 ${char} found.`); +}); \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..19bebff23 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 @@ +// lets develop our function. function getOrdinalNumber(num) { - return "1st"; + + const lastDigit = num % 10; // ==> 111 % 10 = 11.1 last digit is 1. + const lastTwoDigits = num % 100; // 111 % 100 = 111 last two digits 11. + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13){ + return `${num}th`;// ==> finds the last two digits to equal (11,12,13) + } + if(lastDigit == 1){ + return `${num}st`; + }else if (lastDigit == 2){ + return `${num}nd`; + }else if (lastDigit == 3){ + return `${num}rd`; + } 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..7e6adfe3d 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,27 @@ 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(222)).toEqual("222nd"); +}); +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(333)).toEqual("333rd"); +}); +test("should append 'th' for numbers ending with 4 and more than 4", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(44)).toEqual("44th"); + expect(getOrdinalNumber(444)).toEqual("444th"); + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(100)).toEqual("100th"); + expect(getOrdinalNumber(105)).toEqual("105th"); +}); +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"); +}); \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..19483e0b3 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,8 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) + throw new Error("Negative counts are not valid"); + if (count === 0) return ""; + else return str.repeat(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..e5efb88d3 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -10,23 +10,27 @@ const repeatStr = require("./repeat-str"); // 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); - expect(repeatedStr).toEqual("hellohellohello"); + expect(repeatStr("Love", 3)).toEqual("LoveLoveLove"); }); // 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 print the original string", () => { + expect(repeatStr("Love", 1)).toEqual("Love"); +}); // 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", () => { + expect(repeatStr("Love", 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 when count is a negative number", () => { + expect(()=> repeatStr("Love", -3)).toThrow("Negative counts are not valid"); +}); \ No newline at end of file