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..edc488346 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,24 @@ 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. + // Case 2: Identify Acute Angles + else if (angle < 90) { + return "Acute angle"; + } + // Case 3: Identify Obtuse Angles + else if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } + // Case 4: Identify Straight Angles + else if (angle === 180) { + return "Straight angle"; + } + // Case 5: Identify Reflex Angles + 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. @@ -50,14 +66,18 @@ 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 +const reflex = getAngleType(270); +assertEquals(reflex, "Reflex angle"); + +console.log("All tests completed"); 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..b4d49f254 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,8 +8,11 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { + // Case 1 & general case: numerator < denominator + if (Math.abs(numerator) < Math.abs(denominator)) { return true; + } else { + return false; } } @@ -26,7 +29,7 @@ function assertEquals(actualOutput, targetOutput) { } // Acceptance criteria: - +// // Proper Fraction check: // Input: numerator = 2, denominator = 3 // target output: true @@ -46,14 +49,22 @@ 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); -// ====> complete with your assertion +assertEquals(negativeFraction, true); // Equal Numerator and Denominator check: // Input: numerator = 3, denominator = 3 // 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); -// ====> complete with your assertion +assertEquals(equalFraction, false); + +// Stretch: other scenarios +// Zero numerator check (0/x should always be proper if x != 0) +const zeroNumerator = isProperFraction(0, 5); +assertEquals(zeroNumerator, true); + +// Negative denominator check (-2/5 is proper) +const negativeDenominator = isProperFraction(2, -5); +assertEquals(negativeDenominator, true); -// Stretch: -// What other scenarios could you test for? +console.log("All tests completed"); 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..1fcd09ae5 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 @@ -7,10 +7,47 @@ // complete the rest of the tests and cases // 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) { + // Extract rank by removing the last character (the suit) + const rank = card.slice(0, -1); + + // Handle Ace if (rank === "A") { return 11; } + + // Handle face cards + if (["J", "Q", "K"].includes(rank) || rank === "10") { + return 10; + } + + // Handle number cards 2-10 + const validRanks = [ + "A", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "J", + "Q", + "K", + ]; + + // Check if rank is valid + if (!validRanks.includes(rank)) { + throw new Error("Invalid card rank."); + } + + // Return correct values + if (rank === "A") return 11; + if (["J", "Q", "K"].includes(rank)) return 10; + return Number(rank); // for 2–10 } // The line below allows us to load the getCardValue function into tests in other files. @@ -26,32 +63,49 @@ function assertEquals(actualOutput, targetOutput) { `Expected ${actualOutput} to equal ${targetOutput}` ); } + // Acceptance criteria: +// Case 1: Ace card // Given a card string in the format "A♠" (representing a card in blackjack - the last character will always be an emoji for a suit, and all characters before will be a number 2-10, or one letter of J, Q, K, A), // When the function getCardValue is called with this card string as input, // Then it should return the numerical card value const aceofSpades = getCardValue("A♠"); assertEquals(aceofSpades, 11); -// Handle Number Cards (2-10): +// Case 2: Number Cards (2-10) // 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). +// Then it should return the numeric value corresponding to the rank const fiveofHearts = getCardValue("5♥"); -// ====> write your test here, and then add a line to pass the test in the function above +assertEquals(fiveofHearts, 5); + +const tenofDiamonds = getCardValue("10♦"); +assertEquals(tenofDiamonds, 10); -// Handle Face Cards (J, Q, K): -// Given a card with a rank of "10," "J," "Q," or "K", +// Case 3: Face Cards (J, Q, K) +// Given a card with a rank of "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. +// Then it should return 10 +// +const jackofClubs = getCardValue("J♣"); +assertEquals(jackofClubs, 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 queenofHearts = getCardValue("Q♥"); +assertEquals(queenofHearts, 10); -// Handle Invalid Cards: +const kingofSpades = getCardValue("K♠"); +assertEquals(kingofSpades, 10); + +// Case 4: 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." +// Then it should throw an error +try { + getCardValue("X♠"); + console.error("Expected error for invalid card rank"); +} catch (error) { + assertEquals(error.message, "Invalid card rank."); +} + +console.log("All tests completed"); 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..0d51862cc 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 @@ -1,26 +1,32 @@ // This statement loads the getAngleType function you wrote in the implement directory. -// We will use the same function, but write tests for it using Jest in this file. const getAngleType = require("../implement/1-get-angle-type"); +// Case 1: Identify Right Angles test("should identify right angle (90°)", () => { expect(getAngleType(90)).toEqual("Right angle"); }); -// REPLACE the comments with the tests -// make your test descriptions as clear and readable as possible - -// Case 2: Identify Acute Angles: -// When the angle is less than 90 degrees, -// Then the function should return "Acute angle" +// Case 2: Identify Acute Angles +// +// When the angle is less than 90 degrees, it 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" +// Case 3: Identify Obtuse Angles +// When the angle is greater than 90 degrees and less than 180 degrees, it should return "Obtuse angle" +test("should identify obtuse angle (>90° and <180°)", () => { + 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" +// Case 4: Identify Straight Angles +// When the angle is exactly 180 degrees, it 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" +// Case 5: Identify Reflex Angles +// When the angle is greater than 180 degrees and less than 360 degrees, it should return "Reflex angle" +test("should identify reflex angle (>180° and <360°)", () => { + 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..d1063de48 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,54 @@ -// 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 +test("should return true for a proper fraction (numerator < denominator)", () => { expect(isProperFraction(2, 3)).toEqual(true); }); +// -// Case 2: Identify Improper Fractions: +// Case 2: Improper fraction +test("should return false for an improper fraction (numerator > denominator)", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); + +// // Case 3: Negative fraction +// test("should return true for a negative proper fraction (numerator < denominator)", () => { +// expect(isProperFraction(-4, 7)).toEqual(true); +// }); + +// Case 4: Numerator equal to denominator +test("should return false when numerator equals denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +// Optional: Zero numerator +test("should return true when numerator is zero", () => { + expect(isProperFraction(0, 5)).toEqual(true); +}); + +// // Case 5: Negative denominator +// test("should return true when denominator is negative and proper", () => { +// expect(isProperFraction(2, -5)).toEqual(true); +// }); + +//handle all negative number scenarios -// Case 3: Identify Negative Fractions: +test("should correctly handle all negative number scenarios", () => { + const cases = [ + // Proper negatives (absolute numerator < absolute denominator) + [-4, 7, true, "-4/7 proper fraction"], + [4, -7, true, "4/-7 proper fraction"], + [-2, -5, true, "-2/-5 proper fraction"], -// Case 4: Identify Equal Numerator and Denominator: + // Improper negatives (absolute numerator >= absolute denominator) + [-5, 2, false, "-5/2 improper fraction"], + [5, -2, false, "5/-2 improper fraction"], + [-7, -4, false, "-7/-4 improper fraction"], + + // Edge equal case + [-3, -3, false, "-3/-3 equal fraction"], + ]; + for (const [num, den, expected, desc] of cases) { + expect(isProperFraction(num, den)).toBe(expected); + } +}); 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..4685396c5 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 @@ -2,12 +2,36 @@ // We will use the same function, but write tests for it using Jest in this file. const getCardValue = require("../implement/3-get-card-value"); +// Case 1: Handle Ace test("should return 11 for Ace of Spades", () => { const aceofSpades = getCardValue("A♠"); expect(aceofSpades).toEqual(11); }); -// Case 2: Handle Number Cards (2-10): -// Case 3: Handle Face Cards (J, Q, K): -// Case 4: Handle Ace (A): -// Case 5: Handle Invalid Cards: +// Case 2: Handle Number Cards (2-10) +// When the card is "2" to "10", it should return the numeric value +test("should return the correct value for number cards", () => { + expect(getCardValue("5♥")).toEqual(5); + expect(getCardValue("2♦")).toEqual(2); + expect(getCardValue("10♣")).toEqual(10); +}); + +// Case 3: Handle Face Cards (J, Q, K) +// When the card is "J", "Q", or "K", it should return 10 +test("should return 10 for face cards J, Q, K", () => { + expect(getCardValue("J♣")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♠")).toEqual(10); +}); + +// Case 4: Handle Ace (already handled in Case 1, but can check another suit) +test("should return 11 for Ace of Hearts", () => { + expect(getCardValue("A♥")).toEqual(11); +}); +// +// Case 5: Handle Invalid Cards +// If the card rank is invalid, it should throw an error +test("should throw error for invalid cards", () => { + expect(() => getCardValue("X♠")).toThrow("Invalid card rank."); + expect(() => getCardValue("11♣")).toThrow("Invalid card rank."); +});