#97 Improve testcases

senzing-garage · Jun 11, 2024 · dbef13b · dbef13b
1 parent 20dcee8
commit dbef13b
Show file tree

Hide file tree

Showing 8 changed files with 145 additions and 162 deletions.
diff --git a/.testcoverage.yml b/.testcoverage.yml
@@ -15,15 +15,15 @@ local-prefix: "github.com/org/project"
 threshold:
   # (optional; default 0)
   # The minimum coverage that each file should have
-  file: 70
+  file: 80
 
   # (optional; default 0)
   # The minimum coverage that each package should have
-  package: 70
+  package: 80
 
   # (optional; default 0)
   # The minimum total coverage project should have
-  total: 70
+  total: 80
 # Holds regexp rules which will override thresholds for matched files or packages
 # using their paths.
 #

diff --git a/checker/checker.go b/checker/checker.go
@@ -44,45 +44,6 @@ var traceOptions = []interface{}{
 	&logging.OptionCallerSkip{Value: 5},
 }
 
-// ----------------------------------------------------------------------------
-// Internal methods
-// ----------------------------------------------------------------------------
-
-// Get the Logger singleton.
-func (schemaChecker *BasicChecker) getLogger() logging.Logging {
-	var err error
-	if schemaChecker.logger == nil {
-		schemaChecker.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, baseCallerSkip)
-		if err != nil {
-			panic(err)
-		}
-	}
-	return schemaChecker.logger
-}
-
-// Log message.
-func (schemaChecker *BasicChecker) log(messageNumber int, details ...interface{}) {
-	schemaChecker.getLogger().Log(messageNumber, details...)
-}
-
-// Debug.
-func (schemaChecker *BasicChecker) debug(messageNumber int, details ...interface{}) {
-	details = append(details, debugOptions...)
-	schemaChecker.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method entry.
-func (schemaChecker *BasicChecker) traceEntry(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	schemaChecker.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method exit.
-func (schemaChecker *BasicChecker) traceExit(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	schemaChecker.getLogger().Log(messageNumber, details...)
-}
-
 // ----------------------------------------------------------------------------
 // Interface methods
 // ----------------------------------------------------------------------------
@@ -344,3 +305,42 @@ func (schemaChecker *BasicChecker) UnregisterObserver(ctx context.Context, obser
 
 	return err
 }
+
+// ----------------------------------------------------------------------------
+// Internal methods
+// ----------------------------------------------------------------------------
+
+// Get the Logger singleton.
+func (schemaChecker *BasicChecker) getLogger() logging.Logging {
+	var err error
+	if schemaChecker.logger == nil {
+		schemaChecker.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, baseCallerSkip)
+		if err != nil {
+			panic(err)
+		}
+	}
+	return schemaChecker.logger
+}
+
+// Log message.
+func (schemaChecker *BasicChecker) log(messageNumber int, details ...interface{}) {
+	schemaChecker.getLogger().Log(messageNumber, details...)
+}
+
+// Debug.
+func (schemaChecker *BasicChecker) debug(messageNumber int, details ...interface{}) {
+	details = append(details, debugOptions...)
+	schemaChecker.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method entry.
+func (schemaChecker *BasicChecker) traceEntry(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	schemaChecker.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method exit.
+func (schemaChecker *BasicChecker) traceExit(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	schemaChecker.getLogger().Log(messageNumber, details...)
+}
diff --git a/checker/checker_examples_test.go b/checker/checker_examples_test.go
@@ -31,3 +31,16 @@ func ExampleBasicChecker_IsSchemaInstalled() {
 	fmt.Printf("isSchemaInstalled: %t", isSchemaInstalled)
 	// Output: isSchemaInstalled: false
 }
+
+func ExampleBasicChecker_RecordCount() {
+	// For more information, visit https://github.com/senzing-garage/go-databasing/blob/main/checker/checker_examples_test.go
+	ctx := context.TODO()
+	databaseConnector, err := connector.NewConnector(ctx, sqliteDatabaseURL)
+	printErr(err)
+	testObject := &BasicChecker{
+		DatabaseConnector: databaseConnector,
+	}
+	recordCount, err := testObject.RecordCount(ctx)
+	printErr(err)
+	_ = recordCount // Faux use of recordCount
+}
diff --git a/connectormssql/connectormssql_test.go b/connectormssql/connectormssql_test.go
@@ -13,7 +13,7 @@ import (
 
 func TestNewConnector(test *testing.T) {
 	ctx := context.TODO()
-	configuration := "user id=sa;password=Passw0rd;database=G2;server=localhost"
+	configuration := "user id=sa;password=Passw0rd;database=master;server=localhost"
 	databaseConnector, err := NewConnector(ctx, configuration)
 	require.NoError(test, err)
 	_, err = databaseConnector.Connect(ctx)

diff --git a/connectorsqlite/connectorsqlite_test.go b/connectorsqlite/connectorsqlite_test.go
@@ -2,8 +2,6 @@ package connectorsqlite
 
 import (
 	"context"
-	"fmt"
-	"os"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -21,31 +19,3 @@ func TestNewConnector(test *testing.T) {
 	_, err = databaseConnector.Connect(ctx)
 	require.NoError(test, err)
 }
-
-// ----------------------------------------------------------------------------
-// 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
-}
diff --git a/main.go b/main.go
@@ -29,7 +29,7 @@ const (
 // ----------------------------------------------------------------------------
 
 func main() {
-	databaseIDs := []int{Sqlite, Postgresql, Mysql}
+	databaseIDs := []int{Sqlite, Postgresql, Mysql, Mssql}
 	printStatementTemplate := "\n==== %11s ==========================\n\n"
 	for _, databaseID := range databaseIDs {
 		switch databaseID {
@@ -86,7 +86,7 @@ func demonstrateDatabase(databaseID int) {
 		sqlFilename = gitRepositoryDir + "/testdata/mysql/g2core-schema-mysql-create.sql"
 	case Mssql:
 		// See https://github.com/microsoft/go-mssqldb#connection-parameters-and-dsn
-		databaseURL = "mysql://sa:Passw0rd@localhost/master"
+		databaseURL = "mssql://sa:Passw0rd@localhost/master"
 		sqlFilename = gitRepositoryDir + "/testdata/mssql/g2core-schema-mssql-create.sql"
 	default:
 		exitOnError(fmt.Errorf("unknown databaseNumber: %d", databaseID))

diff --git a/postgresql/postgresql_basic.go b/postgresql/postgresql_basic.go
@@ -40,48 +40,6 @@ var traceOptions = []interface{}{
 	&logging.OptionCallerSkip{Value: 5},
 }
 
-// ----------------------------------------------------------------------------
-// Internal methods
-// ----------------------------------------------------------------------------
-
-// Get the Logger singleton.
-func (sqlExecutor *BasicPostgresql) getLogger() logging.Logging {
-	var err error
-	if sqlExecutor.logger == nil {
-		options := []interface{}{
-			&logging.OptionCallerSkip{Value: 4},
-		}
-		sqlExecutor.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, options...)
-		if err != nil {
-			panic(err)
-		}
-	}
-	return sqlExecutor.logger
-}
-
-// Log message.
-func (sqlExecutor *BasicPostgresql) log(messageNumber int, details ...interface{}) {
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Debug.
-func (sqlExecutor *BasicPostgresql) debug(messageNumber int, details ...interface{}) {
-	details = append(details, debugOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method entry.
-func (sqlExecutor *BasicPostgresql) traceEntry(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method exit.
-func (sqlExecutor *BasicPostgresql) traceExit(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
 // ----------------------------------------------------------------------------
 // Interface methods
 // ----------------------------------------------------------------------------
@@ -301,3 +259,45 @@ func (sqlExecutor *BasicPostgresql) UnregisterObserver(ctx context.Context, obse
 
 	return err
 }
+
+// ----------------------------------------------------------------------------
+// Internal methods
+// ----------------------------------------------------------------------------
+
+// Get the Logger singleton.
+func (sqlExecutor *BasicPostgresql) getLogger() logging.Logging {
+	var err error
+	if sqlExecutor.logger == nil {
+		options := []interface{}{
+			&logging.OptionCallerSkip{Value: 4},
+		}
+		sqlExecutor.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, options...)
+		if err != nil {
+			panic(err)
+		}
+	}
+	return sqlExecutor.logger
+}
+
+// Log message.
+func (sqlExecutor *BasicPostgresql) log(messageNumber int, details ...interface{}) {
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Debug.
+func (sqlExecutor *BasicPostgresql) debug(messageNumber int, details ...interface{}) {
+	details = append(details, debugOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method entry.
+func (sqlExecutor *BasicPostgresql) traceEntry(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method exit.
+func (sqlExecutor *BasicPostgresql) traceExit(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
diff --git a/sqlexecutor/sqlexecutor_basic.go b/sqlexecutor/sqlexecutor_basic.go
@@ -43,51 +43,6 @@ var traceOptions = []interface{}{
 	&logging.OptionCallerSkip{Value: 5},
 }
 
-// ----------------------------------------------------------------------------
-// Internal methods
-// ----------------------------------------------------------------------------
-
-// --- Logging ----------------------------------------------------------------
-
-// Get the Logger singleton.
-func (sqlExecutor *BasicSQLExecutor) getLogger() logging.Logging {
-	var err error
-	if sqlExecutor.logger == nil {
-		options := []interface{}{
-			logging.OptionCallerSkip{Value: 4},
-			logging.OptionMessageFields{Value: []string{"id", "text"}},
-		}
-		sqlExecutor.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, options...)
-		if err != nil {
-			panic(err)
-		}
-	}
-	return sqlExecutor.logger
-}
-
-// Log message.
-func (sqlExecutor *BasicSQLExecutor) log(messageNumber int, details ...interface{}) {
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Debug.
-func (sqlExecutor *BasicSQLExecutor) debug(messageNumber int, details ...interface{}) {
-	details = append(details, debugOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method entry.
-func (sqlExecutor *BasicSQLExecutor) traceEntry(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
-// Trace method exit.
-func (sqlExecutor *BasicSQLExecutor) traceExit(messageNumber int, details ...interface{}) {
-	details = append(details, traceOptions...)
-	sqlExecutor.getLogger().Log(messageNumber, details...)
-}
-
 // ----------------------------------------------------------------------------
 // Interface methods
 // ----------------------------------------------------------------------------
@@ -394,3 +349,48 @@ func (sqlExecutor *BasicSQLExecutor) UnregisterObserver(ctx context.Context, obs
 
 	return err
 }
+
+// ----------------------------------------------------------------------------
+// Internal methods
+// ----------------------------------------------------------------------------
+
+// --- Logging ----------------------------------------------------------------
+
+// Get the Logger singleton.
+func (sqlExecutor *BasicSQLExecutor) getLogger() logging.Logging {
+	var err error
+	if sqlExecutor.logger == nil {
+		options := []interface{}{
+			logging.OptionCallerSkip{Value: 4},
+			logging.OptionMessageFields{Value: []string{"id", "text"}},
+		}
+		sqlExecutor.logger, err = logging.NewSenzingLogger(ComponentID, IDMessages, options...)
+		if err != nil {
+			panic(err)
+		}
+	}
+	return sqlExecutor.logger
+}
+
+// Log message.
+func (sqlExecutor *BasicSQLExecutor) log(messageNumber int, details ...interface{}) {
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Debug.
+func (sqlExecutor *BasicSQLExecutor) debug(messageNumber int, details ...interface{}) {
+	details = append(details, debugOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method entry.
+func (sqlExecutor *BasicSQLExecutor) traceEntry(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}
+
+// Trace method exit.
+func (sqlExecutor *BasicSQLExecutor) traceExit(messageNumber int, details ...interface{}) {
+	details = append(details, traceOptions...)
+	sqlExecutor.getLogger().Log(messageNumber, details...)
+}