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 ca1dfe7f2..114817090 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 @@ -11,8 +11,21 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; } - // Run the tests, work out what Case 2 is testing, and implement the required code here. - // Then keep going for the other cases, one at a time. + // Run the tests, work out what Case 2 is testing, and implement the required code here. + // Then keep going for the other cases, one at a time. + if (angle < 90 && angle > 0) { + return "Acute angle"; + } + if (angle < 180) { + return "Obtuse angle"; + } + if (angle === 180) { + return "Straight angle"; + } + if (angle > 180 && angle < 360) { + return "Reflex angle"; + } + return "Invalid angle"; } // The line below allows us to load the getAngleType function into tests in other files. @@ -50,14 +63,36 @@ assertEquals(acute, "Acute angle"); // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" const obtuse = getAngleType(120); +assertEquals(obtuse, "Obtuse angle"); // ====> write your test here, and then add a line to pass the test in the function above // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" +const straight = getAngleType(180); +assertEquals(straight, "Straight angle"); // ====> write your test here, and then add a line to pass the test in the function above // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" -// ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file +const reflex = getAngleType(250); +assertEquals(reflex, "Reflex angle"); +// ====> write your test here, and then add a line to pass the test in the function above + +let angle = 90; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 45; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 120; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 250; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 180; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 360; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = -10; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 0; +console.log(angle + " degrees is a " + getAngleType(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 a4739af77..90d3a90e4 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 @@ -8,9 +8,10 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { - return true; + 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. @@ -46,6 +47,7 @@ assertEquals(improperFraction, false); // target output: true // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true. const negativeFraction = isProperFraction(-4, 7); +assertEquals(negativeFraction, true); // ====> complete with your assertion // Equal Numerator and Denominator check: @@ -53,7 +55,114 @@ const negativeFraction = isProperFraction(-4, 7); // target output: false // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false. const equalFraction = isProperFraction(3, 3); +assertEquals(equalFraction, false); // ====> complete with your assertion // Stretch: // What other scenarios could you test for? + +// Zero Numerator check: +const zeroNumerator = isProperFraction(0, 5); +assertEquals(zeroNumerator, true); + +// Negative Denominator check: +const negativeDenominator = isProperFraction(2, -3); +assertEquals(negativeDenominator, true); + +// Both Negative check: +const bothNegative = isProperFraction(-2, -5); +assertEquals(bothNegative, true); + +// Large Numbers check: +const largeNumbers = isProperFraction(1000000, 1000001); +assertEquals(largeNumbers, true); + +let numerator = 2; +let denominator = 2; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = -3; +denominator = 4; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = 5; +denominator = -6; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = -7; +denominator = -8; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = 0; +denominator = 1; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = 10; +denominator = 20; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = 15; +denominator = 10; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = -25; +denominator = 30; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); + +numerator = 478356; +denominator = 478357; +console.log( + numerator + + "/" + + denominator + + " proper fraction output is " + + isProperFraction(numerator, denominator) +); 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 266525d1b..066696e46 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 @@ -8,9 +8,17 @@ // write one test at a time, and make it pass, build your solution up methodically // just make one change at a time -- don't rush -- programmers are deep and careful thinkers function getCardValue(card) { + const rank = card.slice(0, -1); + if (["2", "3", "4", "5", "6", "7", "8", "9"].includes(rank)) { + return parseInt(rank, 10); + } if (rank === "A") { return 11; } + if (["K", "Q", "J", "10"].includes(rank)) { + return 10; + } + return "Invalid card rank"; } // The line below allows us to load the getCardValue function into tests in other files. @@ -39,6 +47,7 @@ assertEquals(aceofSpades, 11); // When the function is called with such a card, // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). const fiveofHearts = getCardValue("5♥"); +assertEquals(fiveofHearts, 5); // ====> write your test here, and then add a line to pass the test in the function above // Handle Face Cards (J, Q, K): @@ -46,12 +55,34 @@ const fiveofHearts = getCardValue("5♥"); // When the function is called with such a card, // Then it should return the value 10, as these cards are worth 10 points each in blackjack. +const kingofDiamonds = getCardValue("K"); +assertEquals(kingofDiamonds, 10); +const queenofClubs = getCardValue("Q"); +assertEquals(queenofClubs, 10); +const jackofHearts = getCardValue("J"); +assertEquals(jackofHearts, 10); +const tenofSpades = getCardValue("10"); +assertEquals(tenofSpades, 10); // Handle Ace (A): // Given a card with a rank of "A", // When the function is called with an Ace, // Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack. +const aceofClubs = getCardValue("A♣"); +assertEquals(aceofClubs, 11); + // Handle Invalid Cards: // Given a card with an invalid rank (neither a number nor a recognized face card), // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." +const invalidCard = getCardValue("1♠"); +assertEquals(invalidCard, "Invalid card rank"); +const anotherInvalidCard = getCardValue("B♦"); +assertEquals(anotherInvalidCard, "Invalid card rank"); + +console.log(getCardValue("3♠")); +console.log(getCardValue("10♣")); +console.log(getCardValue("J♦")); +console.log(getCardValue("A♥")); +console.log(getCardValue("11♠")); +console.log(getCardValue("J")); 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 4a92a3e82..eb6fab69b 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 @@ -12,15 +12,27 @@ test("should identify right angle (90°)", () => { // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify acute angle (<90°)", () => { + expect(getAngleType(45)).toEqual("Acute angle"); +}); // Case 3: Identify Obtuse Angles: // When the angle is greater than 90 degrees and less than 180 degrees, // Then the function should return "Obtuse angle" +test("should identify obtuse angle (90° { + expect(getAngleType(120)).toEqual("Obtuse angle"); +}); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" +test("should identify straight angle (180°)", () => { + expect(getAngleType(180)).toEqual("Straight angle"); +}); // Case 5: Identify Reflex Angles: // When the angle is greater than 180 degrees and less than 360 degrees, // Then the function should return "Reflex angle" +test("should identify reflex angle (180° { + expect(getAngleType(270)).toEqual("Reflex 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 caf08d15b..88e89e691 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 @@ -1,13 +1,22 @@ // This statement loads the isProperFraction function you wrote in the implement directory. // We will use the same function, but write tests for it using Jest in this file. -const isProperFraction = require("../implement/2-is-proper-fraction"); +const isProperFraction = require("../implement/2-is-proper-fraction"); // The path test("should return true for a proper fraction", () => { expect(isProperFraction(2, 3)).toEqual(true); }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 4)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative fraction", () => { + expect(isProperFraction(-1, 2)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal numerator and denominator", () => { + expect(isProperFraction(3, 3)).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 04418ff72..d4a870fe0 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 @@ -8,6 +8,25 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return correct value for numbered cards (2-10)", () => { + expect(getCardValue("5♥")).toBe(5); + expect(getCardValue("10♦")).toBe(10); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return 'Invalid card rank' for invalid cards", () => { + ["1♣", "B♦", "Z♠"].forEach((card) => { + expect(getCardValue(card)).toBe("Invalid card rank"); + }); +}); // Case 4: Handle Ace (A): +test("should return 11 for Ace (A)", () => { + ["A♠", "A♥"].forEach((card) => { + expect(getCardValue(card)).toBe(11); + }); +}); // Case 5: Handle Invalid Cards: +test("should return 'Invalid card rank' for invalid cards", () => { + ["1♣", "B♦", "Z♠"].forEach((card) => { + expect(getCardValue(card)).toBe("Invalid card rank"); + }); +});