cleanup

Author: MetalBlueberry

assets/tilesets/testLoadTile.tsx renamed to assets/tilesets/testLoadTilesetTile.tsx

@@ -110,3 +110,7 @@ func SaveTilesetToWriter(tileset *Tileset, w io.Writer) error {
 	encoder.Indent("", " ")
 	return encoder.Encode(tileset)
 }
+
+func b(v bool) *bool {
+	return &v
+}

tiled.go

@@ -184,7 +184,7 @@ func TestFont(t *testing.T) {
 				assert.Equal(t, false, text.Italic)
 				assert.Equal(t, false, text.Underline)
 				assert.Equal(t, false, text.Strikethrough)
-				assert.Equal(t, true, text.Kerning)
+				assert.Equal(t, true, *text.Kerning)
 				assert.Equal(t, "left", text.HAlign)
 				assert.Equal(t, "top", text.VAlign)
 			}

tiled_test.go

@@ -47,7 +47,7 @@ type ObjectGroup struct {
 	// The opacity of the layer as a value from 0 to 1. Defaults to 1.
 	Opacity float32 `xml:"opacity,attr,omitempty"`
 	// Whether the layer is shown (1) or hidden (0). Defaults to 1.
-	Visible *bool `xml:"visible,attr"` // TODO: default to non 0 value
+	Visible *bool `xml:"visible,attr"`
 	// Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)
 	OffsetX int `xml:"offsetx,attr,omitempty"`
 	// Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)
@@ -82,7 +82,7 @@ type Object struct {
 	// An reference to a tile (optional).
 	GID uint32 `xml:"gid,attr,omitempty"`
 	// Whether the object is shown (1) or hidden (0). Defaults to 1. (since 0.9)
-	Visible *bool `xml:"visible,attr"` // TODO: default not 0
+	Visible *bool `xml:"visible,attr"`
 	// Custom properties
 	Properties *Properties `xml:"properties,omitempty"`
 	// Used to mark an object as an ellipse. The existing x, y, width and height attributes are used to determine the size of the ellipse.
@@ -162,27 +162,27 @@ type Text struct {
 	// The actual text
 	Text string `xml:",chardata"`
 	// The font family used (default: "sans-serif")
-	FontFamily string `xml:"fontfamily,attr"`
+	FontFamily string `xml:"fontfamily,attr,omitempty"`
 	// The size of the font in pixels (not using points, because other sizes in the TMX format are also using pixels) (default: 16)
-	Size int `xml:"pixelsize,attr"`
+	Size int `xml:"pixelsize,attr,omitempty"`
 	// Whether word wrapping is enabled (1) or disabled (0). Defaults to 0.
-	Wrap bool `xml:"wrap,attr"`
+	Wrap bool `xml:"wrap,attr,omitempty"`
 	// Color of the text in #AARRGGBB or #RRGGBB format (default: #000000)
-	Color *HexColor `xml:"color,attr"`
+	Color *HexColor `xml:"color,attr,omitempty"`
 	// Whether the font is bold (1) or not (0). Defaults to 0.
-	Bold bool `xml:"bold,attr"`
+	Bold bool `xml:"bold,attr,omitempty"`
 	// Whether the font is italic (1) or not (0). Defaults to 0.
-	Italic bool `xml:"italic,attr"`
+	Italic bool `xml:"italic,attr,omitempty"`
 	// Whether a line should be drawn below the text (1) or not (0). Defaults to 0.
-	Underline bool `xml:"underline,attr"`
+	Underline bool `xml:"underline,attr,omitempty"`
 	// Whether a line should be drawn through the text (1) or not (0). Defaults to 0.
-	Strikethrough bool `xml:"strikeout,attr"`
+	Strikethrough bool `xml:"strikeout,attr,omitempty"`
 	// Whether kerning should be used while rendering the text (1) or not (0). Default to 1.
-	Kerning bool `xml:"kerning,attr"`
+	Kerning *bool `xml:"kerning,attr,omitempty"`
 	// Horizontal alignment of the text within the object (left (default), center, right or justify (since Tiled 1.2.1))
-	HAlign string `xml:"halign,attr"`
+	HAlign string `xml:"halign,attr,omitempty"`
 	// Vertical alignment of the text within the object (top (default), center or bottom)
-	VAlign string `xml:"valign,attr"`
+	VAlign string `xml:"valign,attr,omitempty"`
 }
 
 // UnmarshalXML decodes a single XML element beginning with the given start element.
@@ -192,7 +192,7 @@ func (t *Text) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	item := Alias{
 		FontFamily: "sans-serif",
 		Size:       16,
-		Kerning:    true,
+		Kerning:    b(true),
 		HAlign:     "left",
 		VAlign:     "top",
 		Color:      &HexColor{},

tmx_object.go

@@ -31,25 +31,27 @@ import (
 func TestGetProperty(t *testing.T) {
 
 	props := Properties{
-		{
-			Name:  "string-name",
-			Type:  "string",
-			Value: "string-value",
-		},
-		{
-			Name:  "int-name",
-			Type:  "int",
-			Value: "123",
-		},
-		{
-			Name:  "float-name",
-			Type:  "float",
-			Value: "1.23",
-		},
-		{
-			Name:  "bool-name",
-			Type:  "boolean",
-			Value: "true",
+		Property: []*Property{
+			{
+				Name:  "string-name",
+				Type:  "string",
+				Value: "string-value",
+			},
+			{
+				Name:  "int-name",
+				Type:  "int",
+				Value: "123",
+			},
+			{
+				Name:  "float-name",
+				Type:  "float",
+				Value: "1.23",
+			},
+			{
+				Name:  "bool-name",
+				Type:  "boolean",
+				Value: "true",
+			},
 		},
 	}
 

tmx_property_test.go

@@ -95,7 +95,7 @@ type TilesetTile struct {
 	// Embedded image
 	Image *Image `xml:"image"`
 	// Tile object groups
-	ObjectGroups []*ObjectGroup `xml:"objectgroup"`
+	ObjectGroups []*ObjectGroup `xml:"objectgroup,omitempty"`
 	// List of animation frames
 	Animation *Animation `xml:"animation,omitempty"`
 }

tmx_tileset.go

@@ -50,7 +50,7 @@ var testLoadTilesetFile = &Tileset{
 	Version: "1.2",
 }
 
-var testLoadTileFile = &TilesetTile{
+var testLoadTilesetTileFile = &TilesetTile{
 	ID: 464,
 	Animation: &Animation{
 		Frame: []*AnimationFrame{
@@ -123,7 +123,7 @@ func TestSaveTileset(t *testing.T) {
 }
 
 func TestLoadTile(t *testing.T) {
-	tsxFile, err := os.Open(filepath.Join(GetAssetsDirectory(), "tilesets/testLoadTile.tsx"))
+	tsxFile, err := os.Open(filepath.Join(GetAssetsDirectory(), "tilesets/testLoadTilesetTile.tsx"))
 	assert.Nil(t, err)
 	defer tsxFile.Close()
 
@@ -132,11 +132,11 @@ func TestLoadTile(t *testing.T) {
 	assert.Len(t, tsx.Tiles, 1)
 
 	tile := tsx.Tiles[0]
-	assert.Equal(t, testLoadTileFile, tile)
+	assert.Equal(t, testLoadTilesetTileFile, tile)
 }
 
 func TestSaveTile(t *testing.T) {
-	tsxFile, err := os.Open(filepath.Join(GetAssetsDirectory(), "tilesets/testLoadTile.tsx"))
+	tsxFile, err := os.Open(filepath.Join(GetAssetsDirectory(), "tilesets/testLoadTilesetTile.tsx"))
 	assert.Nil(t, err)
 	defer tsxFile.Close()
 
@@ -185,7 +185,3 @@ func (n *node) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error {
 	}
 	return nil
 }
-
-func b(v bool) *bool {
-	return &v
-}