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..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 @@ -10,3 +10,30 @@ 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"); +}); +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"); +}); 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" + ); +}); 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"; } 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; } 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}"`); } 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"); +}); 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); +}); 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 -