Merge pull request #15 from Databean/RoadDevCard

Road dev card

Author: Kdog0073

include/DevelopmentCard.h

@@ -14,6 +14,8 @@
 #include "Player.h"
 #include "GameVisitor.h"
 
+#include <stdexcept>
+
 
 enum DevCardType { KNIGHT, VICTORYPOINT, YEAROFPLENTY, MONOPOLY, ROADBUILDING };
 
@@ -97,6 +99,7 @@ class RoadBuildingCard : public DevelopmentCard {
 
     virtual DevCardType getType() const;
     virtual void playCard();
+    void playCard(Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2);
 };
 
 

include/GameBoard.h

@@ -9,6 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <cstddef>
+#include <stdexcept>
 
 #include "Util.h"
 #include "GamePiece.h"
@@ -37,6 +38,7 @@ class GameBoard {
 
 	bool isValidBoard() const;
 
+
 	bool verifyRoadPlacement(Coordinate start, Coordinate end, Player& Owner) const;
 	bool outOfBounds(const Coordinate& coord) const;
 	bool roadExists(Coordinate start, Coordinate end) const;
@@ -82,7 +84,6 @@ class GameBoard {
 
 	bool buyRoad(Coordinate start, Coordinate end, Player& Owner);
 
-
 	//void PlaceSettlement(Coordinate location, Player& Owner);
 	void PlaceCity(Coordinate location, Player& Owner);
 	bool PlaceRoad(Coordinate start, Coordinate end, Player& Owner);

include/Player.h

@@ -27,7 +27,7 @@ const int WOOL_INDEX = 4;
 
 class DevelopmentCard;
 class Deck;
-
+class GameBoard;
 
 
 
@@ -40,7 +40,7 @@ class Player {
     int armySize;
     int longestRoad;
     int victoryPoints;
-//    GameBoard *board;
+    GameBoard* board;
     int resources[5];
 
 
@@ -63,6 +63,9 @@ class Player {
     void buyCard(std::unique_ptr<DevelopmentCard> card);
     std::string getName() const;
 
+    GameBoard* getBoard();
+    void setBoard(GameBoard* newboard);
+
     void playCard(DevelopmentCard* card);
 
     bool canBuyRoad();

include/Road.h

@@ -5,6 +5,7 @@
 #include "Player.h"
 #include <vector>
 #include <cmath>
+#include <stdexcept>
 
 #include "Player.h"
 

src/DevelopmentCard.cpp

@@ -8,6 +8,7 @@
 
 #include "DevelopmentCard.h"
 #include "Util.h"
+#include "GameBoard.h"
 
 
 //Base Class
@@ -104,8 +105,17 @@ DevCardType RoadBuildingCard::getType() const
 void RoadBuildingCard::playCard()
 {
     //Call function to build a road twice
+	//Perhaps this function could signal to the controller how it should receive input next.
 }
 
+void RoadBuildingCard::playCard(Coordinate start1, Coordinate end1, Coordinate start2, Coordinate end2){
+	if (!(getOwner()->getBoard()->PlaceRoad(start1, end1, *getOwner()))){
+		throw std::invalid_argument("The first road passed was not valid, no roads placed");
+	}
+	if ((!getOwner()->getBoard()->PlaceRoad(start2, end2, *getOwner()))){
+		throw std::invalid_argument("The second road passed was not valid, only the first road was placed");
+	}
+}
 
 
 

src/GameBoard.cpp

@@ -358,7 +358,7 @@ bool GameBoard::PlaceRoad(Coordinate start, Coordinate end, Player& Owner) {
 	std::shared_ptr<Road> newRoad;
 	try {
 		newRoad = std::shared_ptr<Road>(new Road(start, end, Owner));
-	} catch (int n) {
+	} catch (std::invalid_argument& e) {
 		//Coordinates did not meet the criteria for a valid road
 		return false;
 	}

src/Player.cpp

@@ -118,6 +118,13 @@ int Player::getVictoryPoints()
     return victoryPoints;
 }
 
+GameBoard* Player::getBoard(){
+	return board;
+}
+
+void Player::setBoard(GameBoard * newboard){
+	board = newboard;
+}
 
 void Player::buyCard(std::unique_ptr<DevelopmentCard> card)
 {

src/Road.cpp

@@ -13,7 +13,7 @@ Road::Road(Coordinate start, Coordinate end, Player& Owner) : owner(Owner) {
 
 	//If the input is bad, throw an exception so bad roads won't be built
 	if(!checkRoad()){
-		throw -1;
+		throw std::invalid_argument("Road start on one corner and go to a corner exactly 1 away");
 	}
 }
 

tests/test_DevelopmentCards.cpp

@@ -0,0 +1,72 @@
+#include <vector>
+#include <memory>
+#include <map>
+#include <stdexcept>
+
+#include "GameBoard.h"
+#include "GamePiece.h"
+#include "DevelopmentCard.h"
+#include "Util.h"
+#include "UnitTest++.h"
+
+
+TEST(RoadBuildingCard_good){
+	std::vector<std::unique_ptr<Player>> players {};
+	players.emplace_back(new Player("tester"));
+	Player& test_player = *players[0];
+	GameBoard * test_board = new GameBoard(std::move(players));
+	test_player.setBoard(test_board);
+
+	test_board->PlaceSettlement(Coordinate(0,0), test_player);
+
+	RoadBuildingCard test_card(&test_player);
+
+	try{
+		test_card.playCard(Coordinate(0,0), Coordinate(-1,1), Coordinate(0,0), Coordinate(1,0));
+		CHECK(true);
+	} catch (std::invalid_argument& e){
+		std::cout << e.what();
+		CHECK(false);
+	}
+}
+
+TEST(RoadBuildingCard_bad){
+	std::vector<std::unique_ptr<Player>> players {};
+	players.emplace_back(new Player("tester"));
+	Player& test_player = *players[0];
+	GameBoard * test_board = new GameBoard(std::move(players));
+	test_player.setBoard(test_board);
+
+	test_board->PlaceSettlement(Coordinate(0,0), test_player);
+
+	RoadBuildingCard test_card(&test_player);
+
+	try{
+		test_card.playCard(Coordinate(0,0), Coordinate(0,2), Coordinate(0,0), Coordinate(1,0));
+		CHECK(false);
+	} catch (std::invalid_argument& e){
+		CHECK(true);
+	}
+
+	try{
+		test_card.playCard(Coordinate(0,0), Coordinate(0,1), Coordinate(0,0), Coordinate(2,2));
+		CHECK(false);
+	} catch (std::invalid_argument& e){
+		CHECK(true);
+	}
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+

tests/test_Roads.cpp

@@ -27,15 +27,15 @@ TEST(road_constuctor_bad){
 	try {
 		Road test_road_1(start, start, test_player);
 		CHECK(false);
-	} catch (int n) {
-		CHECK(n == -1);
+	} catch (const std::invalid_argument& e) {
+		CHECK(true);
 	}
 	//test road too long
 	try {
 		Road test_road_2(start, end, test_player);
 		CHECK(false);
-	} catch (int n) {
-		CHECK(n == -1);
+	} catch (const std::invalid_argument& e) {
+		CHECK(true);
 	}
 
 }