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..7e35feedc3 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,26 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { + { + 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"; + } + return "Invalid angle"; +} + + // TODO: Implement this function } @@ -35,3 +55,6 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right 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..c3be77fdcb 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 @@ -10,10 +10,6 @@ // After you have implemented the function, write tests to cover all the cases, and // execute the code to ensure all tests pass. -function isProperFraction(numerator, denominator) { - // TODO: Implement this function -} - // 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. module.exports = isProperFraction; @@ -31,3 +27,20 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); + +function isProperFraction(numerator, denominator) { + if (typeof numerator !== "number" || typeof denominator !== "number") { + throw new Error("Numerator and denominator must be numbers"); + } + if (denominator === 0) { + return false; + } + if (Math.abs(numerator) < Math.abs(denominator)) { + //Math.abs gives an absolute version of a number regardless of positive or negative + return true; + } + return false; +} +console.log(isProperFraction(2, 3)); // true + +module.exports = isProperFraction; 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 ff5c532e1d..1fa56059c9 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,9 +22,31 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const suit = card.slice(-1); + const rank = card.slice(0, -1); + + const validSuits = ["♠", "♥", "♦", "♣"]; + + if (!validSuits.includes(suit)) { + throw new Error("Invalid card"); + } + + if (rank === "A") { + return 11; + } + + if (["J", "Q", "K"].includes(rank)) { + return 10; + } + + if (["2", "3", "4", "5", "6", "7", "8", "9", "10"].includes(rank)) { + return Number(rank); + } + + throw new Error("Invalid card"); } + // The line below allows us to load the getCardValue function into tests in other files. // This will be useful in the "rewrite tests with jest" step. module.exports = getCardValue; @@ -52,3 +74,6 @@ try { } // What other invalid card cases can you think of? +// logging cards without suits to throw error + + 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..08cc39f295 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,74 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test(`should return "Right angle" when (angle === 90)`, () => { + // Test various acute angles, including boundary cases + 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(135)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); +}); + // Case 4: Straight angle +test(`should return "Straight angle" when (angle === 180)`, () => { + // Test various acute angles, including boundary cases + 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 < 0 || angle > 360)`, () => { + // Test various invalid angles + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(361)).toEqual("Invalid angle"); +}); + +// Case 7: Invalid Non-numeric inputs +test("should return Invalid angle for non-number inputs", () => { + expect(getAngleType("90")).toEqual("Invalid angle"); + expect(getAngleType("hello")).toEqual("Invalid angle"); +}); + +// Case 8: Decimal angles +test("should handle decimal angles", () => { + expect(getAngleType(0.5)).toEqual("Acute angle"); + expect(getAngleType(89.5)).toEqual("Acute angle"); + expect(getAngleType(90.5)).toEqual("Obtuse angle"); + expect(getAngleType(179.5)).toEqual("Obtuse angle"); + expect(getAngleType(180.5)).toEqual("Reflex angle"); + expect(getAngleType(359.5)).toEqual("Reflex angle"); +}); + +// Case 9: Very large numbers +test("should return Invalid angle for angles above 360", () => { + expect(getAngleType(361)).toEqual("Invalid angle"); + expect(getAngleType(720)).toEqual("Invalid angle"); + expect(getAngleType(1000)).toEqual("Invalid angle"); +}); + +// Case 10: Very large negative numbers +test("should return Invalid angle for negative angles", () => { + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(-90)).toEqual("Invalid angle"); + expect(getAngleType(-360)).toEqual("Invalid angle"); +}); + +// Case 11: testing boundary angles +test(`should return "Invalid angle" for values just below 0 or just above 360`, () => { + expect(getAngleType(-0.1)).toEqual("Invalid angle"); + expect(getAngleType(-0.001)).toEqual("Invalid angle"); + expect(getAngleType(360.1)).toEqual("Invalid angle"); + expect(getAngleType(360.001)).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..1683bdc08f 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,45 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + +test(`should return true when numerator is zero`, () => { + expect(isProperFraction(0, 3)).toEqual(true); +}); + +test(`should return false when both numerator and denominator are zero`, () => { + expect(isProperFraction(0, 0)).toEqual(false); +}); + +test(`should return false when both numerator and denominator are the same number`, () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +test(`should return true when numerator is less than denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(-1, -2)).toEqual(true); +}); + +test(`should return false when numerator is equal to denominator`, () => { + expect(isProperFraction(2, 2)).toEqual(false); + expect(isProperFraction(-2, -2)).toEqual(false); +}); + +test(`should return false when numerator is greater than denominator`, () => { + expect(isProperFraction(3, 2)).toEqual(false); + expect(isProperFraction(-3, -2)).toEqual(false); +}); + +test("should handle decimal numbers", () => { + expect(isProperFraction(0.5, 2)).toEqual(true); + expect(isProperFraction(2.5, 2)).toEqual(false); +}); + +test("should throw an error for non-numerical values", () => { + expect(() => isProperFraction("2", 3)).toThrow( + "Numerator and denominator must be numbers" + ); +}); + +test(`should return true when numerator is negative and denominator is positive`, () => { + expect(isProperFraction(-1, 2)).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..081268b046 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 @@ -10,11 +10,62 @@ test(`Should return 11 when given an ace card`, () => { }); // Suggestion: Group the remaining test data into these categories: -// Number Cards (2-10) -// Face Cards (J, Q, K) + +// Case 2: Number Cards (2-10) +test(`Should return the same number when given a number card of any suit`, () => { + expect(getCardValue("3♠")).toEqual(3); + expect(getCardValue("5♥")).toEqual(5); + expect(getCardValue("9♦")).toEqual(9); + expect(getCardValue("10♣")).toEqual(10); +}); + +// Case 3: Valid Suits +test("Should accept all valid suits", () => { + expect(getCardValue("A♠")).toEqual(11); + expect(getCardValue("A♥")).toEqual(11); + expect(getCardValue("A♦")).toEqual(11); + expect(getCardValue("A♣")).toEqual(11); +}); + +// Case 4: Face Cards (J, Q, K) +test(`Should return 10 when given an any face card`, () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♦")).toEqual(10); +}); + // Invalid Cards +// Test 5: Non-suit inputs +test("Cards without suits throw an error", () => { + expect(() => { + getCardValue("10"); + }).toThrow("Invalid card"); +}); + +// Test 6: Invalid suits +test("Should throw an error for an invalid suit", () => { + expect(() => getCardValue("A★")).toThrow("Invalid card"); +}); + +// Test 7: Invalid rank +test("Should throw an error for an invalid rank", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid card"); +}); + +// Test 8: Invalid input +test("Should throw an error for an invalid card", () => { + expect(() => getCardValue("hello")).toThrow("Invalid card"); +}); + +// Test 9: Reject lowercase card ranks +test("Should reject lowercase card ranks", () => { + expect(() => getCardValue("a♠")).toThrow("Invalid card"); + expect(() => getCardValue("j♠")).toThrow("Invalid card"); + expect(() => getCardValue("q♠")).toThrow("Invalid card"); + expect(() => getCardValue("k♠")).toThrow("Invalid card"); +}); + // 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 -