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..32bce1d0bc 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 > 360){ + return "Invalid"; + }else if (angle > 0 && 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 line"; + }else 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 +47,18 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); + +const acute = getAngleType(15); +assertEquals(acute, "Acute angle"); + +const obtuse= getAngleType(115); +assertEquals(obtuse, "Obtuse angle"); + +const straight = getAngleType(180); +assertEquals(straight, "Straight line"); + +const reflexAngle = getAngleType(215); +assertEquals(reflexAngle, "Reflex angle"); + +const invalid = getAngleType(380); +assertEquals(invalid, "Invalid"); 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..b4edc8a801 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){ + return true; + }else{ + return false; + } } // The line below allows us to load the isProperFraction function into tests in other files. @@ -31,3 +35,8 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +assertEquals(isProperFraction(2, 3), true); +assertEquals(isProperFraction(499, 500), true); +assertEquals(isProperFraction(5, 2), false); +assertEquals(isProperFraction(5, 5), false); +assertEquals(isProperFraction(1, 0), 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..81b0545441 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,35 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const number = card.slice(0, -1); + const suit = card.slice(-1); + //console.log(`number is ${number}`); + //console.log(typeof suit); + //console.log(suit); + if (suit == "♠" || suit == "♥" || suit == "♦" || suit == "♣"){ + switch (number) { + case "A": + return 11; + case "J": + case "Q": + case "K": + return 10; + case "2": + case "3": + case "4": + case "5": + case "6": + case "7": + case "8": + case "9": + return Number(number); + default: + return "invalid"; + + } + }else{ + return "invalid"; + } } // The line below allows us to load the getCardValue function into tests in other files. @@ -39,7 +67,19 @@ 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("A♥"), 11); +assertEquals(getCardValue("J♦"), 10); +assertEquals(getCardValue("Q♦"), 10); +assertEquals(getCardValue("K♦"), 10); +assertEquals(getCardValue("2♣"), 2); +assertEquals(getCardValue("3♣"), 3); +assertEquals(getCardValue("4♦"), 4); +assertEquals(getCardValue("5♦"), 5); +assertEquals(getCardValue("6♦"), 6); +assertEquals(getCardValue("7♦"), 7); +assertEquals(getCardValue("8♣"), 8); +assertEquals(getCardValue("9♣"), 9); // Handling invalid cards try { 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..fcb8858814 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,37 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test(`should return "Right angle" when (angle = 90)`, () => { + // Test right angles, only one case + 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(125)).toEqual("Obtuse angle"); + expect(getAngleType(179)).toEqual("Obtuse angle"); +}); + // Case 4: Straight angle +test(`should return "Straight angle angle" when (angle = 180)`, () => { + // Test right angles, only one case + expect(getAngleType(180)).toEqual("Straight line"); +}); + // 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(225)).toEqual("Reflex angle"); + expect(getAngleType(359)).toEqual("Reflex angle"); +}); + // Case 6: Invalid angles +test(`should return "Invalid" when ( angle < 0 or angle > 360 )`, () => { + // Test various invalid angle, including boundary cases + expect(getAngleType(-1)).toEqual("Invalid"); + expect(getAngleType(361)).toEqual("Invalid"); + expect(getAngleType(550)).toEqual("Invalid"); +}); 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..81e52ed008 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,21 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + +// Proper fraction cases +test(`should return true when numerator is smaller then denominator`, () => { + expect(isProperFraction(1, 2)).toEqual(true); + expect(isProperFraction(65, 67)).toEqual(true); + expect(isProperFraction(1, 1000)).toEqual(true); + expect(isProperFraction(999, 1000)).toEqual(true); + expect(isProperFraction(0, 6)).toEqual(true); +}); + +// Improper fraction cases +test(`should return false when numerator is bigger then denominator`, () => { + expect(isProperFraction(3, 2)).toEqual(false); + expect(isProperFraction(65, 60)).toEqual(false); + expect(isProperFraction(1000, 1)).toEqual(false); + expect(isProperFraction(2999, 1000)).toEqual(false); + expect(isProperFraction(11, 10)).toEqual(false); +}); 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..9332c62771 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,38 @@ 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); + expect(getCardValue("A♠")).toEqual(11); +}); + +// Case 2: Face cards Jack, Queen, King (J,Q,K) +test(`Should return 10 when given a face card`, () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("J♦")).toEqual(10); + expect(getCardValue("Q♣")).toEqual(10); + expect(getCardValue("K♥")).toEqual(10); +}); + +// Case 3: Number cards 2-10 (2,3,4,5,6,7,8,9) +test(`Should return the card value when given a number card`, () => { + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("3♦")).toEqual(3); + expect(getCardValue("4♣")).toEqual(4); + expect(getCardValue("5♥")).toEqual(5); + expect(getCardValue("6♠")).toEqual(6); + expect(getCardValue("7♦")).toEqual(7); + expect(getCardValue("8♣")).toEqual(8); + expect(getCardValue("9♥")).toEqual(9); +}); + +// Case 4: Invalid card +test(`Should return 10 when given an ace card`, () => { + expect(getCardValue("invalid")).toEqual("invalid"); + expect(getCardValue("♦")).toEqual("invalid"); + expect(getCardValue("4")).toEqual("invalid"); + expect(getCardValue("")).toEqual("invalid"); + expect(getCardValue("m")).toEqual("invalid"); + expect(getCardValue("300")).toEqual("invalid"); }); // Suggestion: Group the remaining test data into these categories: