From 65e05021bc8f9a879723ca57c62e7251e5a76fbf Mon Sep 17 00:00:00 2001
From: go-jet <zer0.sub@protonmail.com>
Date: Fri, 20 Sep 2019 19:24:54 +0200
Subject: [PATCH] Add more unit tests.

---
 internal/utils/utils_test.go     | 14 +++++++++++-
 tests/mysql/generator_test.go    | 24 ++++++++++-----------
 tests/postgres/generator_test.go | 37 ++++++++++++++++----------------
 3 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/internal/utils/utils_test.go b/internal/utils/utils_test.go
index 359e854..8ee2d49 100644
--- a/internal/utils/utils_test.go
+++ b/internal/utils/utils_test.go
@@ -25,7 +25,7 @@ func TestToGoIdentifier(t *testing.T) {
 	assert.Equal(t, ToGoIdentifier("My-Table"), "MyTable")
 }
 
-func TestErrorCatch(t *testing.T) {
+func TestErrorCatchErr(t *testing.T) {
 	var err error
 
 	func() {
@@ -36,3 +36,15 @@ func TestErrorCatch(t *testing.T) {
 
 	assert.Error(t, err, "newError")
 }
+
+func TestErrorCatchNonErr(t *testing.T) {
+	var err error
+
+	func() {
+		defer ErrorCatch(&err)
+
+		panic(11)
+	}()
+
+	assert.Error(t, err, "11")
+}
diff --git a/tests/mysql/generator_test.go b/tests/mysql/generator_test.go
index b519ea9..e3dab15 100644
--- a/tests/mysql/generator_test.go
+++ b/tests/mysql/generator_test.go
@@ -15,22 +15,22 @@ const genTestDirRoot = "./.gentestdata3"
 const genTestDir3 = "./.gentestdata3/mysql"
 
 func TestGenerator(t *testing.T) {
-	err := os.RemoveAll(genTestDir3)
-	assert.NilError(t, err)
 
-	err = mysql.Generate(genTestDir3, mysql.DBConnection{
-		Host:     dbconfig.MySqLHost,
-		Port:     dbconfig.MySQLPort,
-		User:     dbconfig.MySQLUser,
-		Password: dbconfig.MySQLPassword,
-		DBName:   "dvds",
-	})
+	for i := 0; i < 3; i++ {
+		err := mysql.Generate(genTestDir3, mysql.DBConnection{
+			Host:     dbconfig.MySqLHost,
+			Port:     dbconfig.MySQLPort,
+			User:     dbconfig.MySQLUser,
+			Password: dbconfig.MySQLPassword,
+			DBName:   "dvds",
+		})
 
-	assert.NilError(t, err)
+		assert.NilError(t, err)
 
-	assertGeneratedFiles(t)
+		assertGeneratedFiles(t)
+	}
 
-	err = os.RemoveAll(genTestDirRoot)
+	err := os.RemoveAll(genTestDirRoot)
 	assert.NilError(t, err)
 }
 
diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go
index 8b04b6e..5eecba0 100644
--- a/tests/postgres/generator_test.go
+++ b/tests/postgres/generator_test.go
@@ -71,27 +71,26 @@ func TestCmdGenerator(t *testing.T) {
 
 func TestGenerator(t *testing.T) {
 
+	for i := 0; i < 3; i++ {
+		err := postgres.Generate(genTestDir2, postgres.DBConnection{
+			Host:     dbconfig.Host,
+			Port:     dbconfig.Port,
+			User:     dbconfig.User,
+			Password: dbconfig.Password,
+			SslMode:  "disable",
+			Params:   "",
+
+			DBName:     dbconfig.DBName,
+			SchemaName: "dvds",
+		})
+
+		assert.NilError(t, err)
+
+		assertGeneratedFiles(t)
+	}
+
 	err := os.RemoveAll(genTestDir2)
 	assert.NilError(t, err)
-
-	err = postgres.Generate(genTestDir2, postgres.DBConnection{
-		Host:     dbconfig.Host,
-		Port:     dbconfig.Port,
-		User:     dbconfig.User,
-		Password: dbconfig.Password,
-		SslMode:  "disable",
-		Params:   "",
-
-		DBName:     dbconfig.DBName,
-		SchemaName: "dvds",
-	})
-
-	assert.NilError(t, err)
-
-	assertGeneratedFiles(t)
-
-	err = os.RemoveAll(genTestDir2)
-	assert.NilError(t, err)
 }
 
 func assertGeneratedFiles(t *testing.T) {