diff --git a/practice-tdd/count.js b/practice-tdd/count.js index 5518c5712..ae98c6a43 100644 --- a/practice-tdd/count.js +++ b/practice-tdd/count.js @@ -1,3 +1,9 @@ export function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (const character of stringOfCharacters) { + if (character === findCharacter) { + count++; + } + } + return count; } diff --git a/practice-tdd/count.test.js b/practice-tdd/count.test.js index cb3aaae59..d06f72bf1 100644 --- a/practice-tdd/count.test.js +++ b/practice-tdd/count.test.js @@ -1,5 +1,6 @@ // implement a function countChar that counts the number of times a character occurs in a string import { countChar } from "./count.js"; + // Given a string `str` and a single character `char` to search for, // When the countChar function is called with these inputs, // Then it should: @@ -22,3 +23,10 @@ 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 indicate no occurrences of a character", () => { + const str = "abcde"; + const char = "f"; + const numberOfOccurrence = countChar(str, char); + expect(numberOfOccurrence).toEqual(0); +}); diff --git a/practice-tdd/get-ordinal-number.js b/practice-tdd/get-ordinal-number.js index 5c6291f5e..7ddd7fd01 100644 --- a/practice-tdd/get-ordinal-number.js +++ b/practice-tdd/get-ordinal-number.js @@ -1,3 +1,21 @@ export function getOrdinalNumber(num) { - return "1st"; + //handle a non number inputs + if (!num) { + return ""; + } + const lastTwoDigits = num % 100; + // Handle exceptions: 11th, 12th, 13th, 111th, etc. + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return `${num}th`; + } + switch (num % 10) { + case 1: + return `${num}st`; + case 2: + return `${num}nd`; + case 3: + return `${num}rd`; + default: + return `${num}th`; + } } diff --git a/practice-tdd/get-ordinal-number.test.js b/practice-tdd/get-ordinal-number.test.js index e23174a18..97fa8c94c 100644 --- a/practice-tdd/get-ordinal-number.test.js +++ b/practice-tdd/get-ordinal-number.test.js @@ -1,20 +1,66 @@ import { getOrdinalNumber } from "./get-ordinal-number.js"; -// In this week's prep, we started implementing getOrdinalNumber. +// 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. - // To ensure thorough testing, we need broad scenarios that cover all possible cases. // Listing individual values, however, can quickly lead to an unmanageable number of test cases. // Instead of writing tests for individual numbers, consider grouping all possible input values // into meaningful categories. Then, select representative samples from each category to test. // This approach improves coverage and makes our tests easier to maintain. -// Case 1: Numbers ending with 1 (but not 11) -// When the number ends with 1, except those ending with 11, -// Then the function should return a string by appending "st" to the number. +// Case 1: test("should append 'st' for numbers ending with 1, except those ending with 11", () => { expect(getOrdinalNumber(1)).toEqual("1st"); expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +// Case 2: +test("should append 'nd' for numbers ending with 2, except those ending with 12", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(32)).toEqual("32nd"); + expect(getOrdinalNumber(72)).toEqual("72nd"); + expect(getOrdinalNumber(452)).toEqual("452nd"); + expect(getOrdinalNumber(862)).toEqual("862nd"); +}); + +// Case 3: N +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(43)).toEqual("43rd"); + expect(getOrdinalNumber(93)).toEqual("93rd"); + expect(getOrdinalNumber(823)).toEqual("823rd"); + expect(getOrdinalNumber(183)).toEqual("183rd"); +}); + +// Case 4: +test("should append 'th' for numbers ending with 4,5,6 ,7 ,8 or 9 ", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(25)).toEqual("25th"); + expect(getOrdinalNumber(656)).toEqual("656th"); + expect(getOrdinalNumber(1007)).toEqual("1007th"); + expect(getOrdinalNumber(638398)).toEqual("638398th"); + expect(getOrdinalNumber(34454559)).toEqual("34454559th"); +}); + +// Case 5: +test("should append 'th' for numbers in 100's ending with 11, 12 , 13", () => { + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); + +// Case 6:A test case handling the special cases like 11,12,13,101 & 103 + +test("should append 'th' for numbers for 11,12,13 and 'st' for 101 and 'rd' for 103", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(101)).toEqual("101st"); + expect(getOrdinalNumber(103)).toEqual("103rd"); +}); + +test("should return empty string if empty string is passed", () => { + expect(getOrdinalNumber("")).toEqual(""); +}); diff --git a/practice-tdd/repeat-str.js b/practice-tdd/repeat-str.js index af273f3b0..b5753a858 100644 --- a/practice-tdd/repeat-str.js +++ b/practice-tdd/repeat-str.js @@ -1,5 +1,14 @@ -export function repeatStr() { +export function repeatStr(str, count) { // Your implementation of this function must *not* call String.prototype.repeat (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat). // The goal is to re-implement that function, not to use it. - return "hellohellohello"; + if (count < 0) { + throw new Error("Error! negative counts are not valid"); + } + let result = ""; + let counter = count; + while (counter > 0) { + result += str; + counter--; + } + return result; } diff --git a/practice-tdd/repeat-str.test.js b/practice-tdd/repeat-str.test.js index 8a7036102..ff6d452f2 100644 --- a/practice-tdd/repeat-str.test.js +++ b/practice-tdd/repeat-str.test.js @@ -9,7 +9,7 @@ import { repeatStr } from "./repeat-str.js"; // 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", () => { +test("should repeat the string 3 times when the value of count =3", () => { const str = "hello"; const count = 3; const repeatedStr = repeatStr(str, count); @@ -21,12 +21,34 @@ test("should repeat the string count times", () => { // When the repeatStr function is called with these inputs, // Then it should return the original `str` without repetition. +test("should return the original string when the count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual("hello"); +}); + // 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 count is 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).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 an error, when count is a negative number.", () => { + const str = "hello"; + const count = -3; + expect(() => repeatStr(str, count)).toThrow( + "Error! negative counts are not valid" + ); +});