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..ca82810fc 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,12 @@ // 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"; + else if (angle > 0 && angle < 90) return "Acute angle"; + else if (angle > 90 && angle < 180) return "Obtuse angle"; + else if (angle === 180) return "Straight line"; + else 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 @@ -43,14 +47,16 @@ 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); -// ====> 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 line = getAngleType(180); +assertEquals(line, "Straight line"); // 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(210); +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..36e5ec50f 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,8 @@ // 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) < denominator) return true; + else return false; } // here's our helper again @@ -40,14 +41,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? +// Negative Fraction check where numerator is greater than denominator +// Input: numerator = -8, denominator = 5 +// target output: false +// Explanation: The fraction -8/5 is a improper fraction because the absolute value of the numerator (8) is greater than the denominator (7). The function should return false. +const negativeImproper = isProperFraction(-8, 7); +assertEquals(negativeImproper, 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..6ea3b2a9b 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,12 @@ // 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; + let rank = card.startsWith("10") ? "10" : card[0]; + if (rank === "A") return 11; + else if (rank >= "2" && rank <= "9") return Number(rank); + else if (rank === "10" || rank === "J" || rank === "Q" || rank === "K") + return 10; + else return "Invalid Card rank"; } // You need to write assertions for your function to check it works in different cases @@ -25,27 +30,31 @@ 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); // 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♥"); -// ====> 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 faceCards = getCardValue("10♣"); +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 aceofSpades = getCardValue("A♠"); +assertEquals(aceofSpades, 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 invalidCards = getCardValue("14"); +assertEquals(invalidCards, "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..8bdc2d71f 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,14 @@ function getAngleType(angle) { if (angle === 90) return "Right angle"; - // replace with your completed function from key-implement - + 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"; } - - - - - - - // 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..f5ff47df0 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,30 @@ 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 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 & <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 angles (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º & <360º)", () => { + expect(getAngleType(220)).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..109c1ff16 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,8 @@ function isProperFraction(numerator, denominator) { - if (numerator < denominator) return true; - // add your completed function from key-implement here + // add your completed function from key-implement here + if (Math.abs(numerator) < denominator) return true; + else if (Math.abs(numerator) > denominator) return false; + 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..2bcb9c460 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 improper function", () => { + expect(isProperFraction(7, 5)).toEqual(false); +}); // Case 3: Identify Negative Fractions: +test("should return true for negative proper fractions", () => { + expect(isProperFraction(-3, 4)).toEqual(true); +}); // Case 4: Identify Equal Numerator and Denominator: +test("should return false for equal Numerator and Denominator", () => { + expect(isProperFraction(7, 7)).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..44cd3846c 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,9 @@ function getCardValue(card) { - // replace with your code from key-implement - return 11; + // replace with your code from key-implement + let rank = card[0]; + if (rank === "A") return 11; + else if (rank >= "2" && rank <= "9") return Number(rank); + else if (rank == "10" || rank == "J" || rank == "Q" || rank == "K") return 10; + else return "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..f90dd976e 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,23 @@ 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 numeric value corresponding to the rank", () => { + expect(getCardValue("2♣︎")).toEqual(2); +}); // Case 3: Handle Face Cards (J, Q, K): +test("should return the value 10, as these cards are worth 10 points each in blackjack", () => { + expect(getCardValue("J♠︎")).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 return Invalid card rank", () => { + expect(getCardValue("11")).toEqual("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..a64ed91ab 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.js +++ b/Sprint-3/3-mandatory-practice/implement/count.js @@ -1,5 +1,15 @@ function countChar(stringOfCharacters, findCharacter) { - return 5 + // Find the number of times findCharacter appears in stringOfCharacters + + let count = 0; + for (let i = 0; i < stringOfCharacters.length; i++) { + if (stringOfCharacters[i] === findCharacter) { + // Increment the count + count++; + } + } + // Return the 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..de6d24dec 100644 --- a/Sprint-3/3-mandatory-practice/implement/count.test.js +++ b/Sprint-3/3-mandatory-practice/implement/count.test.js @@ -22,3 +22,21 @@ 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 in the string", () => { + const str = "hello"; + const char = "z"; + const count = countChar(str, char); + expect(count).toEqual(0); +}); + +// Scenario: Case Sensitivity +// Given the input string str, +// And a character char that exists in the str with different cases (e.g., 'A' vs. 'a'), +// When the function is called with these inputs, +// Then it should return the count of occurrences of case-sensitive char +test("should count occurrences of a case-sensitive character with different cases", () => { + const str = "Hello"; + const char = "h"; + 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..4fd8c64d7 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,23 @@ function getOrdinalNumber(num) { - return "1st"; + let ordinal = ""; + switch (true) { + case num == 1 || (num % 10 == 1 && num != 11): + ordinal = `${num}st`; + break; + case num == 11: + ordinal = `${num}th`; + break; + case num == 2 || num == 22: + ordinal = `${num}nd`; + break; + case num == 3 || (num % 10 == 3 && num != 13): + ordinal = `${num}rd`; + break; + default: + ordinal = `${num}th`; + break; + } + return ordinal; } -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..ec75a830c 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 @@ -9,5 +9,62 @@ const getOrdinalNumber = require("./get-ordinal-number"); // Then the function should return "1st" test("should return '1st' for 1", () => { - expect(getOrdinalNumber(1)).toEqual("1st"); - }); + expect(getOrdinalNumber(1)).toEqual("1st"); +}); + +// Case 2: Identify the ordinal number for 11 +// When the number is 11, +// Then the function should return "11th" +test("should return '11th' for 11", () => { + expect(getOrdinalNumber(11)).toEqual("11th"); +}); + +// Case 3: Identify the ordinal number for numbers ending with 1 +// When the number is 21, +// Then the function should return "21st" + +test("should return '21st' for 21", () => { + expect(getOrdinalNumber(21)).toEqual("21st"); +}); + +// Case 4: Identify the ordinal number for 2 +// When the number is 2, +// Then the function should return "2nd" +test("should return '2nd' for 2", () => { + expect(getOrdinalNumber(2)).toEqual("2nd"); +}); + +// Case 5: Identify the ordinal number for 22 +// When the number is 22, +// Then the function should return "22nd" +test("should return '22nd' for 22", () => { + expect(getOrdinalNumber(22)).toEqual("22nd"); +}); + +// Case 6: Identify the ordinal number for 3 +// When the number is 3, +// Then the function should return "3rd" +test("should return '3rd' for 3", () => { + expect(getOrdinalNumber(3)).toEqual("3rd"); +}); + +// Case 7: Identify the ordinal number for numbers ending with 3 +// When the number is 23, +// Then the function should return "23rd" +test("should return '23rd' for 23", () => { + expect(getOrdinalNumber(23)).toEqual("23rd"); +}); + +// Case 8: Identify the ordinal number for 13 +// When the number is 13, +// Then the function should return "13th" +test("should return '13th' for 13", () => { + expect(getOrdinalNumber(13)).toEqual("13th"); +}); + +// Case 9: Identify the ordinal number for numbers ending with 4 +// When the number is 4, +// Then the function should return "4th" +test("should return '4th' for 4", () => { + 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..ace2aa547 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) { + let result = ""; + if (count < 0) { + throw new Error("Invalid count"); + } + for (i = 0; i < count; i++) { + result += str; + } + return result; + //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..9fefb6fbc 100644 --- a/Sprint-3/3-mandatory-practice/implement/repeat.test.js +++ b/Sprint-3/3-mandatory-practice/implement/repeat.test.js @@ -10,23 +10,51 @@ 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 = "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)).toThrowError("Invalid count"); +}); + +// case: Empty String: +// Given an empty string str and a positive integer count, +// When the repeat function is called with these inputs, +// Then it should return an empty string, as repeating an empty string any number of times still results in an empty string. +test("should return an empty string when str is empty", () => { + const str = ""; + const count = 5; + const repeatedStr = repeat(str, count); + expect(repeatedStr).toEqual(""); +}); diff --git a/Sprint-3/4-stretch-investigate/password-validator.js b/Sprint-3/4-stretch-investigate/password-validator.js index b55d527db..54076ab12 100644 --- a/Sprint-3/4-stretch-investigate/password-validator.js +++ b/Sprint-3/4-stretch-investigate/password-validator.js @@ -1,6 +1,29 @@ -function passwordValidator(password) { - return password.length < 5 ? false : true +function passwordValidator(password, previousPasswords = []) { + switch (true) { + case password.length < 5: + return false; + break; + case !/[A-Z]/.test(password): + return false; + break; + case !/[a-z]/.test(password): + return false; + break; + case !/[0-9]/.test(password): + return false; + break; + case !/[!#$%.&*]/.test(password): + return false; + break; + // Check if the password is in the previous passwords array + case previousPasswords.includes(password): + return false; + break; + // If all conditions are met, return true + default: + return true; + break; + } } - -module.exports = passwordValidator; \ No newline at end of file +module.exports = passwordValidator; diff --git a/Sprint-3/4-stretch-investigate/password-validator.test.js b/Sprint-3/4-stretch-investigate/password-validator.test.js index 8fa3089d6..92169590c 100644 --- a/Sprint-3/4-stretch-investigate/password-validator.test.js +++ b/Sprint-3/4-stretch-investigate/password-validator.test.js @@ -16,11 +16,66 @@ You must breakdown this problem in order to solve it. Find one test case first a */ const isValidPassword = require("./password-validator"); test("password has at least 5 characters", () => { - // Arrange - const password = "12345"; - // Act - const result = isValidPassword(password); - // Assert - expect(result).toEqual(true); -} -); \ No newline at end of file + // Arrange + const password = "Pass1!"; + // Act + const result = isValidPassword(password); + // Assert + expect(result).toEqual(true); +}); + +test("password has at least one uppercase letter", () => { + // Arrange + const password = "Password1!"; + // Act + const result = isValidPassword(password); + // Assert + expect(result).toEqual(true); +}); + +test("password has at least one lowercase letter", () => { + // Arrange + const password = "PASSWORD1!"; + // Act + const result = isValidPassword(password); + // Assert + expect(result).toEqual(false); +}); + +test("password has at least one number", () => { + // Arrange + const password = "Password!"; + // Act + const result = isValidPassword(password); + // Assert + expect(result).toEqual(false); +}); + +test("password has at least one special character", () => { + // Arrange + const password = "Password1"; + // Act + const result = isValidPassword(password); + // Assert + expect(result).toEqual(false); +}); + +test("password is not in the previous passwords array", () => { + // Arrange + const password = "Password1!"; + const previousPasswords = ["OldPassword1!", "AnotherPassword2!"]; + // Act + const result = isValidPassword(password, previousPasswords); + // Assert + expect(result).toEqual(true); +}); + +test("password is in the previous passwords array", () => { + // Arrange + const password = "OldPassword1!"; + const previousPasswords = ["OldPassword1!", "AnotherPassword2!"]; + // Act + const result = isValidPassword(password, previousPasswords); + // Assert + expect(result).toEqual(false); +});