Update all tests for template template update(#41)

Cleptomania · Cleptomania · commit 29c04a39a969 · 2021-07-28T22:38:10.000-04:00
diff --git a/tests/test_data/map_tests/embedded_tileset/expected.py b/tests/test_data/map_tests/embedded_tileset/expected.py
@@ -21,11 +21,11 @@
             image_height=199,
             margin=1,
             spacing=1,
+            firstgid=1,
             name="tileset",
             tile_count=48,
             tile_height=32,
             tile_width=32,
-            firstgid=1,
         )
     },
 )
diff --git a/tests/test_data/map_tests/external_tileset_dif_dir/expected.py b/tests/test_data/map_tests/external_tileset_dif_dir/expected.py
@@ -85,6 +85,7 @@
             tiled_version="1.6.0",
             tile_height=32,
             tile_width=32,
+            firstgid=1,
             version="1.6",
             type="tileset",
             grid=tileset.Grid(orientation="orthogonal", width=1, height=1),
diff --git a/tests/test_data/map_tests/hexagonal/expected.py b/tests/test_data/map_tests/hexagonal/expected.py
@@ -143,6 +143,7 @@
             .resolve(),
             image_width=106,
             image_height=72,
+            firstgid=1,
             margin=0,
             spacing=0,
             name="tileset",
diff --git a/tests/test_data/map_tests/no_background_color/expected.py b/tests/test_data/map_tests/no_background_color/expected.py
@@ -21,6 +21,7 @@
             .resolve(),
             image_width=265,
             image_height=199,
+            firstgid=1,
             margin=1,
             spacing=1,
             name="tile_set_image",
diff --git a/tests/test_data/map_tests/no_layers/expected.py b/tests/test_data/map_tests/no_layers/expected.py
@@ -22,6 +22,7 @@
             .resolve(),
             image_width=265,
             image_height=199,
+            firstgid=1,
             margin=1,
             spacing=1,
             name="tile_set_image",
diff --git a/tests/test_data/map_tests/template/expected.py b/tests/test_data/map_tests/template/expected.py
@@ -24,33 +24,31 @@
                     type="",
                 ),
                 tiled_object.Tile(
-                    id=3,
-                    coordinates=common_types.OrderedPair(
-                        46.3682110303692, 112.993321292057
-                    ),
+                    id=6,
+                    coordinates=common_types.OrderedPair(46, 136.666666666667),
                     name="",
                     rotation=0,
                     type="",
                     visible=True,
                     size=common_types.Size(32, 32),
-                    gid=30,
+                    gid=49,
                 ),
                 tiled_object.Tile(
-                    id=5,
-                    coordinates=common_types.OrderedPair(116, 145),
+                    id=7,
+                    coordinates=common_types.OrderedPair(141.333333333333, 148),
                     name="",
                     rotation=0,
                     type="",
                     visible=True,
                     size=common_types.Size(32, 32),
-                    gid=1,
+                    gid=50,
                 ),
             ],
         )
     ],
     map_size=common_types.Size(8, 6),
     next_layer_id=3,
-    next_object_id=6,
+    next_object_id=8,
     orientation="orthogonal",
     render_order="right-down",
     tiled_version="1.7.1",
@@ -65,6 +63,7 @@
             .resolve(),
             image_width=265,
             image_height=199,
+            firstgid=1,
             margin=1,
             spacing=1,
             name="tile_set_image",
@@ -76,15 +75,33 @@
             type="tileset",
         ),
         49: tileset.Tileset(
+            columns=1,
+            image=Path(Path(__file__).parent / "../../images/tile_04.png")
+            .absolute()
+            .resolve(),
+            image_width=32,
+            image_height=32,
+            firstgid=49,
+            margin=0,
+            spacing=0,
+            name="tile_set_image_for_template",
+            tile_count=1,
+            tiled_version="1.7.1",
+            tile_height=32,
+            tile_width=32,
+            version="1.6",
+            type="tileset",
+        ),
+        50: tileset.Tileset(
             columns=0,
             margin=0,
             spacing=0,
-            name="tileset_single_image",
+            name="tile_set_single_image",
             grid=tileset.Grid(orientation="orthogonal", width=1, height=1),
             tiles={
                 0: tileset.Tile(
                     id=0,
-                    image=Path(Path(__file__).parent / "../../images/tile_01.png")
+                    image=Path(Path(__file__).parent / "../../images/tile_02.png")
                     .absolute()
                     .resolve(),
                     image_height=32,
@@ -95,6 +112,7 @@
             tiled_version="1.7.1",
             tile_height=32,
             tile_width=32,
+            firstgid=50,
             type="tileset",
             version="1.6",
         ),
diff --git a/tests/test_data/map_tests/template/map.json b/tests/test_data/map_tests/template/map.json
@@ -10,21 +10,21 @@
          "objects":[
                 {
                  "id":2,
-                 "template":"template.json",
+                 "template":"template-rectangle.json",
                  "x":98.4987608686521,
                  "y":46.2385012811358
                 }, 
                 {
-                 "id":3,
-                 "template":"template_tile.json",
-                 "x":46.3682110303692,
-                 "y":112.993321292057
+                 "id":6,
+                 "template":"template-tile-spritesheet.json",
+                 "x":46,
+                 "y":136.666666666667
                 }, 
                 {
-                 "id":5,
-                 "template":"template_tile_image.json",
-                 "x":116,
-                 "y":145
+                 "id":7,
+                 "template":"template-tile-image.json",
+                 "x":141.333333333333,
+                 "y":148
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -33,7 +33,7 @@
          "y":0
         }],
  "nextlayerid":3,
- "nextobjectid":6,
+ "nextobjectid":8,
  "orientation":"orthogonal",
  "properties":[
         {
@@ -76,7 +76,7 @@
         }, 
         {
          "firstgid":49,
-         "source":"tileset_single_image.json"
+         "source":"tile_set_image_for_template.json"
         }],
  "tilewidth":32,
  "type":"map",
diff --git a/tests/test_data/map_tests/template/template-rectangle.json b/tests/test_data/map_tests/template/template-rectangle.json
diff --git a/tests/test_data/map_tests/template/template-tile-image.json b/tests/test_data/map_tests/template/template-tile-image.json
@@ -2,7 +2,7 @@
     {
      "gid":1,
      "height":32,
-     "id":4,
+     "id":7,
      "name":"",
      "rotation":0,
      "type":"",
@@ -12,7 +12,7 @@
  "tileset":
     {
      "firstgid":1,
-     "source":"tileset_single_image.json"
+     "source":"tile_set_single_image.json"
     },
  "type":"template"
 }
diff --git a/tests/test_data/map_tests/template/template-tile-spritesheet.json b/tests/test_data/map_tests/template/template-tile-spritesheet.json
@@ -1,8 +1,8 @@
 { "object":
     {
-     "gid":30,
+     "gid":1,
      "height":32,
-     "id":3,
+     "id":6,
      "name":"",
      "rotation":0,
      "type":"",
@@ -12,7 +12,7 @@
  "tileset":
     {
      "firstgid":1,
-     "source":"tileset.json"
+     "source":"tile_set_image_for_template.json"
     },
  "type":"template"
 }
diff --git a/tests/test_data/map_tests/template/tile_set_image_for_template.json b/tests/test_data/map_tests/template/tile_set_image_for_template.json
@@ -0,0 +1,14 @@
+{ "columns":1,
+ "image":"..\/..\/images\/tile_04.png",
+ "imageheight":32,
+ "imagewidth":32,
+ "margin":0,
+ "name":"tile_set_image_for_template",
+ "spacing":0,
+ "tilecount":1,
+ "tiledversion":"1.7.1",
+ "tileheight":32,
+ "tilewidth":32,
+ "type":"tileset",
+ "version":"1.6"
+}
diff --git a/tests/test_data/map_tests/template/tile_set_single_image.json b/tests/test_data/map_tests/template/tile_set_single_image.json
@@ -6,15 +6,15 @@
      "width":1
     },
  "margin":0,
- "name":"tileset_single_image",
+ "name":"tile_set_single_image",
  "spacing":0,
  "tilecount":1,
  "tiledversion":"1.7.1",
  "tileheight":32,
  "tiles":[
         {
          "id":0,
-         "image":"..\/..\/images\/tile_01.png",
+         "image":"..\/..\/images\/tile_02.png",
          "imageheight":32,
          "imagewidth":32
         }],
diff --git a/tests/test_data/tilesets/image/expected.py b/tests/test_data/tilesets/image/expected.py
@@ -7,6 +7,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_background_color/expected.py b/tests/test_data/tilesets/image_background_color/expected.py
@@ -8,6 +8,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_grid/expected.py b/tests/test_data/tilesets/image_grid/expected.py
@@ -7,6 +7,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_properties/expected.py b/tests/test_data/tilesets/image_properties/expected.py
@@ -8,6 +8,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_tile_offset/expected.py b/tests/test_data/tilesets/image_tile_offset/expected.py
@@ -8,6 +8,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_transformations/expected.py b/tests/test_data/tilesets/image_transformations/expected.py
@@ -7,6 +7,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tile_set_image",
diff --git a/tests/test_data/tilesets/image_transparent_color/expected.py b/tests/test_data/tilesets/image_transparent_color/expected.py
@@ -8,6 +8,7 @@
     image=Path("../../images/tmw_desert_spacing.png"),
     image_height=199,
     image_width=265,
+    firstgid=1,
     margin=1,
     spacing=1,
     name="tileset",
diff --git a/tests/test_data/tilesets/individual_images/expected.py b/tests/test_data/tilesets/individual_images/expected.py
@@ -11,6 +11,7 @@
     tiled_version="1.6.0",
     tile_height=32,
     tile_width=32,
+    firstgid=1,
     version="1.6",
     type="tileset",
     grid=tileset.Grid(orientation="orthogonal", width=1, height=1),
diff --git a/tests/test_data/tilesets/terrain/expected.py b/tests/test_data/tilesets/terrain/expected.py
@@ -14,6 +14,7 @@
     tiled_version="1.6.0",
     tile_height=32,
     tile_width=32,
+    firstgid=1,
     version="1.6",
     type="tileset",
     wang_sets=[
diff --git a/tests/test_data/tilesets/wangsets/map.json b/tests/test_data/tilesets/wangsets/map.json
diff --git a/tests/test_data/tilesets/wangsets/tileset.json b/tests/test_data/tilesets/wangsets/tileset.json
diff --git a/tests/test_data/world_tests/both/expected.py b/tests/test_data/world_tests/both/expected.py
diff --git a/tests/test_data/world_tests/pattern_matched/expected.py b/tests/test_data/world_tests/pattern_matched/expected.py
diff --git a/tests/test_data/world_tests/static_defined/expected.py b/tests/test_data/world_tests/static_defined/expected.py
diff --git a/tests/test_tileset.py b/tests/test_tileset.py

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@`
`21`	`21`	`image_height=199,`
`22`	`22`	`margin=1,`
`23`	`23`	`spacing=1,`
	`24`	`+ firstgid=1,`
`24`	`25`	`name="tileset",`
`25`	`26`	`tile_count=48,`
`26`	`27`	`tile_height=32,`
`27`	`28`	`tile_width=32,`
`28`		`- firstgid=1,`
`29`	`29`	`)`
`30`	`30`	`},`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`{`
`3`	`3`	`"gid":1,`
`4`	`4`	`"height":32,`
`5`		`- "id":4,`
	`5`	`+ "id":7,`
`6`	`6`	`"name":"",`
`7`	`7`	`"rotation":0,`
`8`	`8`	`"type":"",`
`@@ -12,7 +12,7 @@`
`12`	`12`	`"tileset":`
`13`	`13`	`{`
`14`	`14`	`"firstgid":1,`
`15`		`- "source":"tileset_single_image.json"`
	`15`	`+ "source":"tile_set_single_image.json"`
`16`	`16`	`},`
`17`	`17`	`"type":"template"`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{ "object":`
`2`	`2`	`{`
`3`		`- "gid":30,`
	`3`	`+ "gid":1,`
`4`	`4`	`"height":32,`
`5`		`- "id":3,`
	`5`	`+ "id":6,`
`6`	`6`	`"name":"",`
`7`	`7`	`"rotation":0,`
`8`	`8`	`"type":"",`
`@@ -12,7 +12,7 @@`
`12`	`12`	`"tileset":`
`13`	`13`	`{`
`14`	`14`	`"firstgid":1,`
`15`		`- "source":"tileset.json"`
	`15`	`+ "source":"tile_set_image_for_template.json"`
`16`	`16`	`},`
`17`	`17`	`"type":"template"`
`18`	`18`	`}`