From 282f847f626c0645b60ed0d765da583012993ee7 Mon Sep 17 00:00:00 2001 From: Maryam Janjua Date: Tue, 4 Aug 2026 20:43:57 +0100 Subject: [PATCH] Attempt all TDD Tasks! --- Sprint-3/2-practice-tdd/count.js | 9 +++- Sprint-3/2-practice-tdd/count.test.js | 6 +++ Sprint-3/2-practice-tdd/get-ordinal-number.js | 20 ++++++++- .../2-practice-tdd/get-ordinal-number.test.js | 18 ++++++++ Sprint-3/2-practice-tdd/repeat-str.js | 14 ++++++- Sprint-3/2-practice-tdd/repeat-str.test.js | 42 ++++++++++--------- 6 files changed, 84 insertions(+), 25 deletions(-) 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..f81b695470 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 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..2ab47ed2dd 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,21 @@ function getOrdinalNumber(num) { - return "1st"; + let getStr = num.toString(); + let lastTwoDigit = getStr.slice(-2); + let lastDigit = getStr.slice(-1); + if(lastTwoDigit == "11" || lastTwoDigit == "12" || lastTwoDigit == "13"){ + return getStr + "th"; + } + else if(lastDigit =="1"){ + return getStr + "st"; + } + else if(lastDigit == "2"){ + return getStr + "nd"; + } + else if(lastDigit == "3"){ + return getStr + "rd"; + } + else{ + return getStr + "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..1862ea3e1e 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,21 @@ 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(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"); +}); +test("should append 'th' for numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + 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..04efe58615 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,7 +1,17 @@ -function repeatStr() { +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"; + let result=""; + if (count >=1){ + for(let i=1 ; i <= count ; i++){ + result= str + result; + } + return result; + } + else if (count == 0){ + return ""; + } + throw new Error("invalid 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 a3fc1196c4..2a03d41010 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,26 @@ 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 +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 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 negative count +test("should throw an error when count is negative", () => { + const str = "Hello World!"; + const count = -1; -// 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. + expect(() => repeatStr(str, count)).toThrow(); +}); \ No newline at end of file