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..7ab64f55a4 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 @@ -16,7 +16,28 @@ function getAngleType(angle) { // TODO: Implement this function -} + if (angle < 0) { + return "Invalid angle" + } else if (angle < 90) { + return "Acute angle" + } else if (angle ===90) { + return "Right angle" + } else if (angle < 180) { + return "Obtuse angle" + } else if (angle ===180) { + return "Straight angle" + } else if (angle < 360) { + return "Reflex angle" + } else if (angle === 360) { + return "Acute angle" + } else if (angle > 360) { + return "Invalid angle" + } + + } + + + // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. @@ -35,3 +56,11 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); +// const right = getAngleType(89); +// assertEquals(right, "Acute angle"); +// const right = getAngleType(145); +// assertEquals(right, "Obtuse angle"); +// const right = getAngleType(180); +// assertEquals(right, "Straight angle"); +// const right = getAngleType(200); +// assertEquals(right, "Invalid angle"); \ No newline at end of file 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..6ce2029a93 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,9 +11,30 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (denominator === 0) { + return false + } + + if (numerator === denominator) { + return false + } + + if (numerator > denominator) { + return false + } + + if (numerator < denominator) { + return true + } } +// function isProperFraction(numerator, denominator) { +// if (denominator === 0) { +// return false +// } else if (Math.abs(numerator) < Math.abs(denominator)) { +// return true +// }; +// } // 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; 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..aaa4e3b994 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,6 +22,26 @@ // execute the code to ensure all tests pass. function getCardValue(card) { + //check for suit + const suits = "♥♦♣♠"; + if (!suits.includes(card.slice(-1))){ + return "Invalid" + }; + // check for face card or number + const cardFace = "AKJQ"; + const numberCards = ["2", "3", "4", "5", "6", "7", "8", "9", "10"]; + if (!cardFace.includes(card.slice(0, -1)) && !numberCards.includes(card.slice(0, -1))){ + return "Invalid" + }; + + const removeSuit = card.slice (0, -1); + if (removeSuit === "A") { + return 11 + } else if (removeSuit === "J" || removeSuit === "Q" || removeSuit === "K" ){ + return 10; + } + return Number(removeSuit); + // TODO: Implement this function } @@ -35,7 +55,7 @@ function assertEquals(actualOutput, targetOutput) { actualOutput === targetOutput, `Expected ${actualOutput} to equal ${targetOutput}` ); -} +}; // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: 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..eed1548586 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)', () => { + expect(getAngleType(90)).toEqual("Right angle"); +}); + // Case 3: Obtuse angles +test ('should return "Obtuse angle" when (angle < 180)', () => { + expect(getAngleType(91)).toEqual("Obtuse angle"); + expect(getAngleType(175)).toEqual("Obtuse angle"); + expect(getAngleType(135)).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 (angle < 360)', () => { + expect(getAngleType(190)).toEqual("Reflex angle"); + expect(getAngleType(250)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); + // Case 6: Invalid angles +test ('should return "Invalid angle" when (angle > 360)', () => { + expect(getAngleType(361)).toEqual("Invalid angle"); + expect(getAngleType(450)).toEqual("Invalid angle"); + expect(getAngleType(3854)).toEqual("Invalid angle"); + expect(getAngleType(-12)).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..c887165a70 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,20 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + +// numerator is higher than denominator +test(`should return false when numerator is higher value than denominator`, () => { + expect(isProperFraction(2, 1)).toEqual(false); +}); + +// numerator is lower than denominator +test(`should return true when numerator is lower value than denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(-1, 2 )).toEqual(true); + expect(isProperFraction(0, 2 )).toEqual(true); +}) + +// numerator is equal to denominator +test(`should return false when numerator is equal to denominator`, () => { + expect(isProperFraction(1, 1)).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..90b4279ca1 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 @@ -7,6 +7,28 @@ const getCardValue = require("../implement/3-get-card-value"); // Case 1: Ace (A) test(`Should return 11 when given an ace card`, () => { expect(getCardValue("A♠")).toEqual(11); + expect(getCardValue("A♦")).toEqual(11); +}); + +// Case 2: Face cards (J, Q, K) +test(`Should return 10 when given a face card`, () => { + expect(getCardValue("K♦")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("J♣")).toEqual(10); +}); + +// Case 3: Number cards (1-10) +test(`Should return number value when given a number card`, () => { + expect(getCardValue("2♦")).toEqual(2); + expect(getCardValue("8♥")).toEqual(8); + expect(getCardValue("10♥")).toEqual(10); +}); + +// Case 4: Invalid cards +test(`Should return Invalid when given invalid cards`, () => { + expect(getCardValue("10")).toEqual("Invalid"); + expect(getCardValue("ka9")).toEqual("Invalid"); + expect(getCardValue("13♥")).toEqual("Invalid"); }); // Suggestion: Group the remaining test data into these categories: @@ -18,3 +40,4 @@ test(`Should return 11 when given an ace card`, () => { // please refer to the Jest documentation: // https://jestjs.io/docs/expect#tothrowerror +// "♠", "♥", "♦", "♣" \ No newline at end of file