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

Author: Temceo

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

@@ -20,56 +20,82 @@
 // Acceptance criteria:
 // After you have implemented the function, write tests to cover all the cases, and
 // execute the code to ensure all tests pass.
-function generateValidCards() {
-  const ranks = "A,2,3,4,5,6,7,8,9,10,J,Q,K".split(",");
-  const suites = "♠,♥,♦,♣".split(",");
-  const validCards = new Set();
-  for (const rank of ranks) {
-    for (const suite of suites) {
-      validCards.add(rank + suite);
-    }
-  }
-  return validCards;
-}
 
 function getCardValue(card) {
   // TODO: Implement this function
-  const validCards = generateValidCards();
-  if (!validCards.has(card)) {
-    throw new Error("invalid");
+  const cardRanks = "A,2,3,4,5,6,7,8,9,10,J,Q,K".split(",");
+  const cardSuits = "♠,♥,♦,♣".split(",");
+
+  // Throw error if card is empty
+  if (!card) throw new Error(`Invalid card`);
+
+  const cardSuit = card[card.length - 1];
+  // Throw error is card suit is not valid
+  if (!cardSuits.includes(cardSuit)) {
+    throw new Error(`Invalid card suit`);
   }
 
-  let cardValue = card.slice(0, -1);
-  if (cardValue === "A") return 11;
-  if (cardValue === "J" || cardValue === "Q" || cardValue === "K") return 10;
-  return Number(cardValue);
+  const cardRank = card.slice(0, -1);
+  // Throw error is cardRank is not valid
+  if (!cardRanks.includes(cardRank)) {
+    throw new Error(`Invalid card rank`);
+  }
+
+  // Return the card value based on given rank
+  if (cardRank === "A") return 11;
+  if (["J", "Q", "K"].includes(cardRank)) return 10;
+  return Number(cardRank);
 }
 
 // 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;
 
 // Helper functions to make our assertions easier to read.
-function assertEquals(card, targetOutput) {
+function assertEquals(actualOutput, targetOutput) {
+  console.assert(
+    actualOutput === targetOutput,
+    `Expected ${actualOutput} to equal ${targetOutput}`
+  );
+}
+
+// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
+// Examples:
+assertEquals(getCardValue("9♠"), 9);
+assertEquals(getCardValue("J♥"), 10);
+assertEquals(getCardValue("Q♣"), 10);
+assertEquals(getCardValue("K♠"), 10);
+assertEquals(getCardValue("A♥"), 11);
+assertEquals(getCardValue("10♦"), 10);
+
+// Handling invalid cards
+function assertErrors(func, errorMessage) {
   try {
-    console.log(`Card: ${card}`);
-    const actualOutput = getCardValue(card);
+    func();
+    console.error("Error was not thrown for invalid card 😢");
+  } catch (error) {
     console.assert(
-      actualOutput === targetOutput,
-      `Expected ${actualOutput} to equal ${targetOutput}`
+      error.message.includes(errorMessage),
+      `Expected error: ${errorMessage}, got: ${error.message}`
     );
-    console.error("Error was not thrown for invalid card 😢");
-  } catch (e) {
     console.log("Error thrown for invalid card 🎉");
   }
-  console.log("-".repeat(45));
 }
 
-// TODO: Write tests to cover all outcomes, including throwing errors for invalid cards.
-assertEquals("9♠", 9);
-assertEquals("A", 11);
-assertEquals("Q", 10);
-assertEquals("5", 5);
-assertEquals("A♣", 11);
-assertEquals("Q♣", 11);
-assertEquals("A♦", 10);
+function testInvalidCards() {
+  const invalidCardCases = [
+    ["A", "Invalid card suit"],
+    ["11♠", "Invalid card rank"],
+    ["N♠", "Invalid card rank"],
+    ["7K", "Invalid card suit"],
+    ["", "Invalid card"],
+  ];
+
+  invalidCardCases.forEach(([card, message]) => {
+    console.log("-".repeat(50));
+    console.log(`Card: ${card}, Message: ${message}`);
+    assertErrors(() => getCardValue(card), message);
+  });
+}
+
+testInvalidCards();

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

@@ -9,6 +9,24 @@ test(`Should return 11 when given an ace card`, () => {
   expect(getCardValue("A♠")).toEqual(11);
 });
 
+test(`Should return 10 when given an a face card of J, Q or K`, () => {
+  expect(getCardValue("J♠")).toEqual(10);
+  expect(getCardValue("Q♠")).toEqual(10);
+  expect(getCardValue("K♠")).toEqual(10);
+});
+
+test(`Should return number when given an a face card (>= 2 && < 10)`, () => {
+  expect(getCardValue("2♠")).toEqual(2);
+  expect(getCardValue("6♠")).toEqual(6);
+  expect(getCardValue("9♠")).toEqual(9);
+});
+
+test(`Should return an error for an invalid card`, () => {
+  expect(getCardValue("2")).toThrowError();
+  expect(getCardValue("Q")).toThrowError();
+  expect(getCardValue("5")).toThrowError();
+});
+
 // Suggestion: Group the remaining test data into these categories:
 //   Number Cards (2-10)
 //   Face Cards (J, Q, K)
@@ -17,4 +35,3 @@ test(`Should return 11 when given an ace card`, () => {
 // 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
-