oof

tests/unit2/test_pytiled_parser.py

@@ -13,58 +13,72 @@ os.chdir(os.path.dirname(os.path.abspath(__file__)))
 
 def test_map_simple():
     """
-    TMX with a very simple tileset and some properties.
+    TMX with a very simple spritesheet tile set and some properties.
     """
     map = pytiled_parser.parse_tile_map(Path("../test_data/test_map_simple.tmx"))
 
-    properties = {
-        "bool property - false": False,
-        "bool property - true": True,
-        "color property": (0x49, 0xfc, 0xff, 0xff),
-        "file property": Path("/var/log/syslog"),
-        "float property": 1.23456789,
-        "int property": 13,
-        "string property": "Hello, World!!"
-    }
-
+    # map
+    # unsure how to get paths to compare propperly
+    assert str(map.parent_dir) == "../test_data"
     assert map.version == "1.2"
     assert map.tiled_version == "1.2.3"
     assert map.orientation == "orthogonal"
     assert map.render_order == "right-down"
-    assert map.width == 8
-    assert map.height == 6
-    assert map.tile_width == 32
-    assert map.tile_height == 32
+    assert map.map_size == (8, 6)
+    assert map.tile_size == (32, 32)
     assert map.infinite == False
+    assert map.next_layer_id == 2
+    assert map.next_object_id == 1
+
+    # optional, not for orthogonal maps
     assert map.hex_side_length == None
     assert map.stagger_axis == None
     assert map.stagger_index == None
     assert map.background_color == None
-    assert map.next_layer_id == 2
-    assert map.next_object_id == 1
-    assert map.properties == properties
 
+    assert map.properties == {
+    "bool property - false": False,
+    "bool property - true": True,
+    "color property": (0x49, 0xfc, 0xff, 0xff),
+    "file property": Path("/var/log/syslog"),
+    "float property": 1.23456789,
+    "int property": 13,
+    "string property": "Hello, World!!"
+    }
+
+    # tileset
     assert map.tile_sets[1].name == "tile_set_image"
-    assert map.tile_sets[1].tilewidth == 32
-    assert map.tile_sets[1].tileheight == 32
+    assert map.tile_sets[1].max_tile_size == (32, 32)
     assert map.tile_sets[1].spacing == 1
     assert map.tile_sets[1].margin == 1
-    assert map.tile_sets[1].tilecount == 48
+    assert map.tile_sets[1].tile_count == 48
     assert map.tile_sets[1].columns == 8
-    assert map.tile_sets[1].tileoffset == None
+    assert map.tile_sets[1].tile_offset == None
     assert map.tile_sets[1].grid == None
     assert map.tile_sets[1].properties == None
-    assert map.tile_sets[1].terraintypes == None
-    assert map.tile_sets[1].tiles == {}
 
     # unsure how to get paths to compare propperly
     assert str(map.tile_sets[1].image.source) == (
-        "images/tmw_desert_spacing.png")
+    "images/tmw_desert_spacing.png")
     assert map.tile_sets[1].image.trans == None
-    assert map.tile_sets[1].image.width == 265
-    assert map.tile_sets[1].image.height == 199
+    assert map.tile_sets[1].image.size == (265, 199)
 
-    # assert map.layers ==
+    assert map.tile_sets[1].terrain_types == None
+    assert map.tile_sets[1].tiles == {}
+
+    # layers
+    assert map.layers[0].data == [[1,2,3,4,5,6,7,8],
+                                  [9,10,11,12,13,14,15,16],
+                                  [17,18,19,20,21,22,23,24],
+                                  [25,26,27,28,29,30,31,32],
+                                  [33,34,35,36,37,38,39,40],
+                                  [41,42,43,44,45,46,47,48]]
+    assert map.layers[0].id == 1
+    assert map.layers[0].name == "Tile Layer 1"
+    assert map.layers[0].offset == (0, 0)
+    assert map.layers[0].opacity == 0xFF
+    assert map.layers[0].properties == None
+    assert map.layers[0].size == (8, 6)
 
 
 @pytest.mark.parametrize(
@@ -80,4 +94,4 @@ def test_color_parsing(test_input, expected):
     """
     Tiled has a few different types of color representations.
     """
-    assert pytiled_parser._parse_color(test_input) == expected
+    assert pytiled_parser.utilities.parse_color(test_input) == expected