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..6d8d2a215 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,15 @@ // 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 (typeof angle === "number" && isFinite(angle)) { + if (angle <= 0 || angle >= 360) return "Invalid angle"; + if (angle < 90) return "Acute angle"; + if (angle === 90) return "Right angle"; + if (angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle < 360) return "Reflex angle"; + } else return "Invalid Input"; + // 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 @@ -43,14 +50,27 @@ 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); +assertEquals(obtuse, "Obtuse angle"); // ====> write your test here, and then add a line to pass the test in the function above // 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 strDegree = getAngleType(180); +assertEquals(strDegree, "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"); + +// When the angle is less than or equal to 0 or greater than or equal to 360, +// Then the function should return "Invalid angle +const invalidAngle = getAngleType(-20); +assertEquals(invalidAngle, "Invalid angle"); + +// When the input is invalid, +// Then the function should return "invalid Input" +const invalidInput = getAngleType("Aida"); +assertEquals(invalidInput, "Invalid Input"); 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..b5f39a8e9 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); // false or true } // here's our helper again @@ -40,14 +40,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? + +const zeroNumerator = isProperFraction(0, 3); +assertEquals(zeroNumerator, false); + +const negativeDenominator = isProperFraction(3, -3); +assertEquals(negativeDenominator, 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..89edbe6cc 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,15 @@ // 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); // Get everything before the suit emoji + + if (rank === "A") return 11; + if (["K", "Q", "J", "10"].includes(rank)) return 10; + const number = parseInt(rank); + if (number >= 2 && number <= 9) return number; + throw new Error("Invalid 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 @@ -22,7 +28,8 @@ 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♠"); @@ -33,19 +40,28 @@ 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 FaceCard = getCardValue("J♥"); +assertEquals(FaceCard, 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 HandleAce = getCardValue("A♥"); +assertEquals(HandleAce, 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." + +const InvalidCard = getCardValue("B♣"); +assertEquals(InvalidCard, 32); 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..740ecee2b 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,16 @@ function getAngleType(angle) { - if (angle === 90) return "Right angle"; - // replace with your completed function from key-implement - + if (typeof angle === "number" && isFinite(angle)) { + if (angle <= 0 || angle >= 360) return "Invalid angle"; + if (angle < 90) return "Acute angle"; + if (angle === 90) return "Right angle"; + if (angle < 180) return "Obtuse angle"; + if (angle === 180) return "Straight angle"; + if (angle < 360) return "Reflex angle"; + } else return "Invalid input"; } - - - - - - - // 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..f5f96facd 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,60 @@ 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"); + expect(getAngleType(10)).toEqual("Acute angle"); + expect(getAngleType(1.23)).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° < angle < 180°)", () => { + expect(getAngleType(120)).toEqual("Obtuse angle"); + expect(getAngleType(170)).toEqual("Obtuse angle"); + expect(getAngleType(145.87)).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° < angle < 360°)", () => { + expect(getAngleType(300)).toEqual("Reflex angle"); + expect(getAngleType(359.999)).toEqual("Reflex angle"); + expect(getAngleType(180.001)).toEqual("Reflex angle"); +}); + +// When the angle is less than or equal to 0 or greater than or equal to 360, +// Then the function should return "Invalid angle + +test("should return 'Invalid angle' for angles ≤ 0 or ≥ 360", () => { + expect(getAngleType(0)).toEqual("Invalid angle"); + expect(getAngleType(-12)).toEqual("Invalid angle"); + expect(getAngleType(450)).toEqual("Invalid angle"); +}); + +// Case: Angles near important limits +// These tests make sure the function works correctly +// for values very close to 90° and 360° +test("should return 'Acute angle' for angle just below 90°", () => { + expect(getAngleType(89.999)).toEqual("Acute angle"); +}); +test("should return 'Reflex angle' for angle just below 360°", () => { + expect(getAngleType(359.999999)).toEqual("Reflex angle"); +}); + +// Case: For invalid input +// Should return "Invalid input" for non-numeric or missing values +test("should return 'Invalid input' for invalid", () => { + expect(getAngleType("Aida")).toEqual("Invalid input"); + expect(getAngleType("")).toEqual("Invalid input"); + expect(getAngleType()).toEqual("Invalid input"); +}); 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..a96c4f8d9 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); // false or true } -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..b2ae47e9b 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 a Improper fraction", () => { + expect(isProperFraction(4, 3)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a Negative fraction", () => { + expect(isProperFraction(-3, 6)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for Equal Numerator and Denominator", () => { + expect(isProperFraction(6, 6)).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..540ed0243 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,17 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + const rank = card.slice(0, -1); // Get everything before the suit emoji + + if (rank === "A") return 11; + if (["K", "Q", "J", "10"].includes(rank)) return 10; + const number = parseInt(rank); + if (number >= 2 && number <= 9) return number; + + throw new Error("Invalid card rank"); } -module.exports = getCardValue; \ No newline at end of file +module.exports = getCardValue; + +console.log(getCardValue("2XYZ♠")); // ==> 2 +console.log(getCardValue("0x02♠")); // ==> 2 +console.log(getCardValue("2.1♠")); // ==> 2 +// console.log(getCardValue("00_02♠")); //==> Invalid card rank +console.log(getCardValue("2.5♥")); 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..989179664 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,46 @@ const getCardValue = require("./3-get-card-value"); +let cardList = ["♥", "♣", "♠", "♦"]; +let faceCardList = ["J", "Q", "K"]; +let invalidCards = ["B♣", "11♠", "0♣", "5", "♠", "_", ""]; test("should return 11 for Ace of Spades", () => { - const aceofSpades = getCardValue("A♠"); - expect(aceofSpades).toEqual(11); - }); + const aceofSpades = getCardValue("A♠"); + expect(aceofSpades).toEqual(11); +}); // Case 2: Handle Number Cards (2-10): + +for (let item of cardList) { + for (let i = 2; i <= 10; i++) { + test(`should return ${i} for ${i}${item}`, () => { + const fiveofHearts = getCardValue(`${i}${item}`); + expect(fiveofHearts).toEqual(i); + }); + } +} + // Case 3: Handle Face Cards (J, Q, K): +for (let face of faceCardList) { + for (let item of cardList) { + test(`should return 10 for ${face}${item}`, () => { + const FaceCard = getCardValue(`${face}${item}`); + expect(FaceCard).toEqual(10); + }); + } +} + // Case 4: Handle Ace (A): +for (let item of cardList) { + test(`should return 11 for Ace of ${item}`, () => { + const HandleAce = getCardValue(`A${item}`); + expect(HandleAce).toEqual(11); + }); +} + // Case 5: Handle Invalid Cards: + +for (let invCard of invalidCards) { + test(`should throw error for invalid card ${invCard}`, () => { + expect(() => getCardValue(invCard)).toThrow("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..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..4f2175c3d 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", () => { + const str = "Hello"; + const char = "E"; + 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..e9c9e190d 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,22 @@ function getOrdinalNumber(num) { - return "1st"; + const lastTwo = num % 100; + const lastDigit = num % 10; + if (lastTwo >= 11 && lastTwo <= 13) { + // for 11 , 12, 13 + return num + "th"; + } + + switch (lastDigit) { + case 1: + return num + "st"; + case 2: + return num + "nd"; + case 3: + return num + "rd"; + default: + return num + "th"; + } } -module.exports = getOrdinalNumber; \ No newline at end of file +module.exports = getOrdinalNumber; +console.log(getOrdinalNumber(2)); 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..5c200214b 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 @@ -8,6 +8,32 @@ const getOrdinalNumber = require("./get-ordinal-number"); // When the number is 1, // Then the function should return "1st" -test("should return '1st' for 1", () => { - expect(getOrdinalNumber(1)).toEqual("1st"); - }); +test("adds 'st' to numbers like 1, 21, 101 (except 11)", () => { + expect(getOrdinalNumber(1)).toEqual("1st"); + expect(getOrdinalNumber(21)).toEqual("21st"); + expect(getOrdinalNumber(101)).toEqual("101st"); + expect(getOrdinalNumber(11)).toEqual("11th"); +}); + +test("adds 'nd' to numbers like 2, 22, 102 (except 12)", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); + expect(getOrdinalNumber(22)).toEqual("22nd"); + expect(getOrdinalNumber(102)).toEqual("102nd"); + expect(getOrdinalNumber(12)).toEqual("12th"); +}); + +test("adds 'rd' to numbers like 3, 23, 103 (except 13)", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); + expect(getOrdinalNumber(23)).toEqual("23rd"); + expect(getOrdinalNumber(103)).toEqual("103rd"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + +test("adds 'th' to other numbers", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); + expect(getOrdinalNumber(24)).toEqual("24th"); + expect(getOrdinalNumber(100)).toEqual("100th"); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..4b58e4ac4 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 (count < 0) { + throw new Error("Count cannot be negative"); + } else { + let result = ""; + for (let i = 0; i < count; i++) { + result += str; + } + return result; + } } - -module.exports = repeat; \ No newline at end of file +// console.log(repeat("Aida", -5)); +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..2a1b2a9ae 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -10,23 +10,40 @@ 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 = "Aida"; + const count = 1; + expect(repeat(str, count)).toEqual("Aida"); +}); + // 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 = "Aida"; + const count = 0; + expect(repeat(str, count)).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 when count is negative", () => { + const str = "Aida"; + const count = -3; + + expect(() => repeat(str, count)).toThrow("Count cannot be negative"); +});