diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..55b5a9ade4 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 + const lengthOfStr = stringOfCharacters.length; + let numOfOccurrence = 0; + for(let i = 0; i< lengthOfStr ; i++){ + if(stringOfCharacters[i] == findCharacter){ + numOfOccurrence = numOfOccurrence + 1; + } + } + return numOfOccurrence; } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf7..0c2f3901a5 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -16,9 +16,29 @@ test("should count multiple occurrences of a character", () => { const count = countChar(str, char); expect(count).toEqual(5); }); +// multiple occurrences of a particular character +test("should count multiple occurrences of a character in a general string", () => { + const str = "banana"; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(3); +}); +//empty string given +test("should return 0 when the string is empty", () => { + const str = ""; + const char = "a"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); // Scenario: No Occurrences // Given the input string `str`, // 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 when the character does not exist in the string", () => { + const str = "Hello world"; + const char = "a"; + 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 f95d71db13..3a5731925f 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,20 @@ function getOrdinalNumber(num) { - return "1st"; + let lastTwoDigit = num % 100; + let lastDigit = num % 10; + if(lastTwoDigit == "11" || lastTwoDigit == "12" || lastTwoDigit == "13"){ + return num + "th"; + } + else 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 adfa58560f..f63cd926e2 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -13,8 +13,38 @@ const getOrdinalNumber = require("./get-ordinal-number"); // 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. + 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"); }); + +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(42)).toEqual("42nd"); + expect(getOrdinalNumber(102)).toEqual("102nd"); +}); + +test("should append 'rd' for numbers ending with 3, except those ending with 13", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(103)).toEqual("103rd"); +}); + +// Numbers ending with 11, 12, or 13 are exceptions and should use "th" +test("should append 'th' for numbers ending with 11, 12, or 13", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); +}); + +test("should append 'th' for numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(100)).toEqual("100th"); +}); \ 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 2af0a2cea7..c2a311de78 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,7 +1,15 @@ -function repeatStr() { - // 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"; +function repeatStr(str, count) { + if (count < 0){ + throw new Error("invalid count"); + } + + let result=""; + + for(let i=1 ; i <= count ; i++){ + result= str + result; + } + + 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 a3fc1196c4..c30449c79c 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -1,14 +1,7 @@ // 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: handle multiple repetitions: -// Given a target string `str` and a positive integer `count` greater than 1, -// When the repeatStr function is called with these inputs, -// Then it should return a string that contains the original `str` repeated `count` times. +// Case: handle multiple repetitions test("should repeat the string count times", () => { const str = "hello"; const count = 3; @@ -16,17 +9,55 @@ test("should repeat the string count times", () => { expect(repeatedStr).toEqual("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. +// Case: handle count of 1 +test("should return the original string when count is 1", () => { + const str = "Maryam"; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(str); +}); -// 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. +// Case: handle count of 0 +test("should return an empty string when count is 0", () => { + const str = "Hello World!"; + 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. +// Case: handle negative count +test("should throw an error when count is negative", () => { + const str = "Hello World!"; + const count = -1; + expect(() => repeatStr(str, count)).toThrow(); +}); +// Case: empty string with count of 3 +test("should return an empty string when string is empty and count is 3", () => { + const str = ""; + const count = 3; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +// Case: empty string with count of 1 +test("should return an empty string when string is empty and count is 1", () => { + const str = ""; + const count = 1; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +// Case: empty string with count of 0 +test("should return an empty string when string is empty and count is 0", () => { + const str = ""; + const count = 0; + const repeatedStr = repeatStr(str, count); + expect(repeatedStr).toEqual(""); +}); + +// Case: empty string with negative count +test("should throw an error when string is empty and count is negative", () => { + const str = ""; + const count = -1; + expect(() => repeatStr(str, count)).toThrow(); +});