From 193dfec2b0f5d1855ecaeb5f70deb65558400dc2 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Tue, 4 Nov 2025 15:29:39 +0000 Subject: [PATCH 1/5] 1.get-angle-type.js updated --- .../implement/1-get-angle-type.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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..130520dcf 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 @@ -10,6 +10,21 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; + } + 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"; } // 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. From 9faececb81b0952e67bb0904ed0ab5202e6afa55 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Tue, 4 Nov 2025 15:59:58 +0000 Subject: [PATCH 2/5] 2.is-proper-function updated --- .../implement/2-is-proper-fraction.js | 9 +++++++++ 1 file changed, 9 insertions(+) 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..ec2900daa 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 @@ -10,6 +10,8 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) { return true; + } else { + return false; } } @@ -46,6 +48,7 @@ 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); +assertEquals(negativeFraction, true); // ====> complete with your assertion // Equal Numerator and Denominator check: @@ -53,7 +56,13 @@ const negativeFraction = isProperFraction(-4, 7); // 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); +assertEquals(equalFraction, false); // ====> complete with your assertion // Stretch: // What other scenarios could you test for? +const zeroFraction = isProperFraction(0, 5); +assertEquals(zeroFraction, true); + +const negativeDenominator = isProperFraction(3, -5); +assertEquals(negativeDenominator, false); From aceb21945ae0bb4f919428a7b7f23703fc40e521 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Tue, 4 Nov 2025 16:21:22 +0000 Subject: [PATCH 3/5] 1 and 3 updated --- .../implement/1-get-angle-type.js | 5 ++++ .../implement/3-get-card-value.js | 28 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 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 130520dcf..b2eb10793 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 @@ -65,14 +65,19 @@ 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); +assertEquals(obtuse, "Obtuse angle"); // ====> write your test here, and then add a line to pass the test in the function above // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); // ====> write your test here, and then add a line to pass the test in the function above // 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" +const reflex = getAngleType(220); +assertEquals(reflex, "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 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..3462630bd 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,8 +8,15 @@ // 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; + } else if (["K", "Q", "J", "10"].includes(rank)) { + return 10; + } else if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) { + return Number(rank); + } else { + throw new Error("Invalid card rank"); } } @@ -31,27 +38,42 @@ function assertEquals(actualOutput, targetOutput) { // Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A), // When the function getCardValue is called with this card string as input, // Then it should return the numerical card value -const aceofSpades = getCardValue("A♠"); -assertEquals(aceofSpades, 11); // Handle Number Cards (2-10): // Given a card with a rank between "2" and "9", // 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♥"); +const fiveOfHearts = getCardValue("5♥"); +assertEquals(fiveOfHearts, 5); // ====> write your test here, and then add a line to pass the test in the function above // 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 kingOfDiamonds = getCardValue("K♦"); +assertEquals(kingOfDiamonds, 10); + +const queenOfClubs = getCardValue("Q♣"); +assertEquals(queenOfClubs, 10); + +const jackOfSpades = getCardValue("J♠"); +assertEquals(jackOfSpades, 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 aceOfSpades = getCardValue("A♠"); +assertEquals(aceOfSpades, 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("Z♠"); +} catch (error) { + console.log("Caught error:", error.message); + assertEquals(error.message, "Invalid card rank"); +} From 177f0d72e0ba77f3d88fe64a30dde533a682f200 Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Tue, 4 Nov 2025 17:29:27 +0000 Subject: [PATCH 4/5] updated pr template --- .../1-get-angle-type.test.js | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) 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..a157b4b68 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 @@ -8,6 +8,27 @@ test("should identify right angle (90°)", () => { // REPLACE the comments with the tests // make your test descriptions as clear and readable as possible +//Case 2: Identify Acute Angles + +test("should identify acute angle (<90°)", () => { + expect(getAngleType(45)).toEqual("Acute angle"); +}); + +// Case 3: Identify Obtuse Angles +test("should identify obtuse angle (between 90° and 180°)", () => { + expect(getAngleType(120)).toEqual("Obtuse angle"); +}); + +// Case 4: Identify Straight Angles +test("should identify straight angle (180°)", () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); + +// Case 5: Identify Reflex Angles +test("should identify reflex angle (between 180° and 360°)", () => { + expect(getAngleType(270)).toEqual("Reflex angle"); +}); + // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, From d111dcaaf031a58f7af03e600faba714a446da1d Mon Sep 17 00:00:00 2001 From: Fithi Teklom Date: Tue, 4 Nov 2025 17:39:28 +0000 Subject: [PATCH 5/5] updated PR template --- .../2-is-proper-fraction.test.js | 9 +++++ .../3-get-card-value.test.js | 34 +++++++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) 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..a286b27c3 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 @@ -7,7 +7,16 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction (numerator > denominator)", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a proper fraction with negative numerator", () => { + 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); +}); 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..4c8d83f4a 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 @@ -3,11 +3,41 @@ const getCardValue = require("../implement/3-get-card-value"); test("should return 11 for Ace of Spades", () => { - const aceofSpades = getCardValue("A♠"); - expect(aceofSpades).toEqual(11); + const aceOfSpades = getCardValue("A♠"); + expect(aceOfSpades).toEqual(11); }); // Case 2: Handle Number Cards (2-10): +test("should return 5 for Five of Hearts", () => { + const fiveOfHearts = getCardValue("5♥"); + expect(fiveOfHearts).toEqual(5); +}); + +test("should return 10 for Ten of Clubs", () => { + const tenOfClubs = getCardValue("10♣"); + expect(tenOfClubs).toEqual(10); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for Jack of Diamonds", () => { + const jackOfDiamonds = getCardValue("J♦"); + expect(jackOfDiamonds).toEqual(10); +}); + +test("should return 10 for Queen of Hearts", () => { + const queenOfHearts = getCardValue("Q♥"); + expect(queenOfHearts).toEqual(10); +}); + +test("should return 10 for King of Spades", () => { + const kingOfSpades = getCardValue("K♠"); + expect(kingOfSpades).toEqual(10); +}); // Case 4: Handle Ace (A): +test("should return 11 for Ace of Clubs", () => { + const aceOfClubs = getCardValue("A♣"); + expect(aceOfClubs).toEqual(11); +}); // Case 5: Handle Invalid Cards: +test("should throw an error for invalid card rank", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid card rank"); +});