From c1608bacd17a209b6e19171a63b9ab603516c19d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dorian=20Pu=C5=82a?= <dorian.pula@amber-penguin-software.ca>
Date: Sat, 2 Mar 2019 07:43:42 -0500
Subject: [PATCH] Add working layout and setup code for the game engine.

---
 engine/src/lib.rs | 48 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/engine/src/lib.rs b/engine/src/lib.rs
index 1c541d8..c4d27bd 100644
--- a/engine/src/lib.rs
+++ b/engine/src/lib.rs
@@ -61,8 +61,8 @@ impl Board {
     }
 
     fn get_index(&self, row: u32, column: u32) -> usize {
-        let width = self.dimensions.get_size() / 2;
-        (row * width + (column / 2)) as usize
+        let width = self.dimensions.get_size();
+        (row * (width / 2) + column) as usize
     }
 }
 
@@ -89,7 +89,7 @@ impl fmt::Display for Board {
 
             for col in 0..(width / 2) {
 
-                let idx = (row * (width / 2) + col) as usize;
+                let idx = self.get_index(row, col);
 
                 let token = match self.tiles[idx] {
                     BoardTile::Piece(Piece::LightPawn) => "○",
@@ -122,7 +122,7 @@ mod tests {
     use crate::BoardSize;
 
     #[test]
-    fn setup_international_board() {
+    fn initial_international_board_setup() {
 
         let expected =
             " \
@@ -140,4 +140,44 @@ mod tests {
             ";
         assert_eq!(Board::new(BoardSize::International).to_string(), expected);
     }
+
+    #[test]
+    fn initial_american_board_setup() {
+
+        let expected =
+            " \
+             ABCDEFGH\n\
+            1 ○ ○ ○ ○\n\
+            2○ ○ ○ ○ \n\
+            3 ○ ○ ○ ○\n\
+            4◰ ◰ ◰ ◰ \n\
+            5 ◰ ◰ ◰ ◰\n\
+            6● ● ● ● \n\
+            7 ● ● ● ●\n\
+            8● ● ● ● \n\
+            ";
+        assert_eq!(Board::new(BoardSize::American).to_string(), expected);
+    }
+
+    #[test]
+    fn initial_canadian_board_setup() {
+
+        let expected =
+            " \
+             ABCDEFGHIJKL\n\
+            1 ○ ○ ○ ○ ○ ○\n\
+            2○ ○ ○ ○ ○ ○ \n\
+            3 ○ ○ ○ ○ ○ ○\n\
+            4○ ○ ○ ○ ○ ○ \n\
+            5 ○ ○ ○ ○ ○ ○\n\
+            6◰ ◰ ◰ ◰ ◰ ◰ \n\
+            7 ◰ ◰ ◰ ◰ ◰ ◰\n\
+            8● ● ● ● ● ● \n\
+            9 ● ● ● ● ● ●\n\
+            10● ● ● ● ● ● \n\
+            11 ● ● ● ● ● ●\n\
+            12● ● ● ● ● ● \n\
+            ";
+        assert_eq!(Board::new(BoardSize::Canadian).to_string(), expected);
+    }
 }