Rewrite test with jest completed

Author: Ofonimeedak

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

@@ -8,7 +8,7 @@
 //   "A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"
 // The suit can be one of the following emojis:
 //   "♠", "♥", "♦", "♣"
-// For example: "A♠", "2♥", "10♥", "J♣", "Q♦", "K♦".
+// For example: "A♠", "2♥", "10♥", "J"2♠"", "Q♦", "K♦".
 
 // When the card is an ace ("A"), the function should return 11.
 // When the card is a face card ("J", "Q", "K"), the function should return 10.
@@ -28,7 +28,7 @@ function getCardValue(card) {
     !card.includes("♦") &&
     !card.includes("♣")
   ){
-    return "Invalid String";
+    throw new Error("Invalid String");
   }
   const rank = card.slice(0, -1);
 
@@ -39,12 +39,12 @@ function getCardValue(card) {
     !card.includes("K") &&
     !(rank >= 2 && rank <= 10)
   ) {
-    return "Invalid String";
+    throw new Error("Invalid String");
   }
 
-  if (card.includes("A")) {
+  if (rank==="A") {
     return 11;
-  } else if (card.includes("J") || card.includes("Q") || card.includes("K")) {
+  } else if (rank==="J" || rank==="Q" || rank==="K") {
     return 10;
   } else if (rank >= 2 && rank <= 10) {
     return rank;
@@ -77,6 +77,7 @@ assertEquals(getCardValue("  6 ♠"), "Invalid String");
 assertEquals(getCardValue("   ♠"), "Invalid String");
 assertEquals(getCardValue(" **♠"), "Invalid String");
 assertEquals(getCardValue("10 **"), "Invalid String");
+assertEquals(getCardValue("A10♠"), "Invalid String");
 
 // Handling invalid cards
 try {

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

@@ -14,7 +14,40 @@ test(`should return "Acute angle" when (0 < angle < 90)`, () => {
 });
 
 // Case 2: Right angle
+test(`should return "Right Angles" when(angle===90)`, () => {
+  expect(getAngleType(90)).toEqual("Right angle");
+});
+
 // Case 3: Obtuse angles
+
+test(`should return "Obtuse angles" when (90< angle <180)`, () => {
+  expect(getAngleType(91)).toEqual("Obtuse angle");
+  expect(getAngleType(179)).toEqual("Obtuse angle");
+  expect(getAngleType(160)).toEqual("Obtuse angle");
+  expect(getAngleType(100)).toEqual("Obtuse angle");
+  expect(getAngleType(151.55)).toEqual("Obtuse angle");
+});
+
 // Case 4: Straight angle
+test(`should return "Straight angle" when (angle===180)`, () => {
+  expect(getAngleType(180).toEqual("Straight angle"));
+});
+
 // Case 5: Reflex angles
+test(`Should return "Reflex angle" when (180>angle<360)`, () => {
+  expect(getAngleType(181)).toEqual("Reflex angle");
+  expect(getAngleType(270)).toEqual("Reflex angle");
+  expect(getAngleType(350)).toEqual("Reflex angle");
+  expect(getAngleType(359.5)).toEqual("Reflex angle");
+  expect(getAngleType(210)).toEqual("Reflex angle");
+  expect(getAngleType(200)).toEqual("Reflex angle");
+});
+
 // Case 6: Invalid angles
+test(`Should return "Invalid angle" when (0 =<angle>=360)`, () => {
+  expect(getAngleType(0).toEqual("Invalid angle"));
+  expect(getAngleType(-1).toEqual("Invalid angle"));
+  expect(getAngleType(360).toEqual("Invalid angle"));
+  expect(getAngleType(500).toEqual("Invalid angle"));
+  expect(getAngleType("1e5").toEqual("Invalid angle"));
+});

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

@@ -7,4 +7,10 @@ const isProperFraction = require("../implement/2-is-proper-fraction");
 // Special case: numerator is zero
 test(`should return false when denominator is zero`, () => {
   expect(isProperFraction(1, 0)).toEqual(false);
+  expect(isProperFraction(1, -1)).toEqual(false);
+  expect(isProperFraction(10, 1)).toEqual(false);
+  expect(isProperFraction(1, 10)).toEqual(true);
+  expect(isProperFraction(-1, 0)).toEqual(true);
+  expect(isProperFraction(1e2, 1e4)).toEqual(true);
+  expect(isProperFraction(1e4, 1e0)).toEqual(false);
 });

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

@@ -11,9 +11,44 @@ test(`Should return 11 when given an ace card`, () => {
 
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
+ test(`should return  Number from "2-10" when given a number card`,()=>{
+
+  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);
+  expect(getCardValue("10♠")).toEqual(10);
+ })
+
+
 //   Face Cards (J, Q, K)
+
+test(`Should return 10 when given a face card`,()=>{
+
+expect(getCardValue("J♣")).toEqual(10);
+expect(getCardValue("K♣")).toEqual(10);
+expect(getCardValue("Q♣")).toEqual(10);
+expect(getCardValue("Q♠")).toEqual(10);
+expect(getCardValue("J♠")).toEqual(10);
+expect(getCardValue("K♠")).toEqual(10);
+})
 //   Invalid Cards
 
+test('throws on Invalid String', () => {
+  expect(() => { getCardValue('A10♠');}).toThrow("Invalid String");
+  expect(() => { getCardValue('A');}).toThrow("Invalid String");
+  expect(() => { getCardValue('110♠');}).toThrow("Invalid String");
+  expect(() => { getCardValue('   ♠');}).toThrow("Invalid String");
+  expect(() => { getCardValue('eeeeeej1234');}).toThrow("Invalid String");
+
+});
+
+
+
 // To learn how to test whether a function throws an error as expected in Jest,
 // please refer to the Jest documentation:
 // https://jestjs.io/docs/expect#tothrowerror