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..d3273c6350 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,19 @@ // execute the code to ensure all tests pass. 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"; + } } // The line below allows us to load the getAngleType function into tests in other files. @@ -34,4 +46,30 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all cases, including boundary and invalid cases. // Example: Identify Right Angles const right = getAngleType(90); +const acute = getAngleType(66); +const obtuse = getAngleType(109); +const straight = getAngleType(180); +const reflex = getAngleType(222); +const invalid = getAngleType(366); +const boundary = getAngleType(0); +const invalidBoundary = getAngleType(360) +const acuteBoundary = getAngleType(1) +const acuteSecondBoundary = getAngleType(89) +const obtuseBoundary = getAngleType(91) +const reflexBoundary = getAngleType(181) + + + assertEquals(right, "Right angle"); +assertEquals(acute, "Acute angle"); +assertEquals(obtuse, "Obtuse angle"); +assertEquals(straight, "Straight angle"); +assertEquals(reflex, "Reflex angle") +assertEquals(invalid, "Invalid angle") +assertEquals(invalidBoundary, "Invalid angle") +assertEquals(acuteBoundary, "Acute angle") +assertEquals(acuteSecondBoundary, "Acute angle") +assertEquals(obtuseBoundary, "Obtuse angle") +assertEquals(reflexBoundary, "Reflex 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..bc994aa83a 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 (numerator <= denominator && numerator > 0) { + return true; + } else { + return false; + } } // The line below allows us to load the isProperFraction function into tests in other files. @@ -31,3 +35,10 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(0, 4), false); +assertEquals(isProperFraction(5, 5), true); +assertEquals(isProperFraction(-8, 2), false); +assertEquals(isProperFraction(4, 0), false); +assertEquals(isProperFraction(0, 0), false); +assertEquals(isProperFraction(-2, -2), 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 ff5c532e1d..7d38831bb8 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,16 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + let removeSuit = card.slice(0, -1); + if (removeSuit === "A") { + return 11; + } else if (removeSuit === "J" || removeSuit === "Q" ||removeSuit === "K") { + return 10; + } else if (removeSuit > 1 && removeSuit < 11) { + return Number(removeSuit); + } else { + throw new Error("Error") + } } // The line below allows us to load the getCardValue function into tests in other files. @@ -40,11 +49,15 @@ 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("7♥"), 7); +assertEquals(getCardValue("A♥"), 11); +assertEquals(getCardValue("8♥"), 8); // Handling invalid cards try { getCardValue("invalid"); - // This line will not be reached if an error is thrown as expected console.error("Error was not thrown for invalid card 😢"); } catch (e) { @@ -52,3 +65,11 @@ try { } // What other invalid card cases can you think of? +try { + getCardValue("15♥"); + // This line will not be reached if an error is thrown as expected + console.error("Error was not thrown for invalid card 😢"); +} catch (e) { + console.log("Error thrown for invalid card 🎉"); +} + 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..b26253f729 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,33 @@ 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 (angle < 180, angle > 90)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); + expect(getAngleType(99)).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 (angle < 360, angle > 180)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(189)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); + expect(getAngleType(199)).toEqual("Reflex angle"); +}); // Case 6: Invalid angles +test(`should return "Invalid angle" when (angle > 361, angle < 0)`, () => { + // Test various acute angles, including boundary cases + expect(getAngleType(505)).toEqual("Invalid angle"); + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(699)).toEqual("Invalid angle"); +}); \ No newline at end of file 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..456f5d79ae 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,17 @@ 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 denominator is smaller or equal to the numerator`,() =>{ + expect(isProperFraction(2, 4)).toEqual(true); + expect(isProperFraction(3, 3)).toEqual(true); + expect(isProperFraction(5, 10)).toEqual(true); + expect(isProperFraction(2, 2)).toEqual(true); +}); + +test(`should return false when denominator is bigger than the numerator`, () => { + expect(isProperFraction(5, -2)).toEqual(false); + expect(isProperFraction(-1, 0)).toEqual(false); + expect(isProperFraction(12, 4)).toEqual(false); + +}); + \ 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..653bc4a194 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 @@ -9,6 +9,29 @@ test(`Should return 11 when given an ace card`, () => { expect(getCardValue("A♠")).toEqual(11); }); +test(`Should return 10 when given a Joker card`, () => { + expect(getCardValue("J♥")).toEqual(10); +}); + +test(`Should return 2 when given the 2 card`, () => { + expect(getCardValue("2♠")).toEqual(2); +}); + +test(`Should return 10 when given a King card`, () => { + expect(getCardValue("K♠")).toEqual(10); +}); + +test(`Should return 5 when given the 5 card`, () => { + expect(getCardValue("5♠")).toEqual(5); +}); + +test(`Should return 8 when gine the 8 card`, () => { + expect(getCardValue("8♠")).toEqual(8); +}); + +test(`Should return 10 when given the Queen card`, () => { + expect(getCardValue("Q♠")).toEqual(10); +}); // Suggestion: Group the remaining test data into these categories: // Number Cards (2-10) // Face Cards (J, Q, K) @@ -16,5 +39,9 @@ test(`Should return 11 when given an ace 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 - +// https://jestjs.io/docs/exåpect#tothrowerror +test(`Should not return any card should throw an error message`, () => { + expect(() => { + getCardValue("QQ♥"); + }).toThrow(); +});