From 6496a070f14c8f3f83a47aa3704ceeeac8a66729 Mon Sep 17 00:00:00 2001 From: Roumaissae Date: Sun, 26 Apr 2026 19:09:41 +0200 Subject: [PATCH 1/3] Implement getAngleType with full angle classification cases --- .../implement/1-get-angle-type.js | 29 ++++++++++++--- .../implement/2-is-proper-fraction.js | 11 ++++-- .../implement/3-get-card-value.js | 37 ++++++++++++++++++- .../1-get-angle-type.test.js | 37 +++++++++---------- .../2-is-proper-fraction.test.js | 11 +++++- .../3-get-card-value.test.js | 21 ++++++++++- 6 files changed, 113 insertions(+), 33 deletions(-) diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index ca1dfe7f2..f3d84c27d 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -11,8 +11,25 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; } - // Run the tests, work out what Case 2 is testing, and implement the required code here. - // Then keep going for the other cases, one at a time. + + // Run the tests, work out what Case 2 is testing, and implement the required code here. + // Then keep going for the other cases, one at a time. + + if (angle < 90) { + return "Acute angle"; + } + + if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } + + if (angle === 180) { + return "Straight angle"; + } + + if (angle > 180 && angle < 360) { + return "Reflex angle"; + } } // The line below allows us to load the getAngleType function into tests in other files. @@ -50,14 +67,16 @@ assertEquals(acute, "Acute angle"); // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" const obtuse = getAngleType(120); -// ====> write your test here, and then add a line to pass the test in the function above +assertEquals(obtuse, "Obtuse angle"); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" -// ====> write your test here, and then add a line to pass the test in the function above +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" -// ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js index a4739af77..9c952de63 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -8,9 +8,12 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + + if (Math.abs(numerator) < Math.abs(denominator)) { return true; } + + return false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -46,14 +49,14 @@ assertEquals(improperFraction, false); // target output: true // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true. const negativeFraction = isProperFraction(-4, 7); -// ====> complete with your assertion +assertEquals(negativeFraction, true); // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 // target output: false // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false. const equalFraction = isProperFraction(3, 3); -// ====> complete with your assertion +assertEquals(equalFraction, false); // Stretch: -// What other scenarios could you test for? +// What other scenarios could you test for? \ No newline at end of file diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js index 266525d1b..ec5f5f736 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js @@ -8,9 +8,25 @@ // write one test at a time, and make it pass, build your solution up methodically // just make one change at a time -- don't rush -- programmers are deep and careful thinkers function getCardValue(card) { + + const rank = card.slice(0, -1); + if (rank === "A") { return 11; } + + + if (!isNaN(rank)) { + return Number(rank); + } + + + if (rank === "K" || rank === "Q" || rank === "J") { + return 10; + } + + + throw new Error("Invalid card rank."); } // The line below allows us to load the getCardValue function into tests in other files. @@ -39,19 +55,38 @@ assertEquals(aceofSpades, 11); // When the function is called with such a card, // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). const fiveofHearts = getCardValue("5♥"); -// ====> write your test here, and then add a line to pass the test in the function above +assertEquals(fiveofHearts, 5); // Handle Face Cards (J, Q, K): // Given a card with a rank of "10," "J," "Q," or "K", // When the function is called with such a card, // Then it should return the value 10, as these cards are worth 10 points each in blackjack. +const king = getCardValue("K♣"); +assertEquals(king, 10); + +const queen = getCardValue("Q♦"); +assertEquals(queen, 10); + +const jack = getCardValue("J♠"); +assertEquals(jack, 10); + +const ten = getCardValue("10♥"); +assertEquals(ten, 10); // Handle Ace (A): // Given a card with a rank of "A", // When the function is called with an Ace, // Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack. +const ace = getCardValue("A♦"); +assertEquals(ace, 11); // Handle Invalid Cards: // Given a card with an invalid rank (neither a number nor a recognized face card), // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." +try { + getCardValue("X♠"); + console.assert(false, "Expected error for invalid card"); +} catch (e) { + console.assert(true); +} \ No newline at end of file diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index 4a92a3e82..48d617052 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -1,26 +1,25 @@ -// This statement loads the getAngleType function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const getAngleType = require("../implement/1-get-angle-type"); -test("should identify right angle (90°)", () => { - expect(getAngleType(90)).toEqual("Right angle"); -}); +describe("getAngleType", () => { -// REPLACE the comments with the tests -// make your test descriptions as clear and readable as possible + test("should return 'Right angle' for exactly 90 degrees", () => { + expect(getAngleType(90)).toBe("Right angle"); + }); -// Case 2: Identify Acute Angles: -// When the angle is less than 90 degrees, -// Then the function should return "Acute angle" + test("should return 'Acute angle' for less than 90 degrees", () => { + expect(getAngleType(45)).toBe("Acute angle"); + }); -// Case 3: Identify Obtuse Angles: -// When the angle is greater than 90 degrees and less than 180 degrees, -// Then the function should return "Obtuse angle" + test("should return 'Obtuse angle' for angles between 90 and 180 degrees", () => { + expect(getAngleType(120)).toBe("Obtuse angle"); + }); -// Case 4: Identify Straight Angles: -// When the angle is exactly 180 degrees, -// Then the function should return "Straight angle" + test("should return 'Straight angle' for exactly 180 degrees", () => { + expect(getAngleType(180)).toBe("Straight angle"); + }); -// Case 5: Identify Reflex Angles: -// When the angle is greater than 180 degrees and less than 360 degrees, -// Then the function should return "Reflex angle" + test("should return 'Reflex angle' for angles between 180 and 360 degrees", () => { + expect(getAngleType(200)).toBe("Reflex angle"); + }); + +}); \ No newline at end of file diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index caf08d15b..7695320f9 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -1,5 +1,3 @@ -// This statement loads the isProperFraction function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const isProperFraction = require("../implement/2-is-proper-fraction"); test("should return true for a proper fraction", () => { @@ -7,7 +5,16 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative proper fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator equals denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); \ No newline at end of file diff --git a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index 04418ff72..813f21f29 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -1,5 +1,3 @@ -// This statement loads the getCardValue function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const getCardValue = require("../implement/3-get-card-value"); test("should return 11 for Ace of Spades", () => { @@ -8,6 +6,25 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return numeric value for number cards", () => { + expect(getCardValue("2♥")).toEqual(2); + expect(getCardValue("5♦")).toEqual(5); + expect(getCardValue("10♣")).toEqual(10); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for face cards", () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♦")).toEqual(10); +}); + // Case 4: Handle Ace (A): +test("should return 11 for Ace", () => { + expect(getCardValue("A♦")).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should throw an error for invalid card rank", () => { + expect(() => getCardValue("X♠")).toThrow("Invalid card rank."); +}); \ No newline at end of file From 4d61561a6c077671b154603f1d09ce7caed4b976 Mon Sep 17 00:00:00 2001 From: Roumaissae Date: Sun, 26 Apr 2026 19:17:57 +0200 Subject: [PATCH 2/3] Add repeat function tests with Jest --- Sprint-3/2-practice-tdd/count.js | 6 ++-- Sprint-3/2-practice-tdd/get-ordinal-number.js | 24 +++++++++++++-- .../2-practice-tdd/get-ordinal-number.test.js | 30 ++++++++++++++----- Sprint-3/2-practice-tdd/repeat.js | 12 ++++++-- Sprint-3/2-practice-tdd/repeat.test.js | 16 +++++++--- 5 files changed, 69 insertions(+), 19 deletions(-) diff --git a/Sprint-3/2-practice-tdd/count.js b/Sprint-3/2-practice-tdd/count.js index 95b6ebb7d..8c44f8113 100644 --- a/Sprint-3/2-practice-tdd/count.js +++ b/Sprint-3/2-practice-tdd/count.js @@ -1,5 +1,5 @@ -function countChar(stringOfCharacters, findCharacter) { - return 5 +function countChar(str, char) { + return str.split("").filter(c => c === char).length; } -module.exports = countChar; +module.exports = countChar; \ 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 f95d71db1..618997280 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.js @@ -1,5 +1,25 @@ function getOrdinalNumber(num) { - return "1st"; + const lastDigit = num % 10; + const lastTwoDigits = num % 100; + + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) { + return num + "th"; + } + + if (lastDigit === 1) { + return num + "st"; + } + + if (lastDigit === 2) { + return num + "nd"; + } + + if (lastDigit === 3) { + return num + "rd"; + } + + return num + "th"; } -module.exports = getOrdinalNumber; +module.exports = getOrdinalNumber; \ 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 dfe4b6091..3791950b8 100644 --- a/Sprint-3/2-practice-tdd/get-ordinal-number.test.js +++ b/Sprint-3/2-practice-tdd/get-ordinal-number.test.js @@ -1,13 +1,29 @@ const getOrdinalNumber = require("./get-ordinal-number"); -// 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 // Case 1: Identify the ordinal number for 1 -// When the number is 1, -// Then the function should return "1st" - test("should return '1st' for 1", () => { expect(getOrdinalNumber(1)).toEqual("1st"); }); + +// Case 2: Identify ordinal number for 2 +test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); +}); + +// Case 3: Identify ordinal number for 3 +test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); +}); + +// Case 4: Identify ordinal numbers for other values +test("should return '4th' for 4", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); +}); + +test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); +}); + +test("should return '21st' for 21", () => { + expect(getOrdinalNumber(21)).toEqual("21st"); +}); \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/repeat.js b/Sprint-3/2-practice-tdd/repeat.js index 00e60d7f3..4efd157d8 100644 --- a/Sprint-3/2-practice-tdd/repeat.js +++ b/Sprint-3/2-practice-tdd/repeat.js @@ -1,5 +1,11 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, times) { + let result = ""; + + for (let i = 0; i < times; i++) { + result += str; + } + + return result; } -module.exports = repeat; +module.exports = repeat; \ No newline at end of file diff --git a/Sprint-3/2-practice-tdd/repeat.test.js b/Sprint-3/2-practice-tdd/repeat.test.js index 34097b09c..f5b621564 100644 --- a/Sprint-3/2-practice-tdd/repeat.test.js +++ b/Sprint-3/2-practice-tdd/repeat.test.js @@ -1,8 +1,4 @@ -// Implement a function repeat const repeat = require("./repeat"); -// Given a target string str and a positive integer count, -// When the repeat function is called with these inputs, -// Then it should: // case: repeat String: // Given a target string str and a positive integer count, @@ -21,12 +17,24 @@ test("should repeat the string count times", () => { // When the repeat function is called with these inputs, // Then it should return the original str without repetition, ensuring that a count of 1 results in no repetition. +test("should return the same string when count is 1", () => { + expect(repeat("hello", 1)).toEqual("hello"); +}); + // case: Handle Count of 0: // Given a target string str and a count equal to 0, // When the repeat function is called with these inputs, // Then it should return an empty string, ensuring that a count of 0 results in an empty output. +test("should return an empty string when count is 0", () => { + expect(repeat("hello", 0)).toEqual(""); +}); + // case: Negative Count: // Given a target string str and a negative integer count, // When the repeat function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. + +test("should throw an error when count is negative", () => { + expect(() => repeat("hello", -1)).toThrow("Invalid count"); +}); \ No newline at end of file From f7b200b484be7eec0cd45b63e4c3b460d0e89c5e Mon Sep 17 00:00:00 2001 From: Roumaissae Date: Sun, 26 Apr 2026 19:23:43 +0200 Subject: [PATCH 3/3] Improve password validator test with full valid example --- Sprint-3/3-stretch/credit-card-validator.js | 21 +++++++++++++++++++ Sprint-3/3-stretch/find.js | 7 +++++++ Sprint-3/3-stretch/password-validator.js | 3 +-- Sprint-3/3-stretch/password-validator.test.js | 11 ++++++---- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 Sprint-3/3-stretch/credit-card-validator.js diff --git a/Sprint-3/3-stretch/credit-card-validator.js b/Sprint-3/3-stretch/credit-card-validator.js new file mode 100644 index 000000000..74074ab63 --- /dev/null +++ b/Sprint-3/3-stretch/credit-card-validator.js @@ -0,0 +1,21 @@ + +// Function that checks if a credit card number is valid +function validateCreditCardNumber(cardNumber) { + // Convert the input into a string so we can check each digit + const cardStr = cardNumber.toString(); + + // Check if the card has exactly 16 digits + if (cardStr.length !== 16) { + return false; + } + + // Check if all characters are numbers + if (!/^\d+$/.test(cardStr)) { + return false; + } + + // Return true only if all conditions are satisfied + return true; +} + +module.exports = validateCreditCardNumber; \ No newline at end of file diff --git a/Sprint-3/3-stretch/find.js b/Sprint-3/3-stretch/find.js index c7e79a2f2..fd3aa548c 100644 --- a/Sprint-3/3-stretch/find.js +++ b/Sprint-3/3-stretch/find.js @@ -20,6 +20,13 @@ 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 increases by 1 (index++) on each loop iteration until it finds the character or reaches the end of the string. + // b) What is the if statement used to check +// The if statement checks whether the current character in the string (str[index]) is equal to the character we are searching for (char). + // c) Why is index++ being used? +// Index++ is used to move to the next position in the string. Without it, the loop would never progress and would run forever. + // d) What is the condition index < str.length used for? +// This condition ensures that the loop only runs while the index is within the bounds of the string, preventing access to invalid positions. \ No newline at end of file diff --git a/Sprint-3/3-stretch/password-validator.js b/Sprint-3/3-stretch/password-validator.js index b55d527db..4f9e0976c 100644 --- a/Sprint-3/3-stretch/password-validator.js +++ b/Sprint-3/3-stretch/password-validator.js @@ -1,6 +1,5 @@ function passwordValidator(password) { - return password.length < 5 ? false : true + return password.length >= 5; } - module.exports = passwordValidator; \ No newline at end of file diff --git a/Sprint-3/3-stretch/password-validator.test.js b/Sprint-3/3-stretch/password-validator.test.js index 8fa3089d6..ef41ca943 100644 --- a/Sprint-3/3-stretch/password-validator.test.js +++ b/Sprint-3/3-stretch/password-validator.test.js @@ -14,13 +14,16 @@ To be valid, a password must: You must breakdown this problem in order to solve it. Find one test case first and get that working */ + const isValidPassword = require("./password-validator"); -test("password has at least 5 characters", () => { + +test("password should have at least 5 characters", () => { // Arrange - const password = "12345"; + const password = "Ab1!c"; + // Act const result = isValidPassword(password); + // Assert expect(result).toEqual(true); -} -); \ No newline at end of file +}); \ No newline at end of file