From 3c343000336214688310d48ba1ba5820738ea64a Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 13:55:56 +0100 Subject: [PATCH 01/24] implemented getAngleType function --- implement-and-rewrite-tests/implement/1-get-angle-type.js | 4 +++- 1 file changed, 3 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..78c8e7290 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,7 @@ // execute the code to ensure all tests pass. export function getAngleType(angle) { - // TODO: Implement this function + if (angle > 0 && angle < 90) { + return "acute angle"; + } } From a3e94a46369403184ac2c7d821db2fd868009338 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 15:36:05 +0100 Subject: [PATCH 02/24] implemented right angle classification --- implement-and-rewrite-tests/implement/1-get-angle-type.js | 4 +++- 1 file changed, 3 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 78c8e7290..45aa6c418 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -18,6 +18,8 @@ export function getAngleType(angle) { if (angle > 0 && angle < 90) { - return "acute angle"; + return "Acute angle"; + } else if (angle === 90) { + return "Right angle"; } } From e24692a8b9bc91ccec05b12673853edc81310e9e Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 15:51:45 +0100 Subject: [PATCH 03/24] added Obtuse angle test --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 5 +++++ 1 file changed, 5 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..297e1d516 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,8 @@ test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); }); + +test("Classifies obtuse angles", () => { + const obtuse = getAngleType(91); + assert.equal(obtuse, "Obtuse angle"); +}); From 9aafc79102c5a1cdf0f9d8e5e243421bc5d321e8 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 16:01:27 +0100 Subject: [PATCH 04/24] added straight angle test it fails --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 4 ++++ 1 file changed, 4 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 297e1d516..ffe2d0659 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 @@ -15,3 +15,7 @@ test("Classifies obtuse angles", () => { const obtuse = getAngleType(91); assert.equal(obtuse, "Obtuse angle"); }); +test("Classifies straight angle", () => { + const straightAngle = getAngleType(180); + assert.equal(straightAngle, "Straight angle"); +}); From db06ff6046989e6e7f9e1863a63eb6fbd6a3377d Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 16:10:23 +0100 Subject: [PATCH 05/24] implemented classification for straight angle test now passes --- implement-and-rewrite-tests/implement/1-get-angle-type.js | 4 ++++ 1 file changed, 4 insertions(+) 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 45aa6c418..34ab023cb 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -21,5 +21,9 @@ export function getAngleType(angle) { return "Acute angle"; } else if (angle === 90) { return "Right angle"; + } else if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } else if (angle === 180) { + return "Straight angle"; } } From 2e539b5b05e2bde3abf48dd262c18d8b6191012f Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 16:15:36 +0100 Subject: [PATCH 06/24] added reflex angle test and it fails --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 5 +++++ 1 file changed, 5 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 ffe2d0659..92c864cf5 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 @@ -19,3 +19,8 @@ test("Classifies straight angle", () => { const straightAngle = getAngleType(180); assert.equal(straightAngle, "Straight angle"); }); + +test("Classifies reflex angles", () => { + const reflexAngle = getAngleType(181); + assert.equal(reflexAngle, "Reflex angle"); +}); From 874aa37bda46c6b0e1d7827a34776ad665cfaf76 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 16:34:46 +0100 Subject: [PATCH 07/24] implemented classification for reflex angle test now passes --- implement-and-rewrite-tests/implement/1-get-angle-type.js | 2 ++ 1 file changed, 2 insertions(+) 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 34ab023cb..337cd2ebf 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -25,5 +25,7 @@ export function getAngleType(angle) { return "Obtuse angle"; } else if (angle === 180) { return "Straight angle"; + } else if (angle > 180 && angle < 360) { + return "Reflex angle"; } } From 190c45baf457e4170ebc75eb5eb88e218166ff50 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 16:37:59 +0100 Subject: [PATCH 08/24] added test for invalid angles it fails --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 5 +++++ 1 file changed, 5 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 92c864cf5..d6e6458e0 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 @@ -24,3 +24,8 @@ test("Classifies reflex angles", () => { const reflexAngle = getAngleType(181); assert.equal(reflexAngle, "Reflex angle"); }); + +test("Classifies invalid angles", () => { + const invalidAngle = getAngleType(-1); + assert.equal(invalidAngle, "Invalid angle"); +}); From 5bf0d701b2424f002050b6e851101e74e3ac17f2 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 20:13:35 +0100 Subject: [PATCH 09/24] added test for acute angle --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 5 +++++ 1 file changed, 5 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 d6e6458e0..3f1920e2d 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 @@ -11,6 +11,11 @@ test("Classifies right angles", () => { assert.equal(right, "Right angle"); }); +test("Classifies acute angle", () => { + const acuteAngle = getAngleType(30); + assert.equal(acuteAngle, "Acute angle"); +}); + test("Classifies obtuse angles", () => { const obtuse = getAngleType(91); assert.equal(obtuse, "Obtuse angle"); From 9faf227c2baac5e29f9cd7b1313b0643fdc7407c Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 20:16:09 +0100 Subject: [PATCH 10/24] refactored acute angle implementation --- implement-and-rewrite-tests/implement/1-get-angle-type.js | 2 +- 1 file changed, 1 insertion(+), 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 337cd2ebf..97a24f7c1 100644 --- a/implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -27,5 +27,5 @@ export function getAngleType(angle) { return "Straight angle"; } else if (angle > 180 && angle < 360) { return "Reflex angle"; - } + } else return "Invalid angle"; } From b7ac8b6984ef09d7f35bcfed86d00bd455cf9b0f Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 20:47:00 +0100 Subject: [PATCH 11/24] added additional acute angle tests --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 6 ++++++ 1 file changed, 6 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 3f1920e2d..fb7fe3016 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 @@ -9,6 +9,12 @@ import { getAngleType } from "../implement/1-get-angle-type.js"; test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); + + const eightyNine = getAngleType(89); + assert.equal(right, "Right angle"); + + const fortyFive = getAngleType(45); + assert.equal(right, "Right angle"); }); test("Classifies acute angle", () => { From f5f0c009f5007e96d7f49cf97dc2ad51eea0a89c Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 20:47:54 +0100 Subject: [PATCH 12/24] refactored aditional acute angle tests --- .../1-get-angle-type.test.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 fb7fe3016..38404f18c 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 @@ -9,17 +9,17 @@ import { getAngleType } from "../implement/1-get-angle-type.js"; test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); +}); + +test("Classifies acute angle", () => { + const thirty = getAngleType(30); + assert.equal(thirty, "Acute angle"); const eightyNine = getAngleType(89); - assert.equal(right, "Right angle"); + assert.equal(eightyNine, "Acute angle"); const fortyFive = getAngleType(45); - assert.equal(right, "Right angle"); -}); - -test("Classifies acute angle", () => { - const acuteAngle = getAngleType(30); - assert.equal(acuteAngle, "Acute angle"); + assert.equal(fortyFive, "Acute angle"); }); test("Classifies obtuse angles", () => { From 780ce9a6dd932a2d493a8aafe844f24ab888865f Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 20:57:25 +0100 Subject: [PATCH 13/24] added additional tests for obtuse angles --- .../1-get-angle-type.test.js | 7 +++++++ 1 file changed, 7 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 38404f18c..4032e02aa 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,7 +25,14 @@ test("Classifies acute angle", () => { test("Classifies obtuse angles", () => { const obtuse = getAngleType(91); assert.equal(obtuse, "Obtuse angle"); + + const oneHundredAndSeventyNine = getAngleType(179); + assert.equal(oneHundredAndSeventyNine, "Obtuse angle"); + + const oneHundredAndTen = getAngleType(110); + assert.equal(oneHundredAndTen, "Obtuse angle"); }); + test("Classifies straight angle", () => { const straightAngle = getAngleType(180); assert.equal(straightAngle, "Straight angle"); From d24235368eda98083003bd25f44fbcc3b35f3851 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 21:02:40 +0100 Subject: [PATCH 14/24] added additional tests for reflex angles --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 4 ++++ 1 file changed, 4 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 4032e02aa..b518f7e19 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 @@ -41,6 +41,10 @@ test("Classifies straight angle", () => { test("Classifies reflex angles", () => { const reflexAngle = getAngleType(181); assert.equal(reflexAngle, "Reflex angle"); + const threeHundredAndFiftyNine = getAngleType(359); + assert.equal(threeHundredAndFiftyNine, "Reflex angle"); + const twoHundredAndFifty = getAngleType(250); + assert.equal(twoHundredAndFifty, "Reflex angle"); }); test("Classifies invalid angles", () => { From ff0d5185b4b9e1d971581dc285814b0d2db5f888 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 21:08:05 +0100 Subject: [PATCH 15/24] added additonal tests for invalid angles --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 6 ++++++ 1 file changed, 6 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 b518f7e19..05bc1b448 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 @@ -50,4 +50,10 @@ test("Classifies reflex angles", () => { test("Classifies invalid angles", () => { const invalidAngle = getAngleType(-1); assert.equal(invalidAngle, "Invalid angle"); + + const zero = getAngleType(0); + assert.equal(zero, "Invalid angle"); + + const fiveHundred = getAngleType(500); + assert.equal(fiveHundred, "Invalid angle"); }); From f049f47f13c5b9e416687d4fbaacceb8f5cae76e Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 21:11:55 +0100 Subject: [PATCH 16/24] added final test for invalid angle 360 --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 3 +++ 1 file changed, 3 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 05bc1b448..3deff8dbd 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 @@ -56,4 +56,7 @@ test("Classifies invalid angles", () => { const fiveHundred = getAngleType(500); assert.equal(fiveHundred, "Invalid angle"); + + const threeHundredAndSixty = getAngleType(360); + assert.equal(threeHundredAndSixty, "Invalid angle"); }); From 036f167a7e543b9d21137727b70e839e47a9ad42 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 21:16:19 +0100 Subject: [PATCH 17/24] added final acute angle test for 1 --- .../implement-tests-with-node-test/1-get-angle-type.test.js | 3 +++ 1 file changed, 3 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 3deff8dbd..5b0793725 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 @@ -12,6 +12,9 @@ test("Classifies right angles", () => { }); test("Classifies acute angle", () => { + const one = getAngleType(1); + assert.equal(one, "Acute angle"); + const thirty = getAngleType(30); assert.equal(thirty, "Acute angle"); From 8631a7e24931d357a6661e29833ce39c1dcc3e36 Mon Sep 17 00:00:00 2001 From: marscancode Date: Tue, 13 Oct 2026 22:04:30 +0100 Subject: [PATCH 18/24] added jest tests --- .../1-get-angle-type.test.js | 24 +++++++++++++++++++ 1 file changed, 24 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..4003b0cf4 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 @@ -1,3 +1,4 @@ +import { get } from "node:http"; import { getAngleType } from "../implement/1-get-angle-type.js"; // TODO: Write tests in Jest syntax to cover all cases/outcomes, @@ -12,7 +13,30 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test(`should return "Right angle" when(angle === 90)`, () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); + // Case 3: Obtuse angles +test(`should return "Obtuse angle" when (angle > 90 && angle < 180)`, () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); + expect(getAngleType(110)).toEqual("Obtuse angle"); +}); // Case 4: Straight angle +test(`should return "Straight angle" when (angle === 180)`, () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); // Case 5: Reflex angles +test(`should return "Reflex angle" when (angle > 180 && < 360)`, () => { + expect(getAngleType(181)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); + expect(getAngleType(250)).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(500)).toEqual("Invalid angle"); + expect(getAngleType(360)).toEqual("Invalid angle"); +}); From 7797f0c202cc01854af95dd9e8d507e381b87724 Mon Sep 17 00:00:00 2001 From: marscancode Date: Wed, 14 Oct 2026 16:40:33 +0100 Subject: [PATCH 19/24] added tests in node for isProperFraction function --- .../2-is-proper-fraction.test.js | 16 ++++++++++++++++ 1 file changed, 16 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..63b55e2d9 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,19 @@ test("Basic proper fraction", () => { // Example: 1/2 is a proper fraction assert.equal(isProperFraction(1, 2), true); }); + +test("Proper fraction numerator is 0", () => { + assert.equal(isProperFraction(0, 1), true); +}); + +test("Improper fraction denominator is 0", () => { + assert.equal(isProperFraction(1, 0), false); +}); + +test("Improper fraction numerator is larger than denominator", () => { + assert.equal(isProperFraction(6, 4), false); +}); + +test("Improper fraction numerator and denominator are the same value", () => { + assert.equal(isProperFraction(3, 3), false); +}); From 5651ef6e28cc1d8d97987a742caa062f9c31b6eb Mon Sep 17 00:00:00 2001 From: marscancode Date: Wed, 14 Oct 2026 16:56:26 +0100 Subject: [PATCH 20/24] Implemented isProperFraction function --- .../implement/2-is-proper-fraction.js | 6 +++++- 1 file changed, 5 insertions(+), 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..f144b542e 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,9 @@ // execute the code to ensure all tests pass. export function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if(numerator < denominator){ + return true; + } else{ + return false; + } } From d47c1c719d9636626ff33194a499c1a10b4f20e8 Mon Sep 17 00:00:00 2001 From: marscancode Date: Wed, 14 Oct 2026 17:24:58 +0100 Subject: [PATCH 21/24] added tests in jest for the isProperFraction function --- .../2-is-proper-fraction.test.js | 15 +++++++++++++++ 1 file changed, 15 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..779e07186 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,18 @@ 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 false when numerator is larger than denominator`, () => { + expect(isProperFraction(6, 4)).toEqual(false); +}); + +test(`should return false when numerator and denominator are the same value`, () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); +test(`should return true when is a proper fraction`, () => { + expect(isProperFraction(1, 2)).toEqual(true); +}); + +test(`should return true when numerator is 0`, () => { + expect(isProperFraction(0, 1)).toEqual(true); +}); From 57a3aba39ddb5a8962ee8164f6f70b88b1145094 Mon Sep 17 00:00:00 2001 From: marscancode Date: Thu, 15 Oct 2026 23:05:18 +0100 Subject: [PATCH 22/24] Implemented getCardValue function --- .../implement/3-get-card-value.js | 30 ++++++++++++++++++- 1 file changed, 29 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..8e52070a8 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,33 @@ // execute the code to ensure all tests pass. export function getCardValue(card) { - // TODO: Implement this function + const cardValue = card.slice(0, -1); // eg "10" + const cardSuit = card.slice(-1); // eg "♠" + const validValue = [ + "A", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "J", + "Q", + "K", + ]; + const validSuit = ["♠", "♥", "♦", "♣"]; + if (!validValue.includes(cardValue) || !validSuit.includes(cardSuit)) { + throw new Error( + `Expected a valid number followed by a suit, but got "${card}"` + ); + } else if (cardValue === "A") { + return 11; + } else if (cardValue === "J" || cardValue === "Q" || cardValue === "K") { + return 10; + } else if (cardValue >= 2 && cardValue <= 10) { + return Number(cardValue); + } } From 7d65d6f2bcc6ada363fc136e21117a0a378711ee Mon Sep 17 00:00:00 2001 From: marscancode Date: Thu, 15 Oct 2026 23:15:06 +0100 Subject: [PATCH 23/24] added node tests for getCardValue function --- .../3-get-card-value.test.js | 69 ++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) 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..1e589e05c 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 @@ -10,7 +10,74 @@ test("Valid single-digit card", () => { }); test("Arbitrary non-card string", () => { - assert.throws(() => getCardValue("invalid"), /Expected a number followed by a suit, but got "invalid"/, "Expected clear error"); + assert.throws( + () => getCardValue("invalid"), + /Expected a valid number followed by a suit, but got "invalid"/, + "Expected clear error" + ); }); // TODO: What other invalid card cases can you think of? +test("Invalid card rank with no suit", () => { + assert.throws( + () => getCardValue("15"), + /Expected a valid number followed by a suit, but got "15"/, + "Expected clear error" + ); +}); + +test("An empty string", () => { + assert.throws( + () => getCardValue(""), + /Expected a valid number followed by a suit, but got ""/, + "Expected clear error" + ); +}); + +test("A valid card rank but invalid suit", () => { + assert.throws( + () => getCardValue("8Z"), + /Expected a valid number followed by a suit, but got "8Z"/, + "Expected clear error" + ); +}); + +test("A valid suit but invalid card rank", () => { + assert.throws( + () => getCardValue("26♣"), + /Expected a valid number followed by a suit, but got "26♣"/, + "Expected clear error" + ); +}); + +test("Rank and suit with an extra letter", () => { + assert.throws( + () => getCardValue("5♣l"), + /Expected a valid number followed by a suit, but got "5♣l"/, + "Expected clear error" + ); +}); + +test("Two suits", () => { + assert.throws( + () => getCardValue("♣♠"), + /Expected a valid number followed by a suit, but got "♣♠"/, + "Expected clear error" + ); +}); + +test("A negative rank but valid suit", () => { + assert.throws( + () => getCardValue("-4♣"), + /Expected a valid number followed by a suit, but got "-4♣"/, + "Expected clear error" + ); +}); + +test("Invalid rank 0 but valid suit", () => { + assert.throws( + () => getCardValue("0♥"), + /Expected a valid number followed by a suit, but got "0♥"/, + "Expected clear error" + ); +}); From f989cbd5923b2369b5370d958735dda0d02f946a Mon Sep 17 00:00:00 2001 From: marscancode Date: Fri, 16 Oct 2026 00:27:43 +0100 Subject: [PATCH 24/24] added jest test for getCardValue function --- .../3-get-card-value.test.js | 108 +++++++++++++++++- 1 file changed, 107 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..c907b227f 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 @@ -7,6 +7,113 @@ test(`Should return 11 when given an ace card`, () => { expect(getCardValue("A♠")).toEqual(11); }); +describe("Returns numeric value when given cards ranked (2-10)", () => { + test("Returns 2 when given a card with rank 2", () => { + expect(getCardValue("2♥")).toEqual(2); + }); + + test("Returns 3 when given a card with rank 3", () => { + expect(getCardValue("3♣")).toEqual(3); + }); + + test("Returns 4 when given a card with rank 4", () => { + expect(getCardValue("4♦")).toEqual(4); + }); + + test("Returns 5 when given a card with rank 5", () => { + expect(getCardValue("5♣")).toEqual(5); + }); + + test("Returns 6 when given a card with rank 6", () => { + expect(getCardValue("6♦")).toEqual(6); + }); + + test("Returns 7 when given a card with rank 7", () => { + expect(getCardValue("7♠")).toEqual(7); + }); + + test("Returns 8 when given a card with rank eight", () => { + expect(getCardValue("8♥")).toEqual(8); + }); + + test("Returns 9 when given a nine card", () => { + expect(getCardValue("9♠")).toEqual(9); + }); + + test("Returns 10 when given a ten card", () => { + expect(getCardValue("10♣")).toEqual(10); + }); +}); + +describe("Returns 10 when given (Q,J or K) cards", () => { + test("Returns 10 when given a Q card", () => { + expect(getCardValue("Q♥")).toEqual(10); + }); + + test("Returns 10 when given a J card", () => { + expect(getCardValue("J♣")).toEqual(10); + }); + + test("Returns 10 when given a K card", () => { + expect(getCardValue("K♠")).toEqual(10); + }); +}); + +describe("Invalid Cards", () => { + test("Throws an error when given an empty string", () => { + expect(() => getCardValue("")).toThrow( + /Expected a valid number followed by a suit, but got ""/ + ); + }); + test("Arbitrary non-card string", () => { + expect(() => getCardValue("invalid")).toThrow( + /Expected a valid number followed by a suit, but got "invalid"/ + ); + }); + + test("Invalid card rank with no suit", () => { + expect(() => getCardValue("15")).toThrow( + /Expected a valid number followed by a suit, but got "15"/ + ); + }); + + test("A valid card rank but invalid suit", () => { + expect(() => getCardValue("8Z")).toThrow( + /Expected a valid number followed by a suit, but got "8Z"/ + ); + }); + + test("A valid suit but invalid card rank", () => { + expect(() => getCardValue("26♣")).toThrow( + /Expected a valid number followed by a suit, but got "26♣"/ + ); + }); + + test("Rank and suit with an extra letter", () => { + expect(() => getCardValue("5♣l")).toThrow( + /Expected a valid number followed by a suit, but got "5♣l"/ + ); + }); + + test("Two suits", () => { + expect(() => getCardValue("♣♠")).toThrow( + /Expected a valid number followed by a suit, but got "♣♠"/ + ); + }); + + test("A negative rank but valid suit", () => { + expect(() => getCardValue("-4♣")).toThrow( + /Expected a valid number followed by a suit, but got "-4♣"/ + ); + }); + + test("Invalid rank 0 but valid suit", () => { + expect(() => getCardValue("0♥")).toThrow( + /Expected a valid number followed by a suit, but got "0♥"/ + ); + }); +}); + // Suggestion: Group the remaining test data into these categories: // Number Cards (2-10) // Face Cards (J, Q, K) @@ -15,4 +122,3 @@ test(`Should return 11 when given an ace card`, () => { // 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 -