Made some test for updating victory points

Author: PickledMonkey

src/Player.cpp

@@ -278,8 +278,7 @@ void Player::updateVictoryPoints()
 	if(largestArmy){
 		sum_points+=2;
 	}
-
-
+	victoryPoints = sum_points;
 }
 
 /**

tests/Makefile

@@ -8,7 +8,7 @@ run: $(TEST_FILE)
 	./$(TEST_FILE)
 
 $(TEST_FILE): ../$(EXECUTABLE) $(TEST_LINK_FILES) $(wildcard *.cpp)
-	$(CXX) $(CXXFLAGS) $(TEST_INCLUDE) $(wildcard *.cpp) -o $@ $(TEST_LINK_FILES) $(OBJECTS_NO_MAIN) $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -I$(TEST_INCLUDE) $(wildcard *.cpp) -o $@ $(TEST_LINK_FILES) $(OBJECTS_NO_MAIN) $(LDFLAGS)
 
 .PHONY: clean
 clean:

tests/test_Player.cpp

@@ -8,6 +8,7 @@
 #include "UnitTest++.h"
 #include "Player.h"
 #include "GameBoard.h"
+#include "DevelopmentCard.h"
 
 
 /**
@@ -230,11 +231,140 @@ TEST(Buy_DevCard_False){
 
 
 //INSERT VICTORY POINT TESTS HERE
+TEST(UpdateVictoryPoints_Settlements){
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
 
+	CHECK(test_player.getVictoryPoints() == 0);
 
-//INSERT DEV CARD TESTS HERE
+	Coordinate start1(0,0);
+	test_board.PlaceSettlement(start1, test_player);
 
+	CHECK(test_player.getVictoryPoints() == 1);
+}
+
+TEST(UpdateVictoryPoints_cities){
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
+
+	CHECK(test_player.getVictoryPoints() == 0);
+
+	Coordinate start1(0,0);
+	test_board.PlaceSettlement(start1, test_player);
+
+	CHECK(test_player.getVictoryPoints() == 1);
+
+	test_board.UpgradeSettlement(start1);
+	CHECK(test_player.getVictoryPoints() == 2);
+}
+
+TEST(UpdateVictoryPoints_longestRoad){
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
+
+	CHECK(test_player.getVictoryPoints() == 0);
 
-//INSERT TRADING TESTS HERE
+	Coordinate start1(0,0);
+	test_board.PlaceSettlement(start1, test_player);
 
+	CHECK(test_player.getVictoryPoints() == 1);
+
+	test_board.PlaceRoad(start1, Coordinate(-1,1), test_player);
+	test_board.PlaceRoad(Coordinate(-1,1), Coordinate(-1,2), test_player);
+	test_board.PlaceRoad(Coordinate(-1,2), Coordinate(0,2), test_player);
+	test_board.PlaceRoad(Coordinate(0,2), Coordinate(0,3), test_player);
+	test_board.PlaceRoad(Coordinate(0,3), Coordinate(1,3), test_player);
+
+	CHECK(test_player.getVictoryPoints() == 3);
+}
+
+TEST(UpdateVictoryPoints_VictoryCards){
+	GameBoard test_board({"tester"});
+	Player& test_player = test_board.getPlayer(0);
+
+	CHECK(test_player.getVictoryPoints() == 0);
+	CHECK(test_player.getVictoryPointsWithoutCards() == 0);
+
+	std::unique_ptr<DevelopmentCard> test_VictoryCard = std::unique_ptr<DevelopmentCard>(new VictoryPointCard());
+	test_player.addOre(1);
+	test_player.addWheat(1);
+	test_player.addWool(1);
+
+	test_player.buyCard(test_VictoryCard);
+	CHECK(test_player.getVictoryPoints() == 1);
+	CHECK(test_player.getVictoryPointsWithoutCards() == 0);
+}
+
+TEST(UpdateVictoryPoints_LargestArmy){
+	GameBoard test_board({"tester1", "tester2"});
+	Player& test_player = test_board.getPlayer(0);
+	Player& opponent = test_board.getPlayer(1);
+
+	CHECK(test_player.getVictoryPoints() == 0);
+
+	test_player.addOre(3);
+	test_player.addWheat(3);
+	test_player.addWool(3);
+
+	std::unique_ptr<DevelopmentCard> test_KnightCard = std::unique_ptr<DevelopmentCard>(new KnightCard());
+	test_player.buyCard(test_KnightCard);
+	test_player.buyCard(test_KnightCard);
+	test_player.buyCard(test_KnightCard);
+
+	test_board.PlaceSettlement(Coordinate(0,0), opponent);
+//	WILL NOT WORK UNTIL THE KNIGHT WORKS
+//	test_player.playKnight(Coordinate(0,1), opponent);
+//	test_player.playKnight(Coordinate(0,1), opponent);
+//	test_player.playKnight(Coordinate(0,1), opponent);
+//
+//	CHECK(test_player.getVictoryPoints() == 2);
+}
+
+TEST(UpdateVictoryPoints_all){
+	GameBoard test_board({"tester", "opponent"});
+	Player& test_player = test_board.getPlayer(0);
+	Player& opponent = test_board.getPlayer(1);
+
+	CHECK(test_player.getVictoryPoints() == 0);
+
+	Coordinate start1(0,0);
+
+	test_board.PlaceSettlement(start1, test_player);
+
+	CHECK(test_player.getVictoryPoints() == 1);
+
+	test_board.PlaceRoad(start1, Coordinate(-1,1), test_player);
+	test_board.PlaceRoad(Coordinate(-1,1), Coordinate(-1,2), test_player);
+	test_board.PlaceRoad(Coordinate(-1,2), Coordinate(0,2), test_player);
+	test_board.PlaceRoad(Coordinate(0,2), Coordinate(0,3), test_player);
+	test_board.PlaceRoad(Coordinate(0,3), Coordinate(1,3), test_player);
+
+	CHECK(test_player.getVictoryPoints() == 3);
+
+	test_board.UpgradeSettlement(start1);
+
+	CHECK(test_player.getVictoryPoints() == 4);
+
+	std::unique_ptr<DevelopmentCard> test_VictoryCard = std::unique_ptr<DevelopmentCard>(new VictoryPointCard());
+	test_player.addOre(4);
+	test_player.addWheat(4);
+	test_player.addWool(4);
+
+	test_player.buyCard(test_VictoryCard);
+	CHECK(test_player.getVictoryPoints() == 5);
+
+	std::unique_ptr<DevelopmentCard> test_KnightCard = std::unique_ptr<DevelopmentCard>(new KnightCard());
+	test_player.buyCard(test_KnightCard);
+	test_player.buyCard(test_KnightCard);
+	test_player.buyCard(test_KnightCard);
+
+//	WILL NOT WORK UNTIL THE KNIGHT WORKS
+//	test_board.PlaceSettlement(Coordinate(0,6), opponent);
+//
+//	test_player.playKnight(Coordinate(0,5), opponent);
+//	test_player.playKnight(Coordinate(0,5), opponent);
+//	test_player.playKnight(Coordinate(0,5), opponent);
+//
+//	CHECK(test_player.getVictoryPoints() == 7);
+}