From 861486503fdfabbd92112dae5ae651ae8b6c2266 Mon Sep 17 00:00:00 2001 From: mirabellemorah Date: Mon, 30 Jun 2025 18:30:45 +0100 Subject: [PATCH 1/3] Provided answers to 1-key-implement --- Sprint-3/1-key-implement/1-get-angle-type.js | 17 ++++++--- .../1-key-implement/2-is-proper-fraction.js | 13 +++++-- Sprint-3/1-key-implement/3-get-card-value.js | 36 +++++++++++++++++-- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/Sprint-3/1-key-implement/1-get-angle-type.js b/Sprint-3/1-key-implement/1-get-angle-type.js index 08d1f0cba..8ede6fd7e 100644 --- a/Sprint-3/1-key-implement/1-get-angle-type.js +++ b/Sprint-3/1-key-implement/1-get-angle-type.js @@ -8,8 +8,13 @@ // Then, write the next test! :) Go through this process until all the cases are implemented function getAngleType(angle) { - if (angle === 90) return "Right angle"; - // read to the end, complete line 36, then pass your test here + if (angle === 90) return "Right angle"; + // read to the end, complete line 36, then pass your test here + 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"; + else return "Invalid angle"; } // we're going to use this helper function to make our assertions easier to read @@ -43,14 +48,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 +// ====> 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"); diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index 91583e941..0c8f68563 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -8,7 +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; + if (numerator < denominator) return true; + if (numerator >= denominator) return false; } // here's our helper again @@ -40,14 +41,20 @@ 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: // What other scenarios could you test for? +// Zero Denominator check: +// Input: numerator = 1, denominator = 0 +// target output: false +// Explanation: The fraction 1/0 is undefined because division by zero is not allowed. The function should return false. +const zeroDenominator = isProperFraction(1, 0); +assertEquals(zeroDenominator, false); diff --git a/Sprint-3/1-key-implement/3-get-card-value.js b/Sprint-3/1-key-implement/3-get-card-value.js index aa1cc9f90..404adaf77 100644 --- a/Sprint-3/1-key-implement/3-get-card-value.js +++ b/Sprint-3/1-key-implement/3-get-card-value.js @@ -8,7 +8,14 @@ // 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) { - if (rank === "A") return 11; + const rank = card.slice(0, -1); + if (rank === "A") return 11; + + if (["K", "Q", "J", "10"].includes(rank)) return 10; + const num = Number(rank); + if (num >= 2 && num <= 9) return num; + + throw new Error("Invalid card rank"); } // You need to write assertions for your function to check it works in different cases @@ -33,19 +40,44 @@ 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♥"); -// ====> 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 tenofDiamonds = getCardValue("10♦"); +assertEquals(tenofDiamonds, 10); + +const jackofClubs = getCardValue("J♣"); +assertEquals(jackofClubs, 10); + +const queenofSpades = getCardValue("Q♠"); +assertEquals(queenofSpades, 10); + +const kingofHearts = getCardValue("K♥"); +assertEquals(kingofHearts, 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." + +try { + getCardValue("1♠"); + console.assert(false, "Expected an error to be thrown for invalid card"); +} catch (e) { + console.assert( + e.message === "Invalid card rank", + `Expected error message "Invalid card rank", got "${e.message}"` + ); +} From 21679f7b93f77403833f62c7dc19c1d9f5818922 Mon Sep 17 00:00:00 2001 From: mirabellemorah Date: Mon, 30 Jun 2025 18:57:52 +0100 Subject: [PATCH 2/3] Provided answers to 2-mandatory-rewrite --- .../1-key-implement/2-is-proper-fraction.js | 2 ++ .../2-mandatory-rewrite/1-get-angle-type.js | 19 ++++++++----------- .../1-get-angle-type.test.js | 16 ++++++++++++++++ .../2-is-proper-fraction.js | 8 ++++---- .../2-is-proper-fraction.test.js | 9 +++++++++ .../2-mandatory-rewrite/3-get-card-value.js | 13 ++++++++++--- .../3-get-card-value.test.js | 18 ++++++++++++++++++ 7 files changed, 67 insertions(+), 18 deletions(-) diff --git a/Sprint-3/1-key-implement/2-is-proper-fraction.js b/Sprint-3/1-key-implement/2-is-proper-fraction.js index 0c8f68563..c89190e0e 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -8,8 +8,10 @@ // write one test at a time, and make it pass, build your solution up methodically function isProperFraction(numerator, denominator) { + if (denominator === 0) return false; if (numerator < denominator) return true; if (numerator >= denominator) return false; + } // here's our helper again diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js index d61254bd7..acd053d3d 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,18 +1,15 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; - // replace with your completed function from key-implement - + // read to the end, complete line 36, then pass your test here + 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"; + else return "Invalid angle"; } - - - - - - - // Don't get bogged down in this detail // Jest uses CommonJS module syntax by default as it's quite old -// We will upgrade our approach to ES6 modules in the next course module, so for now +// We will upgrade our approach to ES6 modules in the next course module, so for now // we have just written the CommonJS module.exports syntax for you -module.exports = getAngleType; \ No newline at end of file +module.exports = getAngleType; diff --git a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js index b62827b7c..0ec2c3376 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.test.js @@ -11,14 +11,30 @@ test("should identify right angle (90°)", () => { // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify acute angle (45°)", () => { + 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 (135°)", () => { + expect(getAngleType(135)).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 (270°)", () => { + expect(getAngleType(270)).toEqual("Reflex angle"); +}); diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js index 9836fe398..3b41d492b 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js @@ -1,6 +1,6 @@ function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; - // add your completed function from key-implement here + if (denominator === 0) return false; + if (numerator < denominator) return true; + if (numerator >= denominator) return false; } - -module.exports = isProperFraction; \ No newline at end of file +module.exports = isProperFraction; diff --git a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js index ff1cc8173..7431fa82d 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.test.js @@ -5,7 +5,16 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return false for a negative fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal numerator and denominator", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js index 0d95d3736..846bdc0d8 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.js @@ -1,5 +1,12 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + const rank = card.slice(0, -1); + if (rank === "A") return 11; + + if (["K", "Q", "J", "10"].includes(rank)) return 10; + const num = Number(rank); + if (num >= 2 && num <= 9) return num; + + throw new Error("Invalid card rank"); } -module.exports = getCardValue; \ No newline at end of file + +module.exports = getCardValue; diff --git a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js index 03a8e2f34..5d5bff7b9 100644 --- a/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js +++ b/Sprint-3/2-mandatory-rewrite/3-get-card-value.test.js @@ -6,6 +6,24 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return 5 for 5 of Hearts", () => { + const fiveofHearts = getCardValue("5♥"); + expect(fiveofHearts).toEqual(5); +}); + // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for Jack of Diamonds", () => { + const jackofDiamonds = getCardValue("J♦"); + expect(jackofDiamonds).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 card", () => { + expect(() => getCardValue("Invalid")).toThrow("Invalid card rank"); +}); From adae98b85575b36d8ef4046d691cf5014b2d588e Mon Sep 17 00:00:00 2001 From: mirabellemorah Date: Mon, 30 Jun 2025 19:45:06 +0100 Subject: [PATCH 3/3] Provided answers to 3-mandatory-practice/implement --- .../3-mandatory-practice/implement/count.js | 10 +++++-- .../implement/count.test.js | 7 +++++ .../implement/get-ordinal-number.js | 14 +++++++-- .../implement/get-ordinal-number.test.js | 12 ++++++-- .../3-mandatory-practice/implement/repeat.js | 14 +++++++-- .../implement/repeat.test.js | 30 +++++++++++++++---- 6 files changed, 73 insertions(+), 14 deletions(-) diff --git a/Sprint-3/3-mandatory-practice/implement/count.js b/Sprint-3/3-mandatory-practice/implement/count.js index fce249650..d59e425d6 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,11 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + count++; + } + } + return count; } -module.exports = countChar; \ No newline at end of file +module.exports = countChar; diff --git a/Sprint-3/3-mandatory-practice/implement/count.test.js b/Sprint-3/3-mandatory-practice/implement/count.test.js index 42baf4b4b..2cc8c4515 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -22,3 +22,10 @@ test("should count multiple occurrences of a character", () => { // And a character char that does not exist within the case-sensitive str, // When the function is called with these inputs, // Then it should return 0, indicating that no occurrences of the char were found in the case-sensitive str. + +test("should return 0 when character does not exist in the string", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js index 24f528b0d..39cac0e3c 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.js @@ -1,5 +1,15 @@ function getOrdinalNumber(num) { - return "1st"; + if (typeof num !== "number" || !Number.isInteger(num)) { + throw new Error("Input must be an integer."); + } + + const suffixes = ["th", "st", "nd", "rd"]; + const remainder = num % 100; + + return ( + num + + (suffixes[(remainder - 20) % 10] || suffixes[remainder] || suffixes[0]) + ); } -module.exports = getOrdinalNumber; \ No newline at end of file +module.exports = getOrdinalNumber; diff --git a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js index 6d55dfbb4..ef27cdcd9 100644 --- a/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js +++ b/Sprint-3/3-mandatory-practice/implement/get-ordinal-number.test.js @@ -9,5 +9,13 @@ const getOrdinalNumber = require("./get-ordinal-number"); // Then the function should return "1st" test("should return '1st' for 1", () => { - expect(getOrdinalNumber(1)).toEqual("1st"); - }); + expect(getOrdinalNumber(1)).toEqual("1st"); +}); + +test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); +}); + +test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..652ea3a62 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,13 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (typeof str !== "string") { + throw new Error("Input must be a string."); + } + + if (!Number.isInteger(count) || count < 0) { + throw new Error("Count must be a non-negative integer"); + } + + return str.repeat(count); } -module.exports = repeat; \ No newline at end of file +module.exports = repeat; diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.test.js b/Sprint-3/3-mandatory-practice/implement/repeat.test.js index 8a4ab42ef..a61ea79c9 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -10,23 +10,43 @@ const repeat = require("./repeat"); // Then it should repeat the str count times and return a new string containing the repeated str values. test("should repeat the string count times", () => { - const str = "hello"; - const count = 3; - const repeatedStr = repeat(str, count); - expect(repeatedStr).toEqual("hellohellohello"); - }); + const str = "hello"; + const count = 3; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("hellohellohello"); +}); // case: handle Count of 1: // Given a target string str and a count equal to 1, // When the repeat function is called with these inputs, // Then it should return the original str without repetition, ensuring that a count of 1 results in no repetition. +test("should return the original string when count is 1", () => { + const str = "hello"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("hello"); +}); + // case: Handle Count of 0: // Given a target string str and a count equal to 0, // When the repeat function is called with these inputs, // Then it should return an empty string, ensuring that a count of 0 results in an empty output. +test("should return an empty string when count is 0", () => { + const str = "hello"; + const count = 0; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual(""); +}); + // case: Negative Count: // Given a target string str and a negative integer count, // When the repeat function is called with these inputs, // Then it should throw an error or return an appropriate error message, as negative counts are not valid. + +test("should throw an error for negative count", () => { + const str = "hello"; + const count = -2; + expect(() => repeat(str, count)).toThrow("Count must be a non-negative integer"); +}); \ No newline at end of file