From b89ef55f9fd8333320b262f1687395d594d3f702 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 21:58:52 +0200 Subject: [PATCH 1/6] Handled all required conditions and added their test cases --- .../implement/1-get-angle-type.js | 17 ++++++++++++++--- 1 file changed, 14 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 ca1dfe7f2f..763464d053 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,9 +10,15 @@ 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. @@ -50,14 +56,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" // ====> 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 +// ====> write your test here, and then add a line to pass the test in the function above +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); From a1b479c4fa3a08d7548a55a534c6ebd31b80a38f Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 22:07:11 +0200 Subject: [PATCH 2/6] Added all required conditions and test cases for the fractions --- .../implement/2-is-proper-fraction.js | 6 ++++++ 1 file changed, 6 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 a4739af775..68503f87ff 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,10 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) { return true; + } else if (numerator >= denominator) { + return false; + } else if (numerator < 0 && Math.abs(numerator) < denominator) { + return true; } } @@ -47,6 +51,7 @@ assertEquals(improperFraction, false); // 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 @@ -54,6 +59,7 @@ const negativeFraction = isProperFraction(-4, 7); // 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? From e0a8bb4209f73f54b71124f57ae1dd71f836052b Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 22:42:42 +0200 Subject: [PATCH 3/6] Added cases for all types of cards and their test cases --- .../implement/3-get-card-value.js | 27 +++++++++++++++++++ 1 file changed, 27 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..cb5a47bfcd 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); + if (rank === "A") { return 11; + } else if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") { + return 10; + } else if (rank >= "2" && rank <= "9") { + return parseInt(rank); + } else { + throw new Error("Invalid card rank"); } } @@ -40,18 +48,37 @@ assertEquals(aceofSpades, 11); // 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 kingofDiamonds = getCardValue("K♦"); +assertEquals(kingofDiamonds, 10); + +const queenofClubs = getCardValue("Q♣"); +assertEquals(queenofClubs, 10); + +const jackofHearts = getCardValue("J♥"); +assertEquals(jackofHearts, 10); + +const tenofSpades = getCardValue("10♠"); +assertEquals(tenofSpades, 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("1"); +} catch (error) { + assertEquals(error.message, "Invalid card rank"); +} From f9999cbad73cd7bf5c8a97a6daa5f4a6f3c000f7 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 22:51:28 +0200 Subject: [PATCH 4/6] Added jest test cases for getAngleType --- .../1-get-angle-type.test.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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..605305a453 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 @@ -9,18 +9,18 @@ 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: -// When the angle is less than 90 degrees, -// Then the function should return "Acute angle" +test("should identify acute angles (<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 angles (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 angles (>180° and <360°)", () => { + expect(getAngleType(270)).toEqual("Reflex angle"); +}); From 1c6e671504b8f4e9ac0c33744664f5d6db0fa154 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 22:57:33 +0200 Subject: [PATCH 5/6] Added jest test cases to check proper and improper fractions --- .../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..6959ae63ae 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", () => { + expect(isProperFraction(5, 3)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative fraction when absolute value of numerator is less than denominator", () => { + expect(isProperFraction(-1, 3)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator and denominator are equal", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); From d5063444e3710aa25d6ed807cb152fcb717bb002 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 31 Mar 2026 23:05:42 +0200 Subject: [PATCH 6/6] Added jest test cases to handle all cases to test card values --- .../3-get-card-value.test.js | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) 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..a8080c8752 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,30 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return numeric value for number cards (2-10)", () => { + const fiveofHearts = getCardValue("5♥"); + expect(fiveofHearts).toEqual(5); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for face cards (J, Q, K) and 10", () => { + const kingofDiamonds = getCardValue("K♦"); + expect(kingofDiamonds).toEqual(10); + const queenofClubs = getCardValue("Q♣"); + expect(queenofClubs).toEqual(10); + const jackofHearts = getCardValue("J♥"); + expect(jackofHearts).toEqual(10); + const tenofSpades = getCardValue("10♠"); + expect(tenofSpades).toEqual(10); +}); + // Case 4: Handle Ace (A): +test("should return 11 for Ace", () => { + const aceofSpades = getCardValue("A♥"); + expect(aceofSpades).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should throw an error for invalid card ranks", () => { + expect(() => getCardValue("1")).toThrow("Invalid card rank"); +});