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..5ebdac050 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 @@ -10,9 +10,16 @@ function getAngleType(angle) { if (angle === 90) { return "Right angle"; + } else if (angle < 90) { + return "Acute angle"; + } else if (angle > 90 && angle < 180) { + return "Obtuse angle"; + } else if (angle === 180) { + return "Straight angle"; + } else if (angle > 180 && angle < 360) { + return "Reflex 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. + } // The line below allows us to load the getAngleType function into tests in other files. @@ -51,13 +58,18 @@ assertEquals(acute, "Acute angle"); // 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"); \ 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..f078928ed 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,8 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { - if (numerator < denominator) { - return true; - } + + return numerator < denominator; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -47,6 +46,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 +54,13 @@ 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); 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..30ce7ab47 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,8 +8,16 @@ // 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); // Get everything except the last char (the suit) + if (rank === "A") { return 11; + } else if (["K", "Q", "J", "10"].includes(rank)) { + return 10; + } else if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) { + return Number(rank); + } else { + throw new Error(`Invalid card rank: "${rank}"`); // rather than just "Invalid card rank" we can show the actual rank that was invalid } } @@ -40,18 +48,41 @@ assertEquals(aceofSpades, 11); // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 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 jackofClubs = getCardValue("J♣"); +assertEquals(jackofClubs, 10); +const queenofHearts = getCardValue("Q♥"); +assertEquals(queenofHearts, 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♠"); +// ====> write your test here, and then add a line to pass the test in the function above +try { + invalidCard(); + console.assert(false, "Expected an error to be thrown for invalid card rank"); +} catch (e) { + console.assert( + e.message === 'Invalid card rank: "1"', // rather than just "Invalid card rank" we can show the actual rank that was invalid + `Expected error message to be "Invalid card rank" but got "${e.message}"` + ); +} + 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..2c4158a90 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,34 @@ 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° 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" +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° and <360°)", () => { + expect(getAngleType(270)).toEqual("Reflex angle"); +}); + + +// We can run this test file using the command `npx jest 1-get-angle-type.test.js` +// in the terminal. Making sure we are in the directory where this file is located. +// If we have Jest installed globally, you can simply run `jest 1-get-angle-type.test.js` +// instead. If you have added a test script to your package.json file, you can also run +// `npm test 1-get-angle-type.test.js` to execute the tests. \ No newline at end of file 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..95f26970d 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 @@ -7,7 +7,22 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 3)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return false for a negative fraction", () => { + expect(isProperFraction(-2, 3)).toEqual(false); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal numerator and denominator", () => { + expect(isProperFraction(4, 4)).toEqual(false); +}); + +// We can run this test file using the command `npx jest 2-is-proper-fraction.test.js` +// in the terminal. Making sure we are in the directory where this file is located. +// If we have Jest installed globally, you can simply run `jest 2-is-proper-fraction.test.js` +// instead. If you have added a test script to your package.json file, you can also run +// `npm test 2-is-proper-fraction.test.js` to execute the tests. \ 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 04418ff72..dcc31d707 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,49 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return correct value for number cards (2-10)", () => { + expect(getCardValue("2♣")).toEqual(2); + expect(getCardValue("5♦")).toEqual(5); + expect(getCardValue("10♥")).toEqual(10); +}); + // Case 3: Handle Face Cards (J, Q, K): +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 (A): +test("should return 11 for Ace (A)", () => { + expect(getCardValue("A♣")).toEqual(11); + expect(getCardValue("A♦")).toEqual(11); + expect(getCardValue("A♥")).toEqual(11); +}); // Case 5: Handle Invalid Cards: + +test("should throw an error for invalid input '1♣'", () => { + expect(() => getCardValue("1♣")).toThrow('Invalid card rank: "1"'); +}); + +test("should throw an error for invalid input '1♦'", () => { + expect(() => getCardValue("1♦")).toThrow('Invalid card rank: "1"'); +}); + +test("should throw an error for invalid input 'B♥'", () => { + expect(() => getCardValue("B♥")).toThrow('Invalid card rank: "B"'); +}); + +test("should throw an error for invalid input 'Z♠'", () => { + expect(() => getCardValue("Z♠")).toThrow('Invalid card rank: "Z"'); +}); + +test("should throw an error for empty string", () => { + expect(() => getCardValue("")).toThrow('Invalid card rank: ""'); +}); + + +// We can run this test file using the command `npx jest 3-get-card-value.test.js` +// in the terminal. Making sure we are in the directory where this file is located. +// If we have Jest installed globally, you can simply run `3-get-card-value.test.js` +// instead. If you have added a test script to your package.json file, you can also run +// `npm test 3-get-card-value.test.js` to execute the tests. \ No newline at end of file