diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..c61bfdce7 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,12 @@ -function countChar(stringOfCharacters, findCharacter) { - return 5 -} +function countChar(str, char) { + let count = 0; + + for (let i = 0; i < str.length; i++) {//loop through each character in the string + if (str[i] === char) {//check if the character matches the target character + count = count + 1; + } + } -module.exports = countChar; + return count;//return the final count +} +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..c2c8d0fd7 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -1,24 +1,43 @@ // 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: +// Scenario: Single Occurrence +test("counts a single occurrence of a character", () => { + expect(countChar("hello", "h")).toEqual(1); + expect(countChar("world", "d")).toEqual(1); + }); // Scenario: Multiple Occurrences // Given the input string str, // 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'). - -test("should count multiple occurrences of a character", () => { - const str = "aaaaa"; - const char = "a"; - const count = countChar(str, char); - expect(count).toEqual(5); +test("counts multiple occurrences of a character", () => { + expect(countChar("aaaaa", "a")).toEqual(5); + expect(countChar("banana", "a")).toEqual(3); + expect(countChar("mississippi", "s")).toEqual(4); }); +//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 // Given the input string str, // And a character char that does not exist within the case-sensitive str, // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of the char were found in the case-sensitive str. +// Scenario: No Occurrences +test("should return 0 if the character is not in the string", () => { + const str = "hello"; + const char = "x"; // character not present in str + 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..fe45ac0eb 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,22 @@ function getOrdinalNumber(num) { - return "1st"; + const lastTwoDigits = num % 100; // check the last 2 digits for 11,12,13 + const lastDigit = num % 10; + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return num + "th"; + } + + switch (lastDigit) { + 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..3b9a9907c 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -1,13 +1,48 @@ const getOrdinalNumber = require("./get-ordinal-number"); + + // In this week's prep, we started implementing getOrdinalNumber // continue testing and implementing getOrdinalNumber for additional cases // Write your tests using Jest - remember to run your tests often for continual feedback -// Case 1: Identify the ordinal number for 1 -// When the number is 1, -// Then the function should return "1st" - -test("should return '1st' for 1", () => { +// Case 1: Numbers ending in 1 (but not 11) +test("append 'st' to numbers ending in 1, except those ending in 11", () => { expect(getOrdinalNumber(1)).toEqual("1st"); + expect(getOrdinalNumber(21)).toEqual("21st"); + expect(getOrdinalNumber(101)).toEqual("101st"); + expect(getOrdinalNumber(111)).toEqual("111th"); // exception +}); + +// Case 2: Numbers ending in 2 (but not 12) +test("append 'nd' to numbers ending in 2, except those ending in 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(102)).toEqual("102nd"); + expect(getOrdinalNumber(112)).toEqual("112th"); // exception }); +// Case 3: Numbers ending in 3 (but not 13) +test("append 'rd' to numbers ending in 3, except those ending in 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(103)).toEqual("103rd"); + expect(getOrdinalNumber(113)).toEqual("113th"); // exception +}); +// Case 4: Numbers ending in 4–9 or exceptions (11, 12, 13) +test("append 'th' to numbers ending in 4–9 or ending with 11, 12, or 13", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(9)).toEqual("9th"); + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + // Optional: edge cases + test("should handle 0 and large numbers correctly", () => { + expect(getOrdinalNumber(0)).toBe("0th"); + expect(getOrdinalNumber(1000001)).toBe("1000001st"); // ends with 1, not teen + expect(getOrdinalNumber(1000012)).toBe("1000012th"); // ends with 12 -> teen + + }); + + + diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js index 00e60d7f3..c4505cc66 100644 --- a/Sprint-3/2-practice-tdd/repeat.js +++ b/Sprint-3/2-practice-tdd/repeat.js @@ -1,5 +1,8 @@ -function repeat() { - return "hellohellohello"; +function repeat(word, times) { + if (times < 0) { + throw new Error("Count must be a non-negative number"); + } + return word.repeat(times); } module.exports = repeat; diff --git a/Sprint-3/2-practice-tdd/repeat.test.js b/Sprint-3/2-practice-tdd/repeat.test.js index 34097b09c..7c1488b13 100644 --- a/Sprint-3/2-practice-tdd/repeat.test.js +++ b/Sprint-3/2-practice-tdd/repeat.test.js @@ -20,13 +20,23 @@ test("should repeat the string count times", () => { // Given a target string str and a count equal to 1, // When the repeat 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 repeat the string count times", () => { +const str = "hello"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("hello"); +}); // case: Handle Count of 0: // Given a target string str and a count equal to 0, // When the repeat 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 empty string when times is 0", () => { + expect(repeat("hello", 0)).toEqual(""); +}); // case: Negative Count: // Given a target string str and a negative integer count, // When the repeat function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. +test("should throw an error when count is negative", () => { + expect(() => repeat("hello", -3)).toThrow("Count must be a non-negative number"); +});