From e2157ffa20195bda0c86b3f5773868efcaa8a9a9 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:23:11 -0400 Subject: [PATCH 1/3] tests: implemented multiple tileset tests --- tests/test_data/tilesets/image/expected.py | 18 +++++++ tests/test_data/tilesets/image/tileset.json | 14 ++++-- .../image_background_color/expected.py | 20 ++++++++ .../image_background_color/tileset.json | 23 +++++++++ .../tilesets/image_objects/tileset.json | 16 +++++-- .../tilesets/image_properties/tileset.json | 48 +++++++++++++++++++ .../image_transparent_color/expected.py | 20 ++++++++ .../image_transparent_color/tileset.json | 15 ++++++ 8 files changed, 167 insertions(+), 7 deletions(-) create mode 100644 tests/test_data/tilesets/image_background_color/expected.py create mode 100644 tests/test_data/tilesets/image_background_color/tileset.json create mode 100644 tests/test_data/tilesets/image_properties/tileset.json create mode 100644 tests/test_data/tilesets/image_transparent_color/expected.py create mode 100644 tests/test_data/tilesets/image_transparent_color/tileset.json diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py index e69de29..c43c909 100644 --- a/tests/test_data/tilesets/image/expected.py +++ b/tests/test_data/tilesets/image/expected.py @@ -0,0 +1,18 @@ +from pathlib import Path + +from pytiled_parser import tileset + +expected = tileset.TileSet( + columns=8, + image=Path(r"..\/..\/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", + tile_height=32, + tile_width=32, + version=1.2, +) diff --git a/tests/test_data/tilesets/image/tileset.json b/tests/test_data/tilesets/image/tileset.json index 8f3b73e..40b712c 100644 --- a/tests/test_data/tilesets/image/tileset.json +++ b/tests/test_data/tilesets/image/tileset.json @@ -1,14 +1,22 @@ { "columns":8, - "image":"..\/images\/tmw_desert_spacing.png", + "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.1", + "tiledversion":"1.3.5", "tileheight":32, "tilewidth":32, "type":"tileset", "version":1.2 -} +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py new file mode 100644 index 0000000..1387f15 --- /dev/null +++ b/tests/test_data/tilesets/image_background_color/expected.py @@ -0,0 +1,20 @@ +from pathlib import Path + +from pytiled_parser import tileset +from pytiled_parser.common_types import Color + +expected = tileset.TileSet( + columns=8, + image=Path(r"..\/..\/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", + tile_height=32, + tile_width=32, + version=1.2, + background_color=Color("#5500ff"), +) diff --git a/tests/test_data/tilesets/image_background_color/tileset.json b/tests/test_data/tilesets/image_background_color/tileset.json new file mode 100644 index 0000000..a72c388 --- /dev/null +++ b/tests/test_data/tilesets/image_background_color/tileset.json @@ -0,0 +1,23 @@ +{ "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 diff --git a/tests/test_data/tilesets/image_objects/tileset.json b/tests/test_data/tilesets/image_objects/tileset.json index 6ceb5be..e670b61 100644 --- a/tests/test_data/tilesets/image_objects/tileset.json +++ b/tests/test_data/tilesets/image_objects/tileset.json @@ -1,12 +1,20 @@ { "columns":8, - "image":"..\/images\/tmw_desert_spacing.png", + "editorsettings": + { + "export": + { + "format":"", + "target":"." + } + }, + "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", "imageheight":199, "imagewidth":265, "margin":1, "name":"tile_set_image", "spacing":1, - "tilecount":5, - "tiledversion":"1.3.1", + "tilecount":48, + "tiledversion":"1.3.5", "tileheight":32, "tiles":[ { @@ -189,4 +197,4 @@ "tilewidth":32, "type":"tileset", "version":1.2 -} +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_properties/tileset.json b/tests/test_data/tilesets/image_properties/tileset.json new file mode 100644 index 0000000..785c164 --- /dev/null +++ b/tests/test_data/tilesets/image_properties/tileset.json @@ -0,0 +1,48 @@ +{ "columns":8, + "editorsettings": + { + "export": + { + "format":"", + "target":"..\/image" + } + }, + "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tile_set_image", + "properties":[ + { + "name":"bool property", + "type":"bool", + "value":true + }, + { + "name":"color property", + "type":"color", + "value":"#ff0000ff" + }, + { + "name":"float property", + "type":"float", + "value":5.6 + }, + { + "name":"int property", + "type":"int", + "value":5 + }, + { + "name":"string property", + "type":"string", + "value":"testing" + }], + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.5", + "tileheight":32, + "tilewidth":32, + "type":"tileset", + "version":1.2 +} \ No newline at end of file diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py new file mode 100644 index 0000000..cb0c9bb --- /dev/null +++ b/tests/test_data/tilesets/image_transparent_color/expected.py @@ -0,0 +1,20 @@ +from pathlib import Path + +from pytiled_parser import tileset +from pytiled_parser.common_types import Color + +expected = tileset.TileSet( + columns=8, + image=Path(r"..\/..\/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", + tile_height=32, + tile_width=32, + version=1.2, + transparent_color=Color("#ff00ff"), +) diff --git a/tests/test_data/tilesets/image_transparent_color/tileset.json b/tests/test_data/tilesets/image_transparent_color/tileset.json new file mode 100644 index 0000000..6d3ec40 --- /dev/null +++ b/tests/test_data/tilesets/image_transparent_color/tileset.json @@ -0,0 +1,15 @@ +{ "columns":8, + "image":"..\/..\/maps\/images\/tmw_desert_spacing.png", + "imageheight":199, + "imagewidth":265, + "margin":1, + "name":"tileset", + "spacing":1, + "tilecount":48, + "tiledversion":"1.3.5", + "tileheight":32, + "tilewidth":32, + "transparentcolor":"#ff00ff", + "type":"tileset", + "version":1.2 +} \ No newline at end of file From 4c504549c0e9d66ac6e1010da5bab4271da0fb82 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:26:43 -0400 Subject: [PATCH 2/3] tests: implemented tileset with properties test --- .../tilesets/image_properties/expected.py | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 tests/test_data/tilesets/image_properties/expected.py diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py new file mode 100644 index 0000000..8eb3bea --- /dev/null +++ b/tests/test_data/tilesets/image_properties/expected.py @@ -0,0 +1,26 @@ +from pathlib import Path + +from pytiled_parser import tileset +from pytiled_parser.common_types import Color + +expected = tileset.TileSet( + columns=8, + image=Path(r"..\/..\/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", + tile_height=32, + tile_width=32, + version=1.2, + properties={ + "bool property": True, + "color property": Color("#ff0000ff"), + "float property": 5.6, + "int property": 5, + "string property": "testing", + }, +) From 107bf406bc69f7666470b439716a87ebd31bd3b1 Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Thu, 4 Jun 2020 21:28:35 -0400 Subject: [PATCH 3/3] tests: updated expected variable in all expected.py files --- tests/test_data/tilesets/image/expected.py | 2 +- tests/test_data/tilesets/image_background_color/expected.py | 2 +- tests/test_data/tilesets/image_properties/expected.py | 2 +- tests/test_data/tilesets/image_transparent_color/expected.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py index c43c909..95e8db7 100644 --- a/tests/test_data/tilesets/image/expected.py +++ b/tests/test_data/tilesets/image/expected.py @@ -2,7 +2,7 @@ from pathlib import Path from pytiled_parser import tileset -expected = tileset.TileSet( +EXPECTED = tileset.TileSet( columns=8, image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), image_height=199, diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py index 1387f15..bc940aa 100644 --- a/tests/test_data/tilesets/image_background_color/expected.py +++ b/tests/test_data/tilesets/image_background_color/expected.py @@ -3,7 +3,7 @@ from pathlib import Path from pytiled_parser import tileset from pytiled_parser.common_types import Color -expected = tileset.TileSet( +EXPECTED = tileset.TileSet( columns=8, image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), image_height=199, diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py index 8eb3bea..1109340 100644 --- a/tests/test_data/tilesets/image_properties/expected.py +++ b/tests/test_data/tilesets/image_properties/expected.py @@ -3,7 +3,7 @@ from pathlib import Path from pytiled_parser import tileset from pytiled_parser.common_types import Color -expected = tileset.TileSet( +EXPECTED = tileset.TileSet( columns=8, image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), image_height=199, diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py index cb0c9bb..a6f4ce7 100644 --- a/tests/test_data/tilesets/image_transparent_color/expected.py +++ b/tests/test_data/tilesets/image_transparent_color/expected.py @@ -3,7 +3,7 @@ from pathlib import Path from pytiled_parser import tileset from pytiled_parser.common_types import Color -expected = tileset.TileSet( +EXPECTED = tileset.TileSet( columns=8, image=Path(r"..\/..\/maps\/images\/tmw_desert_spacing.png"), image_height=199,