Fixed an error where the desert tile was not being handled properly in the roll tile checking, added test cases for the roll tile checking

Author: malecki1

include/GameBoard.h

@@ -43,6 +43,8 @@ class GameBoard
 	void PlaceSettlement(Coordinate location, Player& Owner);
 
 	void init_resources();
+    
+    bool testRollChecking(int* rolls);
 };
 
 #endif

src/GameBoard.cpp

@@ -101,10 +101,10 @@ void GameBoard::init_resources()
 {
     std::srand(std::time(0));
 
-    resourceType resources[] = {BRICK, BRICK, BRICK, STONE, STONE, STONE, WHEAT, WHEAT, WHEAT, WHEAT, WOOD, WOOD, WOOD, WOOD, SHEEP, SHEEP, SHEEP, SHEEP, DESERT};
+    resourceType resources[] = {BRICK, BRICK, BRICK, STONE, STONE, STONE, WHEAT, WHEAT, WHEAT, WHEAT, WOOD, WOOD, WOOD, WOOD, SHEEP, SHEEP, SHEEP, SHEEP};
     random_shuffle(&resources[0], &resources[19]);
 
-    int rolls[] = {2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11};
+    int rolls[] = {0, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10, 11, 11, 12};
     while (!checkRolls(rolls))
     {
         random_shuffle(&rolls[0], &rolls[18]);
@@ -115,17 +115,17 @@ void GameBoard::init_resources()
 
 
 
-    int rollCount = 0;
+    int resourceCount = 0;
     for (int i = 0; i<19; i++)
     {
-        if (resources[i]==DESERT)
+        if (rolls[i] == 0)
         {
-            addResource(xcoords[i], ycoords[i], resources[i], 0);
+            addResource(xcoords[i], ycoords[i], DESERT, 0);
         }
         else
         {
-            addResource(xcoords[i], ycoords[i], resources[i], rolls[rollCount]);
-            rollCount++;
+            addResource(xcoords[i], ycoords[i], resources[resourceCount], rolls[i]);
+            resourceCount++;
         }
     }
 
@@ -317,3 +317,8 @@ bool GameBoard::checkRolls(int* rolls)
 
     return true;
 }
+
+bool GameBoard::testRollChecking(int* rolls)
+{
+    return checkRolls(rolls);
+}

tests/test_GameBoard.cpp

@@ -20,3 +20,17 @@ TEST(loadFile_simple){
 	CHECK(test_board->load_Board("test_1") == 0);
 	delete(test_board);
 }
+
+TEST(randomize_rolls_fail)
+{
+    GameBoard * test_board = new GameBoard;
+    CHECK(test_board->testRollChecking({0, 2, 3, 3, 4, 4, 5, 5, 6, 6, 8, 8, 9, 9, 10, 10, 11, 11, 12}) == false);
+    delete(test_board);
+}
+
+TEST(randomize_rolls_pass)
+{
+    GameBoard * test_board = new GameBoard;
+    CHECK(test_board->testRollChecking({9, 11, 5, 4, 0, 3, 4, 2, 10, 8, 3, 6, 9, 11, 5, 10, 6, 12, 8}) == true);
+    delete(test_board);
+}