...4

Author: Kyle Grage

tests/test_Player.cpp

@@ -1,5 +1,5 @@
 /*
- * test_PlayerPurchase.cpp
+ * test_Player&Purchase.cpp
  *
  *  Created on: Apr 11, 2014
  *      Author: Kyle Grage
@@ -21,7 +21,7 @@ const int WOOL_INDEX = 4;
  * @param player
  * @return bool if the values match
  */
-bool validateResourceAmount(int wood, int brick, int ore, int wheat, int wool, Player tp){
+bool validateResourceAmount(int wood, int brick, int ore, int wheat, int wool, Player& tp){
 	return wood==tp.getWood() && brick==tp.getBrick() && ore==tp.getOre() && wheat==tp.getWheat() && wool==tp.getWool();
 }
 
@@ -31,15 +31,15 @@ bool validateResourceAmount(int wood, int brick, int ore, int wheat, int wool, P
  * @param player
  * @return bool if the values match
  */
-bool validateTradeModifiers(int wood, int brick, int ore, int wheat, int wool, Player tp){
+bool validateTradeModifiers(int wood, int brick, int ore, int wheat, int wool, Player& tp){
 	return wood==tp.getWoodModifier() && brick==tp.getBrickModifier() && ore==tp.getOreModifier()
 			&& wheat==tp.getWheatModifier() && wool==tp.getWoolModifier();
 
 }
 
 TEST(Player_constructor){
-	Player tp(nullptr, "Buster");
-	CHECK_EQUAL("Buster", tp.getName());
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	CHECK_EQUAL(0, tp.getLongestRoad());
 	CHECK_EQUAL(0, tp.getArmySize());
 	CHECK_EQUAL(0, tp.getDevCardsInHand());
@@ -49,7 +49,8 @@ TEST(Player_constructor){
 }
 
 TEST(Adders_Positive){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addBrick(1);
 	tp.addWood(1);
 	tp.addOre(1);
@@ -61,7 +62,8 @@ TEST(Adders_Positive){
 }
 
 TEST(Adders_Negative_Normal){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,5,5,5);
 	tp.addBrick(-1);
 	tp.addWood(-1);
@@ -74,7 +76,8 @@ TEST(Adders_Negative_Normal){
 }
 
 TEST(Adders_Negative_Excessive){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(1,1,1,1,1);
 	tp.addBrick(-2);
 	tp.addWood(-2);
@@ -89,43 +92,50 @@ TEST(Adders_Negative_Excessive){
 
 //TRADE MODIFIERS
 TEST(Trade_Modifiers_Brick){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setBrickModifier();
 	CHECK(validateTradeModifiers(4,2,4,4,4,tp));
 }
 
 TEST(Trade_Modifiers_Wood){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setWoodModifier();
 	CHECK(validateTradeModifiers(2,4,4,4,4,tp));
 }
 
 TEST(Trade_Modifiers_Ore){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setOreModifier();
 	CHECK(validateTradeModifiers(4,4,2,4,4,tp));
 }
 
 TEST(Trade_Modifiers_Wheat){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setWheatModifier();
 	CHECK(validateTradeModifiers(4,4,4,2,4,tp));
 }
 
 TEST(Trade_Modifiers_Wool){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setWoolModifier();
 	CHECK(validateTradeModifiers(4,4,4,4,2,tp));
 }
 
 TEST(Trade_Modifiers_3){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setGeneralModifier();
 	CHECK(validateTradeModifiers(3,3,3,3,3,tp));
 }
 
 TEST(Trade_Modifiers_Mixed){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.setWheatModifier();
 	tp.setOreModifier();
 	tp.setGeneralModifier();
@@ -134,79 +144,89 @@ TEST(Trade_Modifiers_Mixed){
 
 //PLAYER PURCHASES
 TEST(Buy_Settlement_True){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,5,5,5);
 	CHECK_EQUAL(true, tp.canBuySettlement());
 	tp.buySettlement();
 	CHECK(validateResourceAmount(4,4,5,4,4,tp));
 }
 
 TEST(Buy_Settlement_False){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(0,1,1,1,1);
 	CHECK_EQUAL(false, tp.canBuySettlement());
 	tp.buySettlement();
 	CHECK(validateResourceAmount(0,1,1,1,1,tp));
 }
 
 TEST(Buy_Road_True){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,5,5,5);
 	CHECK_EQUAL(true, tp.canBuyRoad());
 	tp.buyRoad();
 	CHECK(validateResourceAmount(4,4,5,5,5,tp));
 }
 
 TEST(Buy_Road_False){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(0,1,1,1,1);
 	CHECK_EQUAL(false, tp.canBuyRoad());
 	tp.buyRoad();
 	CHECK(validateResourceAmount(0,1,1,1,1,tp));
 }
 
 TEST(Buy_City_True){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,5,5,5);
 	CHECK_EQUAL(true, tp.canBuyCity());
 	tp.buyCity();
 	CHECK(validateResourceAmount(5,5,2,3,5,tp));
 }
 
 TEST(Buy_City_False){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(1,1,1,1,1);
 	CHECK_EQUAL(false, tp.canBuyCity());
 	tp.buyCity();
 	CHECK(validateResourceAmount(1,1,1,1,1,tp));
 }
 
 TEST(Buy_Wonder_True){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(6,6,6,6,6);
 	CHECK_EQUAL(true, tp.canBuyWonder());
 	tp.buyWonder();
 	CHECK(validateResourceAmount(1,1,1,1,1,tp));
 }
 
 TEST(Buy_Wonder_False){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,1,5,5);
 	CHECK_EQUAL(false, tp.canBuyWonder());
 	tp.buyWonder();
 	CHECK(validateResourceAmount(5,5,1,5,5,tp));
 }
 
 TEST(Buy_DevCard_True){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(5,5,5,5,5);
 	CHECK_EQUAL(true, tp.canBuyCard());
 	tp.buyCard();
 	CHECK(validateResourceAmount(5,5,4,4,4,tp));
 }
 
 TEST(Buy_DevCard_False){
-	Player tp(nullptr, "Buster");
+	GameBoard board({"test board"});
+	Player& tp = board.getPlayer(0);
 	tp.addMultiple(1,1,0,1,1);
 	CHECK_EQUAL(false, tp.canBuyCard());
 	tp.buyCard();