Split up player test and regular board test

Author: Databean

Makefile

@@ -18,7 +18,7 @@ $(EXECUTABLE): $(ALLFILES)
 	${LD} obj/*.o $(LDFLAGS) -o $(EXECUTABLE)
 
 .PHONY: tests
-tests:
+tests: $(EXECUTABLE)
 	cd UnitTest++ && $(MAKE) libUnitTest++.a
 	cd tests && $(MAKE)
 

src/GameBoard.cpp

@@ -60,15 +60,16 @@ GameBoard::GameBoard(istream& in) {
 	}
 
 	auto playerElements = doc.RootElement()->FirstChildElement("players");
-	
-	for(auto playerElement = playerElements->FirstChildElement(); playerElement; playerElement = playerElement->NextSiblingElement()) {
-		unique_ptr<Player> player(new Player(playerElement->FirstChildElement("name")->FirstChild()->Value()));
-		player->setWood(fromString<int>(playerElement->FirstChildElement("wood")->FirstChild()->Value()));
-		player->setBrick(fromString<int>(playerElement->FirstChildElement("brick")->FirstChild()->Value()));
-		player->setOre(fromString<int>(playerElement->FirstChildElement("ore")->FirstChild()->Value()));
-		player->setWheat(fromString<int>(playerElement->FirstChildElement("wheat")->FirstChild()->Value()));
-		player->setWool(fromString<int>(playerElement->FirstChildElement("wool")->FirstChild()->Value()));
-		players.emplace_back(std::move(player));
+	if(playerElements) {
+		for(auto playerElement = playerElements->FirstChildElement(); playerElement; playerElement = playerElement->NextSiblingElement()) {
+			unique_ptr<Player> player(new Player(playerElement->FirstChildElement("name")->FirstChild()->Value()));
+			player->setWood(fromString<int>(playerElement->FirstChildElement("wood")->FirstChild()->Value()));
+			player->setBrick(fromString<int>(playerElement->FirstChildElement("brick")->FirstChild()->Value()));
+			player->setOre(fromString<int>(playerElement->FirstChildElement("ore")->FirstChild()->Value()));
+			player->setWheat(fromString<int>(playerElement->FirstChildElement("wheat")->FirstChild()->Value()));
+			player->setWool(fromString<int>(playerElement->FirstChildElement("wool")->FirstChild()->Value()));
+			players.emplace_back(std::move(player));
+		}
 	}
 }
 

tests/testSerialization.cpp

@@ -17,7 +17,21 @@ using std::stringstream;
 
 TEST(emptyBoardSerialization) {
 	vector<unique_ptr<Player>> players;
+	
+	GameBoard testBoard(std::move(players));
+	
+	stringstream stream;
+	testBoard.save(stream);
+	
+	GameBoard copyBoard(stream);
+	
+	CHECK(testBoard == copyBoard);
+}
+
+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));