From 97ed99a95859e05cd41f3e77920ad527f63662fe Mon Sep 17 00:00:00 2001 From: Enice-Codes Date: Sun, 19 Jul 2026 23:18:33 +0200 Subject: [PATCH 1/2] add completed practice-tdd, dead-code, and stretch exercises --- Sprint-3/2-practice-tdd/count.js | 6 +++ Sprint-3/2-practice-tdd/count.test.js | 15 +++++++ Sprint-3/2-practice-tdd/get-ordinal-number.js | 10 +++++ .../2-practice-tdd/get-ordinal-number.test.js | 14 +++++- Sprint-3/3-dead-code/exercise-1.js | 3 +- Sprint-3/3-dead-code/exercise-2.js | 6 +-- Sprint-3/4-stretch/find.js | 18 ++++++++ Sprint-3/4-stretch/password-validator.js | 9 ++++ Sprint-3/4-stretch/password-validator.test.js | 45 ++++++++++++++++++- 9 files changed, 118 insertions(+), 8 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d4..719fddbefa 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -3,3 +3,9 @@ function countChar(stringOfCharacters, findCharacter) { } module.exports = countChar; + test( "should count multiple occurrences of a character ", function(){ + const stringofcharacters = "aaaaa"; + const findcharcaters = "a"; + const count = countChar(stringofcharacters, findcharcaters); + expect(count).toEqual(5); + }); \ 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 179ea0ddf7..7c494f3337 100644 --- a/Sprint-3/2-practice-tdd/count.test.js +++ b/Sprint-3/2-practice-tdd/count.test.js @@ -3,6 +3,15 @@ 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: +function CountChar(str, char) { + let count = 0; + for (let i = 0; i < str.length; i++) { + if (str[i] === char) { + count++; + } + } + return count; +} // Scenario: Multiple Occurrences // Given the input string `str`, @@ -22,3 +31,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 occur in the string', () => { + const str = "hello"; + const char = "x"; + const count = countChar(str, char); + expect(count).toEqual(5); +}); \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/get-ordinal-number.js b/Sprint-3/2-practice-tdd/get-ordinal-number.js index f95d71db13..e56ce47b94 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -3,3 +3,13 @@ function getOrdinalNumber(num) { } module.exports = getOrdinalNumber; + test(`works with any number ending with 1, except for 11. For all other numbers, it should return the number followed by "th" with exceptions to 2 and 3 `, () => { + expect(getOrdinalNumber(1)).toBe("1st"); + expect(getOrdinalNumber(2)).toBe("2nd"); + expect(getOrdinalNumber(3)).toBe("3rd"); + expect(getOrdinalNumber(4)).toBe("4th"); + expect(getOrdinalNumber(11)).toBe("11th"); + expect(getOrdinalNumber(12)).toBe("12th"); + }); + + \ No newline at end of file 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..1df44e4458 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -15,6 +15,18 @@ const getOrdinalNumber = require("./get-ordinal-number"); // 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(31)).toEqual("31st"); 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(132)).toEqual("132nd"); +}); + + 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(143)).toEqual("143rd"); +}); + \ No newline at end of file diff --git a/Sprint-3/3-dead-code/exercise-1.js b/Sprint-3/3-dead-code/exercise-1.js index 4d09f15fa9..a68f274f26 100644 --- a/Sprint-3/3-dead-code/exercise-1.js +++ b/Sprint-3/3-dead-code/exercise-1.js @@ -5,9 +5,8 @@ let testName = "Jerry"; const greeting = "hello"; function sayHello(greeting, name) { - const greetingStr = greeting + ", " + name + "!"; return `${greeting}, ${name}!`; - console.log(greetingStr); + } testName = "Aman"; diff --git a/Sprint-3/3-dead-code/exercise-2.js b/Sprint-3/3-dead-code/exercise-2.js index 56d7887c4c..d865830a2e 100644 --- a/Sprint-3/3-dead-code/exercise-2.js +++ b/Sprint-3/3-dead-code/exercise-2.js @@ -2,12 +2,10 @@ // The countAndCapitalisePets function should continue to work for any reasonable input it's given, and you shouldn't modify the pets variable. const pets = ["parrot", "hamster", "horse", "dog", "hamster", "cat", "hamster"]; -const capitalisedPets = pets.map((pet) => pet.toUpperCase()); + const petsStartingWithH = pets.filter((pet) => pet[0] === "h"); -function logPets(petsArr) { - petsArr.forEach((pet) => console.log(pet)); -} + function countAndCapitalisePets(petsArr) { const petCount = {}; diff --git a/Sprint-3/4-stretch/find.js b/Sprint-3/4-stretch/find.js index c7e79a2f21..6ab0d27c9b 100644 --- a/Sprint-3/4-stretch/find.js +++ b/Sprint-3/4-stretch/find.js @@ -20,6 +20,24 @@ console.log(find("code your future", "z")); // Pay particular attention to the following: // a) How the index variable updates during the call to find +// the index variable starts at 0 and is incremented by 1 after each iteration of the while loop. + // b) What is the if statement used to check +// the if statement is used to check if the character at the current index of the string is equal to the character we are searching for. +// if the condition is true ,it will return the index of the character in the string. ' +// if the condition is false, it will continue to the next iteration of the loop until it finds the character or reaches the end of the string. + // c) Why is index++ being used? +/* + the index++ is used to increment the index variable by 1 after each iteration of the loop. +This allows the loop to move to the next character in the string for the next iteration. Without this increment, +the loop would get stuck on the same character and could potentially run indefinitely if the condition is never met. +*/ + // d) What is the condition index < str.length used for? +/* +the index < str.length condition is used to ensure that the loop continues to iterate through the string until it reaches the end. +the index variable is used to keep track of the current position in the string, and the loop will continue as long as index is less than the length of the string. +Once index reaches the length of the string, + it means we have checked all characters in the string, and if we haven't found the character we're looking for, we return -1 to indicate that it was not found. + */ \ No newline at end of file diff --git a/Sprint-3/4-stretch/password-validator.js b/Sprint-3/4-stretch/password-validator.js index b55d527dba..615e3d0b8c 100644 --- a/Sprint-3/4-stretch/password-validator.js +++ b/Sprint-3/4-stretch/password-validator.js @@ -3,4 +3,13 @@ function passwordValidator(password) { } +module.exports = passwordValidator; + function passwordValidator(password) { + if (password.length < 5){ + return false; + } else if (password.length >= 5 ){ + return true; + } +} + module.exports = passwordValidator; \ No newline at end of file diff --git a/Sprint-3/4-stretch/password-validator.test.js b/Sprint-3/4-stretch/password-validator.test.js index 8fa3089d6b..eb230a67a1 100644 --- a/Sprint-3/4-stretch/password-validator.test.js +++ b/Sprint-3/4-stretch/password-validator.test.js @@ -23,4 +23,47 @@ test("password has at least 5 characters", () => { // Assert expect(result).toEqual(true); } -); \ No newline at end of file +); +// instruction 2 +const isValidPassword = require("./password-validator"); +test("password has least one uppercase letter", () => { + // arrange + const uppercase = "A -Z"; + // act + const result = isValidPassword(uppercase); + // assert + expect(result).toEqual(true); +}); + +// instruction 3 +const isValidPassword = require("./password-validator"); +test("password has least one lowercase letter", () => { + // arrange + const lowercase = "a-z"; + // act + const result = isValidPassword(lowercase); + // assert + expect(result).toEqual(true); +}); + +// instruction 4 +const isValidPassword = require("./password-validator"); +test("password has least one number", () => { + // arrange + const number = "0-9"; + // act + const result = isValidPassword(number); + // assert + expect(result).toEqual(true); +}); + +// instruction 5 +const isValidPassword = require("./password-validator"); +test("password has least one non-alphanumeric symbol", () => { + // arrange + const symbol = "!#$%.*&"; + // act + const result = isValidPassword(symbol); + // assert + expect(result).toEqual(true); +}); \ No newline at end of file From eb034f33be1c12a996e1afaa2a14dd34f8b288d1 Mon Sep 17 00:00:00 2001 From: Enice-Codes Date: Sun, 19 Jul 2026 23:39:52 +0200 Subject: [PATCH 2/2] remove dead-code and stretch files, not part of this task --- Sprint-3/3-dead-code/exercise-1.js | 3 +- Sprint-3/3-dead-code/exercise-2.js | 6 ++- Sprint-3/4-stretch/find.js | 18 -------- Sprint-3/4-stretch/password-validator.js | 9 ---- Sprint-3/4-stretch/password-validator.test.js | 45 +------------------ 5 files changed, 7 insertions(+), 74 deletions(-) diff --git a/Sprint-3/3-dead-code/exercise-1.js b/Sprint-3/3-dead-code/exercise-1.js index a68f274f26..4d09f15fa9 100644 --- a/Sprint-3/3-dead-code/exercise-1.js +++ b/Sprint-3/3-dead-code/exercise-1.js @@ -5,8 +5,9 @@ let testName = "Jerry"; const greeting = "hello"; function sayHello(greeting, name) { + const greetingStr = greeting + ", " + name + "!"; return `${greeting}, ${name}!`; - + console.log(greetingStr); } testName = "Aman"; diff --git a/Sprint-3/3-dead-code/exercise-2.js b/Sprint-3/3-dead-code/exercise-2.js index d865830a2e..56d7887c4c 100644 --- a/Sprint-3/3-dead-code/exercise-2.js +++ b/Sprint-3/3-dead-code/exercise-2.js @@ -2,10 +2,12 @@ // The countAndCapitalisePets function should continue to work for any reasonable input it's given, and you shouldn't modify the pets variable. const pets = ["parrot", "hamster", "horse", "dog", "hamster", "cat", "hamster"]; - +const capitalisedPets = pets.map((pet) => pet.toUpperCase()); const petsStartingWithH = pets.filter((pet) => pet[0] === "h"); - +function logPets(petsArr) { + petsArr.forEach((pet) => console.log(pet)); +} function countAndCapitalisePets(petsArr) { const petCount = {}; diff --git a/Sprint-3/4-stretch/find.js b/Sprint-3/4-stretch/find.js index 6ab0d27c9b..c7e79a2f21 100644 --- a/Sprint-3/4-stretch/find.js +++ b/Sprint-3/4-stretch/find.js @@ -20,24 +20,6 @@ console.log(find("code your future", "z")); // Pay particular attention to the following: // a) How the index variable updates during the call to find -// the index variable starts at 0 and is incremented by 1 after each iteration of the while loop. - // b) What is the if statement used to check -// the if statement is used to check if the character at the current index of the string is equal to the character we are searching for. -// if the condition is true ,it will return the index of the character in the string. ' -// if the condition is false, it will continue to the next iteration of the loop until it finds the character or reaches the end of the string. - // c) Why is index++ being used? -/* - the index++ is used to increment the index variable by 1 after each iteration of the loop. -This allows the loop to move to the next character in the string for the next iteration. Without this increment, -the loop would get stuck on the same character and could potentially run indefinitely if the condition is never met. -*/ - // d) What is the condition index < str.length used for? -/* -the index < str.length condition is used to ensure that the loop continues to iterate through the string until it reaches the end. -the index variable is used to keep track of the current position in the string, and the loop will continue as long as index is less than the length of the string. -Once index reaches the length of the string, - it means we have checked all characters in the string, and if we haven't found the character we're looking for, we return -1 to indicate that it was not found. - */ \ No newline at end of file diff --git a/Sprint-3/4-stretch/password-validator.js b/Sprint-3/4-stretch/password-validator.js index 615e3d0b8c..b55d527dba 100644 --- a/Sprint-3/4-stretch/password-validator.js +++ b/Sprint-3/4-stretch/password-validator.js @@ -3,13 +3,4 @@ function passwordValidator(password) { } -module.exports = passwordValidator; - function passwordValidator(password) { - if (password.length < 5){ - return false; - } else if (password.length >= 5 ){ - return true; - } -} - module.exports = passwordValidator; \ No newline at end of file diff --git a/Sprint-3/4-stretch/password-validator.test.js b/Sprint-3/4-stretch/password-validator.test.js index eb230a67a1..8fa3089d6b 100644 --- a/Sprint-3/4-stretch/password-validator.test.js +++ b/Sprint-3/4-stretch/password-validator.test.js @@ -23,47 +23,4 @@ test("password has at least 5 characters", () => { // Assert expect(result).toEqual(true); } -); -// instruction 2 -const isValidPassword = require("./password-validator"); -test("password has least one uppercase letter", () => { - // arrange - const uppercase = "A -Z"; - // act - const result = isValidPassword(uppercase); - // assert - expect(result).toEqual(true); -}); - -// instruction 3 -const isValidPassword = require("./password-validator"); -test("password has least one lowercase letter", () => { - // arrange - const lowercase = "a-z"; - // act - const result = isValidPassword(lowercase); - // assert - expect(result).toEqual(true); -}); - -// instruction 4 -const isValidPassword = require("./password-validator"); -test("password has least one number", () => { - // arrange - const number = "0-9"; - // act - const result = isValidPassword(number); - // assert - expect(result).toEqual(true); -}); - -// instruction 5 -const isValidPassword = require("./password-validator"); -test("password has least one non-alphanumeric symbol", () => { - // arrange - const symbol = "!#$%.*&"; - // act - const result = isValidPassword(symbol); - // assert - expect(result).toEqual(true); -}); \ No newline at end of file +); \ No newline at end of file