From eddb80b2a7a7bf8621fedb7955e5557cc33d5685 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 14 Mar 2026 23:21:03 +0000 Subject: [PATCH 1/9] Commit for get-angle-type --- .../implement/1-get-angle-type.js | 36 ++++++++++++++++++- 1 file changed, 35 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 9e05a871e2..37c9419466 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 @@ -15,7 +15,26 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + if (angle > 0 && angle < 90) { + return "Acute angle"; + } + if (angle === 90) { + return "Right angle"; + } + if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle > 180 && angle < 360) { + return "Reflex angle"; + } + if (angle === 360) { + return "This is a circle, not an angle"; + } + return "Invalid angle"; + } // The line below allows us to load the getAngleType function into tests in other files. @@ -35,3 +54,18 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); +const acute = getAngleType(45); +assertEquals(acute, "Acute angle"); +const obtuse = getAngleType(120); +assertEquals(obtuse, "Obtuse angle"); +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); +const invalid = getAngleType(-10); +assertEquals(invalid, "Invalid angle"); +const invalid2 = getAngleType(361); +assertEquals(invalid2, "Invalid angle"); +const circle = getAngleType(360); +assertEquals(circle, "This is a circle, not an angle"); + From 6fec6d35480538b88ce8fe5dcf7e30a9155134c7 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 14 Mar 2026 23:34:30 +0000 Subject: [PATCH 2/9] Get-angle-type.test done --- .../1-get-angle-type.test.js | 28 +++++++++++++++++++ 1 file changed, 28 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 d777f348d3..5ed2d867f4 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 @@ -14,7 +14,35 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test(`should return "Right angle" when angle is exactly 90`, () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); // Case 3: Obtuse angles +test(`should return "Obtuse angle" when (90 < angle < 180)`, () => { + // Test various obtuse angles, including boundary cases + 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 exactly 180`, () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); + // Case 5: Reflex angles +test(`should return "Reflex angle" when (180 < angle < 360)`, () => { + // Test various reflex angles, including boundary cases + 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" when angle is outside the valid range`, () => { + // Test various invalid angles + expect(getAngleType(-10)).toEqual("Invalid angle"); + expect(getAngleType(361)).toEqual("Invalid angle"); +}); +// Case 7: Circle +test(`should return "This is a circle, not an angle" when angle is exactly 360`, () => { + expect(getAngleType(360)).toEqual("This is a circle, not an angle"); +}); From bdf116a6535094804df4c1376bf7b97f4a7e31a5 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sun, 15 Mar 2026 22:31:19 +0000 Subject: [PATCH 3/9] Proper fraction done --- .../implement/2-is-proper-fraction.js | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) 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 970cb9b641..ae1a62b499 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 @@ -11,8 +11,15 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + // denominator cannot be 0 in a proper fraction + if (denominator === 0) { + return false; + } + + // The numerator must have a smaller absolute value than the denominator + return Math.abs(numerator) < Math.abs(denominator); } + // The line below allows us to load the isProperFraction function into tests in other files. // This will be useful in the "rewrite tests with jest" step. @@ -31,3 +38,20 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(-1, 2), true); +assertEquals(isProperFraction(1, -2), true); +assertEquals(isProperFraction(-1, -2), true); + +// Example: 2/1 is not a proper fraction +assertEquals(isProperFraction(2, 1), false); +assertEquals(isProperFraction(-2, 1), false); +assertEquals(isProperFraction(2, -1), false); +assertEquals(isProperFraction(-2, -1), false); + +// Example: 0/5 is a proper fraction +assertEquals(isProperFraction(0, 5), true); +assertEquals(isProperFraction(0, -5), true); + +// Example: 5/0 is not a proper fraction +assertEquals(isProperFraction(5, 0), false); +assertEquals(isProperFraction(-5, 0), false); From 05c530454ae269b75077f75ae895790a9a33aa77 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sun, 15 Mar 2026 22:59:50 +0000 Subject: [PATCH 4/9] get-card-value done --- .../implement/3-get-card-value.js | 42 ++++++++++++++++++- 1 file changed, 40 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 c7559e787e..19f40d701e 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 @@ -23,6 +23,27 @@ function getCardValue(card) { // TODO: Implement this function + if (typeof card !== "string") { + throw new Error("Card must be a string"); + } + + const rank = card.slice(0, -1); + const suit = card.slice(-1); + + const validRanks = ["A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"]; + const validSuits = ["♠", "♥", "♦", "♣"]; + + if (!validRanks.includes(rank) || !validSuits.includes(suit)) { + throw new Error("Invalid card format"); + } + + if (rank === "A") { + return 11; + } else if (["J", "Q", "K"].includes(rank)) { + return 10; + } else { + return parseInt(rank, 10); + } } // The line below allows us to load the getCardValue function into tests in other files. @@ -39,14 +60,31 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: -assertEquals(getCardValue("9♠"), 9); +assertEquals(getCardValue("9♠"), 9); +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("J♠"), 10); // Handling invalid cards try { - getCardValue("invalid"); + getCardValue("invalid"); // This line will not be reached if an error is thrown as expected console.error("Error was not thrown for invalid card"); } catch (e) {} // What other invalid card cases can you think of? +try { + getCardValue("11♠"); + console.error("Error was not thrown for invalid rank"); +} catch (e) {} + +try { + getCardValue("A♤"); + console.error("Error was not thrown for invalid suit"); +} catch (e) {} + +try { + getCardValue(123); + console.error("Error was not thrown for non-string input"); +} catch (e) {} + \ No newline at end of file From 5f7a512f8f94ecaab55de5d5b265fb80fedbf688 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sun, 15 Mar 2026 23:10:31 +0000 Subject: [PATCH 5/9] all tasks done, ready for PR --- .../2-is-proper-fraction.test.js | 25 +++++++++++++++++++ .../3-get-card-value.test.js | 22 +++++++++++++--- 2 files changed, 44 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 7f087b2ba1..17ee947092 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,4 +7,29 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); // Special case: numerator is zero test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); + expect(isProperFraction(-1, 0)).toEqual(false); + expect(isProperFraction(0, 0)).toEqual(false); }); + +test(`should return true when the absolute value of the numerator is less than the absolute value of the denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(-1, 2)).toEqual(true); + expect(isProperFraction(1, -2)).toEqual(true); + expect(isProperFraction(-1, -2)).toEqual(true); +}); + +test(`should return false when the absolute value of the numerator is greater than or equal to the absolute value of the denominator`, () => { + expect(isProperFraction(2, 1)).toEqual(false); + expect(isProperFraction(-2, 1)).toEqual(false); + expect(isProperFraction(2, -1)).toEqual(false); + expect(isProperFraction(-2, -1)).toEqual(false); + expect(isProperFraction(5, 0)).toEqual(false); + expect(isProperFraction(-5, 0)).toEqual(false); +}); + +test(`should return true when the numerator is zero and the denominator is non-zero`, () => { + expect(isProperFraction(0, 5)).toEqual(true); + expect(isProperFraction(0, -5)).toEqual(true); +} +); + 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 cf7f9dae2e..44f4d7c13d 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 @@ -11,10 +11,26 @@ 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 the correct value for number cards`, () => { + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("5♠")).toEqual(5); + expect(getCardValue("10♠")).toEqual(10); +}); + // Face Cards (J, Q, K) +test(`Should return 10 for face cards`, () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♠")).toEqual(10); + expect(getCardValue("K♠")).toEqual(10); +}); + // Invalid Cards +test(`Should throw an error for invalid card strings`, () => { + expect(() => getCardValue("invalid")).toThrow("Invalid card format"); + expect(() => getCardValue("11♠")).toThrow("Invalid card format"); + expect(() => getCardValue("A♤")).toThrow("Invalid card format"); + expect(() => getCardValue(123)).toThrow("Card must be a string"); +}); -// 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 8f484a4501f863f5c6ff3bb05825f35d33865aa8 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 17 Mar 2026 11:11:44 +0000 Subject: [PATCH 6/9] added string length requirement to card value test --- .../implement/3-get-card-value.js | 6 +++++- .../rewrite-tests-with-jest/3-get-card-value.test.js | 2 ++ 2 files changed, 7 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 19f40d701e..e11cb4e152 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 @@ -22,11 +22,15 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + if (typeof card !== "string") { throw new Error("Card must be a string"); } + if (card.length < 2) { + throw new Error("Card must have at least two characteristics"); + } + const rank = card.slice(0, -1); const suit = card.slice(-1); 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 44f4d7c13d..1b6c1bec34 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 @@ -30,6 +30,8 @@ test(`Should throw an error for invalid card strings`, () => { expect(() => getCardValue("11♠")).toThrow("Invalid card format"); expect(() => getCardValue("A♤")).toThrow("Invalid card format"); expect(() => getCardValue(123)).toThrow("Card must be a string"); + expect(() => getCardValue(1)).toThrow("Card must have at least two characteristics"); + expect(() => getCardValue("")).toThrow("Card must have at least two characteristics"); }); // https://jestjs.io/docs/expect#tothrowerror From 220aaeb7cc002f0054210b36981304a0a55e509f Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 17 Mar 2026 11:21:27 +0000 Subject: [PATCH 7/9] added a case for a zero-degree angle in 1-get-angle-type --- .../implement/1-get-angle-type.js | 3 +++ .../rewrite-tests-with-jest/1-get-angle-type.test.js | 5 +++++ 2 files changed, 8 insertions(+) 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 37c9419466..a754f5ede0 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 @@ -33,6 +33,9 @@ function getAngleType(angle) { if (angle === 360) { return "This is a circle, not an angle"; } + if (angle === 0) { + return ""; + } return "Invalid angle"; } 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 5ed2d867f4..54368b29a0 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 @@ -46,3 +46,8 @@ test(`should return "Invalid angle" when angle is outside the valid range`, () = test(`should return "This is a circle, not an angle" when angle is exactly 360`, () => { expect(getAngleType(360)).toEqual("This is a circle, not an angle"); }); +// Case 8: Zero angle +test(`should return an empty string when angle is exactly 0`, () => { + expect(getAngleType(0)).toEqual(""); +}); + From 9c604d381f4c78dcbf6943c24f862d724b502916 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 17 Mar 2026 11:28:32 +0000 Subject: [PATCH 8/9] rephrased zero angle issue in 1-get-angle-type --- .../implement/1-get-angle-type.js | 7 ++++--- .../rewrite-tests-with-jest/1-get-angle-type.test.js | 4 ++-- 2 files changed, 6 insertions(+), 5 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 a754f5ede0..806af85476 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 @@ -15,6 +15,9 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { + if (angle === 0) { + return "Zero angle"; + } if (angle > 0 && angle < 90) { return "Acute angle"; } @@ -33,9 +36,7 @@ function getAngleType(angle) { if (angle === 360) { return "This is a circle, not an angle"; } - if (angle === 0) { - return ""; - } + return "Invalid angle"; } 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 54368b29a0..4e3f24a54f 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 @@ -47,7 +47,7 @@ test(`should return "This is a circle, not an angle" when angle is exactly 360`, expect(getAngleType(360)).toEqual("This is a circle, not an angle"); }); // Case 8: Zero angle -test(`should return an empty string when angle is exactly 0`, () => { - expect(getAngleType(0)).toEqual(""); +test(`should return "Zero angle" when angle is exactly 0`, () => { + expect(getAngleType(0)).toEqual("Zero angle"); }); From ab4ad44ee66f53c62b355c86d001a8ffbfe2496e Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Tue, 17 Mar 2026 11:36:17 +0000 Subject: [PATCH 9/9] corrected extra space in 2-is-proper-fraction-test --- .../rewrite-tests-with-jest/2-is-proper-fraction.test.js | 3 +-- 1 file changed, 1 insertion(+), 2 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 17ee947092..f10d01902e 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 @@ -30,6 +30,5 @@ test(`should return false when the absolute value of the numerator is greater th test(`should return true when the numerator is zero and the denominator is non-zero`, () => { expect(isProperFraction(0, 5)).toEqual(true); expect(isProperFraction(0, -5)).toEqual(true); -} -); +});