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..dfe8793c3 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,48 @@ test("Classifies right angles", () => { const right = getAngleType(90); assert.equal(right, "Right angle"); }); + +test("Classifies invalid angle 0 degrees", () => { + const invalid = getAngleType(0); + assert.equal(invalid, "Invalid angle"); +}); + +test("Classifies acute angle 1 degrees", () => { + const acute = getAngleType(1); + assert.equal(acute, "Acute angle"); +}); + +test("Classifies acute angle 89 degrees", () => { + const acute = getAngleType(89); + assert.equal(acute, "Acute angle"); +}); + +test("Classifies obtuse angle 91 degrees", () => { + const obtuse = getAngleType(91); + assert.equal(obtuse, "Obtuse angle"); +}); + +test("Classifies obtuse angle 179 degrees", () => { + const obtuse = getAngleType(179); + assert.equal(obtuse, "Obtuse angle"); +}); + +test("Classifies straight angle 180 degrees", () => { + const straight = getAngleType(180); + assert.equal(straight, "Straight angle"); +}); + +test("Classifies reflex angle 181 degrees", () => { + const reflex = getAngleType(181); + assert.equal(reflex, "Reflex angle"); +}); + +test("Classifies reflex angle 359 degrees", () => { + const reflex = getAngleType(359); + assert.equal(reflex, "Reflex angle"); +}); + +test("Classifies invalid angle 360 degrees", () => { + const invalid = getAngleType(360); + assert.equal(invalid, "Invalid angle"); +}); 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..f6b7464c9 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("Basic improper fraction", () => { + assert.equal(isProperFraction(4, 2), false); +}); + +test("Edge case improper fraction", () => { + assert.equal(isProperFraction(2, 2), false); +}); + +test("Negative proper fraction", () => { + assert.equal(isProperFraction(-5, 8), true); +}); + +test("Negative improper fraction", () => { + assert.equal(isProperFraction(-8, 5), false); +}); 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..ee8770784 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,81 @@ 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 number followed by a suit, but got "invalid"/, + "Expected clear error" + ); }); // TODO: What other invalid card cases can you think of? + +test("Arbitrary non-card string '19♠'", () => { + assert.throws( + () => getCardValue("19♠"), + /Expected a number followed by a suit, but got "19♠"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string 'P♦'", () => { + assert.throws( + () => getCardValue("P♦"), + /Expected a number followed by a suit, but got "P♦"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string 's♦'", () => { + assert.throws( + () => getCardValue("s♦"), + /Expected a number followed by a suit, but got "s♦"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string 'sOup♦'", () => { + assert.throws( + () => getCardValue("soUp♦"), + /Expected a number followed by a suit, but got "soUp♦"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string '-3♦'", () => { + assert.throws( + () => getCardValue("-3♦"), + /Expected a number followed by a suit, but got "-3♦"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string '5'", () => { + assert.throws( + () => getCardValue("5"), + /Expected a number followed by a suit, but got "5"/, + "Expected clear error" + ); +}); + +test("Arbitrary non-card string 'Q'", () => { + assert.throws( + () => getCardValue("Q"), + /Expected a number followed by a suit, but got "Q"/, + "Expected clear error" + ); +}); + +//Valid cases + +test("Valid card 'A♣'", () => { + assert.equal(getCardValue("A♣"), 11); +}); + +test("Valid card '10♣'", () => { + assert.equal(getCardValue("10♣"), 10); +}); + +test("Valid card 'K♠'", () => { + assert.equal(getCardValue("K♠"), 10); +}); 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..21898423d 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,17 @@ // execute the code to ensure all tests pass. export function getAngleType(angle) { - // TODO: Implement this function + if (angle > 0 && angle < 90) { + 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"; + } else if (angle > 180 && angle < 360) { + return "Reflex angle"; + } else { + 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..6029ae39a 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,11 @@ // execute the code to ensure all tests pass. export function isProperFraction(numerator, denominator) { - // TODO: Implement this function + const fraction = Math.abs(numerator / denominator); + + if (fraction >= 0 && fraction < 1) { + return true; + } + + return false; } 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..a2f75ea80 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,32 @@ // execute the code to ensure all tests pass. export function getCardValue(card) { - // TODO: Implement this function + const suitString = "♠♥♦♣"; + const rankString = "JQK"; + + if (card) { + const suit = card[card.length - 1]; + if (suitString.includes(suit)) { + const rank = card.slice(0, -1); + if (rank === "10") { + return 10; + } else if (rank.length === 1) { + if (rank === "A") { + return 11; + } + + if (rankString.includes(rank)) { + return 10; + } + + const rankNum = Number(rank); + + if (rankNum >= 2) { + return rankNum; + } + } + } + } + + 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..1847517b5 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 @@ -4,6 +4,7 @@ import { getAngleType } from "../implement/1-get-angle-type.js"; // including boundary and invalid cases. // Case 1: Acute angles + test(`should return "Acute angle" when (0 < angle < 90)`, () => { // Test various acute angles, including boundary cases expect(getAngleType(1)).toEqual("Acute angle"); @@ -12,7 +13,38 @@ 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 (90 < angle < 180)`, () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(135)).toEqual("Obtuse angle"); + expect(getAngleType(179)).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 (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" when (angle =< 0 and angle >= 360)`, () => { + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(360)).toEqual("Invalid angle"); + expect(getAngleType(361)).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..420df9243 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,31 @@ 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 when 1 and 2 is passed`, () => { + expect(isProperFraction(1, 2)).toEqual(true); +}); + +test(`should return false when 4 and 2 is passed`, () => { + expect(isProperFraction(4, 2)).toEqual(false); +}); + +test(`should return false when edge case 2 and 2 is passed`, () => { + expect(isProperFraction(2, 2)).toEqual(false); +}); + +test(`should return true when -5 and 8 is passed`, () => { + expect(isProperFraction(-5, 8)).toEqual(true); +}); + +test(`should return false when -8 and 5 is passed`, () => { + expect(isProperFraction(-8, 5)).toEqual(false); +}); + +test(`should return true when 0 and 5 is passed`, () => { + expect(isProperFraction(0, 5)).toEqual(true); +}); + +test(`should return true when 3 and -7 is passed`, () => { + expect(isProperFraction(3, -7)).toEqual(true); +}); 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..1fe252cbf 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,71 @@ 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 10 when given '10♣' `, () => { + expect(getCardValue("10♣")).toEqual(10); +}); + // Face Cards (J, Q, K) + +test(`Should return 10 when given 'K♠' `, () => { + expect(getCardValue("K♠")).toEqual(10); +}); + +test(`Should return 11 when given 'A♣'`, () => { + expect(getCardValue("A♣")).toEqual(11); +}); + // Invalid Cards +test(`Should throw error when given 'invalid'`, () => { + expect(() => { + getCardValue("invalid"); + }).toThrow(/Expected a number followed by a suit, but got "invalid"/); +}); + +test(`Should throw error when given '19♠'`, () => { + expect(() => { + getCardValue("19♠"); + }).toThrow(/Expected a number followed by a suit, but got "19♠"/); +}); + +test(`Should throw error when given 'P♦'`, () => { + expect(() => { + getCardValue("P♦"); + }).toThrow(/Expected a number followed by a suit, but got "P♦"/); +}); + +test(`Should throw error when given 's♦'`, () => { + expect(() => { + getCardValue("s♦"); + }).toThrow(/Expected a number followed by a suit, but got "s♦"/); +}); + +test(`Should throw error when given 'sOup♦'`, () => { + expect(() => { + getCardValue("sOup♦"); + }).toThrow(/Expected a number followed by a suit, but got "sOup♦"/); +}); + +test(`Should throw error when given '-3♦'`, () => { + expect(() => { + getCardValue("-3♦"); + }).toThrow(/Expected a number followed by a suit, but got "-3♦"/); +}); + +test(`Should throw error when given '5'`, () => { + expect(() => { + getCardValue("5"); + }).toThrow(/Expected a number followed by a suit, but got "5"/); +}); + +test(`Should throw error when given 'Q'`, () => { + expect(() => { + getCardValue("Q"); + }).toThrow(/Expected a number followed by a suit, but got "Q"/); +}); + // 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 -