#97 Clean tests

senzing-garage · Jun 11, 2024 · b0ace1b · b0ace1b
1 parent 1d155ba
commit b0ace1b
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 47 deletions.
diff --git a/checker/checker_examples_test.go b/checker/checker_examples_test.go
@@ -27,8 +27,7 @@ func ExampleBasicChecker_IsSchemaInstalled() {
 	testObject := &BasicChecker{
 		DatabaseConnector: databaseConnector,
 	}
-	isSchemaInstalled, err := testObject.IsSchemaInstalled(ctx)
-	printErr(err)
+	isSchemaInstalled, _ := testObject.IsSchemaInstalled(ctx)
 	fmt.Printf("isSchemaInstalled: %t", isSchemaInstalled)
 	// Output: isSchemaInstalled: false
 }
diff --git a/checker/checker_test.go b/checker/checker_test.go
@@ -11,51 +11,6 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// ----------------------------------------------------------------------------
-// Test harness
-// ----------------------------------------------------------------------------
-
-func TestMain(m *testing.M) {
-	err := setup()
-	if err != nil {
-		fmt.Print(err)
-		os.Exit(1)
-	}
-	code := m.Run()
-	err = teardown()
-	if err != nil {
-		fmt.Print(err)
-	}
-	os.Exit(code)
-}
-
-func setup() error {
-	var err error
-	return err
-}
-
-func teardown() error {
-	var err error
-	return err
-}
-
-// ----------------------------------------------------------------------------
-// Utility functions
-// ----------------------------------------------------------------------------
-
-func refreshSqliteDatabase(databaseFilename string) error {
-	err := os.Remove(databaseFilename)
-	if err != nil {
-		fmt.Printf("When removing %s got error: %v\n", databaseFilename, err)
-	}
-	file, err := os.Create(databaseFilename)
-	if err != nil {
-		fmt.Printf("When creating %s got error: %v\n", databaseFilename, err)
-	}
-	file.Close()
-	return nil
-}
-
 // ----------------------------------------------------------------------------
 // Test interface functions
 // ----------------------------------------------------------------------------
@@ -101,3 +56,48 @@ func TestBasicChecker_IsSchemaInstalled_False(test *testing.T) {
 	_, err = testObject.IsSchemaInstalled(ctx)
 	require.Error(test, err, "An error should have been returned")
 }
+
+// ----------------------------------------------------------------------------
+// Test harness
+// ----------------------------------------------------------------------------
+
+func TestMain(m *testing.M) {
+	err := setup()
+	if err != nil {
+		fmt.Print(err)
+		os.Exit(1)
+	}
+	code := m.Run()
+	err = teardown()
+	if err != nil {
+		fmt.Print(err)
+	}
+	os.Exit(code)
+}
+
+func setup() error {
+	var err error
+	return err
+}
+
+func teardown() error {
+	var err error
+	return err
+}
+
+// ----------------------------------------------------------------------------
+// Utility functions
+// ----------------------------------------------------------------------------
+
+func refreshSqliteDatabase(databaseFilename string) error {
+	err := os.Remove(databaseFilename)
+	if err != nil {
+		fmt.Printf("When removing %s got error: %v\n", databaseFilename, err)
+	}
+	file, err := os.Create(databaseFilename)
+	if err != nil {
+		fmt.Printf("When creating %s got error: %v\n", databaseFilename, err)
+	}
+	file.Close()
+	return nil
+}