From e275bbf89be14c3cf561b8010f71e8f522acdb2e Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 21:50:58 +0100 Subject: [PATCH 01/20] add more tests --- .../1-get-angle-type.test.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js index cf50f6cad..2117dd24d 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js @@ -10,3 +10,18 @@ test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); }); + +test("Classifies acute angles", () => { + const acute = getAngleType(45); + assert.equal(acute, "Acute angle"); +}); + +test("classifies obtuse angles", () => { + const obtuse = getAngleType(120); + assert.equal(obtuse, "Obtuse angle"); +}); + +test("classifies straight angles", () => { + const straight = getAngleType(180); + assert.equal(straight, "Straight angle"); +}); From 18c03c022eb7e5179b136f833ad820117e3b7a51 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 22:38:05 +0100 Subject: [PATCH 02/20] implement functions --- .../implement/1-get-angle-type.js | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/implement-and-rewrite-tests/implement/1-get-angle-type.js b/implement-and-rewrite-tests/implement/1-get-angle-type.js index 8a6fba050..2fcbad01e 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -17,5 +17,24 @@ // execute the code to ensure all tests pass. export function getAngleType(angle) { - // TODO: Implement this function + if (angle === 90) { + return "Right angle"; + } + if (angle > 0 && 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"; + } + + return "Invalid angle"; } From a19670ae47bc0a3d93f4ed00b15d9aa64d8c2ba9 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 22:41:16 +0100 Subject: [PATCH 03/20] fix error --- .../1-get-angle-type.test.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js index 2117dd24d..0710e6c39 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js @@ -25,3 +25,15 @@ test("classifies straight angles", () => { const straight = getAngleType(180); assert.equal(straight, "Straight angle"); }); +test("classifies reflex angles", () => { + const reflex = getAngleType(270); + assert.equal(reflex, "Reflex angle"); +}); +test("classifies invalid negative angles", () => { + const invalid = getAngleType(-10); + assert.equal(invalid, "Invalid angle"); +}); +test("classifies angles greater than 360 as invalid", () => { + const invalid = getAngleType(400); + assert.equal(invalid, "Invalid angle"); +}); From f5bf95b160654c790574c8b3f3c7a832b3775203 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 22:51:54 +0100 Subject: [PATCH 04/20] implement function --- implement-and-rewrite-tests/implement/2-is-proper-fraction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js index f983800f0..0b4a4d686 100644 --- a/implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -14,5 +14,5 @@ // execute the code to ensure all tests pass. export function isProperFraction(numerator, denominator) { - // TODO: Implement this function + return numerator < denominator; } From 6c865baf04fdb0a2214b62a214043a17e823e100 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 23:01:53 +0100 Subject: [PATCH 05/20] run tests --- .../2-is-proper-fraction.test.js | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js index a29084605..4b86446c3 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js @@ -10,3 +10,34 @@ test("Basic proper fraction", () => { // Example: 1/2 is a proper fraction assert.equal(isProperFraction(1, 2), true); }); +test("Another proper fraction", () => { + assert.equal(isProperFraction(3, 4), true); +}); + +test("Large proper fraction", () => { + assert.equal(isProperFraction(99, 100), true); +}); + +test("Equal numerator and denominator", () => { + assert.equal(isProperFraction(5, 5), false); +}); + +test("Numerator greater than denominator", () => { + assert.equal(isProperFraction(7, 3), false); +}); + +test("Large improper fraction", () => { + assert.equal(isProperFraction(100, 99), false); +}); + +test("Zero numerator", () => { + assert.equal(isProperFraction(0, 5), true); +}); + +test("Numerator one less than denominator", () => { + assert.equal(isProperFraction(9, 10), true); +}); + +test("Numerator one more than denominator", () => { + assert.equal(isProperFraction(11, 10), false); +}); From 37f4f78c55592d9f674b2e0d944c25f61ced5b68 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Thu, 15 Oct 2026 23:21:11 +0100 Subject: [PATCH 06/20] Revert latest test run Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../2-is-proper-fraction.test.js | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js index 4b86446c3..a29084605 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/2-is-proper-fraction.test.js @@ -10,34 +10,3 @@ test("Basic proper fraction", () => { // Example: 1/2 is a proper fraction assert.equal(isProperFraction(1, 2), true); }); -test("Another proper fraction", () => { - assert.equal(isProperFraction(3, 4), true); -}); - -test("Large proper fraction", () => { - assert.equal(isProperFraction(99, 100), true); -}); - -test("Equal numerator and denominator", () => { - assert.equal(isProperFraction(5, 5), false); -}); - -test("Numerator greater than denominator", () => { - assert.equal(isProperFraction(7, 3), false); -}); - -test("Large improper fraction", () => { - assert.equal(isProperFraction(100, 99), false); -}); - -test("Zero numerator", () => { - assert.equal(isProperFraction(0, 5), true); -}); - -test("Numerator one less than denominator", () => { - assert.equal(isProperFraction(9, 10), true); -}); - -test("Numerator one more than denominator", () => { - assert.equal(isProperFraction(11, 10), false); -}); From 12f489325da9f3d47b489464a616b19e82538cc5 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Fri, 16 Oct 2026 01:02:53 +0100 Subject: [PATCH 07/20] add test --- .../3-get-card-value.test.js | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js index f5092d9b1..3b8ebe28c 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js @@ -9,8 +9,34 @@ test("Valid single-digit card", () => { assert.equal(getCardValue("9♠"), 9); }); -test("Arbitrary non-card string", () => { - assert.throws(() => getCardValue("invalid"), /Expected a number followed by a suit, but got "invalid"/, "Expected clear error"); +test("Ace is worth 11", () => { + assert.equal(getCardValue("A♠"), 11); +}); +test("Jack is worth 10", () => { + assert.equal(getCardValue("J♠"), 10); +}); + +test("Queen is worth 10", () => { + assert.equal(getCardValue("Q♠"), 10); +}); + +test("King is worth 10", () => { + assert.equal(getCardValue("K♠"), 10); +}); + +test("Ten is worth 10", () => { + assert.equal(getCardValue("10♠"), 10); +}); + +test("Missing suit is invalid", () => { + assert.throws(() => getCardValue("A")); }); // TODO: What other invalid card cases can you think of? +test("Arbitrary non-card string", () => { + assert.throws( + () => getCardValue("invalid"), + /Expected a number followed by a suit, but got "invalid"/, + "Expected clear error" + ); +}); From f47f80254f8d2721f2422e77193936b40f40b86c Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Fri, 16 Oct 2026 01:03:09 +0100 Subject: [PATCH 08/20] add more test --- .../implement/3-get-card-value.js | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/implement-and-rewrite-tests/implement/3-get-card-value.js b/implement-and-rewrite-tests/implement/3-get-card-value.js index 9614ab1ee..2eb2e4415 100644 --- a/implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/implement-and-rewrite-tests/implement/3-get-card-value.js @@ -24,5 +24,26 @@ // execute the code to ensure all tests pass. export function getCardValue(card) { - // TODO: Implement this function + const suit = card.slice(-1); + const rank = card.slice(0, -1); + + if (!["♠", "♥", "♦", "♣"].includes(suit)) { + throw new Error(`Expected a number followed by a suit, but got "${card}"`); + } + + if (rank === "A") { + return 11; + } + + if (rank === "J" || rank === "Q" || rank === "K") { + return 10; + } + + const value = Number(rank); + + if (!isNaN(value) && value >= 2 && value <= 10) { + return value; + } + + throw new Error(`Expected a number followed by a suit, but got "${card}"`); } From d58fb5ed4b529b5029a4b0fc8d4f830b1b830c49 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Sat, 17 Oct 2026 18:55:44 +0100 Subject: [PATCH 09/20] Add Jest tests for angle types --- .../1-get-angle-type.test.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index e0ba786ab..2c0564e89 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -12,7 +12,30 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test('should return "right angle" when angle is 90', () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); // Case 3: Obtuse angles +test('should return "Obtuse angle" when (90 < angle < 180)', () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(120)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); +}); // Case 4: Straight angle +test('should return "Straight angle" when angle is 180', () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); // Case 5: Reflex angles +test('should return "Reflex angle" when (180 < angle < 360)', () => { + expect(getAngleType(181)).toEqual("Reflex angle"); + expect(getAngleType(270)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); // Case 6: Invalid angles + +test('should return "Invalid angle" for invalid angles', () => { + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(360)).toEqual("Invalid angle"); + expect(getAngleType(400)).toEqual("Invalid angle"); +}); From c9cc257aaf86c5906cee61d54c1c8cb6564c830f Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Sat, 17 Oct 2026 19:17:02 +0100 Subject: [PATCH 10/20] Add proper fraction tests --- .../2-is-proper-fraction.test.js | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index 5d49e2d8b..803c60e9b 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -6,3 +6,30 @@ import { isProperFraction } from "../implement/2-is-proper-fraction.js"; test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); +test("should return true for a proper fraction", () => { + expect(isProperFraction(1, 2)).toEqual(true); +}); + +test("should return false when numerator equals denominator", () => { + expect(isProperFraction(5, 5)).toEqual(false); +}); + +test("should return false when numerator is greater than denominator", () => { + expect(isProperFraction(7, 3)).toEqual(false); +}); + +test("should return true when numerator is zero", () => { + expect(isProperFraction(0, 5)).toEqual(true); +}); + +test("should return false for negative numerator and denominator", () => { + expect(isProperFraction(-1, -2)).toEqual(false); +}); + +test("should return true for negative numerator and positive denominator", () => { + expect(isProperFraction(-1, 2)).toEqual(true); +}); + +test("should return false for positive numerator and negative denominator", () => { + expect(isProperFraction(1, -2)).toEqual(false); +}); From eaa392078f8ea68c66284a602151c6019e81d325 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Sat, 17 Oct 2026 19:25:33 +0100 Subject: [PATCH 11/20] Add Jest tests for card values --- .../3-get-card-value.test.js | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index a6de5a82a..b49ddd84d 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -9,10 +9,34 @@ test(`Should return 11 when given an ace card`, () => { // Suggestion: Group the remaining test data into these categories: // Number Cards (2-10) +test("Should return 2 when given a 2 card", () => { + expect(getCardValue("2♠")).toEqual(2); +}); + +test("Should return 10 when given a 10 card", () => { + expect(getCardValue("10♠")).toEqual(10); +}); // Face Cards (J, Q, K) +test("Should return 10 when given a Jack", () => { + expect(getCardValue("J♠")).toEqual(10); +}); + +test("Should return 10 when given a Queen", () => { + expect(getCardValue("Q♠")).toEqual(10); +}); + +test("Should return 10 when given a King", () => { + expect(getCardValue("K♠")).toEqual(10); +}); // Invalid Cards +test("Should throw an error for invalid text", () => { + expect(() => getCardValue("invalid")).toThrow(); +}); + +test("Should throw an error when suit is missing", () => { + expect(() => getCardValue("A")).toThrow(); +}); // To learn how to test whether a function throws an error as expected in Jest, // please refer to the Jest documentation: // https://jestjs.io/docs/expect#tothrowerror - From 6e7d6e61370323c6d7ec118fee8bc86d577a4bb7 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Mon, 26 Oct 2026 21:19:01 +0000 Subject: [PATCH 12/20] Add boundary cases to angle type tests --- .../1-get-angle-type.test.js | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js index 0710e6c39..bf52cc6c9 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/1-get-angle-type.test.js @@ -3,37 +3,37 @@ import test from "node:test"; import { getAngleType } from "../implement/1-get-angle-type.js"; -// TODO: Write tests to cover all cases, including boundary and invalid cases. -// Example: Identify Right Angles - test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); }); test("Classifies acute angles", () => { - const acute = getAngleType(45); - assert.equal(acute, "Acute angle"); + assert.equal(getAngleType(1), "Acute angle"); + assert.equal(getAngleType(45), "Acute angle"); + assert.equal(getAngleType(89), "Acute angle"); }); -test("classifies obtuse angles", () => { - const obtuse = getAngleType(120); - assert.equal(obtuse, "Obtuse angle"); +test("Classifies obtuse angles", () => { + assert.equal(getAngleType(91), "Obtuse angle"); + assert.equal(getAngleType(120), "Obtuse angle"); + assert.equal(getAngleType(179), "Obtuse angle"); }); -test("classifies straight angles", () => { +test("Classifies straight angles", () => { const straight = getAngleType(180); assert.equal(straight, "Straight angle"); }); -test("classifies reflex angles", () => { - const reflex = getAngleType(270); - assert.equal(reflex, "Reflex angle"); -}); -test("classifies invalid negative angles", () => { - const invalid = getAngleType(-10); - assert.equal(invalid, "Invalid angle"); + +test("Classifies reflex angles", () => { + assert.equal(getAngleType(181), "Reflex angle"); + assert.equal(getAngleType(270), "Reflex angle"); + assert.equal(getAngleType(359), "Reflex angle"); }); -test("classifies angles greater than 360 as invalid", () => { - const invalid = getAngleType(400); - assert.equal(invalid, "Invalid angle"); + +test("Classifies angles outside the valid range as invalid", () => { + assert.equal(getAngleType(-10), "Invalid angle"); + assert.equal(getAngleType(0), "Invalid angle"); + assert.equal(getAngleType(360), "Invalid angle"); + assert.equal(getAngleType(400), "Invalid angle"); }); From f4eca9e694a9253bb89ba1f925069b71faf5684c Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Mon, 26 Oct 2026 21:25:45 +0000 Subject: [PATCH 13/20] Restrict card values to valid ranks --- .../implement/3-get-card-value.js | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/implement-and-rewrite-tests/implement/3-get-card-value.js b/implement-and-rewrite-tests/implement/3-get-card-value.js index 2eb2e4415..56f935df2 100644 --- a/implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/implement-and-rewrite-tests/implement/3-get-card-value.js @@ -23,6 +23,22 @@ // After you have implemented the function, write tests to cover all the cases, and // execute the code to ensure all tests pass. +const cardValues = new Map([ + ["A", 11], + ["2", 2], + ["3", 3], + ["4", 4], + ["5", 5], + ["6", 6], + ["7", 7], + ["8", 8], + ["9", 9], + ["10", 10], + ["J", 10], + ["Q", 10], + ["K", 10], +]); + export function getCardValue(card) { const suit = card.slice(-1); const rank = card.slice(0, -1); @@ -31,18 +47,8 @@ export function getCardValue(card) { throw new Error(`Expected a number followed by a suit, but got "${card}"`); } - if (rank === "A") { - return 11; - } - - if (rank === "J" || rank === "Q" || rank === "K") { - return 10; - } - - const value = Number(rank); - - if (!isNaN(value) && value >= 2 && value <= 10) { - return value; + if (cardValues.has(rank)) { + return cardValues.get(rank); } throw new Error(`Expected a number followed by a suit, but got "${card}"`); From d034af546975b294954fc9f4e2642b29d34dba9e Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Mon, 26 Oct 2026 21:26:20 +0000 Subject: [PATCH 14/20] Test all valid card ranks and reject invalid formats --- .../3-get-card-value.test.js | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js index 3b8ebe28c..b55ba9b03 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js @@ -3,40 +3,37 @@ import test from "node:test"; import { getCardValue } from "../implement/3-get-card-value.js"; -// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. - -test("Valid single-digit card", () => { - assert.equal(getCardValue("9♠"), 9); -}); - -test("Ace is worth 11", () => { - assert.equal(getCardValue("A♠"), 11); -}); -test("Jack is worth 10", () => { - assert.equal(getCardValue("J♠"), 10); -}); - -test("Queen is worth 10", () => { - assert.equal(getCardValue("Q♠"), 10); -}); - -test("King is worth 10", () => { - assert.equal(getCardValue("K♠"), 10); -}); - -test("Ten is worth 10", () => { - assert.equal(getCardValue("10♠"), 10); -}); - -test("Missing suit is invalid", () => { - assert.throws(() => getCardValue("A")); -}); - -// TODO: What other invalid card cases can you think of? -test("Arbitrary non-card string", () => { - assert.throws( - () => getCardValue("invalid"), - /Expected a number followed by a suit, but got "invalid"/, - "Expected clear error" - ); +test("Returns the correct value for every valid rank and suit", () => { + const expectedValues = { + A: 11, + 2: 2, + 3: 3, + 4: 4, + 5: 5, + 6: 6, + 7: 7, + 8: 8, + 9: 9, + 10: 10, + J: 10, + Q: 10, + K: 10, + }; + const suits = ["♠", "♥", "♦", "♣"]; + + for (const [rank, value] of Object.entries(expectedValues)) { + for (const suit of suits) { + assert.equal(getCardValue(`${rank}${suit}`), value); + } + } +}); + +test("Throws an error for invalid card formats", () => { + const invalidCards = ["A", "invalid", "1♠", "11♠", "02♠", "2.5♠", " 2♠", "A?", ""]; + + for (const card of invalidCards) { + assert.throws(() => getCardValue(card), { + message: `Expected a number followed by a suit, but got "${card}"`, + }); + } }); From 7e69ad3cb68f6cab1acec5d463fbfbe0d90ed4c6 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Mon, 26 Oct 2026 21:26:52 +0000 Subject: [PATCH 15/20] Cover all card ranks and invalid formats in Jest tests --- .../3-get-card-value.test.js | 72 +++++++++---------- 1 file changed, 33 insertions(+), 39 deletions(-) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index b49ddd84d..0ef35f575 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -1,42 +1,36 @@ import { getCardValue } from "../implement/3-get-card-value.js"; -// TODO: Write tests in Jest syntax to cover all possible outcomes. - -// Case 1: Ace (A) -test(`Should return 11 when given an ace card`, () => { - expect(getCardValue("A♠")).toEqual(11); -}); - -// Suggestion: Group the remaining test data into these categories: -// Number Cards (2-10) -test("Should return 2 when given a 2 card", () => { - expect(getCardValue("2♠")).toEqual(2); -}); - -test("Should return 10 when given a 10 card", () => { - expect(getCardValue("10♠")).toEqual(10); -}); -// Face Cards (J, Q, K) -test("Should return 10 when given a Jack", () => { - expect(getCardValue("J♠")).toEqual(10); -}); - -test("Should return 10 when given a Queen", () => { - expect(getCardValue("Q♠")).toEqual(10); -}); - -test("Should return 10 when given a King", () => { - expect(getCardValue("K♠")).toEqual(10); -}); -// Invalid Cards -test("Should throw an error for invalid text", () => { - expect(() => getCardValue("invalid")).toThrow(); +test("Returns the correct value for every valid rank and suit", () => { + const expectedValues = { + A: 11, + 2: 2, + 3: 3, + 4: 4, + 5: 5, + 6: 6, + 7: 7, + 8: 8, + 9: 9, + 10: 10, + J: 10, + Q: 10, + K: 10, + }; + const suits = ["♠", "♥", "♦", "♣"]; + + for (const [rank, value] of Object.entries(expectedValues)) { + for (const suit of suits) { + expect(getCardValue(`${rank}${suit}`)).toEqual(value); + } + } +}); + +test("Throws an error for invalid card formats", () => { + const invalidCards = ["A", "invalid", "1♠", "11♠", "02♠", "2.5♠", " 2♠", "A?", ""]; + + for (const card of invalidCards) { + expect(() => getCardValue(card)).toThrow( + `Expected a number followed by a suit, but got "${card}"` + ); + } }); - -test("Should throw an error when suit is missing", () => { - expect(() => getCardValue("A")).toThrow(); -}); - -// To learn how to test whether a function throws an error as expected in Jest, -// please refer to the Jest documentation: -// https://jestjs.io/docs/expect#tothrowerror From 2c547d912031831a75a1fba2fecbdcbdb211bb44 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Mon, 26 Oct 2026 21:38:37 +0000 Subject: [PATCH 16/20] Correct proper fraction expectation for negative values --- .../rewrite-tests-with-jest/2-is-proper-fraction.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js index 803c60e9b..92d8f95c3 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js @@ -22,8 +22,8 @@ test("should return true when numerator is zero", () => { expect(isProperFraction(0, 5)).toEqual(true); }); -test("should return false for negative numerator and denominator", () => { - expect(isProperFraction(-1, -2)).toEqual(false); +test("should return true when both numerator and denominator are negative and form a proper fraction", () => { + expect(isProperFraction(-1, -2)).toEqual(true); }); test("should return true for negative numerator and positive denominator", () => { From dd4d5dc2a84dbaad393fc994b8d92461e8a80718 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Tue, 27 Oct 2026 19:12:20 +0000 Subject: [PATCH 17/20] test: reject invalid card ranks --- .../3-get-card-value.test.js | 15 ++++++++++++++- .../3-get-card-value.test.js | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js index b55ba9b03..91c89c74d 100644 --- a/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js @@ -29,7 +29,20 @@ test("Returns the correct value for every valid rank and suit", () => { }); test("Throws an error for invalid card formats", () => { - const invalidCards = ["A", "invalid", "1♠", "11♠", "02♠", "2.5♠", " 2♠", "A?", ""]; + const invalidCards = [ + "A", + "invalid", + "1♠", + "11♠", + "02♠", + "0x02♦", + "2.1♦", + "0002♦", + "2.5♠", + " 2♠", + "A?", + "", + ]; for (const card of invalidCards) { assert.throws(() => getCardValue(card), { diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index 0ef35f575..8b68d305e 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -26,7 +26,20 @@ test("Returns the correct value for every valid rank and suit", () => { }); test("Throws an error for invalid card formats", () => { - const invalidCards = ["A", "invalid", "1♠", "11♠", "02♠", "2.5♠", " 2♠", "A?", ""]; + const invalidCards = [ + "A", + "invalid", + "1♠", + "11♠", + "02♠", + "0x02♦", + "2.1♦", + "0002♦", + "2.5♠", + " 2♠", + "A?", + "", + ]; for (const card of invalidCards) { expect(() => getCardValue(card)).toThrow( From 6f64b83f1a5d8626982aa6d50aef1e268c054d79 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Tue, 27 Oct 2026 19:18:54 +0000 Subject: [PATCH 18/20] test: cover angle boundaries --- .../rewrite-tests-with-jest/1-get-angle-type.test.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index 2c0564e89..682c281a5 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -7,7 +7,9 @@ import { getAngleType } from "../implement/1-get-angle-type.js"; test(`should return "Acute angle" when (0 < angle < 90)`, () => { // Test various acute angles, including boundary cases expect(getAngleType(1)).toEqual("Acute angle"); + expect(getAngleType(0.5)).toEqual("Acute angle"); expect(getAngleType(45)).toEqual("Acute angle"); + expect(getAngleType(89.5)).toEqual("Acute angle"); expect(getAngleType(89)).toEqual("Acute angle"); }); @@ -17,8 +19,10 @@ test('should return "right angle" when angle is 90', () => { }); // Case 3: Obtuse angles test('should return "Obtuse angle" when (90 < angle < 180)', () => { + expect(getAngleType(90.5)).toEqual("Obtuse angle"); expect(getAngleType(91)).toEqual("Obtuse angle"); expect(getAngleType(120)).toEqual("Obtuse angle"); + expect(getAngleType(179.5)).toEqual("Obtuse angle"); expect(getAngleType(179)).toEqual("Obtuse angle"); }); // Case 4: Straight angle @@ -27,8 +31,10 @@ test('should return "Straight angle" when angle is 180', () => { }); // Case 5: Reflex angles test('should return "Reflex angle" when (180 < angle < 360)', () => { + expect(getAngleType(180.5)).toEqual("Reflex angle"); expect(getAngleType(181)).toEqual("Reflex angle"); expect(getAngleType(270)).toEqual("Reflex angle"); + expect(getAngleType(359.5)).toEqual("Reflex angle"); expect(getAngleType(359)).toEqual("Reflex angle"); }); // Case 6: Invalid angles From 1c0da2991c8d546954491f611b5069c4085c8007 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Tue, 27 Oct 2026 19:29:42 +0000 Subject: [PATCH 19/20] Add negative angle coverage --- .../rewrite-tests-with-jest/1-get-angle-type.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js index 682c281a5..0b7729450 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js @@ -41,6 +41,7 @@ test('should return "Reflex angle" when (180 < angle < 360)', () => { test('should return "Invalid angle" for invalid angles', () => { expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(-10)).toEqual("Invalid angle"); expect(getAngleType(0)).toEqual("Invalid angle"); expect(getAngleType(360)).toEqual("Invalid angle"); expect(getAngleType(400)).toEqual("Invalid angle"); From cb8fa8aed842856cd3c2501c0ef17ce9b8f9cd74 Mon Sep 17 00:00:00 2001 From: Fatima Rouchi Date: Tue, 27 Oct 2026 19:37:10 +0000 Subject: [PATCH 20/20] Group card value cases --- .../3-get-card-value.test.js | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js index 8b68d305e..48e620208 100644 --- a/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js +++ b/implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js @@ -1,30 +1,31 @@ import { getCardValue } from "../implement/3-get-card-value.js"; -test("Returns the correct value for every valid rank and suit", () => { - const expectedValues = { - A: 11, - 2: 2, - 3: 3, - 4: 4, - 5: 5, - 6: 6, - 7: 7, - 8: 8, - 9: 9, - 10: 10, - J: 10, - Q: 10, - K: 10, - }; +test("Returns the value of number cards from 2 to 10", () => { const suits = ["♠", "♥", "♦", "♣"]; - for (const [rank, value] of Object.entries(expectedValues)) { + for (let rank = 2; rank <= 10; rank += 1) { for (const suit of suits) { - expect(getCardValue(`${rank}${suit}`)).toEqual(value); + expect(getCardValue(`${rank}${suit}`)).toEqual(rank); } } }); +test("Returns 10 for face cards", () => { + const suits = ["♠", "♥", "♦", "♣"]; + + for (const rank of ["J", "Q", "K"]) { + for (const suit of suits) { + expect(getCardValue(`${rank}${suit}`)).toEqual(10); + } + } +}); + +test("Returns 11 for aces", () => { + for (const suit of ["♠", "♥", "♦", "♣"]) { + expect(getCardValue(`A${suit}`)).toEqual(11); + } +}); + test("Throws an error for invalid card formats", () => { const invalidCards = [ "A",