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..4224edf48 100644 --- a/Sprint-3/1-key-implement/1-get-angle-type.js +++ b/Sprint-3/1-key-implement/1-get-angle-type.js @@ -11,6 +11,14 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; // read to the end, complete line 36, then pass your test here } +function getAngleType(angle) { + 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"; + else if (angle > 180 && angle < 360) return "Reflex angle"; +} // 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 @@ -53,4 +61,6 @@ const obtuse = getAngleType(120); // 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"); \ 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..3c54e08ef 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,15 @@ // 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; +} else if (numerator >= denominator) { + return false; +} else if (numerator === 1) { + return true; } +} + // here's our helper again function assertEquals(actualOutput, targetOutput) { @@ -39,8 +46,10 @@ assertEquals(improperFraction, false); // Input: numerator = -4, denominator = 7 // 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 @@ -48,6 +57,8 @@ 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 unitFraction = isProperFraction(1, 9); +assertEquals(unitFraction, true); \ 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..ace2c90cd 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,16 @@ // 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 faceCards = ["10", "J", "Q", "K"]; + const rank = card.slice(0, -1); + if (rank === "A") return 11; + if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) + return Number(rank); + if (faceCards.includes(rank)) return 10; + 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 @@ -25,7 +32,7 @@ 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♠"); +const numberCards = getCardValue("5♣"); assertEquals(aceofSpades, 11); // Handle Number Cards (2-10): @@ -34,18 +41,25 @@ 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(numberCards, 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 faceCards = getCardValue("Q♥"); +assertEquals(faceCards, 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("sevenofclubs"); +} catch (error) { + assertEquals(error.message, "Invalid card rank"); +} \ No newline at end of file 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..437828b2f 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,14 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; // replace with your completed function from key-implement + 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"; + else if (angle > 180 && angle < 360) return "Reflex angle"; + + return "Revolution"; } @@ -11,6 +19,7 @@ function getAngleType(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 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..0756c9f7b 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 @@ -6,6 +6,9 @@ test("should identify right angle (90°)", () => { // REPLACE the comments with the tests // make your test descriptions as clear and readable as possible +test("should identify acute angle (less than 90°)", () => { + expect(getAngleType(70)).toEqual("Acute angle"); +}); // Case 2: Identify Acute Angles: // When the angle is less than 90 degrees, @@ -14,11 +17,23 @@ test("should identify right angle (90°)", () => { // 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 indentify obtuse angle (greater than 90°)", () => { + 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 indentify straight angle (180°)", () => { + expect(getAngleType(120)).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 indentify reflex angle (greater than 180°)", () => { + expect(getAngleType(260)).toEqual("Reflex Angle"); +}); \ No newline at end of file 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..1d911ab09 100644 --- a/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js +++ b/Sprint-3/2-mandatory-rewrite/2-is-proper-fraction.js @@ -1,5 +1,7 @@ function isProperFraction(numerator, denominator) { if (numerator < denominator) return true; + // add your completed function from key-implement here + if (numerator >= denominator) return false; // add your completed function from key-implement here } 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..73516c728 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,17 @@ test("should return true for a proper fraction", () => { }); // Case 2: Identify Improper Fractions: - +test("should return false for a improper fraction", () => { + expect(isProperFraction(5, 2)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for a negative fraction", () => { + expect(isProperFraction(-4, 7)).toEqual(true); +}); + // Case 4: Identify Equal Numerator and Denominator: + +test("should return true for a equal fraction", () => { + expect(isProperFraction(3, 3)).toEqual(false); +}); \ 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..9c2d4da0a 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 faceCards = ["10", "J", "Q", "K"]; + const rank = card.slice(0, -1); + if (rank === "A") return 11; + if (!isNaN(rank) && Number(rank) >= 2 && Number(rank) <= 9) + return Number(rank); + if (faceCards.includes(rank)) return 10; + throw new Error("Invalid card rank"); } module.exports = getCardValue; \ No newline at end of file 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..8178e2d14 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,28 @@ const getCardValue = require("./3-get-card-value"); -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): +test("should return the number value of Number cards", () => { + const numberCards = getCardValue("3♦"); + expect(numberCards).toEqual(3); + }); // Case 3: Handle Face Cards (J, Q, K): +test("should return 10 for Face cards", () => { + const faceCards = getCardValue("Q♣"); + expect(faceCards).toEqual(10); + }); + // Case 4: Handle Ace (A): +test("should return 11 for Ace cards", () => { + const aceCards = getCardValue("A♣"); + expect(aceCards).toEqual(11); + }); // Case 5: Handle Invalid Cards: +test("should return Invalid card rank for Invalid cards", () => { + expect(() => { + getCardValue("Z♥"); + }).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..6087a9140 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,5 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + return stringOfCharacters.split(findCharacter).length - 1; } 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..319f9ba94 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 count no occurences of a character", () => { + const str = "shannon"; + const char = "e"; + 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..f2b0f2e08 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,17 @@ function getOrdinalNumber(num) { - return "1st"; -} + const lastDigits = num % 10; + const lastTwoDigits = num % 100; + + if (lastTwoDigits >= 11 && lastTwoDigits <= 13) return num + "th"; + if (lastDigits === 1) { + return num + "st"; + } else if (lastDigits === 2) { + return num + "nd"; + } else if (lastDigits === 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..067a719a3 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 @@ -10,4 +10,24 @@ 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 11th for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); +}); + +test("should return 19th for 19", () => { + expect(getOrdinalNumber(19)).toEqual("19th"); +}); + +test("should return 24th for 24", () => { + expect(getOrdinalNumber(24)).toEqual("24th"); +}); diff --git a/Sprint-3/3-mandatory-practice/implement/repeat.js b/Sprint-3/3-mandatory-practice/implement/repeat.js index 621f9bd35..9b9e20a3a 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) return ""; + if (count < 0) { + throw new Error("Not Allowed"); + } else { + 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..2e4625d85 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -14,19 +14,31 @@ 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 original string", () => { + const str = "word"; + const count = 1; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual("word"); + }); // 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 empty string ", () => { + const str = "shannon"; + 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 return error", () => { + expect(() => repeat("hello", -4)).toThrow("Not Allowed"); + }); \ No newline at end of file