From 612bd52653cae81281a511351ba4f72d4232705e Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Wed, 5 Aug 2020 23:14:31 -0400 Subject: [PATCH] tests(layer): infinite map tests --- tests/test_data/layer_tests/b64/expected.py | 2 - .../layer_tests/b64_gzip/expected.py | 2 - .../layer_tests/b64_zlib/expected.py | 2 - .../layer_tests/infinite_map/expected.py | 93 ++++++ .../layer_tests/infinite_map/map.json | 68 +++++ .../layer_tests/infinite_map_b64/expected.py | 279 ++++++++++++++++++ .../layer_tests/infinite_map_b64/map.json | 51 ++++ tests/test_layer.py | 2 + 8 files changed, 493 insertions(+), 6 deletions(-) create mode 100644 tests/test_data/layer_tests/infinite_map/expected.py create mode 100644 tests/test_data/layer_tests/infinite_map/map.json create mode 100644 tests/test_data/layer_tests/infinite_map_b64/expected.py create mode 100644 tests/test_data/layer_tests/infinite_map_b64/map.json diff --git a/tests/test_data/layer_tests/b64/expected.py b/tests/test_data/layer_tests/b64/expected.py index 05f89cc..9e27994 100644 --- a/tests/test_data/layer_tests/b64/expected.py +++ b/tests/test_data/layer_tests/b64/expected.py @@ -9,8 +9,6 @@ EXPECTED = [ visible=True, id=1, size=common_types.Size(8, 6), - encoding="base64", - compression="", data=[ 1, 2, diff --git a/tests/test_data/layer_tests/b64_gzip/expected.py b/tests/test_data/layer_tests/b64_gzip/expected.py index 75415b7..9e27994 100644 --- a/tests/test_data/layer_tests/b64_gzip/expected.py +++ b/tests/test_data/layer_tests/b64_gzip/expected.py @@ -9,8 +9,6 @@ EXPECTED = [ visible=True, id=1, size=common_types.Size(8, 6), - encoding="base64", - compression="gzip", data=[ 1, 2, diff --git a/tests/test_data/layer_tests/b64_zlib/expected.py b/tests/test_data/layer_tests/b64_zlib/expected.py index bafa15d..9e27994 100644 --- a/tests/test_data/layer_tests/b64_zlib/expected.py +++ b/tests/test_data/layer_tests/b64_zlib/expected.py @@ -9,8 +9,6 @@ EXPECTED = [ visible=True, id=1, size=common_types.Size(8, 6), - encoding="base64", - compression="zlib", data=[ 1, 2, diff --git a/tests/test_data/layer_tests/infinite_map/expected.py b/tests/test_data/layer_tests/infinite_map/expected.py new file mode 100644 index 0000000..e6db30c --- /dev/null +++ b/tests/test_data/layer_tests/infinite_map/expected.py @@ -0,0 +1,93 @@ +from pathlib import Path + +from pytiled_parser import common_types, layer, tiled_object + +EXPECTED = [ + layer.TileLayer( + name="Tile Layer 1", + opacity=1, + visible=True, + id=1, + size=common_types.Size(16, 16), + offset=common_types.OrderedPair(163.089434111595, 116.462603878116), + properties={"test": "test property",}, + chunks=[ + layer.Chunk( + coordinates=common_types.OrderedPair(0, 0), + size=common_types.Size(4, 8), + data=[ + 1, + 2, + 3, + 4, + 9, + 10, + 11, + 12, + 17, + 18, + 19, + 20, + 25, + 26, + 27, + 28, + 33, + 34, + 35, + 36, + 41, + 42, + 43, + 44, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + ], + ), + layer.Chunk( + coordinates=common_types.OrderedPair(4, 0), + size=common_types.Size(4, 8), + data=[ + 5, + 6, + 7, + 8, + 13, + 14, + 15, + 16, + 21, + 22, + 23, + 24, + 29, + 30, + 31, + 32, + 37, + 38, + 39, + 40, + 45, + 46, + 47, + 48, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + ], + ), + ], + ) +] diff --git a/tests/test_data/layer_tests/infinite_map/map.json b/tests/test_data/layer_tests/infinite_map/map.json new file mode 100644 index 0000000..f506453 --- /dev/null +++ b/tests/test_data/layer_tests/infinite_map/map.json @@ -0,0 +1,68 @@ +{ "compressionlevel":-1, + "editorsettings": + { + "chunksize": + { + "height":8, + "width":4 + }, + "export": + { + "target":"..\/all_layer_types" + } + }, + "height":6, + "infinite":true, + "layers":[ + { + "chunks":[ + { + "data":[1, 2, 3, 4, 9, 10, 11, 12, 17, 18, 19, 20, 25, 26, 27, 28, 33, 34, 35, 36, 41, 42, 43, 44, 0, 0, 0, 0, 0, 0, 0, 0], + "height":8, + "width":4, + "x":0, + "y":0 + }, + { + "data":[5, 6, 7, 8, 13, 14, 15, 16, 21, 22, 23, 24, 29, 30, 31, 32, 37, 38, 39, 40, 45, 46, 47, 48, 0, 0, 0, 0, 0, 0, 0, 0], + "height":8, + "width":4, + "x":4, + "y":0 + }], + "height":16, + "id":1, + "name":"Tile Layer 1", + "offsetx":163.089434111595, + "offsety":116.462603878116, + "opacity":1, + "properties":[ + { + "name":"test", + "type":"string", + "value":"test property" + }], + "startx":0, + "starty":0, + "type":"tilelayer", + "visible":true, + "width":16, + "x":0, + "y":0 + }], + "nextlayerid":6, + "nextobjectid":3, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.4.1", + "tileheight":32, + "tilesets":[ + { + "firstgid":1, + "source":"..\/all_layer_types\/tileset.json" + }], + "tilewidth":32, + "type":"map", + "version":1.4, + "width":8 +} \ No newline at end of file diff --git a/tests/test_data/layer_tests/infinite_map_b64/expected.py b/tests/test_data/layer_tests/infinite_map_b64/expected.py new file mode 100644 index 0000000..16be791 --- /dev/null +++ b/tests/test_data/layer_tests/infinite_map_b64/expected.py @@ -0,0 +1,279 @@ +from pathlib import Path + +from pytiled_parser import common_types, layer, tiled_object + +EXPECTED = [ + layer.TileLayer( + name="Tile Layer 1", + opacity=1, + visible=True, + id=1, + size=common_types.Size(16, 16), + offset=common_types.OrderedPair(1, 3), + properties={"test": "test property",}, + chunks=[ + layer.Chunk( + coordinates=common_types.OrderedPair(0, 0), + size=common_types.Size(16, 16), + data=[ + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 17, + 18, + 19, + 20, + 21, + 22, + 23, + 24, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 25, + 26, + 27, + 28, + 29, + 30, + 31, + 32, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 33, + 34, + 35, + 36, + 37, + 38, + 39, + 40, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 41, + 42, + 43, + 44, + 45, + 46, + 47, + 48, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + ], + ) + ], + ) +] diff --git a/tests/test_data/layer_tests/infinite_map_b64/map.json b/tests/test_data/layer_tests/infinite_map_b64/map.json new file mode 100644 index 0000000..54c3852 --- /dev/null +++ b/tests/test_data/layer_tests/infinite_map_b64/map.json @@ -0,0 +1,51 @@ +{ "compressionlevel":-1, + "height":6, + "infinite":true, + "layers":[ + { + "chunks":[ + { + "data":"AQAAAAIAAAADAAAABAAAAAUAAAAGAAAABwAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkAAAAKAAAACwAAAAwAAAANAAAADgAAAA8AAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARAAAAEgAAABMAAAAUAAAAFQAAABYAAAAXAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGQAAABoAAAAbAAAAHAAAAB0AAAAeAAAAHwAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAiAAAAIwAAACQAAAAlAAAAJgAAACcAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApAAAAKgAAACsAAAAsAAAALQAAAC4AAAAvAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "height":16, + "width":16, + "x":0, + "y":0 + }], + "compression":"", + "encoding":"base64", + "height":16, + "id":1, + "name":"Tile Layer 1", + "offsetx":1, + "offsety":3, + "opacity":1, + "properties":[ + { + "name":"test", + "type":"string", + "value":"test property" + }], + "startx":0, + "starty":0, + "type":"tilelayer", + "visible":true, + "width":16, + "x":0, + "y":0 + }], + "nextlayerid":6, + "nextobjectid":3, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.4.1", + "tileheight":32, + "tilesets":[ + { + "firstgid":1, + "source":"..\/all_layer_types\/tileset.json" + }], + "tilewidth":32, + "type":"map", + "version":1.4, + "width":8 +} \ No newline at end of file diff --git a/tests/test_layer.py b/tests/test_layer.py index 7d3e8c0..6310ca5 100644 --- a/tests/test_layer.py +++ b/tests/test_layer.py @@ -19,6 +19,8 @@ ALL_LAYER_TESTS = [ LAYER_TESTS / "b64_gzip", LAYER_TESTS / "b64_zlib", LAYER_TESTS / "no_layers", + LAYER_TESTS / "infinite_map", + LAYER_TESTS / "infinite_map_b64", ]