--

Author: ankit21

include/Deck.h

@@ -14,7 +14,7 @@
 //#include "DevelopmentCard.h"
 
 
-enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
+enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING, NULLTYPE };
 
 
 /**

src/Deck.cpp

@@ -86,7 +86,7 @@ DevCardType Deck::drawCard()
 
     if(this->getSize() == 0)
     {
-        return KNIGHT;
+        return NULLTYPE;
     }
 
     DevCardType card = this->deck.back();

tests/test_Deck.cpp

@@ -14,7 +14,7 @@ TEST(DeckTest, deck_draw)
 {
     Deck* testDeck= new Deck();
     DevCardType temp = testDeck->drawCard();
-    ASSERT_NE(temp, KNIGHT);
+    ASSERT_NE(temp, NULLTYPE);
     testDeck->discard(temp);
 //    temp = NULL;
 //    delete testDeck;
@@ -27,7 +27,7 @@ TEST(DeckTest, reshuffle_discard_pile)
     for (int i = 0; i<300; i++)
     {
         drawn = testDeck->drawCard();
-        ASSERT_NE(drawn, KNIGHT);
+        ASSERT_NE(drawn, NULLTYPE);
         testDeck->discard(drawn);
 //        drawn = NULL;
     }