Fix path finder incorrect behaviour

Signed-off-by: pacien <pacien.trangirard@pacien.net>

3 files changed, 32 insertions, 18 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/board/PathFinder.java b/src/main/java/fr/umlv/java/wallj/board/PathFinder.java
index c530d83..dfd1fa6 100644
--- a/src/main/java/fr/umlv/java/wallj/board/PathFinder.java
+++ b/src/main/java/fr/umlv/java/wallj/board/PathFinder.java
@@ -57,7 +57,7 @@ public class PathFinder {
 
   private static <T> List<T> findPath(Node<T> start, T target, BiFunction<T, T, Double> heuristic) {
     Map<Node<T>, NodeSearchData<T>> searchData = new HashMap<>();
-    TreeSet<Node<T>> discovered = new TreeSet<>(Comparator.comparingDouble(n -> searchData.get(n).estimatedCost));
+    Queue<Node<T>> discovered = new PriorityQueue<>(Comparator.comparingDouble(n -> searchData.get(n).estimatedCost));
     Set<Node<T>> visited = new HashSet<>();
 
     searchData.put(start, new NodeSearchData<>(null, 0, heuristic.apply(start.val, target)));
@@ -65,7 +65,7 @@ public class PathFinder {
 
     Node<T> current;
     while (!discovered.isEmpty()) {
-      current = discovered.pollFirst();
+      current = discovered.poll();
       if (target.equals(current.val)) return buildPath(searchData, current);
 
       for (Map.Entry<Node<T>, Integer> neighborEntry : current.neighbors.entrySet()) {
diff --git a/src/test/java/fr/umlv/java/wallj/board/PathFinderTest.java b/src/test/java/fr/umlv/java/wallj/board/PathFinderTest.java
index be615b7..ddacf71 100644
--- a/src/test/java/fr/umlv/java/wallj/board/PathFinderTest.java
+++ b/src/test/java/fr/umlv/java/wallj/board/PathFinderTest.java
@@ -14,7 +14,6 @@ import java.util.List;
  * @author Pacien TRAN-GIRARD
  */
 final class PathFinderTest {
-
   private Path getResourcePath(String str) throws URISyntaxException {
     return Paths.get(getClass().getResource(str).toURI());
   }
@@ -35,29 +34,37 @@ final class PathFinderTest {
     return true;
   }
 
-  @Test
-  void testFailImpossibleFindPath() throws URISyntaxException, IOException {
-    Board board = BoardParser.parse(getResourcePath("/maps/island.txt"));
+  private void testValidPath(Board board, TileVec2 origin, TileVec2 target) {
     PathFinder pathFinder = new PathFinder(board);
+    List<TileVec2> path = pathFinder.findPath(origin, target);
 
-    Assertions.assertThrows(IllegalArgumentException.class, () -> {
-      pathFinder.findPath(TileVec2.of(7, 3), TileVec2.of(16, 5)); // into a wall
-    });
+    Assertions.assertEquals(path.get(0), origin);
+    Assertions.assertEquals(path.get(path.size() - 1), target);
+    Assertions.assertTrue(isPathConnected(path));
+    Assertions.assertTrue(path.stream().allMatch(v -> board.getBlockTypeAt(v).isTraversable()));
   }
 
   @Test
   void testFindPath() throws URISyntaxException, IOException {
+    testValidPath(
+    BoardParser.parse(getResourcePath("/maps/wall.txt")),
+    TileVec2.of(4, 3),
+    TileVec2.of(6, 3));
+
+    testValidPath(
+    BoardParser.parse(getResourcePath("/maps/island.txt")),
+    TileVec2.of(7, 3),
+    TileVec2.of(33, 4));
+  }
+
+
+  @Test
+  void testFailImpossibleFindPath() throws URISyntaxException, IOException {
     Board board = BoardParser.parse(getResourcePath("/maps/island.txt"));
     PathFinder pathFinder = new PathFinder(board);
 
-    TileVec2 origin = TileVec2.of(7, 3);
-    TileVec2 target = TileVec2.of(33, 4);
-    List<TileVec2> path = pathFinder.findPath(origin, target);
-
-    Assertions.assertEquals(path.get(0), origin);
-    Assertions.assertEquals(path.get(path.size() - 1), target);
-    Assertions.assertTrue(isPathConnected(path));
-    Assertions.assertTrue(path.stream().allMatch(v -> board.getBlockTypeAt(v).isTraversable()));
+    Assertions.assertThrows(IllegalArgumentException.class, () -> {
+      pathFinder.findPath(TileVec2.of(7, 3), TileVec2.of(16, 5)); // into a wall
+    });
   }
-
 }
diff --git a/src/test/resources/maps/wall.txt b/src/test/resources/maps/wall.txt
new file mode 100644
index 0000000..97a5874
--- /dev/null
+++ b/src/test/resources/maps/wall.txt
@@ -0,0 +1,7 @@
+WWWWWWWWWWW
+W         W
+W    W    W
+W    W    W
+W    W    W
+W         W
+WWWWWWWWWWW
\ No newline at end of file