Merge branch 'master' into serialization

Conflicts:
	tests/test_GameBoard.cpp

Author: Databean

tests/test_GameBoard.cpp

@@ -1,28 +1,26 @@
-/*
- * test_GameBoard.cpp
- *
- *  Created on: Feb 22, 2014
- *      Author: The Pickle
- */
-
-#include <vector>
-#include <memory>
-
-#include "GameBoard.h"
-#include "UnitTest++.h"
-
-TEST(randomize_rolls_fail)
-{
-    GameBoard * test_board = new GameBoard(std::vector<std::unique_ptr<Player>>());
-    int badRolls[] = {0, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10, 11, 11, 12};
-    CHECK(test_board->testRollChecking(badRolls) == false);
-    delete(test_board);
-}
-
-TEST(randomize_rolls_pass)
-{
-    GameBoard * test_board = new GameBoard(std::vector<std::unique_ptr<Player>>());
-    int goodRolls[] = {9, 11, 5, 4, 0, 3, 4, 2, 10, 8, 3, 6, 9, 11, 5, 10, 6, 12, 8};
-    CHECK(test_board->testRollChecking(goodRolls) == true);
-    delete(test_board);
+/*
+ * test_GameBoard.cpp
+ *
+ *  Created on: Feb 22, 2014
+ *      Author: The Pickle
+ */
+
+#include <vector>
+#include <memory>
+
+#include "GameBoard.h"
+#include "UnitTest++.h"
+
+TEST(randomize_rolls_fail)
+{
+    GameBoard test_board(std::vector<std::unique_ptr<Player>>{});
+    int badRolls[] = {0, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10, 11, 11, 12};
+    CHECK(test_board.testRollChecking(badRolls) == false);
+}
+
+TEST(randomize_rolls_pass)
+{
+    GameBoard test_board(std::vector<std::unique_ptr<Player>>{});
+    int goodRolls[] = {9, 11, 5, 4, 0, 3, 4, 2, 10, 8, 3, 6, 9, 11, 5, 10, 6, 12, 8};
+    CHECK(test_board.testRollChecking(goodRolls) == true);
 }