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..f422d2fa8 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,21 @@ // 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 === undefined || isNaN(angle)) { + return "Invalid angle: Please provide a valid number"; + } + + if (angle < 0 || angle > 360) { + return "Invalid angle: Angle must be between 0 and 360 degrees"; + } + + if (angle === 360 || angle === 0) return "Full rotation"; + + 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"; } // we're going to use this helper function to make our assertions easier to read @@ -44,13 +57,38 @@ 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"); + +// Case 6: Identify Full Rotation: +// When the angle is exactly 360 degrees or 0 degrees, +// Then the function should return "Full rotation" +const fullRotation = getAngleType(360); +assertEquals(fullRotation, "Full rotation"); +const zeroAngle = getAngleType(0); +assertEquals(zeroAngle, "Full rotation"); + +// Case 7: Handle missing input: +// When no angle is provided, +// Then the function should return an error message +const noAngle = getAngleType(); +assertEquals(noAngle, "Invalid angle: Please provide a valid number"); + +// Case 8: Handle invalid angle values: +// When an angle outside the valid range (0-360 degrees) is provided, +// Then the function should return an error message +const tooBig = getAngleType(361); +assertEquals(tooBig, "Invalid angle: Angle must be between 0 and 360 degrees"); +const negative = getAngleType(-10); +assertEquals(negative, "Invalid angle: Angle must be between 0 and 360 degrees"); \ 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..17c197c9b 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,11 @@ // 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 (Math.abs(numerator) < Math.abs(denominator)) { + return true; + } else { + return false; + } } // here's our helper again @@ -40,14 +44,14 @@ 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? +// What other scenarios could you test for? \ No newline at end of file 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..63c191012 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,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) { + if (!card || card.length < 2) { + throw new Error("Invalid card rank."); + } + + const rank = card.slice(0, -1); + if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") return 10; + + if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9 && rank.length === 1) { + return Number(rank); + } + + throw new Error("Invalid card rank."); } // You need to write assertions for your function to check it works in different cases @@ -33,12 +46,23 @@ 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 jackofClubs = getCardValue("J♣"); +assertEquals(jackofClubs, 10); + +const queenofDiamonds = getCardValue("Q♦"); +assertEquals(queenofDiamonds, 10); + +const kingofHearts = getCardValue("K♥"); +assertEquals(kingofHearts, 10); + +const tenofSpades = getCardValue("10♠"); +assertEquals(tenofSpades, 10); // Handle Ace (A): // Given a card with a rank of "A", @@ -49,3 +73,30 @@ const fiveofHearts = getCardValue("5♥"); // 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♠"); + console.error("Error was expected but not thrown"); +} catch (e) { + assertEquals(e.message, "Invalid card rank."); +} + +try { + const oddValue = getCardValue("345♠"); + console.error("Error was expected but not thrown for '345♠'"); +} catch (e) { + assertEquals(e.message, "Invalid card rank."); +} + +try { + const onlySuit = getCardValue("♠"); + console.error("Error was expected but not thrown for '♠'"); +} catch (e) { + assertEquals(e.message, "Invalid card rank."); +} + +try { + const oneHundred = getCardValue("100♠"); + console.error("Error was expected but not thrown for '100♠'"); +} catch (e) { + assertEquals(e.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..ef5d9ce3d 100644 --- a/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js +++ b/Sprint-3/2-mandatory-rewrite/1-get-angle-type.js @@ -1,7 +1,20 @@ function getAngleType(angle) { + if (angle === undefined || isNaN(angle)) { + return "Invalid angle: Please provide a valid number"; + } + + if (angle < 0 || angle > 360) { + return "Invalid angle: Angle must be between 0 and 360 degrees"; + } + + if (angle === 360 || angle === 0) return "Full rotation"; 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: Please provide a valid number"; } 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..6eeef151f 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 @@ -4,21 +4,46 @@ test("should identify right angle (90°)", () => { expect(getAngleType(90)).toEqual("Right angle"); }); -// REPLACE the comments with the tests -// make your test descriptions as clear and readable as possible - // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, // Then the function should return "Acute angle" +test("should identify acute angles (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 angles (greater than 90° and less than 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 angles (greater than 180° and less than 360°)", () => { + expect(getAngleType(270)).toEqual("Reflex angle"); +}); + +test("should identify full rotation (0° or 360°)", () => { + expect(getAngleType(360)).toEqual("Full rotation"); + expect(getAngleType(0)).toEqual("Full rotation"); +}); + +test("should handle undefined angle value", () => { + expect(getAngleType()).toEqual("Invalid angle: Please provide a valid number"); +}); + +test("should handle angle values outside the valid range", () => { + expect(getAngleType(361)).toEqual("Invalid angle: Angle must be between 0 and 360 degrees"); + expect(getAngleType(-10)).toEqual("Invalid angle: Angle must be between 0 and 360 degrees"); +}); + +test("should handle edge case inputs that might bypass initial checks", () => { + expect(getAngleType(NaN)).toEqual("Invalid angle: Please provide a valid number"); + expect(getAngleType(null)).toEqual("Acute 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..e921584bd 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,13 @@ function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; - // add your completed function from key-implement here + if (denominator === 0) { + return false; + } + + if (Math.abs(numerator) < Math.abs(denominator)) { + return true; + } else { + 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..25b13d62f 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,21 @@ 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 true for a negative proper fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false when numerator and denominator are equal", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); + +test("should return false when denominator is zero", () => { + expect(isProperFraction(0, 0)).toEqual(false); + expect(isProperFraction(5, 0)).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..fa5bc5ee6 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,13 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + if (!card || card.length < 2) { + throw new Error("Invalid card rank."); + } + + const rank = card.slice(0, -1); + if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K" || rank === "10") return 10; + if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) return Number(rank); + 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..bc49b6da5 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 @@ -3,9 +3,38 @@ 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 correct number for number cards", () => { + 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 J, Q, K", () => { + expect(getCardValue("J♣")).toEqual(10); + expect(getCardValue("Q♦")).toEqual(10); + expect(getCardValue("K♥")).toEqual(10); +}); + // Case 4: Handle Ace (A): +// (Already tested above with Ace of Spades) + // Case 5: Handle Invalid Cards: +test("should throw error for invalid cards", () => { + expect(() => getCardValue("Z♠")).toThrow("Invalid card rank."); + expect(() => getCardValue("1♠")).toThrow("Invalid card rank."); +}); + +test("should throw error for multi-digit number (other than 10)", () => { + expect(() => getCardValue("345♠")).toThrow("Invalid card rank."); +}); + +test("should throw error for only suit (no rank)", () => { + expect(() => getCardValue("♠")).toThrow("Invalid card rank."); +}); + +test("should throw error for numbers out of range", () => { + expect(() => getCardValue("100♠")).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..16c330a03 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,9 @@ 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 +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..68a8a0b32 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -1,5 +1,5 @@ -// implement a function countChar that counts the number of times a character occurs in a string 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: @@ -22,3 +22,31 @@ 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 if character does not occur", () => { + const str = "Hello World"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +test("should be case sensitive", () => { + const str = "Hello World"; + const char = "h"; + const count = countChar(str, char); + expect(count).toEqual(0); + + const uppercaseCount = countChar(str, "H"); + expect(uppercaseCount).toEqual(1); +}); + +test("should count spaces as characters", () => { + const str = "Hello World"; + const char = " "; + const count = countChar(str, char); + expect(count).toEqual(1); + + const multiSpaceStr = "Hello World !"; + const multiSpaceCount = countChar(multiSpaceStr, " "); + expect(multiSpaceCount).toEqual(4); +}); 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..3790a8085 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,12 @@ function getOrdinalNumber(num) { - return "1st"; + const suffixes = ["th", "st", "nd", "rd"]; + const v = num % 100; + if (v >= 11 && v <= 13) { + return num + "th"; + } else { + const suffix = suffixes[(num % 10)] || "th"; + return num + suffix; + } } -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..a7c193577 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 @@ -4,10 +4,42 @@ const getOrdinalNumber = require("./get-ordinal-number"); // continue testing and implementing getOrdinalNumber for additional cases // Write your tests using Jest - remember to run your tests often for continual feedback -// Case 1: Identify the ordinal number for 1 -// When the number is 1, -// Then the function should return "1st" - 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 number + 'th' for numbers ending in 0, 4, 5, 6, 7, 8, 9", () => { + expect(getOrdinalNumber(4)).toEqual("4th"); + expect(getOrdinalNumber(5)).toEqual("5th"); + expect(getOrdinalNumber(6)).toEqual("6th"); + expect(getOrdinalNumber(7)).toEqual("7th"); + expect(getOrdinalNumber(8)).toEqual("8th"); + expect(getOrdinalNumber(9)).toEqual("9th"); + expect(getOrdinalNumber(10)).toEqual("10th"); + expect(getOrdinalNumber(20)).toEqual("20th"); +}); + +test("should return number + 'th' for special teen cases (11-13)", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); + expect(getOrdinalNumber(12)).toEqual("12th"); + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + +test("should return correct suffix for larger numbers", () => { + expect(getOrdinalNumber(21)).toEqual("21st"); + expect(getOrdinalNumber(32)).toEqual("32nd"); + expect(getOrdinalNumber(43)).toEqual("43rd"); + expect(getOrdinalNumber(101)).toEqual("101st"); + expect(getOrdinalNumber(111)).toEqual("111th"); + expect(getOrdinalNumber(112)).toEqual("112th"); + expect(getOrdinalNumber(113)).toEqual("113th"); + expect(getOrdinalNumber(121)).toEqual("121st"); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..9385a11fa 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.js @@ -1,5 +1,8 @@ -function repeat() { - return "hellohellohello"; +function repeat(str, count) { + if (count < 0) { + throw new Error("Invalid count"); + } + 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..63e9ccd64 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -14,19 +14,65 @@ test("should repeat the string count times", () => { 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 when count is negative", () => { + const str = "hello"; + const count = -1; + expect(() => repeat(str, count)).toThrow("Invalid count"); +}); + +test("should handle empty strings correctly", () => { + const str = ""; + const count = 5; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual(""); +}); + +test("should work with special characters", () => { + const str = "!@#$%^&*"; + const count = 2; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("!@#$%^&*!@#$%^&*"); +}); + +test("should work with multiple-character strings", () => { + const str = "abc"; + const count = 3; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("abcabcabc"); +}); + +test("should handle large repetition counts", () => { + const str = "a"; + const count = 1000; + const repeatedStr = repeat(str, count); + expect(repeatedStr.length).toEqual(1000); + expect(repeatedStr).toEqual("a".repeat(1000)); +});