more cases for mariadb_gtid_test

Author: zeminzhou

mysql/mariadb_gtid.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/pingcap/errors"
 	"github.com/siddontang/go-log/log"
-	"github.com/siddontang/go/hack"
 )
 
 // MariadbGTID represent mariadb gtid, [domain ID]-[server-id]-[sequence]
@@ -158,26 +157,13 @@ func (s *MariadbGTIDSet) Update(GTIDStr string) error {
 }
 
 func (s *MariadbGTIDSet) String() string {
-	if len(s.Sets) == 1 {
-		for _, set := range s.Sets {
-			return set.String()
-		}
-	}
-
-	var buf bytes.Buffer
 	sets := make([]string, 0, len(s.Sets))
 	for _, set := range s.Sets {
 		sets = append(sets, set.String())
 	}
 	sort.Strings(sets)
 
-	sep := ""
-	for _, set := range sets {
-		buf.WriteString(sep)
-		buf.WriteString(set)
-		sep = ","
-	}
-	return hack.String(buf.Bytes())
+	return strings.Join(sets, ",")
 }
 
 // Encode encodes mariadb gtid set

mysql/mariadb_gtid_test.go

@@ -234,10 +234,12 @@ func (t *mariaDBTestSuite) TestMariaDBGTIDSetClone(c *check.C) {
 }
 
 func (t *mariaDBTestSuite) TestMariaDBGTIDSetSortedString(c *check.C) {
-	gtidSetStr := "2-2-2,1-1-1,3-2-1"
-	sorted := "1-1-1,2-2-2,3-2-1"
+	cases := [][]string{{"", ""}, {"1-1-1", "1-1-1"},
+		{"2-2-2,1-1-1,3-2-1", "1-1-1,2-2-2,3-2-1"}}
 
-	gtidSet, err := ParseMariadbGTIDSet(gtidSetStr)
-	c.Assert(err, check.IsNil)
-	c.Assert(gtidSet.String(), check.Equals, sorted)
+	for _, strs := range cases {
+		gtidSet, err := ParseMariadbGTIDSet(strs[0])
+		c.Assert(err, check.IsNil)
+		c.Assert(gtidSet.String(), check.Equals, strs[1])
+	}
 }