Starting tests, upgrade to == operator, fixed bug where wonder was not

inherited from cp

Author: Kyle Grage

include/City.h

@@ -21,6 +21,8 @@ class City : public CornerPiece {
 
 		int getResourceModifier();
 		int getVictoryPoints();
+
+		bool operator==(const City&) const;
 };
 
 #endif

include/CornerPiece.h

@@ -23,6 +23,8 @@ class CornerPiece : public GamePiece {
 	virtual int getResourceModifier();
 
 	virtual int getVictoryPoints();
+
+	virtual bool operator==(const CornerPiece&) const;
 };
 
 #endif

include/Settlement.h

@@ -20,6 +20,8 @@ class Settlement : public CornerPiece {
 	virtual bool operator==(const GamePiece&) const;
 	int getResourceModifier();
 	int getVictoryPoints();
+
+	bool operator==(const Settlement&) const;
 };
 
 #endif

include/Wonder.h

@@ -10,7 +10,7 @@
 
 #include "CornerPiece.h"
 
-class Wonder {
+class Wonder : public CornerPiece {
 	private:
 
 	public:
@@ -25,6 +25,8 @@ class Wonder {
 
 		int getResourceModifier();
 		int getVictoryPoints();
+
+		bool operator==(const Wonder&) const;
 };
 
 #endif /* WONDER_H_ */

src/City.cpp

@@ -58,3 +58,16 @@ int City::getVictoryPoints() {
 City::City(CornerPiece& sett) : CornerPiece(sett.getBoard(), sett.getLocation(), sett.getOwner()) {
 
 }
+
+/**
+ * Determines if a piece is the same
+ * @return boolean
+ */
+bool City::operator==(const City& other) const {
+	auto city = dynamic_cast<const City*>(&other);
+	if(city) {
+		return getOwner().getName() == city->getOwner().getName() && getLocation() == city->getLocation();
+	} else {
+		return false;
+	}
+}

src/CornerPiece.cpp

@@ -47,4 +47,17 @@ int CornerPiece::getVictoryPoints() {
  */
 int CornerPiece::getResourceModifier() {
 	return 0;
-}
+}
+
+/**
+ * Determines if a piece is the same
+ * @return boolean
+ */
+bool CornerPiece::operator==(const CornerPiece& other) const {
+	auto cp = dynamic_cast<const CornerPiece*>(&other);
+	if(cp) {
+		return getOwner().getName() == cp->getOwner().getName() && getLocation() == cp->getLocation();
+	} else {
+		return false;
+	}
+}

src/Wonder.cpp

@@ -69,3 +69,16 @@ Wonder::Wonder(CornerPiece& sett) : CornerPiece(sett.getBoard(), sett.getLocatio
 
 }
 
+/**
+ * Determines if a piece is the same
+ * @return boolean
+ */
+bool City::operator==(const City& other) const {
+	auto won = dynamic_cast<const Wonder*>(&other);
+	if(won) {
+		return getOwner().getName() == won->getOwner().getName() && getLocation() == won->getLocation();
+	} else {
+		return false;
+	}
+}
+

tests/test_cornerpiece.cpp

@@ -0,0 +1,89 @@
+/*
+ * test_cornerpiece.cpp
+ *
+ *  Created on: Apr 10, 2014
+ *      Author: Kyle Grage
+ */
+
+#include "UnitTest++.h"
+#include "CornerPiece.h"
+#include "Settlement.h"
+#include "City.h"
+#include "Wonder.h"
+
+//TEST CONSTRUCTORS
+TEST(CornerPiece_constructor){
+	Coordinate loc = Coordinate(0,0);
+	GameBoard board({"test board"});
+	Player& test_player = board.getPlayer(0);
+
+	CornerPiece test_cp(&board, loc, test_player);
+}
+
+TEST(Settlement_constructor){
+	Coordinate loc = Coordinate(0,0);
+	GameBoard board({"test board"});
+	Player& test_player = board.getPlayer(0);
+
+	Settlement test_cp(&board, loc, test_player);
+}
+
+TEST(City_constructor){
+	Coordinate loc = Coordinate(0,0);
+	GameBoard board({"test board"});
+	Player& test_player = board.getPlayer(0);
+
+	City test_cp(&board, loc, test_player);
+}
+
+TEST(Wonder_constructor){
+	Coordinate loc = Coordinate(0,0);
+	GameBoard board({"test board"});
+	Player& test_player = board.getPlayer(0);
+
+	Wonder test_cp(&board, loc, test_player);
+}
+
+TEST(City_upgrade_constructor){
+
+}
+
+TEST(Wonder_upgrade_constructor){
+
+}
+
+//TEST RESOURCE MODIFIERS
+TEST(CornerPiece_Resource_Mod){
+
+}
+
+TEST(Settlement_Resource_Mod){
+
+}
+
+TEST(City_Resource_Mod){
+
+}
+
+TEST(Wonder_Resource_Mod){
+
+}
+
+//TEST VICTORY POINTS
+TEST(CornerPiece_Victory_Pts){
+
+}
+
+TEST(Settlement_Victory_Pts){
+
+}
+
+TEST(City_Victory_Pts){
+
+}
+
+TEST(Wonder_Victory_Pts){
+
+}
+
+