Skip to content

Commit 2570ad0

Browse files
CleptomaniaCleptomania
committed
Update test files for Tiled 1.6(still needs work)
1 parent 3e9289e commit 2570ad0

File tree

47 files changed

+534
-1177
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+534
-1177
lines changed

‎tests/test_data/layer_tests/all_layer_types/map.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
{
6464
"id":3,
65-
"image":"..\/..\/images\/tile_04.png",
65+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
6666
"name":"Image Layer 1",
6767
"opacity":1,
6868
"tintcolor":"#ff0000",
@@ -74,7 +74,7 @@
7474
},
7575
{
7676
"id":5,
77-
"image":"..\/..\/images\/tile_04.png",
77+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
7878
"name":"Image Layer 2",
7979
"opacity":1,
8080
"parallaxx":1.5,
@@ -88,7 +88,7 @@
8888
"nextobjectid":3,
8989
"orientation":"orthogonal",
9090
"renderorder":"right-down",
91-
"tiledversion":"1.5.0",
91+
"tiledversion":"1.6.0",
9292
"tileheight":32,
9393
"tilesets":[
9494
{
@@ -97,6 +97,6 @@
9797
}],
9898
"tilewidth":32,
9999
"type":"map",
100-
"version":1.5,
100+
"version":"1.6",
101101
"width":8
102102
}

‎tests/test_data/layer_tests/all_layer_types/tileset.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
{ "columns":8,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"format":"",
7-
"target":"."
8-
}
9-
},
102
"image":"..\/..\/images\/tmw_desert_spacing.png",
113
"imageheight":199,
124
"imagewidth":265,
135
"margin":1,
146
"name":"tile_set_image",
157
"spacing":1,
168
"tilecount":48,
17-
"tiledversion":"1.3.5",
9+
"tiledversion":"1.6.0",
1810
"tileheight":32,
1911
"tilewidth":32,
2012
"type":"tileset",
21-
"version":1.2
13+
"version":"1.6"
2214
}

‎tests/test_data/layer_tests/b64/map.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"id":3,
53-
"image":"..\/..\/images\/tile_04.png",
53+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
5454
"name":"Image Layer 1",
5555
"opacity":1,
5656
"transparentcolor":"#000000",
@@ -63,7 +63,7 @@
6363
"nextobjectid":3,
6464
"orientation":"orthogonal",
6565
"renderorder":"right-down",
66-
"tiledversion":"1.4.1",
66+
"tiledversion":"1.6.0",
6767
"tileheight":32,
6868
"tilesets":[
6969
{
@@ -72,6 +72,6 @@
7272
}],
7373
"tilewidth":32,
7474
"type":"map",
75-
"version":1.4,
75+
"version":"1.6",
7676
"width":8
7777
}

‎tests/test_data/layer_tests/b64/tileset.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
{ "columns":8,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"format":"",
7-
"target":"."
8-
}
9-
},
102
"image":"..\/..\/images\/tmw_desert_spacing.png",
113
"imageheight":199,
124
"imagewidth":265,
135
"margin":1,
146
"name":"tile_set_image",
157
"spacing":1,
168
"tilecount":48,
17-
"tiledversion":"1.3.5",
9+
"tiledversion":"1.6.0",
1810
"tileheight":32,
1911
"tilewidth":32,
2012
"type":"tileset",
21-
"version":1.2
13+
"version":"1.6"
2214
}

‎tests/test_data/layer_tests/b64_gzip/map.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"id":3,
53-
"image":"..\/..\/images\/tile_04.png",
53+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
5454
"name":"Image Layer 1",
5555
"opacity":1,
5656
"transparentcolor":"#000000",
@@ -63,7 +63,7 @@
6363
"nextobjectid":3,
6464
"orientation":"orthogonal",
6565
"renderorder":"right-down",
66-
"tiledversion":"1.4.1",
66+
"tiledversion":"1.6.0",
6767
"tileheight":32,
6868
"tilesets":[
6969
{
@@ -72,6 +72,6 @@
7272
}],
7373
"tilewidth":32,
7474
"type":"map",
75-
"version":1.4,
75+
"version":"1.6",
7676
"width":8
7777
}

‎tests/test_data/layer_tests/b64_gzip/tileset.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
{ "columns":8,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"format":"",
7-
"target":"."
8-
}
9-
},
102
"image":"..\/..\/images\/tmw_desert_spacing.png",
113
"imageheight":199,
124
"imagewidth":265,
135
"margin":1,
146
"name":"tile_set_image",
157
"spacing":1,
168
"tilecount":48,
17-
"tiledversion":"1.3.5",
9+
"tiledversion":"1.6.0",
1810
"tileheight":32,
1911
"tilewidth":32,
2012
"type":"tileset",
21-
"version":1.2
13+
"version":"1.6"
2214
}

‎tests/test_data/layer_tests/b64_zlib/map.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
},
5151
{
5252
"id":3,
53-
"image":"..\/..\/images\/tile_04.png",
53+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
5454
"name":"Image Layer 1",
5555
"opacity":1,
5656
"transparentcolor":"#000000",
@@ -63,7 +63,7 @@
6363
"nextobjectid":3,
6464
"orientation":"orthogonal",
6565
"renderorder":"right-down",
66-
"tiledversion":"1.4.1",
66+
"tiledversion":"1.6.0",
6767
"tileheight":32,
6868
"tilesets":[
6969
{
@@ -72,6 +72,6 @@
7272
}],
7373
"tilewidth":32,
7474
"type":"map",
75-
"version":1.4,
75+
"version":"1.6",
7676
"width":8
7777
}

‎tests/test_data/layer_tests/b64_zlib/tileset.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
{ "columns":8,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"format":"",
7-
"target":"."
8-
}
9-
},
102
"image":"..\/..\/images\/tmw_desert_spacing.png",
113
"imageheight":199,
124
"imagewidth":265,
135
"margin":1,
146
"name":"tile_set_image",
157
"spacing":1,
168
"tilecount":48,
17-
"tiledversion":"1.3.5",
9+
"tiledversion":"1.6.0",
1810
"tileheight":32,
1911
"tilewidth":32,
2012
"type":"tileset",
21-
"version":1.2
13+
"version":"1.6"
2214
}

‎tests/test_data/layer_tests/b64_zstd/expected.py‎

Lines changed: 0 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +0,0 @@
1-
from pathlib import Path
2-
3-
from pytiled_parser import common_types, layer, tiled_object
4-
5-
EXPECTED = [
6-
layer.TileLayer(
7-
name="Tile Layer 1",
8-
opacity=1,
9-
visible=True,
10-
id=1,
11-
size=common_types.Size(8, 6),
12-
data=[
13-
[
14-
1,
15-
2,
16-
3,
17-
4,
18-
5,
19-
6,
20-
7,
21-
8,
22-
],
23-
[
24-
9,
25-
10,
26-
11,
27-
12,
28-
13,
29-
14,
30-
15,
31-
16,
32-
],
33-
[
34-
17,
35-
18,
36-
19,
37-
20,
38-
21,
39-
22,
40-
23,
41-
24,
42-
],
43-
[
44-
25,
45-
26,
46-
27,
47-
28,
48-
29,
49-
30,
50-
31,
51-
32,
52-
],
53-
[
54-
33,
55-
34,
56-
35,
57-
36,
58-
37,
59-
38,
60-
39,
61-
40,
62-
],
63-
[
64-
41,
65-
42,
66-
43,
67-
44,
68-
45,
69-
46,
70-
47,
71-
48,
72-
],
73-
],
74-
),
75-
layer.LayerGroup(
76-
name="Group 1",
77-
opacity=1,
78-
visible=True,
79-
id=4,
80-
layers=[
81-
layer.ObjectLayer(
82-
name="Object Layer 1",
83-
opacity=1,
84-
visible=True,
85-
id=2,
86-
draw_order="topdown",
87-
tiled_objects=[
88-
tiled_object.Rectangle(
89-
id=1,
90-
name="",
91-
rotation=0,
92-
size=common_types.Size(69.3333333333333, 52.6666666666667),
93-
coordinates=common_types.OrderedPair(46.3333333333333, 39),
94-
visible=True,
95-
type="",
96-
)
97-
],
98-
),
99-
],
100-
),
101-
layer.ImageLayer(
102-
name="Image Layer 1",
103-
opacity=1,
104-
visible=True,
105-
id=3,
106-
image=Path("../../images/tile_04.png"),
107-
transparent_color=common_types.Color(0, 0, 0, 255),
108-
),
109-
]

‎tests/test_data/layer_tests/b64_zstd/map.json‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
{ "compressionlevel":-1,
2-
"editorsettings":
3-
{
4-
"export":
5-
{
6-
"target":"."
7-
}
8-
},
92
"height":6,
103
"infinite":false,
114
"layers":[
@@ -57,7 +50,7 @@
5750
},
5851
{
5952
"id":3,
60-
"image":"..\/..\/images\/tile_04.png",
53+
"image":"..\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/layer_tests\/tests\/test_data\/images\/tile_04.png",
6154
"name":"Image Layer 1",
6255
"opacity":1,
6356
"transparentcolor":"#000000",
@@ -70,7 +63,7 @@
7063
"nextobjectid":3,
7164
"orientation":"orthogonal",
7265
"renderorder":"right-down",
73-
"tiledversion":"1.4.3",
66+
"tiledversion":"1.6.0",
7467
"tileheight":32,
7568
"tilesets":[
7669
{
@@ -79,6 +72,6 @@
7972
}],
8073
"tilewidth":32,
8174
"type":"map",
82-
"version":1.4,
75+
"version":"1.6",
8376
"width":8
8477
}

0 commit comments

Comments
 (0)