Updated tests for tableparser

Author: percona-csalguero

runtests.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+wait_mysql() {
+    local PORT=$1
+    while :
+    do
+        sleep 3
+        if mysql -P ${PORT} -e 'select version()' &>/dev/null; then
+            break
+        fi
+    done
+}
+
+for PORT in 3306 3307 3308; do
+    echo "##########################"
+    echo "### MySQL at port ${PORT}"
+    echo "##########################"
+    wait_mysql $PORT
+    export TEST_DSN="root:@tcp(127.1:${PORT})/sakila?parseTime=true"
+    go test -v ./...
+done
+

tableparser/tableparser_test.go

@@ -1,7 +1,6 @@
 package tableparser
 
 import (
-	"reflect"
 	"testing"
 	"time"
 
@@ -11,49 +10,33 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func TestParse56(t *testing.T) {
+func TestParse(t *testing.T) {
 	db := tu.GetMySQLConnection(t)
-	v := tu.GetVersion(t, db)
-	v56, _ := version.NewVersion("5.6")
-
-	if v.GreaterThan(v56) {
-		t.Skipf("This test runs under MySQL < 5.7 and version is %s", v.String())
-	}
-
-	table, err := NewTable(db, "sakila", "film")
-	if err != nil {
-		t.Error(err)
-	}
+	v := tu.GetMinorVersion(t, db)
 	var want *Table
-	tu.LoadJson(t, "table001.json", &want)
 
-	if !reflect.DeepEqual(table, want) {
-		t.Error("Table film was not correctly parsed")
+	// Patch part of version is stripped by GetMinorVersion so for these test
+	// it is .0
+	sampleFiles := map[string]string{
+		"5.6.0": "table001.json",
+		"5.7.0": "table002.json",
+		"8.0.0": "table003.json",
 	}
-}
-
-func TestParse57(t *testing.T) {
-	db := tu.GetMySQLConnection(t)
-	v := tu.GetVersion(t, db)
-	v57, _ := version.NewVersion("5.7")
-
-	if v.LessThan(v57) {
-		t.Skipf("This test runs under MySQL 5.7+ and version is %s", v.String())
+	sampleFile, ok := sampleFiles[v.String()]
+	if !ok {
+		t.Fatalf("Unknown MySQL version %s", v.String())
 	}
 
 	table, err := NewTable(db, "sakila", "film")
 	if err != nil {
 		t.Error(err)
 	}
 	if tu.UpdateSamples() {
-		tu.WriteJson(t, "table002.json", table)
+		tu.WriteJson(t, sampleFile, table)
 	}
-	var want *Table
-	tu.LoadJson(t, "table002.json", &want)
+	tu.LoadJson(t, sampleFile, &want)
 
-	if !reflect.DeepEqual(table, want) {
-		t.Error("Table film was not correctly parsed")
-	}
+	tu.Equals(t, table, want)
 }
 
 func TestGetIndexes(t *testing.T) {

tableparser/testdata/indexes.json

@@ -1,18 +1,18 @@
 {
   "PRIMARY": {
     "Name": "PRIMARY",
-    "Unique": true,
     "Fields": [
       "actor_id"
     ],
+    "Unique": true,
     "Visible": true
   },
   "idx_fk_film_id": {
     "Name": "idx_fk_film_id",
-    "Unique": false,
     "Fields": [
       "film_id"
     ],
+    "Unique": false,
     "Visible": true
   }
 }