fixedproper fraction and card functions

Author: Ofonimeedak

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

@@ -23,7 +23,7 @@ function getAngleType(angle) {
     return "Obtuse angle";
   } else if (angle === 90) {
     return "Right angle";
-  } else if (angle === 180) {
+  } else if (angle===180) {
     return "Straight angle";
   } else if (angle > 180 && angle < 360) {
     return "Reflex angle";

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

@@ -12,10 +12,12 @@
 
 function isProperFraction(numerator, denominator) {
   // TODO: Implement this function
-  if(numerator>denominator) {
-    return false
-  }else{
-    return true
+  if ( Math.abs(numerator) >= Math.abs(denominator)) {
+    return false;
+  } else if (Math.abs(denominator) === 0) {
+    return false;
+  } else {
+    return true;
   }
 }
 
@@ -38,10 +40,17 @@ function assertEquals(actualOutput, targetOutput) {
 assertEquals(isProperFraction(1, 2), true);
 assertEquals(isProperFraction(1, 10000), true);
 assertEquals(isProperFraction(100, 2), false);
-assertEquals(isProperFraction(1, 0.005), false);
 assertEquals(isProperFraction(1e2, 1e3), true);
-assertEquals(isProperFraction(1e4, 1e0), false);
-assertEquals(isProperFraction(-1, 1), true);
+assertEquals(isProperFraction(1e4, 1), false);
+assertEquals(isProperFraction(-1, 1), false);
 assertEquals(isProperFraction(1, -1), false);
-assertEquals(isProperFraction(0, -1), false);
-assertEquals(isProperFraction(-1, 0), true);
+assertEquals(isProperFraction(0, -1), true);
+assertEquals(isProperFraction(-1, -2), true);
+assertEquals(isProperFraction(1, -2), true);
+assertEquals(isProperFraction(-1, 2), true);
+assertEquals(isProperFraction(1, 0), false);
+assertEquals(isProperFraction(-1, 0), false);
+
+  
+
+

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

@@ -22,13 +22,16 @@
 // execute the code to ensure all tests pass.
 
 function getCardValue(card) {
+  if (card.length >= 4) {
+    throw new Error ("Invalid String");
+  }
   if (
     !card.includes("♠") &&
     !card.includes("♥") &&
     !card.includes("♦") &&
     !card.includes("♣")
-  ){
-    throw new Error("Invalid String");
+  ) {
+    throw new Error('Invalid String');
   }
   const rank = card.slice(0, -1);
 
@@ -42,12 +45,12 @@ function getCardValue(card) {
     throw new Error("Invalid String");
   }
 
-  if (rank==="A") {
+  if (rank === "A") {
     return 11;
-  } else if (rank==="J" || rank==="Q" || rank==="K") {
+  } else if (rank === "J" || rank === "Q" || rank === "K") {
     return 10;
   } else if (rank >= 2 && rank <= 10) {
-    return rank;
+    return Number(rank);
   }
 }
 
@@ -72,20 +75,33 @@ assertEquals(getCardValue("K♠"), 10);
 assertEquals(getCardValue("Q♠"), 10);
 assertEquals(getCardValue("2♠"), 2);
 assertEquals(getCardValue("10♠"), 10);
-assertEquals(getCardValue("   ♠"), "Invalid String");
-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 {
-  getCardValue("invalid");
+function throwInvalidStringError(card){
 
+try {
+  getCardValue(card)
   // 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 (e) {
+  assertEquals(e.message,"Invalid String")
+}
+}
+
+throwInvalidStringError("invalid");
+throwInvalidStringError("   ♠");
+throwInvalidStringError("  6 ♠");
+throwInvalidStringError("   ♠");
+throwInvalidStringError(" **♠");
+throwInvalidStringError("10 **");
+throwInvalidStringError("A10♠");
+throwInvalidStringError("0x02♠");
+throwInvalidStringError("2.1♠");
+throwInvalidStringError("0002♠");
+throwInvalidStringError("22");
+throwInvalidStringError("♠2");
 
 // What other invalid card cases can you think of?
 // card with a mix of suit

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

@@ -30,11 +30,11 @@ test(`should return "Obtuse angles" when (90< angle <180)`, () => {
 
 // Case 4: Straight angle
 test(`should return "Straight angle" when (angle===180)`, () => {
-  expect(getAngleType(180).toEqual("Straight angle"));
+  expect(getAngleType(180)).toEqual("Straight angle");
 });
 
 // Case 5: Reflex angles
-test(`Should return "Reflex angle" when (180>angle<360)`, () => {
+test(`Should return "Reflex angle" when (360<angle>180)`, () => {
   expect(getAngleType(181)).toEqual("Reflex angle");
   expect(getAngleType(270)).toEqual("Reflex angle");
   expect(getAngleType(350)).toEqual("Reflex angle");
@@ -45,9 +45,9 @@ test(`Should return "Reflex angle" when (180>angle<360)`, () => {
 
 // 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"));
+  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

@@ -10,7 +10,7 @@ test(`should return false when denominator is zero`, () => {
   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(-1, 0)).toEqual(false);
   expect(isProperFraction(1e2, 1e4)).toEqual(true);
   expect(isProperFraction(1e4, 1e0)).toEqual(false);
 });