diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js index 9e05a871e..4d147da26 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js @@ -15,12 +15,34 @@ // execute the code to ensure all tests pass. function getAngleType(angle) { - // TODO: Implement this function + function getAngleType(angle) { + if (angle <= 0 || angle >= 360) + } + + 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"; } +module.exports = getAngleType; + + + // TODO: Implement this function + // The line below allows us to load the getAngleType function into tests in other files. // This will be useful in the "rewrite tests with jest" step. -module.exports = getAngleType; + // This helper function is written to make our assertions easier to read. // If the actual output matches the target output, the test will pass @@ -35,3 +57,11 @@ function assertEquals(actualOutput, targetOutput) { // Example: Identify Right Angles const right = getAngleType(90); assertEquals(right, "Right angle"); + + // Test +assertEquals(getAngleType(45), "Acute angle"); +assertEquals(getAngleType(90), "Right angle"); +assertEquals(getAngleType(120), "Obtuse angle"); +assertEquals(getAngleType(180), "Straight angle"); +assertEquals(getAngleType(270), "Reflex angle"); +assertEquals(getAngleType(390), "invalid angle"); diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js index 970cb9b64..f7fcfd8be 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js @@ -1,4 +1,4 @@ -// Implement a function isProperFraction, +(properfraction (// Implement a function isProperFraction, // when given two numbers, a numerator and a denominator, it should return true if // the given numbers form a proper fraction, and false otherwise. @@ -11,12 +11,16 @@ // execute the code to ensure all tests pass. function isProperFraction(numerator, denominator) { - // TODO: Implement this function + if (numerator < denominator) { +return true; + } else { + return false; + } } +module.exports = isProperFraction; // The line below allows us to load the isProperFraction function into tests in other files. // This will be useful in the "rewrite tests with jest" step. -module.exports = isProperFraction; // Here's our helper again function assertEquals(actualOutput, targetOutput) { @@ -31,3 +35,24 @@ function assertEquals(actualOutput, targetOutput) { // Example: 1/2 is a proper fraction assertEquals(isProperFraction(1, 2), true); +//Test +// Proper fraction +assertEqual(isProperFraction(3,5), true); +assertEual(isProperFraction(4,8), true); +assertEqual(isproperFraction(-1,2), true); +assertEqual(isProperFraction(-1,-2), true); +assertEqual(ispProperFraction(1,-2), true) + + +//Not +assertEqual(isproperFraction(9/7), false); +assertEqual(isproperFracton(13/11), false); +assertEqual(isproperFracton (19/10), false); +assertEqual(isproperFracton (17/3 ), false); + + + +//Edge case +assertEqual(isperoperFractio(0/5), true); + + diff --git a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js index c7559e787..3e20d3eb6 100644 --- a/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js +++ b/Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js @@ -22,12 +22,27 @@ // execute the code to ensure all tests pass. function getCardValue(card) { - // TODO: Implement this function + const rank = card.slice(0, -1); + const suit = card.slice(-1); + +const vaildSuits = ["♠", "♥", "♦", "♣"]; + const vailRanks = ["A","2","3","4","5","6","7","8","9","10","J","Q","k"]; + + if (!vaildSuits.includes(suit) || !validRanks.inculdes(rank)){ + throw new Error("Invaild card"); + } + if (rank === "A") return 11; + if (rank === "J" || rank === "Q" || rank === "K") return 10; + + return Number(rank); } +module.exports = getCardValue; + + // The line below allows us to load the getCardValue function into tests in other files. // This will be useful in the "rewrite tests with jest" step. -module.exports = getCardValue; + // Helper functions to make our assertions easier to read. function assertEquals(actualOutput, targetOutput) { @@ -40,10 +55,15 @@ function assertEquals(actualOutput, targetOutput) { // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards. // Examples: assertEquals(getCardValue("9♠"), 9); +//Test +assertEquals(getCardvalue("A♠"), 11); +assertEquals(getCardEqual("J♣), 10); +assertEquals(getCardequal("10♥"), 10); // Handling invalid cards try { getCardValue("invalid"); + // This line will not be reached if an error is thrown as expected console.error("Error was not thrown for invalid card");