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..555bf728a 100644 --- a/Sprint-3/1-key-implement/1-get-angle-type.js +++ b/Sprint-3/1-key-implement/1-get-angle-type.js @@ -9,6 +9,12 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; + else if (angle > 0 && 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"; + + // read to the end, complete line 36, then pass your test here } @@ -44,13 +50,19 @@ 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"); + 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..6ffa4181a 100644 --- a/Sprint-3/1-key-implement/2-is-proper-fraction.js +++ b/Sprint-3/1-key-implement/2-is-proper-fraction.js @@ -9,6 +9,11 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) return true; + else if (numerator > denominator) return false; + else if (-numerator > denominator) return true; + else if (numerator === denominator) return false; + else return "Error"; + } // here's our helper again @@ -41,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 @@ -48,6 +54,6 @@ 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? 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..8908a6dd6 100644 --- a/Sprint-3/1-key-implement/3-get-card-value.js +++ b/Sprint-3/1-key-implement/3-get-card-value.js @@ -8,9 +8,22 @@ // 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 (rank === "2") return 2; + if (rank === "3") return 3; + if (rank === "4") return 4; + if (rank === "5") return 5; + if (rank === "6") return 6; + if (rank === "7") return 7; + if (rank === "8") return 8; + if (rank === "9") return 9; + if(["10", "J", "Q", "K"].includes(rank)) return 10; + throw new Error("Invaild card rank") } + + // You need to write assertions for your function to check it works in different cases // we're going to use this helper function to make our assertions easier to read // if the actual output matches the target output, the test will pass @@ -25,27 +38,40 @@ function assertEquals(actualOutput, targetOutput) { // 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); +const aceOfSpades = getCardValue("A♠"); +assertEquals(aceOfSpades, 11); // Handle 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). -const fiveofHearts = getCardValue("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 jackOfSpades = getCardValue("J♠"); +assertEquals(jackOfSpades, 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. + // Handle Invalid Cards: -// Given a card with an invalid rank (neither a number nor a recognized face card), +// Given a card with an invalid rank (neither a number or a recognized face card), // When the function is called with such a card, // Then it should throw an error indicating "Invalid card rank." +try { + const invaildCard = getCardValue("222"); + assertEquals(invaildCard, "Invalid card rank"); + } + catch (error) { + assertEquals(error.message, "Invaild card rank"); + + } + + + 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..50f657809 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,6 +1,11 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; // replace with your completed function from key-implement + if (angle < 90) return "Acute angle"; + if (angle > 90 && angle <180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle > 180 && angle < 360) return "Reflex angle"; + return "Invalid angle"; } 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..ac2eee8a4 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 @@ -10,15 +10,26 @@ 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 (less than 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 (greater than 90° and less than 180°)", () => { + 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 (greater than 180° and less than 360°)", () => { + 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..a0ba24fba 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,10 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) return true; // add your completed function from key-implement here + if (numerator > denominator) return false; + if (-numerator > denominator) return true; + if (numerator === denominator) return false; + else return "Error"; } module.exports = isProperFraction; \ No newline at end of file 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..e6993ea01 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,28 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: +test("should return false for an improper fraction", () => { + expect(isProperFraction(4, 3)).toEqual(false); + expect(isProperFraction(3, 3)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a proper fraction with negative numerator", () => { + expect(isProperFraction(-2, 3)).toEqual(true); +}); + +test("should return false for an improper fraction with negative numerator", () => { + expect(isProperFraction(-4, 3)).toEqual(false); +}); +test("should return true for a proper fraction with negative denominator", () => { + expect(isProperFraction(2, -3)).toEqual(true); +}); + +test("should return false for an improper fraction with negative denominator", () => { + expect(isProperFraction(4, -3)).toEqual(false); +}); // 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..95fa64297 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,23 @@ function getCardValue(card) { // replace with your code from key-implement - return 11; + const value = card.slice(0, -1); + const rank = value.toString(); + if (rank === "A") return 11; + if (rank === "2") return 2; + if (rank === "3") return 3; + if (rank === "4") return 4; + if (rank === "5") return 5; + if (rank === "6") return 6; + if (rank === "7") return 7; + if (rank === "8") return 8; + if (rank === "9") return 9; + if(["10", "J", "Q", "K"].includes(rank)) return 10; + throw new Error("Invalid card rank") } -module.exports = getCardValue; \ No newline at end of file +module.exports = getCardValue; + +// console.log(getCardValue("A♠")); +// console.log(getCardValue("5♠")); +// console.log(getCardValue("10♠")); +// console.log(getCardValue("J♠")); +// console.log(getCardValue("11")); 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..be5eb5f03 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,34 @@ test("should return 11 for Ace of Spades", () => { }); // Case 2: Handle Number Cards (2-10): +test("should return the correct value for number cards", () => { + 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", () => { + 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", () => { + expect(getCardValue("A♠")).toEqual(11); + 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 cards", () => { +// expect(getCardValue("1♠")).toThrow("Invalid card rank"); +// expect(getCardValue("Z♠")).toThrow("Invalid card rank"); +// expect(getCardValue("")).toThrow("Invalid card rank"); +// }); + +test("should throw an error for invalid cards", () => { + expect(() => getCardValue("1♠")).toThrow("Invalid card rank"); + expect(() => getCardValue("Z♠")).toThrow("Invalid card rank"); + expect(() => getCardValue("")).toThrow("Invalid card rank"); + }); \ No newline at end of file diff --git a/Sprint-3/3-mandatory-practice/implement/count.js b/Sprint-3/3-mandatory-practice/implement/count.js index fce249650..4034da57b 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,10 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 -} - + let count = 0; + for (let char of stringOfCharacters) { + if (char === findCharacter) { + count++; + } + } + return count; + } module.exports = countChar; \ No newline at end of file diff --git a/Sprint-3/3-mandatory-practice/implement/count.test.js b/Sprint-3/3-mandatory-practice/implement/count.test.js index 42baf4b4b..4cf379b91 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -22,3 +22,9 @@ 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 the character does not exist in the string", () => { + const str = "hello"; + const char = "s"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); \ No newline at end of file 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..9a6f7d1da 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,14 @@ function getOrdinalNumber(num) { - return "1st"; +if (num === 11 || num ===12 || num ===13) return num + "th"; +const lastDigit = num % 10; +if (lastDigit === 1) return num + "st"; +else if (lastDigit === 2) return num + "nd"; +else if (lastDigit === 3) return num + "rd"; +else return num + "th"; } + + + + module.exports = getOrdinalNumber; \ No newline at end of file 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..9905ec510 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 @@ -11,3 +11,30 @@ const getOrdinalNumber = require("./get-ordinal-number"); test("should return '1st' for 1", () => { 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"); + }); +test("should return '4th' for 4", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + }); +test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + }); +test("should return '12th' for 12", () => { + expect(getOrdinalNumber(12)).toEqual("12th"); + }); +test("should return '13th' for 13", () => { + expect(getOrdinalNumber(13)).toEqual("13th"); + }); +test("should return '21st' for 21", () => { + expect(getOrdinalNumber(21)).toEqual("21st"); + }); +test("should return '22nd' for 22", () => { + expect(getOrdinalNumber(22)).toEqual("22nd"); + }); +test("should return '23rd' for 23", () => { + expect(getOrdinalNumber(23)).toEqual("23rd"); + }); \ No newline at end of file diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..b49e1d288 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,7 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (count < 0) throw new Error("Error"); + return str.repeat(count); + } module.exports = repeat; \ No newline at end of file diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.test.js b/Sprint-3/3-mandatory-practice/implement/repeat.test.js index 8a4ab42ef..3529d7935 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -20,13 +20,31 @@ test("should repeat the string count times", () => { // 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 repeat the string count times", () => { + const str = "bye"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("bye"); +}); // 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 repeat the string count times", () => { + const str = "bye"; + 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 = "bye"; + const count = -1; + expect(() => repeat(str, count)).toThrow("Error"); + }); \ No newline at end of file