diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-01 13:45:24 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-01 13:45:24 +0200 |
| commit | 14d149d6141b25035d7aba4b9efe5ee3a3ccdabd (patch) | |
| tree | 7e7a6071aff48d44d09d2b942fc6cdf3d0a0a8fa | |
| parent | eec2f37d438222450f41ceeafc7267224f8025f5 (diff) | |
| download | RustAndDust-14d149d6141b25035d7aba4b9efe5ee3a3ccdabd.zip RustAndDust-14d149d6141b25035d7aba4b9efe5ee3a3ccdabd.tar.gz | |
update findAllPaths(...) tests
| -rw-r--r-- | core/test/ch/asynk/tankontank/BoardUtils.java | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/core/test/ch/asynk/tankontank/BoardUtils.java b/core/test/ch/asynk/tankontank/BoardUtils.java index 632d7a4..cea97ff 100644 --- a/core/test/ch/asynk/tankontank/BoardUtils.java +++ b/core/test/ch/asynk/tankontank/BoardUtils.java @@ -1,7 +1,7 @@ package ch.asynk.tankontank; import java.util.List; -import java.util.ArrayDeque; +import java.util.Vector; import org.junit.Test; import org.junit.Before; @@ -27,40 +27,43 @@ public class BoardUtils public void testPaths() { Helpers.FakePawn p = new Helpers.FakePawn(3); - List<ArrayDeque<SearchBoard.Node>> paths = sb.possiblePaths(p, 2, 2, 4, 3); + List<Vector<SearchBoard.Node>> paths = sb.possiblePaths(p, 2, 2, 4, 3); assertTrue(paths.size() == 8); - for(ArrayDeque<SearchBoard.Node> path : paths) { + for(Vector<SearchBoard.Node> path : paths) { assertTrue((path.size() == 3) || (path.size() == 4)); - SearchBoard.Node n = path.removeFirst(); + SearchBoard.Node n = path.get(0); assertTrue(n.col == 4); assertTrue(n.row == 3); - n = path.removeLast(); + n = path.get(path.size() - 1); assertTrue(n.col == 2); assertTrue(n.row == 2); - if (path.size() == 1) { - n = path.pop(); + int i = 1; + if (path.size() == 3) { + n = path.get(i); assertTrue(n.col == 3); assertTrue((n.row == 3) || (n.row == 2)); } else { - n = path.pop(); + n = path.get(i); if (n.col == 2) { - if (n.col == 1) { - n = path.pop(); + i += 1; + if (n.row == 1) { + n = path.get(i); assert(n.col == 3); assert(n.row == 2); } else { assert(n.col == 3); - n = path.pop(); + n = path.get(i); assert(n.col == 2); assert(n.row == 3); } } else if (n.col == 3) { + i += 1; if (n.row == 2) { - n = path.pop(); + n = path.get(i); if (n.col == 2) assert(n.row == 1); else { @@ -69,7 +72,7 @@ public class BoardUtils } } else { assert(n.col == 3); - n = path.pop(); + n = path.get(i); if (n.col == 2) assert(n.row == 3); else { @@ -78,14 +81,15 @@ public class BoardUtils } } } else { + i += 1; assertTrue(n.col == 4); if (n.row == 4) { - n = path.pop(); + n = path.get(i); assert(n.col == 3); assert(n.row == 3); } else { assert(n.row == 2); - n = path.pop(); + n = path.get(i); assert(n.col == 3); assert(n.row == 2); } |