From 208f354dec56c437d35ff56bbb75b95f54ae8073 Mon Sep 17 00:00:00 2001 From: dcostaprakash Date: Wed, 4 Mar 2026 23:12:45 +0000 Subject: [PATCH] Glasgow | 26-ITP-JAN | Prakash Dcosta | Sprint 3 | Practice TDD Self checklist - [X] I have titled my PR with Region | Cohort | FirstName LastName | Sprint | Assignment Title - [X] My changes meet the requirements of the task - [X] I have tested my changes - [X] My changes follow the [style guide](https://curriculum.codeyourfuture.io/guides/reviewing/style-guide/) ## Changelist Briefly explain your PR. Have made changes to the file as per the coursework --- Sprint-3/2-practice-tdd/count.js | 8 ++++- Sprint-3/2-practice-tdd/count.test.js | 6 ++++ Sprint-3/2-practice-tdd/get-ordinal-number.js | 18 ++++++++++- .../2-practice-tdd/get-ordinal-number.test.js | 31 +++++++++++++++++++ Sprint-3/2-practice-tdd/repeat-str.js | 13 ++++++-- Sprint-3/2-practice-tdd/repeat-str.test.js | 17 ++++++++++ 6 files changed, 89 insertions(+), 4 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..b997097ce 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,11 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count = count + 1; + } + } + return count; } module.exports = countChar; diff --git a/Sprint-3/2-practice-tdd/count.test.js b/Sprint-3/2-practice-tdd/count.test.js index 179ea0ddf..e125fc7fa 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 is not found", () => { + const str = "hello"; + const char = "z"; + 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..5bf5908d4 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"; + const lastDigit = num % 10; + const lastTwoDigits = num % 100; + + 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 adfa58560..bb8298dcb 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,34 @@ test("should append 'st' for numbers ending with 1, except those ending with 11" expect(getOrdinalNumber(21)).toEqual("21st"); expect(getOrdinalNumber(131)).toEqual("131st"); }); + +// Case 2: Numbers ending with 2 (but not 12) +// When the number ends with 2, except for those ending with 12, +// Then the function should return a string by appending "nd" to the number. + test("returns 'nd' for 2, 22, 102", () => { + expect(getOrdinalNumber(2)).toBe("2nd"); + expect(getOrdinalNumber(22)).toBe("22nd"); + expect(getOrdinalNumber(102)).toBe("102nd"); + }); + +// Case 3: Numbers ending with 3 (but not 13) +// When the number ends with 3, except for those ending with 13, +// Then the function should return a string by appending "rd" to the number. + test("returns 'rd' for 3, 23, 103", () => { + expect(getOrdinalNumber(3)).toBe("3rd"); + expect(getOrdinalNumber(23)).toBe("23rd"); + expect(getOrdinalNumber(103)).toBe("103rd"); + }); + +// Case 4: All other numbers including umbers ending with 11, 12 or 13 +// These are for all other numbers including special cases and should always end with "th", +// Then the function should return a string by appending "th" to the number. +test("returns 'th' for all other numbers including those ending with 11, 12, 13", () => { + expect(getOrdinalNumber(11)).toBe("11th"); + expect(getOrdinalNumber(12)).toBe("12th"); + expect(getOrdinalNumber(13)).toBe("13th"); + expect(getOrdinalNumber(10)).toBe("10th"); + expect(getOrdinalNumber(99)).toBe("99th"); + expect(getOrdinalNumber(100)).toBe("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 3838c7b00..16a425e57 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.js +++ b/Sprint-3/2-practice-tdd/repeat-str.js @@ -1,5 +1,14 @@ -function repeatStr() { - return "hellohellohello"; +function repeatStr(str, count) { + if (count < 0) { + throw new Error("Count cannot be negative"); + } + + let result = ""; + for (let i = 0; i < count; i++) { + result += str; + } + + 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 a3fc1196c..314edd188 100644 --- a/Sprint-3/2-practice-tdd/repeat-str.test.js +++ b/Sprint-3/2-practice-tdd/repeat-str.test.js @@ -21,12 +21,29 @@ 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 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 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 negative", () => { + expect(() => repeatStr("hello", -1)).toThrow(); +}); \ No newline at end of file