From b737af3216c24dc89760e1bfa9d027b0403ace53 Mon Sep 17 00:00:00 2001 From: Raihan Sharif Date: Wed, 25 Feb 2026 14:46:08 +0000 Subject: [PATCH 1/5] implement and rewrite sprint 3 pt 1 --- .../implement/1-get-angle-type.js | 32 ++++++++++++++- .../implement/2-is-proper-fraction.js | 8 +++- .../implement/3-get-card-value.js | 41 ++++++++++++++++++- .../1-get-angle-type.test.js | 28 +++++++++++++ .../2-is-proper-fraction.test.js | 39 ++++++++++++++++++ .../3-get-card-value.test.js | 21 +++++++++- 6 files changed, 165 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 9e05a871e2..714e24abfa 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,22 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + if (angle < 90) { + return "Acute angle"; + } + if (angle === 90) { + return "Right angle"; + } + if (angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle <= 360) { + return "Reflex angle"; + } + return "Invalid angle"; } // The line below allows us to load the getAngleType function into tests in other files. @@ -33,5 +48,20 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all cases, including boundary and invalid cases. // Example: Identify Right Angles +const acute = getAngleType(70); +assertEquals(acute, "Acute angle"); + const right = getAngleType(90); assertEquals(right, "Right angle"); + +const obtuse = getAngleType(95); +assertEquals(obtuse, "Obtuse angle"); + +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); + +const reflex = getAngleType(280); +assertEquals(reflex, "Reflex angle"); + +const invalid = getAngleType(180); +assertEquals(invalid, "Invalid angle"); 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..f4378f8833 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,7 +11,8 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (denominator === 0) return false; + return numerator < denominator ? true : false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -31,3 +32,8 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(2, 1), false); +assertEquals(isProperFraction(0, 0), false); +assertEquals(isProperFraction(-0, 0), false); +assertEquals(isProperFraction(-5, 4), true); +assertEquals(isProperFraction(-4, -5), false); 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..7797abf412 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,7 +22,39 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const rank = [ + "A", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "J", + "Q", + "K", + ]; + const suit = ["♠", "♥", "♦", "♣"]; + + const cardValue = card.slice(0, -1); + console.log("card value: " + cardValue); + const cardSuit = card[card.length - 1]; + + if (!rank.includes(cardValue) || !suit.includes(cardSuit)) { + throw new Error("invalid input"); + } + + if ("A" === cardValue) { + return 11; + } + if (["J", "Q", "K"].includes(cardValue)) { + return 10; + } + + return Number(cardValue); } // The line below allows us to load the getCardValue function into tests in other files. @@ -40,6 +72,13 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: assertEquals(getCardValue("9♠"), 9); +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("J♠"), 10); +assertEquals(getCardValue("K♠"), 10); +assertEquals(getCardValue("Q♠"), 10); +assertEquals(getCardValue("2♠"), 2); +assertEquals(getCardValue("5♠"), 5); +assertEquals(getCardValue("10♠"), 10); // Handling invalid cards try { 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..44e3052a92 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 @@ -11,6 +11,34 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { expect(getAngleType(1)).toEqual("Acute angle"); expect(getAngleType(45)).toEqual("Acute angle"); expect(getAngleType(89)).toEqual("Acute angle"); + expect(getAngleType(95)).not.toEqual("Acute angle"); +}); +test(`should return "Right angle" when angle is 90)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(90)).toEqual("Right angle"); + expect(getAngleType(45)).not.toEqual("Right angle"); + expect(getAngleType(99)).not.toEqual("Right angle"); +}); + +test(`should return "Obtuse angle" when (90 < angle < 180)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(90)).not.toEqual("Obtuse angle"); + expect(getAngleType(100)).toEqual("Obtuse angle"); + expect(getAngleType(180)).not.toEqual("Obtuse angle"); + expect(getAngleType(200)).not.toEqual("Obtuse angle"); +}); + +test(`should return "Straight angle" when (angle is 180)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(179)).not.toEqual("Straight angle"); + expect(getAngleType(180)).toEqual("Straight angle"); + expect(getAngleType(181)).not.toEqual("Straight angle"); +}); +test(`should return "Reflex angle" when (180 < angle < 361)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(179)).not.toEqual("Reflex angle"); + expect(getAngleType(371)).not.toEqual("Reflex angle"); + expect(getAngleType(200)).toEqual("Reflex angle"); }); // Case 2: Right angle 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..59d5d2194e 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 @@ -8,3 +8,42 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); +// This statement loads the isProperFraction function you wrote in the implement directory. +// We will use the same function, but write tests for it using Jest in this file. +const isProperFraction = require("../implement/2-is-proper-fraction"); + +// TODO: Write tests in Jest syntax to cover all combinations of positives, negatives, zeros, and other categories. + +// Special case: numerator is zero +test(`should return false when denominator is zero`, () => { + expect(isProperFraction(1, 0)).toEqual(false); + expect(isProperFraction(0, 0)).toEqual(false); + expect(isProperFraction(-1, 0)).toEqual(false); +}); + +test(`should return true when numerator and denominator both positive and numerator < denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(4, 5)).toEqual(true); + expect(isProperFraction(2, 3)).toEqual(true); +}); + +test(`should return true when numerator and denominator both negative and numerator < denominator`, () => { + expect(isProperFraction(-3, -2)).toEqual(true); +}); + +test(`should return true when numerator is negative and numerator < denominator`, () => { + expect(isProperFraction(-3, 2)).toEqual(true); +}); + +test(`should return false when numerator > denominator`, () => { + expect(isProperFraction(2, 1)).toEqual(false); +}); + +test(`should return false when numerator > denominator, negative nums`, () => { + expect(isProperFraction(-1, -2)).toEqual(false); +}); + +test(`should return false when numerator == denominator`, () => { + expect(isProperFraction(-2, -2)).toEqual(false); + expect(isProperFraction(2, 2)).toEqual(false); +}); 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..d7287feaca 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 @@ -13,8 +13,27 @@ test(`Should return 11 when given an ace card`, () => { // Number Cards (2-10) // Face Cards (J, Q, K) // Invalid Cards +test(`Should return 10 when given a K, Q or J card`, () => { + expect(getCardValue("K♠")).toEqual(10); + expect(getCardValue("Q♠")).toEqual(10); + expect(getCardValue("J♠")).toEqual(10); +}); + +test(`Should return the number of the card given a numeric card card`, () => { + expect(getCardValue("10♠")).toEqual(10); + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("3♠")).toEqual(3); +}); + +test(`Should throw an error if invalid card`, () => { + expect(() => { + getCardValue("2😬"); + }).toThrow(); + expect(() => { + getCardValue("22♠"); + }).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 7e46c90879660e0410785e8276d3d08889040d50 Mon Sep 17 00:00:00 2001 From: Raihan Sharif Date: Sat, 7 Mar 2026 00:00:49 +0000 Subject: [PATCH 2/5] account for negative angles and reflex is <360, not <= 360 --- .../implement/1-get-angle-type.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 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 714e24abfa..31c9e69599 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 "Invalid angle"; + } if (angle < 90) { return "Acute angle"; } @@ -27,7 +30,7 @@ function getAngleType(angle) { if (angle === 180) { return "Straight angle"; } - if (angle <= 360) { + if (angle < 360) { return "Reflex angle"; } return "Invalid angle"; @@ -63,5 +66,8 @@ assertEquals(straight, "Straight angle"); const reflex = getAngleType(280); assertEquals(reflex, "Reflex angle"); -const invalid = getAngleType(180); +const invalid = getAngleType(-10); assertEquals(invalid, "Invalid angle"); + +const invalid2 = getAngleType(360); +assertEquals(invalid2, "Invalid angle"); From bfc79d36b0e90845555ad1a9befda42685dc8f96 Mon Sep 17 00:00:00 2001 From: Raihan Sharif Date: Sat, 7 Mar 2026 00:02:13 +0000 Subject: [PATCH 3/5] account for sign of numerator and denomnator --- .../implement/2-is-proper-fraction.js | 2 +- 1 file changed, 1 insertion(+), 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 f4378f8833..cee2cde98d 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 @@ -12,7 +12,7 @@ function isProperFraction(numerator, denominator) { if (denominator === 0) return false; - return numerator < denominator ? true : false; + return Math.abs(numerator) < Math.abs(denominator); } // The line below allows us to load the isProperFraction function into tests in other files. From 0034bc15c49c1672a35c3238ab6d695422dd74da Mon Sep 17 00:00:00 2001 From: Raihan Sharif Date: Sat, 7 Mar 2026 00:03:29 +0000 Subject: [PATCH 4/5] remove debug code --- .../1-implement-and-rewrite-tests/implement/3-get-card-value.js | 1 - 1 file changed, 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 7797abf412..6aac44ddd6 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 @@ -40,7 +40,6 @@ function getCardValue(card) { const suit = ["♠", "♥", "♦", "♣"]; const cardValue = card.slice(0, -1); - console.log("card value: " + cardValue); const cardSuit = card[card.length - 1]; if (!rank.includes(cardValue) || !suit.includes(cardSuit)) { From 5449bd6249347e54148c28b0aa84bb1304b34774 Mon Sep 17 00:00:00 2001 From: Raihan Sharif Date: Sat, 7 Mar 2026 00:04:02 +0000 Subject: [PATCH 5/5] change "numeric card" to "number card" --- .../rewrite-tests-with-jest/3-get-card-value.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d7287feaca..4ce771e1b9 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 @@ -19,7 +19,7 @@ test(`Should return 10 when given a K, Q or J card`, () => { expect(getCardValue("J♠")).toEqual(10); }); -test(`Should return the number of the card given a numeric card card`, () => { +test(`Should return the number of the card given a number card`, () => { expect(getCardValue("10♠")).toEqual(10); expect(getCardValue("2♠")).toEqual(2); expect(getCardValue("3♠")).toEqual(3);