Glasgow | 25-ITP-Sep | Hanna Mykytiuk | Sprint 3 | implement-and-rewrite-tests

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

@@ -11,6 +11,19 @@ function getAngleType(angle) {
   if (angle === 90) {
     return "Right angle";
   }
+  else if (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"
+  }
+
    // 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.
 }
@@ -50,14 +63,19 @@ 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);
+assertEquals(obtuse,"Obtuse angle");
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // 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(190);
+assertEquals(reflex, "Reflex angle" );

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

@@ -8,9 +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 (Math.abs(numerator) < Math.abs(denominator)) {
     return true;
   }
+  else {
+    return false;
+  }
 }
 
 // The line below allows us to load the isProperFraction function into tests in other files.
@@ -46,14 +49,21 @@ 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);
+assertEquals(negativeFraction,true)
 // ====> complete with your assertion
 
 // 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);
+assertEquals(equalFraction,false);
 // ====> complete with your assertion
 
 // Stretch:
 // What other scenarios could you test for?
+const bothNegativeProperFraction = isProperFraction(-3, -5);
+assertEquals(bothNegativeProperFraction,true);
+//
+const bothNegativeNotProperFraction = isProperFraction(-6, -5);
+assertEquals(bothNegativeNotProperFraction,false);

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

@@ -8,9 +8,21 @@
 // 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) {
+  let rank = card.slice(0, card.length-1) 
   if (rank === "A") {
     return 11;
   }
+  else if (parseInt(rank) >= 2 && parseInt(rank)){
+    return parseInt(rank)
+  }
+  else if( rank === "J" || rank === "Q" || rank === "K") {
+    return 10;
+  }
+  else{
+    throw  new Error("Invalid card rank.")
+  }
+
+
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.
@@ -39,19 +51,35 @@ assertEquals(aceofSpades, 11);
 // 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♥");
+assertEquals(fiveofHearts, 5);
 // ====> write your test here, and then add a line to pass the test in the function above
 
 // 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 cardOfJ = getCardValue("J♥");
+assertEquals(cardOfJ, 10);
+const cardOfQ = getCardValue("Q♠");
+assertEquals(cardOfQ, 10);
+const cardOfK = getCardValue("K♠");
+assertEquals(cardOfK, 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 aceOfHeart = getCardValue("A♥");
+assertEquals(aceOfHeart, 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 {
+  assertEquals(getCardValue("W♥"), "Invalid card rank");
+} catch (error) {
+  console.log(error.message);
+}

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

@@ -12,15 +12,28 @@ 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 less then 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 greater then 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 identify Straight angle that = 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 greater then 180 and less then 360", () => {
+  expect(getAngleType(220)).toEqual("Reflex angle");
+});

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

@@ -7,7 +7,16 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
+test("should return false for improper fraction", () => {
+  expect(isProperFraction(5, 2)).toEqual(false);
+});
 
 // Case 3: Identify Negative Fractions:
+test("should return true for negative fraction", () => {
+  expect(isProperFraction(-4, 7)).toEqual(true);
+});
 
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false for Equal Numerator fraction", () => {
+  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,28 @@ test("should return 11 for Ace of Spades", () => {
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("Handle Number Cards (2-10)", () => {
+  const fiveofHearts = getCardValue("5♥");
+  expect(fiveofHearts).toEqual(5);
+});
 // Case 3: Handle Face Cards (J, Q, K):
+test("Case 3: Handle Face Cards (J, Q, K)", () => {
+  const cardOfJ = getCardValue("J♥");
+  expect(cardOfJ).toEqual(10);
+});
 // Case 4: Handle Ace (A):
+test("Case 3: Handle Face Cards (J, Q, K)", () => {
+  const aceOfHeart = getCardValue("A♥");
+  expect(aceOfHeart).toEqual(11);
+});
 // Case 5: Handle Invalid Cards:
+test("Case 3: Handle Invalid Cards", () => {
+  try {
+  assertEquals(getCardValue("W♥"), "Invalid card rank");
+} catch (error) {
+  console.log(error.message);
+}
+});
+
+
+