removed commented out lines

Author: ankit21

tests/testSerialization.cpp

@@ -7,7 +7,6 @@
 
 #include "Serialization.h"
 #include "GameBoard.h"
-//#include "DevelopmentCard.h"
 #include "Player.h"
 
 #include "tinyxml2.h"
@@ -41,11 +40,6 @@ TEST(SerializationTest, testCardSerialization) {
 	Player& testPlayer = testBoard.getPlayer(0);
 
 
-//	std::unique_ptr<DevelopmentCard> knight_card = unique_ptr<DevelopmentCard>(new KnightCard());
-//	std::unique_ptr<DevelopmentCard> victory_card = unique_ptr<DevelopmentCard>(new VictoryPointCard());
-//	std::unique_ptr<DevelopmentCard> plenty_card = unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
-//	std::unique_ptr<DevelopmentCard> monopoly_card = unique_ptr<DevelopmentCard>(new MonopolyCard());
-//	std::unique_ptr<DevelopmentCard> road_card = std::unique_ptr<DevelopmentCard>(new RoadBuildingCard());
 
 	testPlayer.buyCard(KNIGHT);
 	testPlayer.buyCard(VICTORYPOINT);

tests/test_Deck.cpp

@@ -16,8 +16,7 @@ TEST(DeckTest, deck_draw)
     DevCardType temp = testDeck->drawCard();
     ASSERT_NE(temp, NULLTYPE);
     testDeck->discard(temp);
-//    temp = NULL;
-//    delete testDeck;
+
 }
 
 TEST(DeckTest, reshuffle_discard_pile)

tests/test_DevelopmentCards.cpp

@@ -7,7 +7,6 @@
 
 #include "GameBoard.h"
 #include "GamePiece.h"
-//#include "DevelopmentCard.h"
 #include "Player.h"
 #include "Util.h"
 
@@ -80,7 +79,6 @@ TEST(DevCardTest, RoadBuildingCard){
 	Player& test_player = *test_board.getPlayers()[0];
 
 	test_board.PlaceSettlement(Coordinate(0,0), test_player);
-//	std::unique_ptr<DevelopmentCard> test_card = std::unique_ptr<DevelopmentCard>(new RoadBuildingCard());
 	DevCardType test_card = ROADBUILDING;
 
 	test_player.addOre(4);
@@ -116,7 +114,6 @@ TEST(DevCardTest, VictoryPointCard){
 	GameBoard test_board({"tester1"});
 	Player& test_player = *test_board.getPlayers()[0];
 
-//	std::unique_ptr<DevelopmentCard> test_card = std::unique_ptr<DevelopmentCard>(new VictoryPointCard());
 	DevCardType test_card = VICTORYPOINT;
 	test_player.addOre(2);
 	test_player.addWheat(2);
@@ -156,7 +153,6 @@ TEST(DevCardTest, MonopolyCard){
 	Player& test_player2 = test_board.getPlayer(1);
 	Player& test_player3 = test_board.getPlayer(2);
 
-//	std::unique_ptr<DevelopmentCard> test_card = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
 	DevCardType test_card = MONOPOLY;
 
 
@@ -206,7 +202,6 @@ TEST(DevCardTest, YearOfPlentyCard){
 	GameBoard test_board({"tester1"});
 	Player& test_player = test_board.getPlayer(0);
 
-//	std::unique_ptr<DevelopmentCard> test_card = std::unique_ptr<YearOfPlentyCard>(new YearOfPlentyCard());
 	DevCardType test_card = YEAROFPLENTY;
 
 
@@ -263,7 +258,6 @@ TEST(DevCardTest, KnightCard){
 	Player& test_player2 = test_board.getPlayer(1);
 	Player& test_player3 = test_board.getPlayer(2);
 
-//	std::unique_ptr<DevelopmentCard> test_card = std::unique_ptr<DevelopmentCard>(new KnightCard());
 	DevCardType test_card = KNIGHT;
 
 	test_player1.addOre(4);

tests/test_Player.cpp

@@ -284,7 +284,6 @@ TEST(PlayerTest, UpdateVictoryPoints_VictoryCards){
 
 	ASSERT_EQ(test_player.getVictoryPoints(), 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);
@@ -304,7 +303,6 @@ TEST(PlayerTest, UpdateVictoryPoints_LargestArmy){
 	test_player.addWheat(3);
 	test_player.addWool(3);
 
-//	std::unique_ptr<DevelopmentCard> test_KnightCard = std::unique_ptr<DevelopmentCard>(new KnightCard());
 	test_player.buyCard(KNIGHT);
 	test_player.buyCard(KNIGHT);
 	test_player.buyCard(KNIGHT);
@@ -343,15 +341,13 @@ TEST(PlayerTest, UpdateVictoryPoints_all){
 
 	ASSERT_EQ(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(VICTORYPOINT);
 	ASSERT_EQ(test_player.getVictoryPoints(), 5);
 
-//	std::unique_ptr<DevelopmentCard> test_KnightCard = std::unique_ptr<DevelopmentCard>(new KnightCard());
 	test_player.buyCard(KNIGHT);
 	test_player.buyCard(KNIGHT);
 	test_player.buyCard(KNIGHT);
@@ -376,7 +372,6 @@ TEST(PlayerTest, Monopoly_card_1){
 
 	tp1.addMultiple(0,0,1,1,1);
 
-//	std::unique_ptr<DevelopmentCard> test_MonopolyCard = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
 	tp1.buyCard(MONOPOLY);
 
 
@@ -421,7 +416,6 @@ TEST(PlayerTest, Monopoly_card_false){
 	Player& tp1 = board.getPlayer(0);
 	Player& tp2 = board.getPlayer(1);
 
-//	std::unique_ptr<DevelopmentCard> test_MonopolyCard = std::unique_ptr<DevelopmentCard>(new MonopolyCard());
 	tp1.buyCard(MONOPOLY);
 
 	tp1.addMultiple(0,0,0,1,1);
@@ -459,7 +453,6 @@ TEST(PlayerTest, Year_Of_Plenty_card){
 
 	tp1.addMultiple(0,0,1,1,1);
 
-//	std::unique_ptr<DevelopmentCard> test_YearOfPlentyCard = std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
 	tp1.buyCard(YEAROFPLENTY);
 
 	tp1.addMultiple(0,0,0,1,1);
@@ -477,7 +470,6 @@ TEST(PlayerTest, Year_Of_Plenty_card_false){
 
 	Player& tp1 = board.getPlayer(0);
 
-//	std::unique_ptr<DevelopmentCard> test_YearOfPlentyCard = std::unique_ptr<DevelopmentCard>(new YearOfPlentyCard());
 	tp1.buyCard(YEAROFPLENTY);
 
 	tp1.addMultiple(0,0,0,1,1);