From a3bba619ac51190ad38154fb930d5e508b7c5307 Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Thu, 30 Oct 2025 00:29:36 +0100 Subject: [PATCH 1/8] add angle type --- .../implement/1-get-angle-type.js | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 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..2b0416e20 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,20 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; + } else if (angle < 90) { + return "Acute angle"; + } else if (angle < 180) { + return "Obtuse angle"; + } else if (angle === 180) { + return "Straight angle"; + } else if (angle < 360) { + return "Reflex angle"; + } else { + return "Incorrect 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. } // The line below allows us to load the getAngleType function into tests in other files. @@ -50,14 +61,18 @@ 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 +const reflex = getAngleType(260); +assertEquals(reflex, "Reflex angle"); +// ====> write your test here, and then add a line to pass the test in the function above From 9cbbf9d5291ca52e5c07f538d17a497db202ed2c Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Thu, 30 Oct 2025 00:29:56 +0100 Subject: [PATCH 2/8] add proper fraction --- .../implement/2-is-proper-fraction.js | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 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 a4739af77..979065e63 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,8 +8,20 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + if (denominator === 0) { + // denominator cannot be zero. + return false; + } + if (numerator > 0 && numerator < denominator) { + //positive + return true; + } + if (numerator < 0 && Math.abs(numerator) < Math.abs(denominator)) { + //neg-pos value return true; + } else { + //improper. + return false; } } @@ -46,14 +58,19 @@ 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? +const zeroDenominator = isProperFraction(5, 0); +assertEquals(zeroDenominator, false); + +const doubleNegativeFractionResult = isProperFraction(-5, -7); +assertEquals(doubleNegativeFractionResult, true); From 51a8574985b46a771955438c89fe59a8e9389226 Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Fri, 31 Oct 2025 01:06:49 +0100 Subject: [PATCH 3/8] modify answer --- .../implement/1-get-angle-type.js | 5 +---- 1 file changed, 1 insertion(+), 4 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 2b0416e20..a42d9e43a 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 @@ -18,8 +18,6 @@ function getAngleType(angle) { return "Straight angle"; } else if (angle < 360) { return "Reflex angle"; - } else { - return "Incorrect angle"; } // Run the tests, work out what Case 2 is testing, and implement the required code here. @@ -62,7 +60,6 @@ assertEquals(acute, "Acute angle"); // 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, @@ -70,9 +67,9 @@ assertEquals(obtuse, "Obtuse 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" const reflex = getAngleType(260); assertEquals(reflex, "Reflex angle"); -// ====> write your test here, and then add a line to pass the test in the function above From 68d4ef68f0b560c0c4ca59773559e711d6aa8a1b Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Fri, 31 Oct 2025 01:07:18 +0100 Subject: [PATCH 4/8] answer get-card-value questions --- .../implement/3-get-card-value.js | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) 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..aecead904 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,17 @@ // 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) { + let rank = card.slice(0, -1); if (rank === "A") { return 11; } + if (rank >= "2" && rank <= "9") { + return Number(rank); + } + if (rank === "J" || rank === "Q" || rank === "K") { + 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 +47,42 @@ 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 ten = getCardValue("10"); +assertEquals(ten, 10); + +const jack = getCardValue("J♦"); +assertEquals(jack, 10); + +const queen = getCardValue("Q♠"); +assertEquals(queen, 10); + +const king = getCardValue("K♥"); +assertEquals(king, 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("Z♥"); +} catch (e) { + console.assert( + e.message === "Invalid card rank", + `Expected "Invalid card rank" but got "${e.message}"` + ); +} From a21a1a4e3c395b1888d4ca084da199b27df40ec2 Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Sat, 1 Nov 2025 13:28:02 +0100 Subject: [PATCH 5/8] add test for angle type --- .../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 4a92a3e82..6c3130293 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 angle(45°)", () => { + 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 angle(120°)", () => { + 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(260°)", () => { + expect(getAngleType(260)).toEqual("Reflex angle"); +}); From e717737c9feb3e7cb8e8b37f3970fb7461d5f19c Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Sat, 1 Nov 2025 13:46:46 +0100 Subject: [PATCH 6/8] add test properFraction --- .../2-is-proper-fraction.test.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 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..2ac79da5b 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 @@ -6,8 +6,14 @@ test("should return true for a proper fraction", () => { expect(isProperFraction(2, 3)).toEqual(true); }); -// 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 negative fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); -// Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal fraction", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); From 5a3084754b88812e702966f88f240ddc9d1a62fc Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Sat, 1 Nov 2025 14:22:46 +0100 Subject: [PATCH 7/8] to change answer --- .../implement/3-get-card-value.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 aecead904..a62e8619a 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 @@ -12,7 +12,7 @@ function getCardValue(card) { if (rank === "A") { return 11; } - if (rank >= "2" && rank <= "9") { + if (rank === "10" || (rank >= "2" && rank <= "9")) { return Number(rank); } if (rank === "J" || rank === "Q" || rank === "K") { @@ -53,7 +53,7 @@ assertEquals(fiveofHearts, 5); // 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 ten = getCardValue("10"); +const ten = getCardValue("10♦"); assertEquals(ten, 10); const jack = getCardValue("J♦"); From a31ba23908e633c5fab6ff63ba012682df1d2344 Mon Sep 17 00:00:00 2001 From: Pinx-pinx Date: Sat, 1 Nov 2025 14:23:01 +0100 Subject: [PATCH 8/8] to answer getcardvalue --- .../3-get-card-value.test.js | 37 +++++++++++++++++-- 1 file changed, 33 insertions(+), 4 deletions(-) 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..11b5dad1e 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 @@ -7,7 +7,36 @@ test("should return 11 for Ace of Spades", () => { expect(aceofSpades).toEqual(11); }); -// Case 2: Handle Number Cards (2-10): -// Case 3: Handle Face Cards (J, Q, K): -// Case 4: Handle Ace (A): -// Case 5: Handle Invalid Cards: +test("should return card value for number cards", () => { + const fiveofHearts = getCardValue("5♥"); + expect(fiveofHearts).toEqual(5); +}); + +test("should return 10 for 10 card", () => { + const ten = getCardValue("10♦"); + expect(ten).toEqual(10); +}); + +test("should return 10 for jack card", () => { + const jack = getCardValue("J♦"); + expect(jack).toEqual(10); +}); + +test("should return 10 for queen card", () => { + const queen = getCardValue("Q♠"); + expect(queen).toEqual(10); +}); + +test("should return 10 for king card", () => { + const king = getCardValue("K♥"); + expect(king).toEqual(10); +}); + +test("should return 11 for the ace cards", () => { + const ace = getCardValue("A♥"); + expect(ace).toEqual(11); +}); + +test("should throw an error for invalid card rank", () => { + expect(() => getCardValue("Z♥")).toThrow("Invalid card rank"); +});