From 7c4071c0f24dc95a1b45433a17140972b4642e07 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:45:39 -0400 Subject: [PATCH 1/3] tests: all currently implemented tileset tests passing. --- tests/test_data/tilesets/image/expected.py | 4 +- .../image_background_color/expected.py | 4 +- .../image_background_color/tileset.json | 39 ++++++++----------- .../tilesets/image_properties/expected.py | 4 +- .../image_transparent_color/expected.py | 4 +- 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py index 95e8db7..629ea1c 100644 --- a/tests/test_data/tilesets/image/expected.py +++ b/tests/test_data/tilesets/image/expected.py @@ -4,14 +4,14 @@ from pytiled_parser import tileset EXPECTED = tileset.TileSet( columns=8, - image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), + image=Path("../../maps/images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.1", + tiled_version="1.3.5", tile_height=32, tile_width=32, version=1.2, diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py index bc940aa..220ee83 100644 --- a/tests/test_data/tilesets/image_background_color/expected.py +++ b/tests/test_data/tilesets/image_background_color/expected.py @@ -5,14 +5,14 @@ from pytiled_parser.common_types import Color EXPECTED = tileset.TileSet( columns=8, - image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), + image=Path("../../maps/images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.1", + tiled_version="1.3.5", tile_height=32, tile_width=32, version=1.2, diff --git a/tests/test_data/tilesets/image_background_color/tileset.json b/tests/test_data/tilesets/image_background_color/tileset.json index a72c388..64fbc87 100644 --- a/tests/test_data/tilesets/image_background_color/tileset.json +++ b/tests/test_data/tilesets/image_background_color/tileset.json @@ -1,23 +1,16 @@ -{ "backgroundcolor":"#5500ff", - "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"..\/image" - } - }, - "image":"..\/images\/tmw_desert_spacing.png", - "imageheight":199, - "imagewidth":265, - "margin":1, - "name":"tile_set_image", - "spacing":1, - "tilecount":0, - "tiledversion":"1.3.5", - "tileheight":32, - "tilewidth":32, - "type":"tileset", - "version":1.2 -} \ No newline at end of file +{ + "backgroundcolor": "#5500ff", + "columns": 8, + "image": "../../maps/images/tmw_desert_spacing.png", + "imageheight": 199, + "imagewidth": 265, + "margin": 1, + "name": "tile_set_image", + "spacing": 1, + "tilecount": 48, + "tiledversion": "1.3.5", + "tileheight": 32, + "tilewidth": 32, + "type": "tileset", + "version": 1.2 +} diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py index 1109340..5ea2fe0 100644 --- a/tests/test_data/tilesets/image_properties/expected.py +++ b/tests/test_data/tilesets/image_properties/expected.py @@ -5,14 +5,14 @@ from pytiled_parser.common_types import Color EXPECTED = tileset.TileSet( columns=8, - image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), + image=Path("../../maps/images/tmw_desert_spacing.png"), image_height=199, image_width=265, margin=1, spacing=1, name="tile_set_image", tile_count=48, - tiled_version="1.3.1", + tiled_version="1.3.5", tile_height=32, tile_width=32, version=1.2, diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py index a6f4ce7..d588f2d 100644 --- a/tests/test_data/tilesets/image_transparent_color/expected.py +++ b/tests/test_data/tilesets/image_transparent_color/expected.py @@ -10,9 +10,9 @@ EXPECTED = tileset.TileSet( image_width=265, margin=1, spacing=1, - name="tile_set_image", + name="tileset", tile_count=48, - tiled_version="1.3.1", + tiled_version="1.3.5", tile_height=32, tile_width=32, version=1.2, From 2ed04ae204136ea0b4a45e459203a1ae65f09851 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:46:13 -0400 Subject: [PATCH 2/3] tests: refactored the way tileset test directories are handled. Switching from finding all directories to manually listing. --- tests/test_tileset.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/test_tileset.py b/tests/test_tileset.py index 0aaebd2..0e3a3aa 100644 --- a/tests/test_tileset.py +++ b/tests/test_tileset.py @@ -13,7 +13,12 @@ TEST_DATA = TESTS_DIR / "test_data" TILE_SETS = TEST_DATA / "tilesets" -ALL_TILESET_DIRS = TILE_SETS.glob("*") +ALL_TILESET_DIRS = [ + TILE_SETS / "image", + TILE_SETS / "image_background_color", + TILE_SETS / "image_properties", + TILE_SETS / "image_transparent_color", +] @pytest.mark.parametrize("tileset_dir", ALL_TILESET_DIRS) From 9c45223e1017d767172f87e9f471ec4647d4c27f Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:50:52 -0400 Subject: [PATCH 3/3] tests: implemented tile_offset test --- tests/test_data/tilesets/image/tileset.json | 43 +++++++++---------- .../tilesets/image_tile_offset/expected.py | 20 +++++++++ .../tilesets/image_tile_offset/tileset.json | 27 ++++++++++++ tests/test_tileset.py | 1 + 4 files changed, 69 insertions(+), 22 deletions(-) create mode 100644 tests/test_data/tilesets/image_tile_offset/expected.py create mode 100644 tests/test_data/tilesets/image_tile_offset/tileset.json diff --git a/tests/test_data/tilesets/image/tileset.json b/tests/test_data/tilesets/image/tileset.json index 40b712c..279e059 100644 --- a/tests/test_data/tilesets/image/tileset.json +++ b/tests/test_data/tilesets/image/tileset.json @@ -1,22 +1,21 @@ -{ "columns":8, - "editorsettings": - { - "export": - { - "format":"", - "target":"." - } - }, - "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", - "imageheight":199, - "imagewidth":265, - "margin":1, - "name":"tile_set_image", - "spacing":1, - "tilecount":48, - "tiledversion":"1.3.5", - "tileheight":32, - "tilewidth":32, - "type":"tileset", - "version":1.2 -} \ No newline at end of file +{ + "columns": 8, + "editorsettings": { + "export": { + "format": "", + "target": "." + } + }, + "image": "../../maps/images/tmw_desert_spacing.png", + "imageheight": 199, + "imagewidth": 265, + "margin": 1, + "name": "tile_set_image", + "spacing": 1, + "tilecount": 48, + "tiledversion": "1.3.5", + "tileheight": 32, + "tilewidth": 32, + "type": "tileset", + "version": 1.2 +} diff --git a/tests/test_data/tilesets/image_tile_offset/expected.py b/tests/test_data/tilesets/image_tile_offset/expected.py new file mode 100644 index 0000000..3d57844 --- /dev/null +++ b/tests/test_data/tilesets/image_tile_offset/expected.py @@ -0,0 +1,20 @@ +from pathlib import Path + +from pytiled_parser import tileset +from pytiled_parser.common_types import Color, OrderedPair + +EXPECTED = tileset.TileSet( + columns=8, + image=Path("../../maps/images/tmw_desert_spacing.png"), + image_height=199, + image_width=265, + margin=1, + spacing=1, + name="tile_set_image", + tile_count=48, + tiled_version="1.3.5", + tile_height=32, + tile_width=32, + version=1.2, + tile_offset=OrderedPair(3, 5), +) diff --git a/tests/test_data/tilesets/image_tile_offset/tileset.json b/tests/test_data/tilesets/image_tile_offset/tileset.json new file mode 100644 index 0000000..a5893b2 --- /dev/null +++ b/tests/test_data/tilesets/image_tile_offset/tileset.json @@ -0,0 +1,27 @@ +{ "columns":8, + "editorsettings": + { + "export": + { + "format":"", + "target":"..\/image" + } + }, + "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.5", + "tileheight":32, + "tileoffset": + { + "x":3, + "y":5 + }, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} \ No newline at end of file diff --git a/tests/test_tileset.py b/tests/test_tileset.py index 0e3a3aa..f2bf962 100644 --- a/tests/test_tileset.py +++ b/tests/test_tileset.py @@ -18,6 +18,7 @@ ALL_TILESET_DIRS = [ TILE_SETS / "image_background_color", TILE_SETS / "image_properties", TILE_SETS / "image_transparent_color", + TILE_SETS / "image_tile_offset", ]