Fixed tests.

Author: Databean

tests/testSerialization.cpp

@@ -17,9 +17,7 @@ using std::unique_ptr;
 using std::stringstream;
 
 TEST(emptyBoardSerialization) {
-	vector<unique_ptr<Player>> players;
-	
-	GameBoard testBoard(std::move(players));
+	GameBoard testBoard({});
 
 	stringstream stream;
 	testBoard.save(stream);
@@ -30,11 +28,7 @@ TEST(emptyBoardSerialization) {
 }
 
 TEST(multiplePlayerSerialization) {
-	vector<unique_ptr<Player>> players;
-	players.emplace_back(unique_ptr<Player>(new Player("test")));
-	players.emplace_back(unique_ptr<Player>(new Player("test2")));
-	
-	GameBoard testBoard(std::move(players));
+	GameBoard testBoard({"test", "test2"});
 
 	stringstream stream;
 	testBoard.save(stream);
@@ -45,15 +39,13 @@ TEST(multiplePlayerSerialization) {
 }
 
 TEST(testCardSerialization) {
-	vector<unique_ptr<Player>> players;
-	players.emplace_back(unique_ptr<Player>(new Player("test")));
-	players[0]->buyCard(unique_ptr<DevelopmentCard>(new KnightCard()));
-	players[0]->buyCard(unique_ptr<DevelopmentCard>(new VictoryPointCard()));
-	players[0]->buyCard(unique_ptr<DevelopmentCard>(new YearOfPlentyCard()));
-	players[0]->buyCard(unique_ptr<DevelopmentCard>(new MonopolyCard()));
-	players[0]->buyCard(unique_ptr<DevelopmentCard>(new RoadBuildingCard()));
-	
-	GameBoard testBoard(std::move(players));
+	GameBoard testBoard({"test"});
+	Player& testPlayer = testBoard.getPlayer(0);
+	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new KnightCard(testBoard)));
+	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new VictoryPointCard(testBoard)));
+	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new YearOfPlentyCard(testBoard)));
+	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new MonopolyCard(testBoard)));
+	testPlayer.buyCard(unique_ptr<DevelopmentCard>(new RoadBuildingCard(testBoard)));
 
 	stringstream stream;
 	testBoard.save(stream);
@@ -64,15 +56,9 @@ TEST(testCardSerialization) {
 }
 
 TEST(roadSerialization) {
-	vector<unique_ptr<Player>> players;
-	players.emplace_back(unique_ptr<Player>(new Player("test")));
-	players.emplace_back(unique_ptr<Player>(new Player("test2")));
-	std::cout << __LINE__ << "\n";
-	Player& firstPlayer = *players[0];
-	Player& secondPlayer = *players[1];
-	std::cout << __LINE__ << "\n";
-	
-	GameBoard testBoard(std::move(players));
+	GameBoard testBoard({"test", "test2"});
+	Player& firstPlayer = testBoard.getPlayer(0);
+	Player& secondPlayer = testBoard.getPlayer(1);
 
 	testBoard.PlaceSettlement(Coordinate(0,0), firstPlayer);
 	testBoard.PlaceSettlement(Coordinate(-1,1), secondPlayer);
@@ -88,12 +74,8 @@ TEST(roadSerialization) {
 }
 
 TEST(settlementSerialization) {
-	vector<unique_ptr<Player>> players;
-	players.emplace_back(unique_ptr<Player>(new Player("test")));
-	
-	Player& player = *players[0];
-	
-	GameBoard testBoard(std::move(players));
+	GameBoard testBoard({"test"});
+	Player& player = testBoard.getPlayer(0);
 
 	testBoard.PlaceSettlement(Coordinate(0, 0), player);
 	testBoard.PlaceSettlement(Coordinate(1, 1), player);

tests/test_Deck.cpp

@@ -6,12 +6,14 @@
  */
 
 #include "Deck.h"
+#include "GameBoard.h"
 #include "Util.h"
 #include "UnitTest++.h"
 
 TEST(deck_draw)
 {
-    Deck* testDeck= new Deck();
+	GameBoard board({});
+    Deck* testDeck= new Deck(board);
     DevelopmentCard* temp = testDeck->drawCard();
     CHECK(temp!=NULL);
     testDeck->discard(temp);
@@ -21,7 +23,8 @@ TEST(deck_draw)
 
 TEST(reshuffle_discard_pile)
 {
-    Deck* testDeck= new Deck();
+	GameBoard board({});
+    Deck* testDeck= new Deck(board);
     DevelopmentCard* drawn = NULL;
     for (int i = 0; i<300; i++)
     {

tests/test_DevelopmentCards.cpp

@@ -11,15 +11,12 @@
 
 
 TEST(RoadBuildingCard_good){
-	std::vector<std::unique_ptr<Player>> players {};
-	players.emplace_back(new Player("tester"));
-	Player& test_player = *players[0];
-	GameBoard test_board(std::move(players));
-	test_player.setBoard(&test_board);
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
 
 	test_board.PlaceSettlement(Coordinate(0,0), test_player);
 
-	RoadBuildingCard test_card;
+	RoadBuildingCard test_card(test_board);
 
 	try{
 		test_card.playCard(&test_player, Coordinate(0,0), Coordinate(-1,1), Coordinate(0,0), Coordinate(1,0));
@@ -31,15 +28,12 @@ TEST(RoadBuildingCard_good){
 }
 
 TEST(RoadBuildingCard_bad){
-	std::vector<std::unique_ptr<Player>> players {};
-	players.emplace_back(new Player("tester"));
-	Player& test_player = *players[0];
-	GameBoard test_board(std::move(players));
-	test_player.setBoard(&test_board);
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
 
 	test_board.PlaceSettlement(Coordinate(0,0), test_player);
 
-	RoadBuildingCard test_card;
+	RoadBuildingCard test_card(test_board);
 
 	try{
 		test_card.playCard(&test_player, Coordinate(0,0), Coordinate(0,2), Coordinate(0,0), Coordinate(1,0));