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..c13bd7af00 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,29 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + if (angle <= 0 || angle >= 360) { + return "Invalid angle"; + } + + if (angle === 90) { + return "Right angle"; + } + + if (angle === 180) { + return "Straight angle"; + } + + if (angle > 0 && angle < 90) { + return "Acute angle"; + } + + if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } + + if (angle > 180 && angle < 360) { + return "Reflex angle"; + } } // The line below allows us to load the getAngleType function into tests in other files. @@ -35,3 +57,34 @@ 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"); + +// Boundary test + +assertEquals(getAngleType(89), "Acute angle"); + +assertEquals(getAngleType(91), "Obtuse angle"); + +assertEquals(getAngleType(179), "Obtuse angle"); + +assertEquals(getAngleType(181), "Reflex angle"); + +// Invalid test + +assertEquals(getAngleType(0), "Invalid angle"); + +assertEquals(getAngleType(360), "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..d913a8a5ce 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,11 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (denominator === 0) { + return false; + } + + return Math.abs(numerator) < Math.abs(denominator); } // The line below allows us to load the isProperFraction function into tests in other files. @@ -27,7 +31,38 @@ function assertEquals(actualOutput, targetOutput) { } // TODO: Write tests to cover all cases. -// What combinations of numerators and denominators should you test? // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); + +// Proper fraction +assertEquals(isProperFraction(2, 4), true); + +// Improper fraction +assertEquals(isProperFraction(5, 3), false); + +// Equal numerator & denominator +assertEquals(isProperFraction(5, 5), false); + +// Negative numbers +assertEquals(isProperFraction(-1, -2), true); + +// Zero numerator +assertEquals(isProperFraction(0, 5), true); + +// Zero denominator (invalid) +assertEquals(isProperFraction(2, 0), false); + +// What combinations of numerators and denominators should you test? + +// Normal proper fractions + +// Improper fractions + +// Equal numerator & denominator + +// Negative numbers + +// Zero numerator + +// Zero denominator (invalid) 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..8f8e218519 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,34 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + 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"); + } + + if (rank === "A") return 11; + if (["J", "Q", "K"].includes(rank)) return 10; + + return Number(rank); } // The line below allows us to load the getCardValue function into tests in other files. @@ -40,6 +67,12 @@ 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("10♦"), 10); +assertEquals(getCardValue("3♥"), 3); +assertEquals(getCardValue("K♣"), 10); +assertEquals(getCardValue("J♠"), 10); +assertEquals(getCardValue("Q♦"), 10); // Handling invalid cards try { @@ -50,3 +83,17 @@ try { } catch (e) {} // What other invalid card cases can you think of? +try { + getCardValue("2$"); + console.error("Error not thrown"); +} catch (e) {} // "Invalid card" + +try { + getCardValue("11♠"); + console.error("Error not thrown"); +} catch (e) {} + +try { + getCardValue("B♠"); + console.error("Error not thrown"); +} catch (e) {} 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..fdb35f5890 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,32 @@ 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)`, () => { + 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)`, () => { + 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 or >= 360`, () => { + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(360)).toEqual("Invalid angle"); + expect(getAngleType(-20)).toEqual("Invalid angle"); + expect(getAngleType(560)).toEqual("Invalid 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..1e454fc070 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,30 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + + +// Case 2: positive proper fractions +test(`should return true when |numerator| < |denominator|`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(2, 4)).toEqual(true); +}) + +// Case 3: negative proper fractions +test(`should return true when |numerator| < |denominator|`, () => { + expect(isProperFraction(-1, -2)).toEqual(true); + expect(isProperFraction(-2, -4)).toEqual(true); +}) + +// Case 4: improper fractions (numerator >= denominator) +test(`should return false when |numerator| >= |denominator|`, () => { + expect(isProperFraction(4, 2)).toEqual(false); + expect(isProperFraction(4, 4)).toEqual(false); + expect(isProperFraction(-6, 4)).toEqual(false); + expect(isProperFraction(7, -2)).toEqual(false); +}); + +// Case 5: numerator is zero +test(`should return true when numerator is 0 and denominator is non-zero`, () => { + expect(isProperFraction(0, 3)).toEqual(true); + expect(isProperFraction(0, -5)).toEqual(true); +}); \ No newline at end of file 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..9d9bed4c6c 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 numeric value for number cards", () => { + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("10♦")).toEqual(10); +}); + // Face Cards (J, Q, K) +test("Should return 10 for face cards (J, Q, K)", () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♠")).toEqual(10); + expect(getCardValue("K♠")).toEqual(10); +}); + // Invalid Cards +test("Should throw an error for invalid cards", () => { + expect(() => getCardValue(null)).toThrow(); + expect(() => getCardValue(undefined)).toThrow(); + expect(() => getCardValue("11")).toThrow(); + expect(() => getCardValue("happy")).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 -