Merged in latest from Paul

Author: Databean

include/GameBoard.h

@@ -8,6 +8,7 @@
 #include <string>
 #include <iostream>
 #include <fstream>
+#include <cstddef>
 
 #include "Util.h"
 #include "GamePiece.h"
@@ -27,8 +28,8 @@ class GameBoard {
 	~GameBoard();
 	GameBoard& operator=(GameBoard&) = delete;
 
-	int saveBoardToFile(std::string filename);
-	int loadBoardFromFile(std::string filename);
+	int save_Board(std::string filename);
+	int load_Board(std::string filename);
 	const std::map<Coordinate, std::unique_ptr<GamePiece>>& getResources() const;
 
 	std::vector<Settlement*> GetNeighboringSettlements(Coordinate location);
@@ -38,4 +39,4 @@ class GameBoard {
 	void init_resources();
 };
 
-#endif
+#endif

src/GameBoard.cpp

@@ -19,40 +19,44 @@ GameBoard::~GameBoard() {
 
 }
 
-int GameBoard::saveBoardToFile(std::string filename){
+
+int GameBoard::save_Board(std::string filename){
 	std::ofstream file;
 	file.exceptions(std::ofstream::failbit | std::ofstream::badbit);
 	try {
 		filename = filename + ".wocs";
-		file.open(filename.c_str(), std::fstream::out | std::fstream::trunc);
+		file.open(filename.c_str());
 		constructFileFromBoard(file);
-
-	} catch (std::ofstream::failure e){
-		std::cerr << "Exception opening/reading/closing file \n";
+		file.close();
+		return 0;
+	} catch (std::ofstream::failure e) {
+		std::cerr << "Exception opening/closing/writing file: " << e.what();
 	}
-	return 0;
+	return -1;
 }
 
-int GameBoard::loadBoardFromFile(std::string filename){
+int GameBoard::load_Board(std::string filename){
 	std::ifstream file;
-	file.exceptions(std::ifstream::failbit | std::ifstream::badbit);
 	try {
 		filename = filename + ".wocs";
-		file.open(filename.c_str(), std::fstream::in);
+		file.open(filename.c_str());
 		constructBoardFromFile(file);
-
 		file.close();
+		return 0;
 	} catch (std::ifstream::failure e) {
-		std::cerr << "Exception opening/reading/closing file\n";
+		std::cerr << "Exception opening/closing/reading file: " << e.what();
 	}
-	return 0;
+	return -1;
 }
 
 int GameBoard::constructBoardFromFile(std::ifstream &file){
 	//Parse and construct the board from the file
 	//@ TODO
-	while (!file.eof()) {
-		std::cout << file.get();
+	std::string line;
+	if (file.is_open()) {
+		while (getline(file, line)) {
+			std::cout << line << '\n';
+		}
 	}
 	return 0;
 }

tests/test_GameBoard.cpp

@@ -0,0 +1,22 @@
+/*
+ * test_GameBoard.cpp
+ *
+ *  Created on: Feb 22, 2014
+ *      Author: The Pickle
+ */
+
+#include "GameBoard.h"
+#include "UnitTest++.h"
+
+
+TEST(saveFile_simple){
+	GameBoard * test_board = new GameBoard;
+	CHECK(test_board->save_Board("test_1") == 0);
+	delete(test_board);
+}
+
+TEST(loadFile_simple){
+	GameBoard * test_board = new GameBoard;
+	CHECK(test_board->load_Board("test_1") == 0);
+	delete(test_board);
+}