;;

Author: ankit21

tests/test_Deck.cpp

@@ -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, KNIGHT);
         testDeck->discard(drawn);
 //        drawn = NULL;
     }

tests/test_DevelopmentCards.cpp

@@ -15,18 +15,18 @@ void testBuyingCard(Player& test_player, DevCardType card, bool correct_result){
 	int prevOre = test_player.getOre();
 	int prevWheat = test_player.getWheat();
 	int prevWool = test_player.getWool();
-	int prevCards = test_player.getDevelopmentCards(card->getType());
+	int prevCards = test_player.getDevelopmentCards(card);
 	ASSERT_EQ(test_player.buyCard(card), correct_result);
 	if(correct_result){
 		ASSERT_EQ(prevOre, test_player.getOre()+1);
 		ASSERT_EQ(prevWheat, test_player.getWheat()+1);
 		ASSERT_EQ(prevWool, test_player.getWool()+1);
-		ASSERT_EQ(prevCards, test_player.getDevelopmentCards(card->getType()) -1);
+		ASSERT_EQ(prevCards, test_player.getDevelopmentCards(card) -1);
 	}else{
 		ASSERT_EQ(prevOre, test_player.getOre());
 		ASSERT_EQ(prevWheat, test_player.getWheat());
 		ASSERT_EQ(prevWool, test_player.getWool());
-		ASSERT_EQ(prevCards, test_player.getDevelopmentCards(card->getType()));
+		ASSERT_EQ(prevCards, test_player.getDevelopmentCards(card));
 	}
 }
 

tests/test_Player.cpp

@@ -350,7 +350,7 @@ TEST(PlayerTest, UpdateVictoryPoints_all){
 	test_player.addWheat(4);
 	test_player.addWool(4);
 
-	test_player.buyCard(VICTORY);
+	test_player.buyCard(VICTORYPOINT);
 	ASSERT_EQ(test_player.getVictoryPoints(), 5);
 
 //	std::unique_ptr<DevelopmentCard> test_KnightCard = std::unique_ptr<DevelopmentCard>(new KnightCard());