relearning pointers

Author: Kyle Grage

tests/test_CornerPiece.cpp

@@ -19,10 +19,9 @@ TEST(Settlement_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Settlement test_cp(&board, loc, test_player);
+	Settlement test_cp(board, loc, test_player);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(1, test_cp.getVictoryPoints());
 }
 
@@ -31,10 +30,9 @@ TEST(City_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	City test_cp(&board, loc, test_player);
+	City test_cp(board, loc, test_player);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(2, test_cp.getVictoryPoints());
 }
 
@@ -43,10 +41,9 @@ TEST(Wonder_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Wonder test_cp(&board, loc, test_player);
+	Wonder test_cp(board, loc, test_player);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(10, test_cp.getVictoryPoints());
 }
 
@@ -55,11 +52,10 @@ TEST(City_upgrade_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Settlement intermediate_cp(&board, loc, test_player);
-	City test_cp(&intermediate_cp);
+	Settlement intermediate_cp(board, loc, test_player);
+	City test_cp(intermediate_cp);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(2, test_cp.getVictoryPoints());
 }
 
@@ -68,11 +64,10 @@ TEST(Wonder_upgrade_settlement_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Settlement intermediate_cp(&board, loc, test_player);
-	Wonder test_cp(&intermediate_cp);
+	Settlement intermediate_cp(board, loc, test_player);
+	Wonder test_cp(intermediate_cp);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(10, test_cp.getVictoryPoints());
 }
 
@@ -81,11 +76,10 @@ TEST(Wonder_upgrade_city_constructor){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	City intermediate_cp(&board, loc, test_player);
-	Wonder test_cp(&intermediate_cp);
+	City intermediate_cp(board, loc, test_player);
+	Wonder test_cp(intermediate_cp);
 	CHECK_EQUAL(loc, test_cp.getLocation());
-	CHECK_EQUAL(&board, test_cp.getBoard());
-	CHECK_EQUAL(&test_player, test_cp.getOwner());
+	CHECK_EQUAL(board, test_cp.getBoard());
 	CHECK_EQUAL(10, test_cp.getVictoryPoints());
 }
 
@@ -95,7 +89,7 @@ TEST(Settlement_Resource_Mod){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Settlement test_cp(&board, loc, test_player);
+	Settlement test_cp(board, loc, test_player);
 	CHECK_EQUAL(1, test_cp.getResourceModifier());
 }
 
@@ -104,7 +98,7 @@ TEST(City_Resource_Mod){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	City test_cp(&board, loc, test_player);
+	City test_cp(board, loc, test_player);
 	CHECK_EQUAL(2, test_cp.getResourceModifier());
 }
 
@@ -113,7 +107,7 @@ TEST(Wonder_Resource_Mod){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Wonder test_cp(&board, loc, test_player);
+	Wonder test_cp(board, loc, test_player);
 	CHECK_EQUAL(10, test_cp.getResourceModifier());
 }
 
@@ -123,7 +117,7 @@ TEST(Settlement_Victory_Pts){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Settlement test_cp(&board, loc, test_player);
+	Settlement test_cp(board, loc, test_player);
 	CHECK_EQUAL(1, test_cp.getVictoryPoints());
 }
 
@@ -132,7 +126,7 @@ TEST(City_Victory_Pts){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	City test_cp(&board, loc, test_player);
+	City test_cp(board, loc, test_player);
 	CHECK_EQUAL(2, test_cp.getVictoryPoints());
 }
 
@@ -141,7 +135,7 @@ TEST(Wonder_Victory_Pts){
 	GameBoard board({"test board"});
 	Player& test_player = board.getPlayer(0);
 
-	Wonder test_cp(&board, loc, test_player);
+	Wonder test_cp(board, loc, test_player);
 	CHECK_EQUAL(10, test_cp.getVictoryPoints());
 }