Swap x/y in unit test (also render path and waypoints correctly)

Author: Bytekeeper

src/test/java/org/bk/ass/path/JpsTest.java

@@ -1,15 +1,15 @@
 package org.bk.ass.path;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.jupiter.api.Test;
 
-import java.awt.Color;
-import java.awt.Graphics;
+import javax.imageio.ImageIO;
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.util.SplittableRandom;
-import javax.imageio.ImageIO;
-import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 class JpsTest {
 
@@ -67,7 +67,7 @@ void shouldFindDiagonalPath() {
     Jps sut =
         new Jps(
             Map.fromBooleanArray(
-                new boolean[][]{{true, true, true}, {true, true, true}, {true, true, true}}));
+                    new boolean[][]{{true, true, true}, {true, true, true}, {true, true, true}}));
 
     // WHEN
     Result result = sut.findPath(new Position(2, 2), new Position(0, 0));
@@ -82,7 +82,7 @@ void shouldFindPathWithObstacle() {
     Jps sut =
         new Jps(
             Map.fromBooleanArray(
-                new boolean[][]{{true, true, true}, {true, false, false}, {true, true, true}}));
+                    new boolean[][]{{true, true, true}, {true, false, false}, {true, true, true}}));
 
     // WHEN
     Result result = sut.findPath(new Position(2, 2), new Position(0, 0));
@@ -99,12 +99,12 @@ void shouldNotFindPathWhenBlockedButWithCircle() {
     Jps sut =
         new Jps(
             Map.fromBooleanArray(
-                new boolean[][]{
-                    {true, true, true, true, true},
-                    {true, false, false, false, true},
-                    {true, false, true, false, true},
-                    {true, false, false, false, true},
-                    {true, true, true, true, true}
+                    new boolean[][]{
+                            {true, true, true, true, true},
+                            {true, false, false, false, true},
+                            {true, false, true, false, true},
+                            {true, false, false, false, true},
+                            {true, true, true, true, true}
                 }));
 
     // WHEN
@@ -120,12 +120,12 @@ void shouldFindPathWhenCircleHasHole() {
     Jps sut =
         new Jps(
             Map.fromBooleanArray(
-                new boolean[][]{
-                    {true, true, true, true, true},
-                    {true, false, false, false, true},
-                    {true, false, true, false, true},
-                    {true, false, false, true, true},
-                    {true, true, true, true, true}
+                    new boolean[][]{
+                            {true, true, true, true, true},
+                            {true, false, false, false, true},
+                            {true, false, true, false, true},
+                            {true, false, false, true, true},
+                            {true, true, true, true, true}
                 }));
 
     // WHEN
@@ -146,8 +146,8 @@ public boolean isWalkable(int x, int y) {
                 return y >= 0
                     && y <= 999
                     && (x == 0 && y % 4 == 1
-                    || x == 999 && y % 4 == 3
-                    || y % 2 == 0 && x >= 0 && x <= 999);
+                        || x == 999 && y % 4 == 3
+                        || y % 2 == 0 && x >= 0 && x <= 999);
               }
 
               @Override
@@ -173,16 +173,16 @@ void shouldFindPathInDemoMap() throws IOException {
     // GIVEN
     BufferedImage image = ImageIO.read(JpsTest.class.getResourceAsStream("/dungeon_map.bmp"));
     boolean[][] data = new boolean[image.getHeight()][image.getWidth()];
-    for (int y = 0; y < image.getHeight(); y++) {
-      for (int x = 0; x < image.getWidth(); x++) {
-        data[y][x] = image.getRGB(x, y) == -1;
+    for (int x = 0; x < image.getWidth(); x++) {
+      for (int y = 0; y < image.getHeight(); y++) {
+        data[x][y] = image.getRGB(x, y) == -1;
       }
     }
     Map map = Map.fromBooleanArray(data);
     Jps sut = new Jps(map);
     SplittableRandom rnd = new SplittableRandom(123456);
     Result result = null;
-    for (int i = 0; i < 1000; i++) {
+    for (int i = 0; i < 500; i++) {
       Position start;
       do {
         start = new Position(rnd.nextInt(image.getWidth()), rnd.nextInt(image.getHeight()));
@@ -201,14 +201,18 @@ void shouldFindPathInDemoMap() throws IOException {
         new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_3BYTE_BGR);
     Graphics g = out.getGraphics();
     g.drawImage(image, 0, 0, null);
-    g.setColor(Color.GREEN);
     Position last = null;
+    g.setColor(Color.GREEN);
     for (Position p : result.path) {
       if (last != null) {
         g.drawLine(last.x, last.y, p.x, p.y);
       }
       last = p;
     }
+    g.setColor(Color.RED);
+    for (Position p : result.path) {
+      g.drawLine(p.x, p.y, p.x, p.y);
+    }
     ImageIO.write(out, "PNG", new File("build/map_with_path.png"));
   }
 }