West Midlands | 25 Sep ITP | Iswat Bello | Sprint 3 | Implement and rewrite tests

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

@@ -8,9 +8,19 @@
 // Then, write the next test! :) Go through this process until all the cases are implemented
 
 function getAngleType(angle) {
+  angleType = "";
   if (angle === 90) {
-    return "Right angle";
+    angleType = "Right angle";
+  } else if (angle < 90) {
+    angleType = "Acute angle";
+  } else if (angle > 90 && angle < 180) {
+    angleType = "Obtuse angle";
+  } else if (angle === 180) {
+    angleType = "Straight angle";
+  } else if (angle > 180 &&  angle < 360) {
+    angleType =  "Reflex angle";
   }
+  return angleType;
    // Run the tests, work out what Case 2 is testing, and implement the required code here.
    // Then keep going for the other cases, one at a time.
 }
@@ -37,6 +47,7 @@ function assertEquals(actualOutput, targetOutput) {
 // Case 1: Identify Right Angles:
 // When the angle is exactly 90 degrees,
 // Then the function should return "Right angle"
+
 const right = getAngleType(90);
 assertEquals(right, "Right angle");
 
@@ -51,13 +62,18 @@ 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
+// ====> 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");

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

@@ -8,8 +8,12 @@
 // write one test at a time, and make it pass, build your solution up methodically
 
 function isProperFraction(numerator, denominator) {
-  if (numerator < denominator) {
+  if (numerator < denominator && numerator !== 0) {
     return true;
+  } else if (numerator >= denominator) {
+    return false;
+  } else if (numerator === 0) {
+    return false;
   }
 }
 
@@ -47,13 +51,17 @@ assertEquals(improperFraction, false);
 // 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?
+const zeroNumerator = isProperFraction(0, 5);
+assertEquals(zeroNumerator, false);

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

@@ -8,8 +8,17 @@
 // 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") {
+  card = card.substring(0 , card.length -1); // Remove the suit emoji
+  console.log(card);
+  if (card === "A") {
     return 11;
+  } if (card === "J" || card === "Q" || card === "K" || card === "10") {
+    return 10;
+  } else if  (card >= 2 && card <=9) {
+    card = Number(card);
+    return card;
+  } else {
+    return "Invalid card rank.";
   }
 }
 
@@ -28,7 +37,8 @@ function assertEquals(actualOutput, targetOutput) {
 }
 // Acceptance criteria:
 
-// 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),
+// 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♠");
@@ -40,11 +50,23 @@ 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(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 jackOfDiamonds = getCardValue("J♦");
+assertEquals(jackOfDiamonds, 10);
+
+const queenOfClubs = getCardValue("Q♣");
+assertEquals(queenOfClubs, 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",
@@ -55,3 +77,7 @@ 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."
+
+
+const invalidRandomCard = getCardValue("15♠");
+//assertEquals(invalidRandomCard, "Invalid card rank.");

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

@@ -12,15 +12,26 @@ test("should identify right angle (90°)", () => {
 // 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(50)).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 identiify obtuse angle (>90° and <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 angle (>180° and <360°)", () => {
+  expect(getAngleType(250)).toEqual("Reflex angle");
+});

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

@@ -2,12 +2,21 @@
 // We will use the same function, but write tests for it using Jest in this file.
 const isProperFraction = require("../implement/2-is-proper-fraction");
 
-test("should return true for a proper fraction", () => {
+test("should return true for a proper fractions", () => {
   expect(isProperFraction(2, 3)).toEqual(true);
 });
 
 // Case 2: Identify Improper Fractions:
+test("should return false for improper fractions", () => {
+  expect(isProperFraction(7, 3)).toEqual(false);
+})
 
 // Case 3: Identify Negative Fractions:
+test("should return false for negative fractions", () => {
+  expect(isProperFraction(-4, 9)).toEqual(true);
+})
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for equal numerator and denominator", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+})

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

@@ -8,6 +8,22 @@ test("should return 11 for Ace of Spades", () => {
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("should return the numeric value for number cards from 2 to 10", () => {
+  const numberCard = getCardValue("7♥");
+  expect(numberCard).toEqual(7);
+})
 // Case 3: Handle Face Cards (J, Q, K):
+test("should return 10 for face cards", () => {
+  const faceCard = getCardValue("J♥");
+  expect(faceCard).toEqual(10);
+})
 // Case 4: Handle Ace (A):
+test("should return 11 for ace card", () => {
+  const aceCard = getCardValue("A♥");
+  expect (aceCard).toEqual(11);
+})
 // Case 5: Handle Invalid Cards:
+test("should return invalid card rank for random numbers", () => {
+  const invalidRandomCard = getCardValue("85♠");
+  expect(invalidRandomCard).toEqual("Invalid card rank.");
+});