Editing tests back to google test for sanity's sake

Author: PickledMonkey

include/GameController.h

@@ -39,10 +39,13 @@ class GameController {
 	bool handleRoadButtonEvent(ScreenCoordinate);
 	bool handleSettlementButtonEvent(ScreenCoordinate);
 	bool handleRoadCardButtonEvent(ScreenCoordinate);
+
+	bool handleBuyDevelopmentCardButtonEvent(ScreenCoordinate);
 	bool handleKnightCardButtonEvent(ScreenCoordinate);
 	bool handleYearOfPlentyCardButtonEvent(ScreenCoordinate);
 	bool handleMonopolyCardButtonEvent(ScreenCoordinate);
 	bool handleVictoryPointCardButtonEvent(ScreenCoordinate);
+
 	bool handleCancelButtonEvent(ScreenCoordinate);
 
 	bool handleConfirmRoadCard(ScreenCoordinate);

include/GameView.h

@@ -53,6 +53,7 @@ class GameView {
 
 	void highlightPoint(ScreenCoordinate & coord);
 	void drawCardCount(std::string font, int fontSize);
+	void drawResourceCount(std::string font, int fontSize);
 
 	GameView(const GameView& o) = delete;
 	GameView& operator=(const GameView& o) = delete;
@@ -69,6 +70,7 @@ class GameView {
 	void addElement(std::unique_ptr<ViewElement> element);
 	void addElement(int priority, std::unique_ptr<ViewElement>);
 
+
 	std::unique_ptr<ViewElement> removeElement(int priority);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement*);
 	std::unique_ptr<ViewElement> removeElement(const ViewElement&);

src/GameBoard.cpp

@@ -409,8 +409,8 @@ std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
 		const Coordinate& diff = adjacentCoordDiffs[i];
 		Coordinate adjacentPoint(location.first + diff.first,
 				location.second + diff.second);
-		auto it = resources.find(adjacentPoint);
-		if (it != resources.end()) {
+		auto it = corners.find(adjacentPoint);
+		if (it != corners.end()) {
 			GamePiece* piece = it->second.get();
 			if (dynamic_cast<CornerPiece*>(piece)) {
 				v.push_back(static_cast<CornerPiece*>(piece));
@@ -421,6 +421,7 @@ std::vector<CornerPiece*> GameBoard::GetNeighboringCorners(
 }
 
 
+
 /**
  * Checks to make sure the coordinate is within bounds of the board and not a resource tile.
  * @param coord The coordinate to check.

src/GameController.cpp

@@ -37,6 +37,7 @@ GameController::GameController(GameBoard& model, GameView& view) : model(model),
 
 	view.addElement(makeViewButtonColor(std::bind(&GameController::handleCancelButtonEvent, this, _1), {{.95, .95}, {1.0, 1.0}}, std::make_tuple(1.f, 0.0f, 0.f)));
 
+	view.addElement(makeViewButtonText(std::bind(&GameController::handleBuyDevelopmentCardButtonEvent, this, _1), {{.85, .23}, {1, .30}}, font, fontSize, "Development Cards"));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleRoadCardButtonEvent, this, _1), {{0.85, 0.0}, {0.97, 0.05}}, font, fontSize, "Road Building "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleKnightCardButtonEvent, this, _1), {{0.85, 0.05}, {0.97, 0.10}},  font, fontSize, "Knight "));
 	view.addElement(makeViewButtonText(std::bind(&GameController::handleYearOfPlentyCardButtonEvent, this, _1), {{0.85, 0.10}, {0.97, 0.15}},  font, fontSize, "Year of Plenty "));
@@ -283,6 +284,11 @@ bool GameController::handleCancelDialogueEvent(ScreenCoordinate coord){
 	return handleCancelButtonEvent(coord);
 }
 
+bool GameController::handleBuyDevelopmentCardButtonEvent(ScreenCoordinate coord){
+	model.buyCard(model.getCurrentPlayer());
+	return handleCancelButtonEvent(coord);
+}
+
 /**
  * Handles a click on the Knight Card button.
  * @param coord The place the user clicked

src/GameView.cpp

@@ -104,9 +104,6 @@ GameView::~GameView() {
  * @return void
  */
 void GameView::drawCardCount(std::string font, int fontSize){
-
-	renderText(font, fontSize, {.85, .23}, {1, .30}, "Development Cards");
-
 	renderText(font, fontSize, {0.97, 0.0}, {1.0, 0.05},
 			toString(model.getCurrentPlayer().getRoadBuildingCards()));	//Road Building
 	renderText(font, fontSize, {0.97, 0.05}, {1.0, 0.1},
@@ -119,6 +116,20 @@ void GameView::drawCardCount(std::string font, int fontSize){
 			toString(model.getCurrentPlayer().getVictoryCards()));		//Victory Point
 }
 
+void GameView::drawResourceCount(std::string font, int fontSize){
+	renderText(font, fontSize, {0.97, 0.35}, {1.0, 0.40},
+			toString(model.getCurrentPlayer().getWood()));		//Wood
+	renderText(font, fontSize, {0.97, 0.40}, {1.0, 0.45},
+			toString(model.getCurrentPlayer().getWool()));		//Sheep
+	renderText(font, fontSize, {0.97, 0.45}, {1.0, 0.50},
+			toString(model.getCurrentPlayer().getOre()));		//Ore
+	renderText(font, fontSize, {0.97, 0.50}, {1.0, 0.55},
+			toString(model.getCurrentPlayer().getBrick()));		//Brick
+	renderText(font, fontSize, {0.97, 0.55}, {1.0, 0.60},
+			toString(model.getCurrentPlayer().getWheat()));		//Wheat
+
+}
+
 
 /**
  * Display the GameBoard to the screen as well as additional ViewElements.
@@ -143,6 +154,7 @@ void GameView::render() {
 	renderText(font, fontSize, {.2, .9}, {.8, 1}, "Settlers of Catan");
 
 	drawCardCount(font, fontSize);
+	drawResourceCount(font, fontSize);
 
 	glFlush();
 }

tests/Makefile

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

tests/main.cpp

@@ -1,6 +1,8 @@
-#include <UnitTest++.h>
+#include "gtest/gtest.h"
 
-int main() {
-	return UnitTest::RunAllTests();
+int main(int argc, char** argv) {
+	::testing::InitGoogleTest(&argc, argv);
+	
+	return RUN_ALL_TESTS();
 }
 

tests/testConfig.cpp

@@ -1,57 +1,59 @@
-#include "UnitTest++.h"
+#include <stdexcept>
+
+#include "gtest/gtest.h"
+
 #include "Config.h"
 
-#include <stdexcept>
 
 using std::string;
 using std::stringstream;
 
-TEST(readOneString) {
+TEST(ConfigTest, readOneString) {
 	stringstream file("variable=value");
 	Config config(file);
 
-	CHECK((string)config["variable"] == "value");
+	ASSERT_EQ((string)config["variable"], "value");
 }
 
-TEST(readTwoStrings) {
+TEST(ConfigTest, readTwoStrings) {
 	stringstream file("var_a=val_a\nvar_b=val_b\n");
 	Config config(file);
 
-	CHECK((string)config["var_a"] == "val_a");
-	CHECK((string)config["var_b"] == "val_b");
+	ASSERT_EQ((string)config["var_a"], "val_a");
+	ASSERT_EQ((string)config["var_b"], "val_b");
 }
 
-TEST(readFloat) {
+TEST(ConfigTest, readFloat) {
 	stringstream file("float=5.0\n");
 	Config config(file);
 
-	CHECK((float)config["float"] == 5.0f);
+	ASSERT_EQ((float)config["float"], 5.0f);
 }
 
-TEST(readCommentsEmptyLines) {
+TEST(ConfigTest, readCommentsEmptyLines) {
 	stringstream file("#this is a string\nstring=hello\n#we just had a string\n\n\n\n\n");
 	Config config(file);
 
-	CHECK((string)config["string"] == "hello");
+	ASSERT_EQ((string)config["string"], "hello");
 }
 
-TEST(readInvalid) {
+TEST(ConfigTest, readInvalid) {
 	stringstream file("variable=value");
 	Config config(file);
 
-	CHECK_THROW((string)config["string"] == "hello", std::runtime_error);
+	ASSERT_THROW((string)config["string"] == "hello", std::runtime_error);
 }
 
-TEST(readCoordinate) {
+TEST(ConfigTest, readCoordinate) {
 	stringstream file("coord=(1,2)");
 	Config config(file);
 
-	CHECK(Coordinate({1, 2}) == (Coordinate)config["coord"]);
+	ASSERT_EQ(Coordinate({1, 2}), (Coordinate)config["coord"]);
 }
 
-TEST(readScreenCoordinate) {
+TEST(ConfigTest, readScreenCoordinate) {
 	stringstream file("coord=(1.5,2.5)");
 	Config config(file);
 
-	CHECK(ScreenCoordinate({1.5, 2.5}) == (ScreenCoordinate)config["coord"]);
+	ASSERT_EQ(ScreenCoordinate({1.5, 2.5}), (ScreenCoordinate)config["coord"]);
 }

tests/testRenderer.cpp

@@ -1,18 +1,19 @@
 #include <iostream>
 
-#include "UnitTest++.h"
+#include "gtest/gtest.h"
+
 #include "Renderer.h"
 
 using std::make_pair;
 
-TEST(coordToScreen) {
+TEST(RendererTest, coordToScreen) {
 	for(int x = -5; x < 5; x++) {
 		for(auto y = -5; y < 5; y++) {
 			auto original = make_pair(x, y);
 			auto screen = coordToScreen(original);
 			auto back = screenToCoord(screen);
-			CHECK(original.first == back.first);
-			CHECK(original.second == back.second);
+			ASSERT_EQ(original.first, back.first);
+			ASSERT_EQ(original.second, back.second);
 		}
 	}
 }

tests/testSerialization.cpp

@@ -1,4 +1,9 @@
-#include <UnitTest++.h>
+#include <iostream>
+#include <sstream>
+#include <memory>
+#include <vector>
+
+#include "gtest/gtest.h"
 
 #include "Serialization.h"
 #include "GameBoard.h"
@@ -7,37 +12,31 @@
 
 #include "tinyxml2.h"
 
-#include <iostream>
-#include <sstream>
-#include <memory>
-#include <vector>
-
 using std::vector;
 using std::unique_ptr;
 using std::stringstream;
 
-TEST(emptyBoardSerialization) {
+TEST(SerializationTest, emptyBoardSerialization) {
 	GameBoard testBoard({});
 
 	stringstream stream;
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
-
-	CHECK(testBoard == copyBoard);
+	ASSERT_EQ(testBoard, copyBoard);
 }
 
-TEST(multiplePlayerSerialization) {
+TEST(SerializationTest, multiplePlayerSerialization) {
 	GameBoard testBoard({"test", "test2"});
 	stringstream stream;
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
-
-	CHECK(testBoard == copyBoard);
+	
+	ASSERT_EQ(testBoard, copyBoard);
 }
 
-TEST(testCardSerialization) {
+TEST(SerializationTest, testCardSerialization) {
 	GameBoard testBoard({"test"});
 	Player& testPlayer = testBoard.getPlayer(0);
 
@@ -58,11 +57,10 @@ TEST(testCardSerialization) {
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
-
-	CHECK(testBoard == copyBoard);
+	ASSERT_EQ(testBoard, copyBoard);
 }
 
-TEST(roadSerialization) {
+TEST(SerializationTest, roadSerialization) {
 	GameBoard testBoard({"test", "test2"});
 	Player& firstPlayer = testBoard.getPlayer(0);
 	Player& secondPlayer = testBoard.getPlayer(1);
@@ -76,11 +74,10 @@ TEST(roadSerialization) {
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
-
-	CHECK(testBoard == copyBoard);
+	ASSERT_EQ(testBoard, copyBoard);
 }
 
-TEST(settlementSerialization) {
+TEST(SerializationTest, settlementSerialization) {
 	GameBoard testBoard({"test"});
 	Player& player = testBoard.getPlayer(0);
 
@@ -91,6 +88,5 @@ TEST(settlementSerialization) {
 	testBoard.save(stream);
 
 	GameBoard copyBoard(stream);
-
-	CHECK(testBoard == copyBoard);
+	ASSERT_EQ(testBoard, copyBoard);
 }