From a847980402205586575e8c9ae2d32aa7873da821 Mon Sep 17 00:00:00 2001 From: Enice-Codes Date: Thu, 13 Aug 2026 01:19:48 +0200 Subject: [PATCH] Complete Sprint 3 implement-and-rewrite exercises --- .../implement/1-get-angle-type.js | 35 +++++++++++-- .../implement/2-is-proper-fraction.js | 20 ++++++++ .../implement/3-get-card-value.js | 50 +++++++++++++++++-- .../1-get-angle-type.test.js | 25 +++++++++- .../2-is-proper-fraction.test.js | 14 ++++++ .../3-get-card-value.test.js | 22 ++++++-- 6 files changed, 154 insertions(+), 12 deletions(-) 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..19140f90a8 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 @@ -1,3 +1,4 @@ + // Implement a function getAngleType // // When given an angle in degrees, it should return a string indicating the type of angle: @@ -13,9 +14,19 @@ // Acceptance criteria: // After you have implemented the function, write tests to cover all the cases, and // execute the code to ensure all tests pass. - function getAngleType(angle) { - // TODO: Implement this function + if (angle > 0 && angle < 90) + return "Acute angle"; + else if (angle === 90) + return "right 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"; + else + return "Invalid angle"; } // The line below allows us to load the getAngleType function into tests in other files. @@ -34,4 +45,22 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all cases, including boundary and invalid cases. // Example: Identify Right Angles const right = getAngleType(90); -assertEquals(right, "Right angle"); +assertEquals(right, "right angle"); + +const acute = getAngleType(45); +assertEquals(acute, 'Acute angle'); + +const obtuse = getAngleType(120); +assertEquals(obtuse,'obtuse angle') + +const straight = getAngleType(180); +assertEquals(straight, 'straight angle'); + +const reflex = getAngleType(270); +assertEquals(reflex, 'reflex angle'); + +const invalid1 = getAngleType(-10); +assertEquals(invalid1, 'Invalid angle'); + +const invalid2 = getAngleType(400); +assertEquals(invalid2, 'Invalid 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 970cb9b641..7fa94535da 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 @@ -12,6 +12,14 @@ function isProperFraction(numerator, denominator) { // TODO: Implement this function + if (denominator === 0){ + return false; + + } + if (numerator < denominator && numerator > 0){ + return true; + } + return false; } // The line below allows us to load the isProperFraction function into tests in other files. @@ -31,3 +39,15 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); + +// example: 4/3 is not a proper fraction +assertEquals(isProperFraction(4, 3), false); + +// example: 6/5 is not a proper fraction +assertEquals(isProperFraction(6, 5), false); + +// example: 0/5 is a proper fraction +assertEquals(isProperFraction(0, 5), true); + +// example: 5/0 is not a proper fraction +assertEquals(isProperFraction(5, 0), false); \ No newline at end of file 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..edf7449283 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,23 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const rank = card.slice(0, -1); // everything except the last character (suit) + const validSuits = ["♠", "♥", "♦", "♣"]; + const suit = card.slice(-1); + + if (!validSuits.includes(suit)) { + throw new Error("Invalid card"); + } + + if (rank === "A") { + return 11; + } else if (rank === "J" || rank === "Q" || rank === "K") { + return 10; + } else if (["2","3","4","5","6","7","8","9","10"].includes(rank)) { + return Number(rank); + } else { + throw new Error("Invalid card"); + } } // The line below allows us to load the getCardValue function into tests in other files. @@ -46,9 +62,37 @@ try { getCardValue("invalid"); // This line will not be reached if an error is thrown as expected - console.error("Error was not thrown for invalid card 😢"); + console.error("Error was not thrown for invalid card "); } catch (e) { - console.log("Error thrown for invalid card 🎉"); + console.log("Error thrown for invalid card "); } +assertEquals(getCardValue("A♠"), 11); +assertEquals(getCardValue("J♣"), 10); +assertEquals(getCardValue("Q♦"), 10); +assertEquals(getCardValue("K♥"), 10); +assertEquals(getCardValue("2♠"), 2); +assertEquals(getCardValue("3♥"), 3); + +// What other valid card cases can you think of? +function assertEqual(func, message) { + try { + func(); + console.log("Valid card test passed: " + message); + } catch (e) { + console.error("Valid card test failed: " + message + " — " + e.message); + } +} // What other invalid card cases can you think of? + function assertThrows(func, errorMessage) { + try { + func(); + console.error("Error was not thrown "); + } catch (e) { + if (e.message === errorMessage) { + console.log("Error thrown as expected "); + } else { + console.error(`Unexpected error message: ${e.message}`); + } + } +} \ 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 d777f348d3..33af2c967a 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 @@ -6,7 +6,7 @@ const getAngleType = require("../implement/1-get-angle-type"); // including boundary and invalid cases. // Case 1: Acute angles -test(`should return "Acute angle" when (0 < angle < 90)`, () => { +test(`should return "Acute angle" when (0 < angle && angle < 90)`, () => { // Test various acute angles, including boundary cases expect(getAngleType(1)).toEqual("Acute angle"); expect(getAngleType(45)).toEqual("Acute angle"); @@ -14,7 +14,28 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => { }); // Case 2: Right angle +test (`should return "right angle" when (angle === 90)`,() => { + // testing various angles ,including boundary cases + expect( getAngleType(90)).toEqual("right angle"); + }); // Case 3: Obtuse angles +test (`should return "obtuse angle" when (90 < angle && angle < 180)`, () => { +expect(getAngleType(91)).toEqual("obtuse angle"); +expect(getAngleType(125)).toEqual("obtuse angle"); +expect(getAngleType(172)).toEqual("obtuse angle"); +}); // Case 4: Straight angle -// Case 5: Reflex angles +test(`should return "straight angle" when (angle === 180)`, () => { + expect(getAngleType(180)).toEqual("straight angle"); +}); +// Case 5: Reflex angles\ +test(`should return "reflex angle" when (180 < angle && angle < 360)`, () => { + expect(getAngleType(181)).toEqual("reflex angle"); + expect(getAngleType(270)).toEqual("reflex angle"); + expect(getAngleType(359)).toEqual("reflex angle"); +}); // Case 6: Invalid angles +test(`should return "Invalid angle" when (angle < 0 || angle > 360)`, () => { + expect(getAngleType(-1)).toEqual("Invalid angle"); + expect(getAngleType(361)).toEqual("Invalid 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 7f087b2ba1..69cda3bf52 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,17 @@ const isProperFraction = require("../implement/2-is-proper-fraction"); test(`should return false when denominator is zero`, () => { expect(isProperFraction(1, 0)).toEqual(false); }); + +// special case : numerator is one +test(` should return true when the numerator is one and denominator is greater than one`, () => { + expect(isProperFraction(1, 2)).toEqual(true); +}); +// special case : denominator is negative to the numerator +test(`should return false when the denominator is negative and the numerator is positive`, () => { + expect(isProperFraction(1, -2)).toEqual(false); +}); + +// special case : denominator is negative to the numerator +test(`should return false when the numerator is negative and the denominator is positive`, () => { + expect(isProperFraction(-1, 2)).toEqual(false); +}); \ 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 cf7f9dae2e..3786982ab6 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 @@ -9,10 +9,24 @@ test(`Should return 11 when given an ace card`, () => { expect(getCardValue("A♠")).toEqual(11); }); -// Suggestion: Group the remaining test data into these categories: -// Number Cards (2-10) -// Face Cards (J, Q, K) -// Invalid Cards +// case 2 : face cards (J, Q, K) +test(`Should return 10 when given a face card`, () => { + expect(getCardValue("J♠")).toEqual(10); + expect(getCardValue("Q♥")).toEqual(10); + expect(getCardValue("K♦")).toEqual(10); +}); + +// Case 3: Number Cards (2-10) +test(`Should return the correct value when given a number card`, () => { + expect(getCardValue("2♠")).toEqual(2); + expect(getCardValue("5♥")).toEqual(5); + expect(getCardValue("10♦")).toEqual(10); +}); + +// Case 4: Invalid Cards +test(`Should throw an error when given an invalid card`, () => { + expect(() => getCardValue("invalid")).toThrow("Invalid card"); +}); // To learn how to test whether a function throws an error as expected in Jest, // please refer to the Jest documentation: