From 99c6964e9b4402f23ff1ebc26f9f0018cca7a67c Mon Sep 17 00:00:00 2001 From: Darren Eberly Date: Mon, 27 Jul 2020 21:06:53 -0400 Subject: [PATCH] tests(layer): increased branch coverage of layer tests --- pytiled_parser/layer.py | 4 +--- .../layer_tests/all_layer_types/expected.py | 9 +++++++++ .../layer_tests/all_layer_types/map.json | 20 ++++++++++++++++++- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/pytiled_parser/layer.py b/pytiled_parser/layer.py index cf7c5cf..1477f7a 100644 --- a/pytiled_parser/layer.py +++ b/pytiled_parser/layer.py @@ -209,10 +209,8 @@ def _decode_tile_layer_data(tile_layer: TileLayer) -> TileLayer: unzipped_data = zlib.decompress(unencoded_data) elif tile_layer.compression == "gzip": unzipped_data = gzip.decompress(unencoded_data) - elif not tile_layer.compression: - unzipped_data = unencoded_data else: - raise ValueError(f"Unsupported compression type: '{tile_layer.compression}'.") + unzipped_data = unencoded_data tile_grid = [] diff --git a/tests/test_data/layer_tests/all_layer_types/expected.py b/tests/test_data/layer_tests/all_layer_types/expected.py index 9e27994..d3442ff 100644 --- a/tests/test_data/layer_tests/all_layer_types/expected.py +++ b/tests/test_data/layer_tests/all_layer_types/expected.py @@ -9,6 +9,8 @@ EXPECTED = [ visible=True, id=1, size=common_types.Size(8, 6), + offset=common_types.OrderedPair(1, 3), + properties={"test": "test property",}, data=[ 1, 2, @@ -94,4 +96,11 @@ EXPECTED = [ image=Path("../../images/tile_04.png"), transparent_color=common_types.Color("#000000"), ), + layer.ImageLayer( + name="Image Layer 2", + opacity=1, + visible=True, + id=5, + image=Path("../../images/tile_04.png"), + ), ] diff --git a/tests/test_data/layer_tests/all_layer_types/map.json b/tests/test_data/layer_tests/all_layer_types/map.json index 125eae5..18e6848 100644 --- a/tests/test_data/layer_tests/all_layer_types/map.json +++ b/tests/test_data/layer_tests/all_layer_types/map.json @@ -7,7 +7,15 @@ "height":6, "id":1, "name":"Tile Layer 1", + "offsetx":1, + "offsety":3, "opacity":1, + "properties":[ + { + "name":"test", + "type":"string", + "value":"test property" + }], "type":"tilelayer", "visible":true, "width":8, @@ -56,8 +64,18 @@ "visible":true, "x":0, "y":0 + }, + { + "id":5, + "image":"..\/..\/images\/tile_04.png", + "name":"Image Layer 2", + "opacity":1, + "type":"imagelayer", + "visible":true, + "x":0, + "y":0 }], - "nextlayerid":5, + "nextlayerid":6, "nextobjectid":3, "orientation":"orthogonal", "renderorder":"right-down",