From deca688c17bacf8c57eee2f26564dbdec030b2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Thu, 15 Jan 2015 23:52:05 +0100
Subject: update tests

---
 core/test/ch/asynk/tankontank/BoardUtils.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/test/ch/asynk/tankontank/BoardUtils.java b/core/test/ch/asynk/tankontank/BoardUtils.java
index 55cdba8..d757861 100644
--- a/core/test/ch/asynk/tankontank/BoardUtils.java
+++ b/core/test/ch/asynk/tankontank/BoardUtils.java
@@ -8,6 +8,7 @@ import org.junit.Test;
 import org.junit.Before;
 
 import ch.asynk.tankontank.engine.Tile;
+import ch.asynk.tankontank.engine.PossiblePaths;
 
 import static org.junit.Assert.assertTrue;
 
@@ -37,35 +38,37 @@ public class BoardUtils
     {
         int n = b.buildPossiblePaths(2, 2, 4, 3);
 
+        assertTrue(b.possiblePaths.distance == 2);
         assertTrue(n == 8);
 
         for(int p = 0; p < n; p++) {
 
-            List<Tile> path = b.possiblePaths.getPath(p);
-            int z = path.size();
+            PossiblePaths.Path path = b.possiblePaths.getPath(p);
+            int z = path.tiles.size();
+            assertTrue(path.cost == (z + 1));
 
             Tile t;
             int i = 0;
             if (z == 1) {
-                t = path.get(i);
+                t = path.tiles.get(i);
                 assertTrue(t.getCol() == 3);
                 assertTrue((t.getRow() == 2) || (t.getRow() == 3));;
             } else if (z == 2) {
-                t = path.get(i);
+                t = path.tiles.get(i);
                 if (t.getCol() == 2) {
                     i += 1;
                     if (t.getRow() == 1) {
-                        t = path.get(i);
+                        t = path.tiles.get(i);
                         assertTile(t, 3, 2);
                     } else {
                         assert(t.getRow()== 3);
-                        t = path.get(i);
+                        t = path.tiles.get(i);
                         assertTile(t, 3, 3);
                     }
                 } else if (t.getCol() == 3) {
                     i += 1;
                     if (t.getRow() == 2) {
-                        t = path.get(i);
+                        t = path.tiles.get(i);
                         if (t.getCol() == 3)
                             assert(t.getRow()== 3);
                         else {
@@ -73,7 +76,7 @@ public class BoardUtils
                         }
                     } else {
                         assert(t.getRow() == 3);
-                        t = path.get(i);
+                        t = path.tiles.get(i);
                         if (t.getCol() == 3)
                             assert(t.getRow() == 2);
                         else {
-- 
cgit v1.1-2-g2b99