Function logic: added safeguards for incorrect suit and card value, added error for both if conditions do not pass. Added tests in node and jest for the incorrect suit case and error throwing. All tests pass.

Author: leigh-ross

implement-and-rewrite-tests/implement-tests-with-node-test/3-get-card-value.test.js

@@ -43,4 +43,27 @@ describe ("Invalid cards", () => {
   test("Out of bound: 11♥", () => {
   assert.throws(() => getCardValue("11♥"), /Expected a number followed by a suit, but got "11♥"/);
     });
+});
+
+describe("Invalid card suits", () => {
+  test("Arbitrary non-card string", () => {
+    assert.throws(
+      () => getCardValue("2O"),
+      /Expected card suit to be: "♠", "♥", "♦", "♣" but got "2O"/,
+      "Expected clear error"
+    );
+  });
+  test("Out of bounds: 1d", () => {
+    assert.throws(
+      () => getCardValue("8d"),
+      /Expected card suit to be: "♠", "♥", "♦", "♣" but got "8d"/
+    );
+  });
+  test("Out of bound: 11X", () => {
+    assert.throws(
+      () => getCardValue("9X"),
+      //`Expected card suit to be: "♠", "♥", "♦", "♣" but got ${cardSuit}`
+      /Expected card suit to be: "♠", "♥", "♦", "♣" but got "9X"/
+    );
+  });
 });

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

@@ -1,40 +1,41 @@
-// This problem involves playing cards: https://en.wikipedia.org/wiki/Standard_52-card_deck
+/* 
+This problem involves playing cards: https://en.wikipedia.org/wiki/Standard_52-card_deck
 
-// Don't forget to write tests in implement-tests-with-node-test.
-
-// Implement a function getCardValue, when given a string representing a playing card,
-// should return the numerical value of the card.
-
-// A valid card string will contain a rank followed by the suit.
-// The rank can be one of the following strings:
-//   "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♦".
-
-// 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.
-// When the card is a number card ("2" to "10"), the function should return its numeric value.
-
-// When the card string is invalid (not following the above format), the function should
-// throw an error.
-
-// Acceptance criteria:
-// After you have implemented the function, write tests to cover all the cases, and
-// execute the code to ensure all tests pass.
+Implement a function getCardValue, when given a string representing a playing card,
+should return the numerical value of the card.
+A valid card string will contain a rank followed by the suit.
+The rank can be one of the following strings:
+  "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♦".
+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.
+When the card is a number card ("2" to "10"), the function should return its numeric value.
+When the card string is invalid (not following the above format), the function should
+throw an error.
+Acceptance criteria:
+After you have implemented the function, write tests to cover all the cases, and
+execute the code to ensure all tests pass.
+*/
 
 export function getCardValue(card) {
-  // TODO: Implement this function
   const cardValue = card.slice(0,-1);
+  const cardSuit = card.slice(-1);
+  const validSuits = ["♠", "♥", "♦", "♣"];
+  const validNumberCards = ["2", "3", "4", "5", "6", "7", "8", "9", "10"]
+  const validFaceCards = ["A", "K", "Q", "J"];
   const cardValueNumber = Number(cardValue)
-  if (cardValue === "A") {
-    return 11
-  }
-  else if (cardValue === "K" || cardValue === "Q" || cardValue === "J") {
-    return 10
+  if (!validNumberCards.includes(cardValue) && !validFaceCards.includes(cardValue)){
+    throw new Error(`Expected a number followed by a suit, but got "${card}"`);
+  } else if (!validSuits.includes(cardSuit)) {
+    throw new Error(`Expected card suit to be: "♠", "♥", "♦", "♣" but got "${card}"`);
   }
-  else if (cardValueNumber >= 2 && cardValueNumber <= 10) {
-    return cardValueNumber
+    if (cardValue === "A") {
+      return 11;
+    } else if (validFaceCards.includes(cardValue)) {
+      return 10;
+    } else {
+      return cardValueNumber;
+    }
   }
-  throw new Error(`Expected a number followed by a suit, but got "${card}"`);
-}

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

@@ -62,4 +62,22 @@ describe("Invalid cards", () => {
       'Expected a number followed by a suit, but got "11♥"'
     );
   });
+});
+
+describe("Invalid card suits", () => {
+  test("Invalid suit: 2O", () => {
+    expect(() => getCardValue("2O")).toThrow(
+      'Expected card suit to be: "♠", "♥", "♦", "♣" but got "2O"'
+    );
+  });
+  test("Invalid suit: 8d", () => {
+    expect(() => getCardValue("8d")).toThrow(
+      'Expected card suit to be: "♠", "♥", "♦", "♣" but got "8d"'
+    );
+  });
+  test("Invalid suit: 9X", () => {
+    expect(() => getCardValue("9X")).toThrow(
+      'Expected card suit to be: "♠", "♥", "♦", "♣" but got "9X"'
+    );
+  });
 });