From f7238090c921e1c8c7a0e211ee5e45faef6de5e8 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Fri, 31 Oct 2025 18:25:17 +0000 Subject: [PATCH 01/11] Sprint-3-implement 1-get-angle-type.js all assertions and necessary functions added --- .../implement/1-get-angle-type.js | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 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 ca1dfe7f2..f696075de 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,10 +10,23 @@ 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. -} + // 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. // This will be useful in the "rewrite tests with jest" step. @@ -50,14 +63,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 straightangle = getAngleType(180); +assertEquals(straightangle, "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"); + +// Sprint-3-implement 1-get-angle-type.js all assertions and necessary functions added \ No newline at end of file From ac087578ad33c3c72de942dcd8504ef5de129cf8 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Fri, 31 Oct 2025 19:01:49 +0000 Subject: [PATCH 02/11] // Sprint-3-implement 1-is-proper-fraction.js all assertions and necessary functions added --- .../implement/2-is-proper-fraction.js | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) 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..b0a3e43b4 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 @@ -11,6 +11,18 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) { return true; } + else if (numerator > denominator){ + return false; + } + else if (numerator === denominator) { + return false; + } + else if (numerator === 0){ + retrurn (false); + } + else if (denominator === 0){ + return (false); + } } // The line below allows us to load the isProperFraction function into tests in other files. @@ -46,14 +58,24 @@ 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); +assertEquals(equalFraction, false); // ====> complete with your assertion // Stretch: // What other scenarios could you test for? + +const numeratorZero = isProperFraction(0, 5); +assertEquals(numeratorZero, true); + +const denominatorrZero = isProperFraction(5, 0); +assertEquals(denominatorrZero, false); + +// Sprint-3-implement 1-is-proper-fraction.js all assertions and necessary functions added + From 2c28a87fd54425977f13f1db381cb651bed8c0f5 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Fri, 31 Oct 2025 19:31:09 +0000 Subject: [PATCH 03/11] Corrected an error in the code --- .../implement/2-is-proper-fraction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b0a3e43b4..eed7de8b8 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 @@ -18,7 +18,7 @@ function isProperFraction(numerator, denominator) { return false; } else if (numerator === 0){ - retrurn (false); + retrurn (true); } else if (denominator === 0){ return (false); From 5d979ed5087e39cbdef9faf69be8b0882049ebfc Mon Sep 17 00:00:00 2001 From: UbunMen Date: Fri, 31 Oct 2025 19:33:30 +0000 Subject: [PATCH 04/11] Modified -implement -is-proper-fraction.js --- .../implement/3-get-card-value.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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..d60ba1cbd 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 @@ -28,7 +28,9 @@ function assertEquals(actualOutput, targetOutput) { } // Acceptance criteria: -// 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), +// 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♠"); From 5f2e94622f467401e90fa6520fd514bc291ae310 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Sat, 1 Nov 2025 16:44:21 +0000 Subject: [PATCH 05/11] Sprint-3 -3-get-card-value.js Functions, assertion and invalid rank tested --- .../implement/3-get-card-value.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) 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 d60ba1cbd..ae11725cc 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,20 @@ // 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; } + else if (["K", "J", "Q", "10"].includes(rank)){ + return 10; + } + else if (!isNaN(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. @@ -41,19 +52,38 @@ 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): // 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 faceCards = getCardValue("J♥"); +assertEquals(faceCards, 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 aceCards = getCardValue("A♣"); +assertEquals(aceCards, 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." + +try { + getCardValue("Z♣"); // invalid card + console.log("Test failed: no error thrown"); +} catch (error) { + assertEquals(error.message, "Invalid Card"); +} \ No newline at end of file From ba5537df13288a43d46a01c0a68425011d533243 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Sat, 1 Nov 2025 17:24:37 +0000 Subject: [PATCH 06/11] Sprint-3 rewrite-tests-with jest 1-get-angle-type-test.js tests conducted --- .../1-get-angle-type.test.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) 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..6d507fb0b 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 @@ -13,14 +13,33 @@ test("should identify right angle (90°)", () => { // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify actue angle (40°)", () => { + expect(getAngleType(40)).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 (120°)", () => { + 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 (240)", () => { + expect(getAngleType(240)).toEqual("Reflex angle"); +}); + + +// Sprint-3 rewrite-tests-with jest 1-get-angle-type-test.js tests conducted \ No newline at end of file From 26e660eb26315456015e9da813edbfc15dc82679 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Sat, 1 Nov 2025 17:38:37 +0000 Subject: [PATCH 07/11] Modified Typo --- .../implement/2-is-proper-fraction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eed7de8b8..115971ebf 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 @@ -18,7 +18,7 @@ function isProperFraction(numerator, denominator) { return false; } else if (numerator === 0){ - retrurn (true); + return (true); } else if (denominator === 0){ return (false); From 49307429a0881064ccf0619836a13b1b539feb47 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Sat, 1 Nov 2025 17:42:48 +0000 Subject: [PATCH 08/11] // Sprint-3 ewrite-tests-with-jest/2-is-proper-fraction.test.js. rewrote tests in jest --- .../2-is-proper-fraction.test.js | 11 +++++++++++ 1 file changed, 11 insertions(+) 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..4534a80b8 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,18 @@ 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 true for a negative fraction", () => { + expect(isProperFraction(-2, 3)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal numerator and denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +// Sprint-3 ewrite-tests-with-jest/2-is-proper-fraction.test.js. rewrote tests in jest \ No newline at end of file From c68a37cd89a4c66b85632ee9bef3dc5787dd10c5 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Sat, 1 Nov 2025 18:01:22 +0000 Subject: [PATCH 09/11] Sprint-3 rewrite-tests-with-jest/2-get-card-value.test.js. rewrote tests using jest --- .../3-get-card-value.test.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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..3852fb1d9 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,23 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should number cards for (2-10)", () => { + const aceofSpades = getCardValue("5♠"); + expect(aceofSpades).toEqual(5); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for face cards", () => { + const aceofSpades = getCardValue("Q♠"); + expect(aceofSpades).toEqual(10); +}); // Case 4: Handle Ace (A): +// test("should return 11 for Ace of Spades", () => { +// const aceofSpades = getCardValue("A♠"); +// expect(aceofSpades).toEqual(11); +// }); // Case 5: Handle Invalid Cards: +test("should throw an error for invalid cards", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid Card"); +}); +// Sprint-3 rewrite-tests-with-jest/2-get-card-value.test.js. rewrote tests using jest From b57c40460c69716911bb141fcbaeaf9cbdfa7381 Mon Sep 17 00:00:00 2001 From: UbunMen Date: Wed, 5 Nov 2025 21:40:45 +0000 Subject: [PATCH 10/11] Few modifications done. --- .../implement/3-get-card-value.js | 8 +++++--- .../rewrite-tests-with-jest/3-get-card-value.test.js | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) 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 ae11725cc..23d355506 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 @@ -51,8 +51,8 @@ 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♥"); -assertEquals(fiveofHearts, 5); +const numberCards = getCardValue("5♥"); +assertEquals(numberCards, 5); // ====> write your test here, and then add a line to pass the test in the function above @@ -86,4 +86,6 @@ try { console.log("Test failed: no error thrown"); } catch (error) { assertEquals(error.message, "Invalid Card"); -} \ No newline at end of file +} + +// Functions, assertion and invalid rank tested \ 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 3852fb1d9..6f0db25ea 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 @@ -28,3 +28,4 @@ test("should throw an error for invalid cards", () => { expect(() => getCardValue("Z♠")).toThrow("Invalid Card"); }); // Sprint-3 rewrite-tests-with-jest/2-get-card-value.test.js. rewrote tests using jest +// Few modifications done. From 0a1ed8cb760253b163af053117e3473b9a8daa0f Mon Sep 17 00:00:00 2001 From: UbunMen Date: Wed, 5 Nov 2025 22:16:15 +0000 Subject: [PATCH 11/11] Little change made --- .../rewrite-tests-with-jest/3-get-card-value.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6f0db25ea..e5c034801 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,8 +9,8 @@ test("should return 11 for Ace of Spades", () => { // Case 2: Handle Number Cards (2-10): test("should number cards for (2-10)", () => { - const aceofSpades = getCardValue("5♠"); - expect(aceofSpades).toEqual(5); + const aceofSpades = getCardValue("6♠"); + expect(aceofSpades).toEqual(6); }); // Case 3: Handle Face Cards (J, Q, K):