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..8665ab246 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,19 @@ 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. + 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 +61,33 @@ 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); -// ====> write your test here, and then add a line to pass the test in the function above +assertEquals(obtuse, "Obtuse angle"); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, // Then the function should return "Straight angle" // ====> write your test here, and then add a line to pass the test in the function above - +const straight = getAngleType(180); +assertEquals(straight, "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" -// ====> write your test here, and then add a line to pass the test in the function above \ No newline at end of file +// ====> write your test here, and then add a line to pass the test in the function above +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); + +let angle = 120; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 45; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 90; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 180; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 270; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = -10; +console.log(angle + " degrees is a " + getAngleType(angle)); +angle = 400; +console.log(angle + " degrees is a " + getAngleType(angle)); +// Case 6: Handle Invalid Angles: \ 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 a4739af77..e4238b59f 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,22 +8,25 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + + if (denominator) { return true; + + if (typeof numerator !== "number" || typeof denominator !== "number") { + return false; // Invalid input types + } + + if (denominator === 0) { + return false; // Division by zero is undefined + } + + const value = numerator / denominator; + return Math.abs(value) < 1; // Proper fraction if the value is between -1 and 1 } -// 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; -// here's our helper again -function assertEquals(actualOutput, targetOutput) { - console.assert( - actualOutput === targetOutput, - `Expected ${actualOutput} to equal ${targetOutput}` - ); -} // Acceptance criteria: @@ -47,6 +50,7 @@ assertEquals(improperFraction, false); // 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); // ====> complete with your assertion +assertEquals(negativeFraction, true); // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 @@ -54,6 +58,47 @@ const negativeFraction = isProperFraction(-4, 7); // 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); // ====> complete with your assertion +assertEquals(equalFraction, false); // Stretch: // What other scenarios could you test for? + + +// Zero Numerator check: +// Input: numerator = 0, denominator = 5 +// target output: true +// Explanation: The fraction 0/5 is a proper fraction because the numerator (0) is less than the denominator (5). The function should return true. +const zeroNumerator = isProperFraction(0, 5); +assertEquals(zeroNumerator, true); + +// Negative Denominator check: +// Input: numerator = 2, denominator = -3 +// target output: false +// Explanation: The fraction 2/-3 is not a proper fraction because the denominator is negative. The function should return false. +const negativeDenominator = isProperFraction(2, -3); +assertEquals(negativeDenominator, true); + +let numerator= 1; +let denominator= 7; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= 5; +denominator= 1; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= -4; +denominator= 9; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= 0; +denominator= 6; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= 4; +denominator= 4; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= -5; +denominator= 8; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= 4; +denominator= -2; +console.log(numerator + "/" + denominator + " check =", isProperFraction(numerator, denominator)); +numerator= -3; +denominator= -7; +console.log(numerator + "/" + denominator + " check =", 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..8c9901688 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 (rank === "A") { return 11; } + if (["10", "J", "Q", "K"].includes(rank)) { + return 10; + } + if (["2", "3", "4", "5", "6", "7", "8", "9"].includes(rank)) { + return parseInt(rank, 10); + } + return "Invalid card rank"; } // The line below allows us to load the getCardValue function into tests in other files. @@ -38,20 +46,51 @@ assertEquals(aceofSpades, 11); // Given a card with a rank between "2" and "9", // 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♥"); +const fiveofHearts = getCardValue("5♥"); // ====> write your test here, and then add a line to pass the test in the function above +assertEquals(fiveofHearts, 5); // Handle Face Cards (J, Q, K): // Given a card with a rank of "10," "J," "Q," or "K", // 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 jackofHearts = getCardValue("J♥"); +assertEquals(jackofHearts, 10); + +const queenofSpades = getCardValue("Q♠"); +assertEquals(queenofSpades, 10); + +const tenofClubs = getCardValue("10♣"); +assertEquals(tenofClubs, 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 invalidCard2 = getCardValue("11♠"); +assertEquals(invalidCard2, "Invalid card rank"); +const invalidCard3 = getCardValue("B♠"); +assertEquals(invalidCard3, "Invalid card rank"); + + +console.log( getCardValue("1♠")); +console.log( getCardValue("11♠")); +console.log( getCardValue("B♠")); +console.log( getCardValue("3♠")); +console.log( getCardValue("10♠")); +console.log( getCardValue("J♠")); +console.log( getCardValue("Q♠")); +console.log( getCardValue("K♠")); +console.log( getCardValue("A♠")); \ No newline at end of file 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..43c137184 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,24 @@ 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..8e6c74deb 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,67 @@ -// 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"); -test("should return true for a proper fraction", () => { + +// Case 1: Proper Fraction +// Given a numerator smaller than denominator (2/3), +// When the function is called, +// Then it should return true because it's a proper fraction. +test("should return true for a proper fraction (2/3)", () => { expect(isProperFraction(2, 3)).toEqual(true); }); -// Case 2: Identify Improper Fractions: -// Case 3: Identify Negative Fractions: +// Case 2: Improper Fraction +// Given a numerator greater than denominator (5/2), +// When the function is called, +// Then it should return false because it's an improper fraction. +test("should return false for an improper fraction (5/2)", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); + + +// Case 3: Negative Proper Fraction +// Given a negative proper fraction (-1/2), +// When the function is called, +// Then it should return true because the value is between -1 and 1. +test("should return true for a negative proper fraction (-1/2)", () => { + expect(isProperFraction(-1, 2)).toEqual(true); +}); + +// Case 4: Equal Numerator and Denominator +// Given a numerator equal to denominator (3/3), +// When the function is called, +// Then it should return false because it's equal to 1 (not proper). +test("should return false for equal numerator and denominator (3/3)", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +// Case 5: Zero numerator +// 0 divided by any non-zero denominator is a proper fraction. +test("should return true for zero numerator", () => { + expect(isProperFraction(0, 5)).toEqual(true); +}); + +// Case 6: Negative denominator +// When denominator is negative, the fraction is still valid, so check absolute values. +test("should return true when denominator is negative but |numerator| < |denominator|", () => { + expect(isProperFraction(2, -3)).toEqual(true); +}); + +// Case 7: Denominator is zero +// Division by zero is undefined, should return false. +test("should return false when denominator is zero", () => { + expect(isProperFraction(3, 0)).toEqual(false); +}); + +// Case 8: Both numerator and denominator are negative but |numerator| < |denominator| +// Negative/negative cancels out, still a proper fraction. +test("should return true when both numerator and denominator are negative and |numerator| < |denominator|", () => { + expect(isProperFraction(-3, -7)).toEqual(true); +}); + +// Case 9: Large numbers +// It should handle large numbers correctly. +test("should return true for large proper fractions", () => { + expect(isProperFraction(999, 1000)).toEqual(true); +}); -// Case 4: Identify Equal Numerator and Denominator: 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..89cef94da 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"); + }); +}); \ No newline at end of file