From e2491d375d18f77f28a0cffda77d866d85d82668 Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 01:37:08 +0000 Subject: [PATCH 1/6] Implement getAngleType function with full angle classification --- .../implement/1-get-angle-type.js | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) 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 ca1dfe7f2f..3c830e3d66 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,10 +10,19 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; + } else if (angle < 90){ + return "Acute angle"; + } else if (angle > 90 && angle < 180){ + return "Obtuse angle"; + } else if (angle === 180){ + return "Straight angle"; + } else 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. -} + // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. @@ -39,25 +48,36 @@ function assertEquals(actualOutput, targetOutput) { // Then the function should return "Right angle" const right = getAngleType(90); assertEquals(right, "Right angle"); +console.log(getAngleType(90)); // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" const acute = getAngleType(45); assertEquals(acute, "Acute angle"); +console.log(getAngleType(45)); // 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" const obtuse = getAngleType(120); +assertEquals (obtuse, "Obtuse angle"); +console.log(getAngleType(120)); // ====> 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"); +console.log(getAngleType(180)); + // ====> 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(200); +assertEquals (Reflex, "Reflex angle"); +console.log(getAngleType(200)); // ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file From 1be2cc85b0ac3a3624f3566fd94399cf0f237133 Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 01:51:41 +0000 Subject: [PATCH 2/6] Add isProperFraction function and tests --- .../implement/2-is-proper-fraction.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) 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 a4739af775..7df434d9a1 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,11 @@ // 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; - } + } else { + return false; + } } // The line below allows us to load the isProperFraction function into tests in other files. @@ -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,17 @@ 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 zeroNumerator = isProperFraction(0, 5); +assertEquals(zeroNumerator, true); + +const negativeDenominator = isProperFraction(4, -7); +assertEquals(negativeDenominator, true); + +const bothNegative = isProperFraction(-4, -7); +assertEquals(bothNegative, true); + From 888f58dc2662b2c08e36cf19f158c8445638fe19 Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 02:15:27 +0000 Subject: [PATCH 3/6] Add getCardValue function with tests for number, face, ace, and invalid cards --- .../implement/3-get-card-value.js | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) 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 266525d1b6..552788949d 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,16 @@ // 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); // remove suit + if (rank === "A") { return 11; + } else if (["K", "Q", "J", "10"].includes(rank)) { + return 10; + } else if (["2","3","4","5","6","7","8","9"].includes(rank)) { + return Number(rank); + } else { + throw new Error("Invalid card rank."); } } @@ -39,12 +47,25 @@ 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♥"); +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 tenOfDiamonds = getCardValue("10♦"); +assertEquals(tenOfDiamonds, 10); + +const jackOfClubs = getCardValue("J♣"); +assertEquals(jackOfClubs, 10); + +const queenOfSpades = getCardValue("Q♠"); +assertEquals(queenOfSpades, 10); + +const kingOfHearts = getCardValue("K♥"); +assertEquals(kingOfHearts, 10); + // Handle Ace (A): // Given a card with a rank of "A", @@ -55,3 +76,10 @@ const fiveofHearts = getCardValue("5♥"); // 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("1♠"); + console.error("Test failed: invalid card did not throw error"); +} catch (error) { + console.log("Invalid card test passed"); +} From a9b1826e5356756ad9186db03f869885a8be1c43 Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 15:12:21 +0000 Subject: [PATCH 4/6] Add Jest unit tests for getAngleType covering all angle types --- .../rewrite-tests-with-jest/1-get-angle-type.test.js | 12 ++++++++++++ 1 file changed, 12 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 4a92a3e821..02e2f55703 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 @@ -12,15 +12,27 @@ test("should identify right angle (90°)", () => { // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify Acute angle (< 90)", () => { + expect(getAngleType(45)).toEqual("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 identify Obtuse angles (> 90 and < 180)", () => { +expect(getAngleType(120)).toEqual("Obtuse angle") +}); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" +test("should identify Straight angle (180)", () => { + expect(getAngleType(180)).toEqual("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 identify Reflex angle (> 180 and <360)", () => { + expect(getAngleType(270)).toEqual("Reflex angle") + }); \ No newline at end of file From 75fdb2a5b41ca8a32481c27dffb7906edb07b92b Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 15:29:00 +0000 Subject: [PATCH 5/6] Add Jest tests for getAngleType and isProperFraction --- .../rewrite-tests-with-jest/2-is-proper-fraction.test.js | 9 +++++++++ 1 file changed, 9 insertions(+) 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 caf08d15bd..69259b838a 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 when numerator is greater than denominator", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true when absolute numerator is less than absolute denominator", () => { + 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); +}); From 78c404f2e820082ba73ef4bd46d93d37e7049e42 Mon Sep 17 00:00:00 2001 From: khalidbih Date: Wed, 4 Mar 2026 15:45:38 +0000 Subject: [PATCH 6/6] Add Jest tests for getCardValue function covering numbers, face cards, Ace, and invalid cards --- .../3-get-card-value.test.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) 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 04418ff728..b2dd576d5d 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 @@ -8,6 +8,20 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return the value of 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): -// Case 4: Handle Ace (A): +test("should return 10 for face cards", () => { + expect(getCardValue("J♣")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♠")).toEqual(10); +}); + // Case 5: Handle Invalid Cards: +test("should throw an error for Invalid card", () => { + expect(() => getCardValue("1♣")).toThrow("Invalid card rank."); +}); \ No newline at end of file