London| 25-ITP-Sep | Sophia Mohamed| Sprint 3|Coursework/sprint-3-implement-and-rewrite

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

@@ -6,18 +6,33 @@
 // The assertion error will tell you what the expected output is
 // Write the code to pass the test
 // Then, write the next test! :) Go through this process until all the cases are implemented
-
+// Run the tests, work out what Case 2 is testing, and implement the required code here.
+// Case 1: Right angle
 function getAngleType(angle) {
   if (angle === 90) {
     return "Right angle";
+  } 
+  // Case 2: Acute angle
+  else if (angle < 90) {
+    return "Acute angle";
+  }
+  // Case 3: Obtuse angle
+  else if (angle > 90 && angle < 180) {
+    return "Obtuse angle";
+  }
+  // Case 4: Straight angle
+  else if (angle === 180) {
+    return "Straight angle";
+  }
+  // Case 5: Reflex angle
+  else if (angle > 180 && angle < 360) {
+    return "Reflex angle";
+      } else {
+    return "Invalid angle";// added to handle angles not in the specified range for Example -1 or 500
   }
-   // 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.
 }
-
 // 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;
 
 // we're going to use this helper function to make our assertions easier to read
 // if the actual output matches the target output, the test will pass
@@ -50,14 +65,25 @@ 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(270);
+const reflex = getAngleType(270);
+assertEquals(reflex, "Reflex angle");
+
+
+
+
+
+module.exports = getAngleType;

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

@@ -1,15 +1,20 @@
 // Implement a function isProperFraction
 // Write assertions for your function to check it works in different cases
-// Terms:
+// Terms:A proper fraction is when:
+//the absolute value of the numerator is less than the denominator
+
 // Fractions: https://www.bbc.co.uk/bitesize/topics/zt9n6g8/articles/zjxpp4j
 // Written here like this: 1/2 == Numerator/Denominator
 // the first test and first case is written for you
-// complete the rest of the tests and cases
-// write one test at a time, and make it pass, build your solution up methodically
+// 1-complete the rest of the tests and cases
 
+// 2-write one test at a time, and make it pass, build your solution up methodically
+//1-
 function isProperFraction(numerator, denominator) {
-  if (numerator < denominator) {
+  if (Math.abs(numerator) < Math.abs(denominator)) {
     return true;
+  } else {
+    return false;
   }
 }
 
@@ -33,7 +38,6 @@ function assertEquals(actualOutput, targetOutput) {
 // Explanation: The fraction 2/3 is a proper fraction, where the numerator is less than the denominator. The function should return true.
 const properFraction = isProperFraction(2, 3);
 assertEquals(properFraction, true);
-
 // Improper Fraction check:
 // Input: numerator = 5, denominator = 2
 // target output: false
@@ -46,14 +50,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);
-// ====> 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 negativeDenominator = isProperFraction(3, -5);
+assertEquals(negativeDenominator, true);
+const bothNegative = isProperFraction(-2, -6);
+assertEquals(bothNegative(-2, -6), true);// both negative should return true as well

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

@@ -8,9 +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) {
+  const rank = card.slice(0, -1);
   if (rank === "A") {
     return 11;
   }
+else if (["J", "Q", "K", "10"].includes(rank)) {// changed the if with else if
+  return 10;
+} else if (!isNaN(rank)) {    
+  return Number(rank);
+} else {
+  throw new Error("Invalid card rank.");
+}
 }
 
 // The line below allows us to load the getCardValue function into tests in other files.
@@ -39,19 +47,40 @@ 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);
+assertEquals(getCardValue("2♣"), 2);
+assertEquals(getCardValue("3♣"), 3);
+assertEquals(getCardValue("4♣"), 4);
+assertEquals(getCardValue("5♥"), 5); 
+assertEquals(getCardValue("6♦"), 6);
+assertEquals(getCardValue("7♠"), 7);
+assertEquals(getCardValue("8♠"), 8);
+assertEquals(getCardValue("9♥"), 9);
 // ====> 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 tenOfDiamonds = getCardValue("10♦");
+assertEquals(tenOfDiamonds, 10);
+
+const jackOfClubs = getCardValue("J♣");
+assertEquals(jackOfClubs, 10);
+
+const queenOfDiamonds = getCardValue("Q♦");
+assertEquals(queenOfDiamonds, 10);
+
+const kingOfHearts = getCardValue("K♥");
+assertEquals(kingOfHearts, 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.
-
+assertEquals(getCardValue("A♠"), 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."
+assertEquals(() => getCardValue("B♦"), "Invalid card rank.");  

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

@@ -12,15 +12,25 @@ 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(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° 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(270)).toEqual("Reflex angle");
+});

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

@@ -7,7 +7,14 @@ test("should return true for a proper fraction", () => {
 });
 
 // Case 2: Identify Improper Fractions:
-
+test("should return false for an improper fraction", () => {
+  expect(isProperFraction(5, 2)).toEqual(false);
+});
 // Case 3: Identify Negative Fractions:
-
+test("should return true for a negative proper fraction", () => {
+  expect(isProperFraction(-4, 7)).toEqual(true);
+});
 // Case 4: Identify Equal Numerator and Denominator:
+test("should return false when numerator equals denominator", () => {
+  expect(isProperFraction(3, 3)).toEqual(false);
+});

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

@@ -1,13 +1,33 @@
 // This statement loads the getCardValue function you wrote in the implement directory.
 // We will use the same function, but write tests for it using Jest in this file.
 const getCardValue = require("../implement/3-get-card-value");
-
+// Case 1: Handle Ace (A):      
 test("should return 11 for Ace of Spades", () => {
   const aceofSpades = getCardValue("A♠");
   expect(aceofSpades).toEqual(11);
 });
 
 // Case 2: Handle Number Cards (2-10):
+test("should return correct values for number cards 2-9", () => {
+  expect(getCardValue("2♣")).toEqual(2);
+  expect(getCardValue("3♣")).toEqual(3);
+  expect(getCardValue("4♣")).toEqual(4);
+  expect(getCardValue("5♥")).toEqual(5);
+  expect(getCardValue("6♦")).toEqual(6);       
+  expect(getCardValue("7♠")).toEqual(7);
+  expect(getCardValue("8♠")).toEqual(8);
+  expect(getCardValue("9♥")).toEqual(9);
+}); 
 // Case 3: Handle Face Cards (J, Q, K):
-// Case 4: Handle Ace (A):
-// Case 5: Handle Invalid Cards:
+test("should return 10 for face cards J, Q, K and 10", () => {
+  expect(getCardValue("10♦")).toEqual(10);
+  expect(getCardValue("J♣")).toEqual(10);
+  expect(getCardValue("Q♦")).toEqual(10);
+  expect(getCardValue("K♥")).toEqual(10);
+});
+
+
+// Case 4: Handle Invalid Cards:
+test("should throw an error for invalid card rank", () => {
+  expect(() => getCardValue("B♦")).toThrow("Invalid card rank.");
+});