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..64c1181ba 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"; + 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"; + + // read to the end, complete line 36, then pass your test here } // we're going to use this helper function to make our assertions easier to read @@ -42,15 +47,21 @@ assertEquals(acute, "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" -const obtuse = getAngleType(120); // ====> write your test here, and then add a line to pass the test in the function above +const obtuse = getAngleType(120); +assertEquals(obtuse, "Obtuse angle"); // Case 4: Identify Straight Angles: // When the angle is exactly 180 degrees, -// Then the function should return "Straight angle" +// 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(260); +assertEquals(reflex, "Reflex angle"); +console.log(getAngleType); \ No newline at end of file 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..e8e472fa6 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,7 @@ // 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 Math.abs(numerator) < Math.abs(denominator); } // here's our helper again @@ -41,6 +41,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 +49,9 @@ 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? +const bothNegative = isProperFraction(-8, -10); +assertEquals(bothNegative, true); 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..cdbc40a56 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,13 @@ // 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[0]; + if (rank === "A") return 11; + + if (["J", "Q", "K"].includes(rank)) return 10; + const number = Number(rank); + if (number >= 2 && number <= 10) return number; + throw new Error("Invalid card rank"); } // You need to write assertions for your function to check it works in different cases @@ -34,18 +40,35 @@ 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 JackOfDiamonds = getCardValue("J♦"); +assertEquals(JackOfDiamonds, 10); + +const QueenOfClubs = getCardValue("Q♣"); +assertEquals(QueenOfClubs, 10); + +const KingOfSpades = getCardValue("K♠"); +assertEquals(KingOfSpades, 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 Ace = getCardValue("A♠"); +assertEquals(Ace, 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♣"); +} catch (error) { + assertEquals(error.message, "Invalid 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..7b0127ef5 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,10 @@ 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"; } 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..7ed0b0a36 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,25 @@ 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(260)).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..e41c5b5f1 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,5 @@ function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; - // add your completed function from key-implement here + return Math.abs(numerator) < Math.abs(denominator); } -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..d44d23545 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 @@ -1,11 +1,21 @@ const isProperFraction = require("./2-is-proper-fraction"); -test("should return true for a proper fraction", () => { - expect(isProperFraction(2, 3)).toEqual(true); + +test("should return false for improper fraction (5/2)", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); + + +test("should return true for negative proper fraction (-4/7)", () => { + expect(isProperFraction(-4, 7)).toEqual(true); }); -// Case 2: Identify Improper Fractions: -// Case 3: Identify Negative Fractions: +test("should return false for equal numerator and denominator (3/3)", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + -// Case 4: Identify Equal Numerator and Denominator: +test("should return true for both negative proper fraction (-8/-10)", () => { + expect(isProperFraction(-8, -10)).toEqual(true); +}); \ No newline at end of file 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..af3bf2265 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,10 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + const rank = card; + + if (rank === "A") return 11; + if (["J", "Q", "K"].includes(rank)) return 10; + const number = Number(rank); + if (number >= 2 && number <= 10) return number; + 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..41e0ef564 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 @@ -1,11 +1,32 @@ const getCardValue = require("./3-get-card-value"); -test("should return 11 for Ace of Spades", () => { - const aceofSpades = getCardValue("A♠"); - expect(aceofSpades).toEqual(11); - }); + // Case 2: Handle Number Cards (2-10): +test("should return number for number cards (2-10)",() => { + expect(getCardValue("2")).toEqual (2); + expect(getCardValue("10")).toEqual(10); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for Jack of Diamonds", () => { + expect(getCardValue ("J")).toEqual(10); +}); + +test("should return 10 for Queen of Clubs", () => { + expect(getCardValue("Q")).toEqual(10); +}); + +test("should return 10 for King of Spades", () => { + expect(getCardValue("K")).toEqual(10); +}); + // Case 4: Handle Ace (A): +test("should return 11 for Ace", () => { + expect(getCardValue("A")).toEqual(11); +}); + // Case 5: Handle Invalid Cards: +test("should throw error for invalid card rank", () => { + expect(() => getCardValue("L")).toThrow(new Error("Invalid card rank")); +}); + diff --git a/Sprint-3/3-mandatory-practice/implement/count.js b/Sprint-3/3-mandatory-practice/implement/count.js index fce249650..708c4d093 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,12 @@ 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 diff --git a/Sprint-3/3-mandatory-practice/implement/count.test.js b/Sprint-3/3-mandatory-practice/implement/count.test.js index 42baf4b4b..892e1b843 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -3,6 +3,12 @@ const countChar = require("./count"); // Given a string str and a single character char to search for, // When the countChar function is called with these inputs, // Then it should: +test("should count occurrences of a character in a string", () => { + const str = "coding is fun"; + const char = "i"; + const count = countChar(str, char); + expect(count).toEqual(2); +}); // Scenario: Multiple Occurrences // Given the input string str, @@ -22,3 +28,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 no occurrences of a character are found", () => { + const str = "good morning"; + const char = "l"; + 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..22aedfc4c 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,25 @@ function getOrdinalNumber(num) { - return "1st"; + const strNum= num.toString(); + if(strNum.slice(-2)==="11") { + return strNum + "th"; + } +if(strNum.slice(-2)==="12") { + return strNum + "th"; + } +if(strNum.slice(-2)==="13") { + return strNum + "th"; + } +if(strNum.slice(-1)==="1") { + return strNum + "st"; + } +if(strNum.slice(-1)==="2") { + return strNum + "nd"; + } +if(strNum.slice(-1)==="3") { + return strNum + "rd"; + } + } -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..4e39d43a7 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,15 @@ 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 '23rd' for 23", () => { + expect(getOrdinalNumber(23)).toEqual("23rd"); + }); + + test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + }); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..73bbbd589 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,9 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (count < 0){ + throw new Error("throw an error as negative counts are not valid"); + } + 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..2726c5f25 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -3,12 +3,19 @@ const repeat = require("./repeat"); // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // Then it should: +test("should return positive integer count", () => { + const str = "hello"; + const count = 3; + const repeatedStr=repeat(str,count); + expect(repeatedStr).toEqual("hellohellohello"); +}); // case: repeat String: // Given a target string str and a positive integer count, // When the repeat function is called with these inputs, // 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; @@ -20,13 +27,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 return a target string when count equals 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 target string when count equals 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 as negative integer counts are not valid", () => { + const str= "hello"; + const count= -3; + expect(() => repeat(str, count)).toThrow("throw an error as negative counts are not valid"); +}); +