diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..c6b15ce1c 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,9 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let char of stringOfCharacters) { + if (char === findCharacter) count++; + } + return count; } -module.exports = countChar; +module.exports = countChar; \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 42baf4b4b..4e130554e 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -1,5 +1,5 @@ // implement a function countChar that counts the number of times a character occurs in a string -const countChar = require("./count"); + // Given a string str and a single character char to search for, // When the countChar function is called with these inputs, // Then it should: @@ -9,6 +9,9 @@ const countChar = require("./count"); // And a character char that may occur multiple times with overlaps within str (e.g., 'a' in 'aaaaa'), // When the function is called with these inputs, // Then it should correctly count overlapping occurrences of char (e.g., 'a' appears five times in 'aaaaa'). + +const countChar = require('./count'); + test("should count multiple occurrences of a character", () => { const str = "aaaaa"; @@ -16,6 +19,36 @@ test("should count multiple occurrences of a character", () => { const count = countChar(str, char); expect(count).toEqual(5); }); +test("should return 0 when the character is not found", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Case Sensitivity +// It should be case-sensitive, meaning 'A' != 'a'. +test("should be case-sensitive when counting characters", () => { + const str = "Banana"; + expect(countChar(str, "a")).toEqual(3); + expect(countChar(str, "A")).toEqual(0); +}); + +// Scenario: Empty String +// It should return 0 when the input string is empty. +test("should return 0 when the input string is empty", () => { + const str = ""; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Special Characters +// It should correctly count spaces and punctuation. +test("should count special characters like spaces or punctuation", () => { + expect(countChar("a b a b", " ")).toEqual(3); + expect(countChar("wow!!!", "!")).toEqual(3); +}); // Scenario: No Occurrences // Given the input string str, diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db1..4f4f5733e 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,24 @@ + function getOrdinalNumber(num) { - return "1st"; + const remainder10 = num % 10; + const remainder100 = num % 100; + + if (remainder100 >= 11 && remainder100 <= 13) { + return `${num}th`; + } + + switch (remainder10) { + case 1: + return `${num}st`; + case 2: + return `${num}nd`; + case 3: + return `${num}rd`; + default: + 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 dfe4b6091..c2f963123 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -1,4 +1,8 @@ const getOrdinalNumber = require("./get-ordinal-number"); + + +module.exports = getOrdinalNumber; + // In this week's prep, we started implementing getOrdinalNumber // continue testing and implementing getOrdinalNumber for additional cases @@ -8,6 +12,39 @@ const getOrdinalNumber = require("./get-ordinal-number"); // When the number is 1, // Then the function should return "1st" -test("should return '1st' for 1", () => { - expect(getOrdinalNumber(1)).toEqual("1st"); + +describe("getOrdinalNumber()", () => { + test("should return '1st' for 1", () => { + expect(getOrdinalNumber(1)).toBe("1st"); + }); + + test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toBe("2nd"); + }); + + test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toBe("3rd"); + }); + + test("should return '4th' for 4", () => { + expect(getOrdinalNumber(4)).toBe("4th"); + }); + + test("should return '11th', '12th', '13th' for special cases", () => { + expect(getOrdinalNumber(11)).toBe("11th"); + expect(getOrdinalNumber(12)).toBe("12th"); + expect(getOrdinalNumber(13)).toBe("13th"); + }); + + test("should return correct suffixes for 21, 22, 23", () => { + expect(getOrdinalNumber(21)).toBe("21st"); + expect(getOrdinalNumber(22)).toBe("22nd"); + expect(getOrdinalNumber(23)).toBe("23rd"); + }); + + test("should return '111th' for numbers ending with 11, 12, 13 even if larger", () => { + expect(getOrdinalNumber(111)).toBe("111th"); + expect(getOrdinalNumber(112)).toBe("112th"); + expect(getOrdinalNumber(113)).toBe("113th"); + }); }); diff --git a/Sprint-3/2-practice-tdd/repeat-str.js b/Sprint-3/2-practice-tdd/repeat-str.js index 3838c7b00..be93ad035 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,9 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + + if (count < 0) { + throw new Error("Count must be a non-negative integer"); + } + 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 fc59d019e..211a4180a 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -1,32 +1,20 @@ -// Implement a function repeatStr -const repeatStr = require("./repeat-str"); -// Given a target string str and a positive integer count, -// When the repeatStr function is called with these inputs, -// Then it should: -// case: repeat String: -// Given a target string str and a positive integer count, -// When the repeatStr function is called with these inputs, -// Then it should repeat the str count times and return a new string containing the repeated str values. + +const repeatStr = require("./repeat-str"); test("should repeat the string count times", () => { - const str = "hello"; - const count = 3; - const repeatedStr = repeatStr(str, count); - expect(repeatedStr).toEqual("hellohellohello"); + expect(repeatStr("hello", 3)).toBe("hellohellohello"); }); -// 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, ensuring that a count of 1 results in no repetition. +test("should return the original string when count is 1", () => { + expect(repeatStr("world", 1)).toBe("world"); +}); -// 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, ensuring that a count of 0 results in an empty output. +test("should return an empty string when count is 0", () => { + expect(repeatStr("test", 0)).toBe(""); +}); + +test("should throw an error when count is negative", () => { + expect(() => repeatStr("oops", -2)).toThrow("Count must be a non-negative integer"); +}); -// case: 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 or return an appropriate error message, as negative counts are not valid.