London | 26-ITP-Jan | Angela McLeary | Sprint 3 | Coursework/sprint 3 implement and rewrite test

Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js

@@ -14,10 +14,32 @@
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
 
-function getAngleType(angle) {
-  // TODO: Implement this function
+function getAngleType(angle){
+  if(angle >0 && angle <90){
+    return "Acute angle";
+  }
+  if(angle === 90){
+    return "Right 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 found"
 }
 
+
+  // 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;
@@ -35,3 +57,28 @@ function assertEquals(actualOutput, targetOutput) {
 // Example: Identify Right Angles
 const right = getAngleType(90);
 assertEquals(right, "Right angle");
+
+const acute = getAngleType(60);
+assertEquals(acute, "Acute angle");
+
+const obtuse = getAngleType(160);
+assertEquals(obtuse, "Obtuse angle");
+
+const straight = getAngleType(180);
+assertEquals(straight, "Straight angle");
+
+const reflex = getAngleType(275);
+assertEquals(reflex, "Reflex angle");
+// test invalid cases
+
+const invalidAngleCase1 = getAngleType (0);
+assertEquals(invalidAngleCase1, "Invalid angle found");
+
+const invalidAngleCase2 = getAngleType (-15);
+assertEquals(invalidAngleCase2, "Invalid angle found");
+
+const invalidAngleCase3 = getAngleType (360);
+assertEquals(invalidAngleCase3, "Invalid angle found");
+
+const invalidAngleCase4 = getAngleType (400);
+assertEquals(invalidAngleCase4, "Invalid angle found");

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

@@ -10,8 +10,14 @@
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
 
-function isProperFraction(numerator, denominator) {
-  // TODO: Implement this function
+  function isProperFraction(numerator, denominator) {
+  // Denominator cannot be 0 because it won't make a fraction.
+ if (denominator === 0) {
+        return false;
+    }
+    // Compare absolute values to eliminate negative values
+    //Proper fraction = absolute value of numerator < absolute value of denominator
+    return Math.abs(numerator) < Math.abs(denominator);
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
@@ -31,3 +37,6 @@ function assertEquals(actualOutput, targetOutput) {
 
 // Example: 1/2 is a proper fraction
 assertEquals(isProperFraction(1, 2), true);
+assertEquals(isProperFraction(2, 1), false);
+assertEquals(isProperFraction(-1, -2), true);
+assertEquals(isProperFraction(1, 0), false);

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

@@ -21,8 +21,55 @@
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
 
+// TODO: Implement this function
 function getCardValue(card) {
-  // TODO: Implement this function
+  // 1. declare variables in an array to use for validation
+  const validRanks = [
+    "A",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "10",
+    "J",
+    "Q",
+    "K",
+  ];
+  const validSuits = ["♠", "♥", "♦", "♣"];
+  //2. Check that input is a string
+  if (typeof card !== "string") {
+    throw new Error("Invalid card");
+  }
+  // 3. Must have at least 2 characters but 3 or less (rank and suit)
+  if (card.length < 2 || card.length > 3) {
+    throw new Error("Invalid card");
+  }
+
+  // 4. Defining the suit and rank
+  //Select character index -1, the last character only.
+  const suit = card.slice(-1);
+  //select everything from index 0 and stop before the last character
+  const rank = card.slice(0, -1);
+
+  // 5. Checking suit validity
+  //Checks if suit is in the array
+  if (!validSuits.includes(suit)) {
+    throw new Error("Invalid card");
+  }
+  // 6. Checking rank validity
+  //Checks if rank is in the array
+  if (!validRanks.includes(rank)) {
+    throw new Error("Invalid card");
+  }
+  //7. Determines the output values for special cards
+  if (rank === "A") return 11;
+  if (["J", "Q", "K"].includes(rank)) return 10;
+  // 8. Otherwise it returns the number of the card
+  return Number(rank);
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.
@@ -40,13 +87,43 @@ function assertEquals(actualOutput, targetOutput) {
 // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
 // Examples:
 assertEquals(getCardValue("9♠"), 9);
+assertEquals(getCardValue("A♠"), 11);
+assertEquals(getCardValue("Q♥"), 10);
+assertEquals(getCardValue("K♦"), 10);
+assertEquals(getCardValue("J♣"), 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");
-} catch (e) {}
+} catch (error) {}
 
 // What other invalid card cases can you think of?
+try {
+  getCardValue("789");
+
+  // This line will not be reached if an error is thrown as expected
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("");
+  console.error("Error was not thrown for invalid card");
+} catch (e) {}
+
+try {
+  getCardValue("♠♥♦♣");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("5$");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("£50");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/1-get-angle-type.test.js

@@ -5,16 +5,48 @@ const getAngleType = require("../implement/1-get-angle-type");
 // TODO: Write tests in Jest syntax to cover all cases/outcomes,
 // including boundary and invalid cases.
 
+// Test various acute angles, including boundary cases
 // Case 1: Acute angles
-test(`should return "Acute angle" when (0 < angle < 90)`, () => {
-  // Test various acute angles, including boundary cases
-  expect(getAngleType(1)).toEqual("Acute angle");
-  expect(getAngleType(45)).toEqual("Acute angle");
-  expect(getAngleType(89)).toEqual("Acute angle");
+// When angle is greater that 0 and less than 90
+test(`should return "Acute angle" when (angle >0 angle < 90)`, () => {
+ expect(getAngleType(1)).toEqual("Acute angle");
+ expect(getAngleType(45)).toEqual("Acute angle");
+ expect(getAngleType(89)).toEqual("Acute angle");
+});
+
+// Case 2: Right angles
+// When angle is 90
+test(`should return Right angle when (angle = 90)`, () => {
+  expect(getAngleType(90)).toEqual("Right angle");
 });
 
-// Case 2: Right angle
 // Case 3: Obtuse angles
+// When angle is greater that 90 and less than 180
+test(`should return "Obtuse angle" when (angle >90 & angle <180)`, () => {
+  expect(getAngleType(91)).toEqual("Obtuse angle");
+  expect(getAngleType(135)).toEqual("Obtuse angle");
+  expect(getAngleType(179)).toEqual("Obtuse angle");
+});
+
 // Case 4: Straight angle
+// When angle is 180
+test(`should return "Straight angle" when (angle = 180)`, () => {
+  expect(getAngleType(180)).toEqual("Straight angle");
+});
+
 // Case 5: Reflex angles
+// When angle is greater that 180 and less than 360
+test(`should return "Reflex angle" when (angle >180 & angle <360)`, () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+  expect(getAngleType(270)).toEqual("Reflex angle");
+  expect(getAngleType(359)).toEqual("Reflex angle");
+});
+
 // Case 6: Invalid angles
+// When angle is equal to or less than 0 and is equal to or greater than 360
+test(`should return "Invalid angle found" when (angle <= 0 or angle >= 360)`, () => {
+  expect(getAngleType(0)).toEqual("Invalid angle found");
+  expect(getAngleType(-1)).toEqual("Invalid angle found");
+  expect(getAngleType(360)).toEqual("Invalid angle found");
+  expect(getAngleType(520)).toEqual("Invalid angle found");
+});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/2-is-proper-fraction.test.js

@@ -8,3 +8,15 @@ const isProperFraction = require("../implement/2-is-proper-fraction");
 test(`should return false when denominator is zero`, () => {
   expect(isProperFraction(1, 0)).toEqual(false);
 });
+
+test(`should return true when denominator is greater than numerator (2)`, () => {
+  expect(isProperFraction(1, 2)).toEqual(true);
+});
+
+test(`should return false when denominator is smaller than the numerator (1)`, () => {
+  expect(isProperFraction(2, 1)).toEqual(false);
+});
+
+test(`should return true when both values are valid numbers`, () => {
+  expect(isProperFraction(-1, -2)).toEqual(true);
+});

Sprint-3/1-implement-and-rewrite-tests/rewrite-tests-with-jest/3-get-card-value.test.js

@@ -6,13 +6,48 @@ const getCardValue = require("../implement/3-get-card-value");
 
 // Case 1: Ace (A)
 test(`Should return 11 when given an ace card`, () => {
-  expect(getCardValue("A♠")).toEqual(11);
-});
-
+  expect(getCardValue("A♠")).toEqual(11)});
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
+test(`Should return a number given 9 card` , ()=> {
+  expect(getCardValue("9♠")).toEqual(9)});
 //   Face Cards (J, Q, K)
+test(`Should return 10 when given a Queen card`, () => {
+  expect(getCardValue("Q♥")).toEqual(10);
+});
+test(`Should return 10 when given a King card`, () => {
+  expect(getCardValue("K♦")).toEqual(10);
+});
+
+test(`Should return 10 when given a Jack card`, () => {
+  expect(getCardValue("J♣")).toEqual(10);
+});
+
 //   Invalid Cards
+test('Should throw "Invalid card" for "invalid"', () => {
+  expect(() => getCardValue("invalid")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "789"', () => {
+  expect(() => getCardValue("789")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input ""', () => {
+  expect(() => getCardValue("")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "♠♥♦♣"', () => {
+  expect(() => getCardValue("♠♥♦♣")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "5$"', () => {
+  expect(() => getCardValue("5$")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "£50"', () => {
+  expect(() => getCardValue("£50")).toThrow("Invalid card");
+});
+
 
 // To learn how to test whether a function throws an error as expected in Jest,
 // please refer to the Jest documentation: