completed 3-get-card-value.js and 3-get-card-value test.js with comments

Author: AngelaMcLeary

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

@@ -23,48 +23,55 @@
 
 // TODO: Implement this function
 function getCardValue(card) {
-    const validRanks = ["A", "2", "3", "4", "5", "6", "7", "8", "9", "10", "J", "Q", "K"];
-    const validSuits = ["♠", "♥", "♦", "♣"];
-    //Validation
-    // Must be a string
-    if (typeof card !== "string") {
-    throw Error("Invalid card");
+  // 1. declare variables in an array to use for validation
+  const validRanks = [
+    "A",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "10",
+    "J",
+    "Q",
+    "K",
+  ];
+  const validSuits = ["♠", "♥", "♦", "♣"];
+  //2. Check that input is a string
+  if (typeof card !== "string") {
+    throw new Error("Invalid card");
   }
-    // Must be at least 2 characters and maximum of 3
-    //
-    //
-}
-// ---------- INVALID CHECKS FIRST ----------
-
-  // 1. Must be a string
-  
-
-  // 2. Must have at least 2 characters (rank + suit)
-  if (card.length < 2) {
+  // 3. Must have at least 2 characters but 3 or less (rank and suit)
+  if (card.length < 2 || card.length > 3) {
     throw new Error("Invalid card");
   }
 
-  // 3. Extract suit and rank
+  // 4. Defining the suit and rank
+  //Select character index -1, the last character only.
   const suit = card.slice(-1);
+  //select everything from index 0 and stop before the last character
   const rank = card.slice(0, -1);
 
-  // 4. Suit must be valid
+  // 5. Checking suit validity
+  //Checks if suit is in the array
   if (!validSuits.includes(suit)) {
     throw new Error("Invalid card");
   }
-
-  // 5. Rank must be valid
+  // 6. Checking rank validity
+  //Checks if rank is in the array
   if (!validRanks.includes(rank)) {
     throw new Error("Invalid card");
   }
-
-  // ---------- ALL INPUT IS NOW VALID ----------
-
+  //7. Determines the output values for special cards
   if (rank === "A") return 11;
   if (["J", "Q", "K"].includes(rank)) return 10;
-
+  // 8. Otherwise it returns the number of the card
   return Number(rank);
 }
+
 // The line below allows us to load the getCardValue function into tests in other files.
 // This will be useful in the "rewrite tests with jest" step.
 module.exports = getCardValue;
@@ -80,13 +87,43 @@ function assertEquals(actualOutput, targetOutput) {
 // TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
 // Examples:
 assertEquals(getCardValue("9♠"), 9);
+assertEquals(getCardValue("A♠"), 11);
+assertEquals(getCardValue("Q♥"), 10);
+assertEquals(getCardValue("K♦"), 10);
+assertEquals(getCardValue("J♣"), 10);
 
 // Handling invalid cards
 try {
   getCardValue("invalid");
 
   // 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 (error) {}
 
 // What other invalid card cases can you think of?
+try {
+  getCardValue("789");
+
+  // This line will not be reached if an error is thrown as expected
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("");
+  console.error("Error was not thrown for invalid card");
+} catch (e) {}
+
+try {
+  getCardValue("♠♥♦♣");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("5$");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}
+
+try {
+  getCardValue("£50");
+  console.error("Error was not thrown for invalid card");
+} catch (error) {}

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

@@ -6,13 +6,48 @@ const getCardValue = require("../implement/3-get-card-value");
 
 // Case 1: Ace (A)
 test(`Should return 11 when given an ace card`, () => {
-  expect(getCardValue("A♠")).toEqual(11);
-});
-
+  expect(getCardValue("A♠")).toEqual(11)});
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
+test(`Should return a number given 9 card` , ()=> {
+  expect(getCardValue("9♠")).toEqual(9)});
 //   Face Cards (J, Q, K)
+test(`Should return 10 when given a Queen card`, () => {
+  expect(getCardValue("Q♥")).toEqual(10);
+});
+test(`Should return 10 when given a King card`, () => {
+  expect(getCardValue("K♦")).toEqual(10);
+});
+
+test(`Should return 10 when given a Jack card`, () => {
+  expect(getCardValue("J♣")).toEqual(10);
+});
+
 //   Invalid Cards
+test('Should throw "Invalid card" for "invalid"', () => {
+  expect(() => getCardValue("invalid")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "789"', () => {
+  expect(() => getCardValue("789")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input ""', () => {
+  expect(() => getCardValue("")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "♠♥♦♣"', () => {
+  expect(() => getCardValue("♠♥♦♣")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "♠♥♦♣"', () => {
+  expect(() => getCardValue("5$")).toThrow("Invalid card");
+});
+
+test('Should throw "Invalid card" for input "♠♥♦♣"', () => {
+  expect(() => getCardValue("£50")).toThrow("Invalid card");
+});
+
 
 // To learn how to test whether a function throws an error as expected in Jest,
 // please refer to the Jest documentation: