From afa36a182493546c255ec7e990a02ca73f0181b1 Mon Sep 17 00:00:00 2001
From: Darren Eberly <darren@eber.ly>
Date: Sun, 26 Feb 2023 23:16:06 -0500
Subject: [PATCH] Fix world tests

---
 tests/test_data/world_tests/both/expected.py  | 60 +++++++++----------
 .../world_tests/pattern_matched/expected.py   | 46 +++++++-------
 tests/test_world.py                           |  1 -
 3 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/tests/test_data/world_tests/both/expected.py b/tests/test_data/world_tests/both/expected.py
index 90d7a86..cddfc7b 100644
--- a/tests/test_data/world_tests/both/expected.py
+++ b/tests/test_data/world_tests/both/expected.py
@@ -1,30 +1,30 @@
-from pathlib import Path
-
-from pytiled_parser import common_types, world
-
-EXPECTED = world.World(
-    only_show_adjacent=False,
-    maps=[
-        world.WorldMap(
-            size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(-160, 0),
-            map_file=Path(Path(__file__).parent / "map_manual_one.json")
-            .absolute()
-            .resolve(),
-        ),
-        world.WorldMap(
-            size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0.0, 160.0),
-            map_file=Path(Path(__file__).parent / "map_p0-n1.json")
-            .absolute()
-            .resolve(),
-        ),
-        world.WorldMap(
-            size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0.0, 0.0),
-            map_file=Path(Path(__file__).parent / "map_p0-n0.json")
-            .absolute()
-            .resolve(),
-        ),
-    ],
-)
+from pathlib import Path
+
+from pytiled_parser import common_types, world
+
+EXPECTED = world.World(
+    only_show_adjacent=False,
+    maps=[
+        world.WorldMap(
+            size=common_types.Size(160, 160),
+            coordinates=common_types.OrderedPair(-160, 0),
+            map_file=Path(Path(__file__).parent / "map_manual_one.json")
+            .absolute()
+            .resolve(),
+        ),
+        world.WorldMap(
+            size=common_types.Size(160, 160),
+            coordinates=common_types.OrderedPair(0.0, 0.0),
+            map_file=Path(Path(__file__).parent / "map_p0-n0.json")
+            .absolute()
+            .resolve(),
+        ),
+        world.WorldMap(
+            size=common_types.Size(160, 160),
+            coordinates=common_types.OrderedPair(0.0, 160.0),
+            map_file=Path(Path(__file__).parent / "map_p0-n1.json")
+            .absolute()
+            .resolve(),
+        ),
+    ],
+)
diff --git a/tests/test_data/world_tests/pattern_matched/expected.py b/tests/test_data/world_tests/pattern_matched/expected.py
index 7bd5b6e..c3dd845 100644
--- a/tests/test_data/world_tests/pattern_matched/expected.py
+++ b/tests/test_data/world_tests/pattern_matched/expected.py
@@ -1,23 +1,23 @@
-from pathlib import Path
-
-from pytiled_parser import common_types, world
-
-EXPECTED = world.World(
-    only_show_adjacent=False,
-    maps=[
-        world.WorldMap(
-            size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0.0, 160.0),
-            map_file=Path(Path(__file__).parent / "map_p0-n1.json")
-            .absolute()
-            .resolve(),
-        ),
-        world.WorldMap(
-            size=common_types.Size(160, 160),
-            coordinates=common_types.OrderedPair(0.0, 0.0),
-            map_file=Path(Path(__file__).parent / "map_p0-n0.json")
-            .absolute()
-            .resolve(),
-        ),
-    ],
-)
+from pathlib import Path
+
+from pytiled_parser import common_types, world
+
+EXPECTED = world.World(
+    only_show_adjacent=False,
+    maps=[
+        world.WorldMap(
+            size=common_types.Size(160, 160),
+            coordinates=common_types.OrderedPair(0.0, 0.0),
+            map_file=Path(Path(__file__).parent / "map_p0-n0.json")
+            .absolute()
+            .resolve(),
+        ),
+        world.WorldMap(
+            size=common_types.Size(160, 160),
+            coordinates=common_types.OrderedPair(0.0, 160.0),
+            map_file=Path(Path(__file__).parent / "map_p0-n1.json")
+            .absolute()
+            .resolve(),
+        ),
+    ],
+)
diff --git a/tests/test_world.py b/tests/test_world.py
index 2d3e902..09024e5 100644
--- a/tests/test_world.py
+++ b/tests/test_world.py
@@ -18,7 +18,6 @@ ALL_WORLD_TESTS = [
 ]
 
 
-@pytest.mark.xfail
 @pytest.mark.parametrize("world_test", ALL_WORLD_TESTS)
 def test_world_integration(world_test):
     # it's a PITA to import like this, don't do it