testing: simplify test setup

Switch to an options-struct pattern to de-noise the test. This was
prompted by the need to add an option that will only be used by
a few tests, in a future commit.

Author: tbg

testing/main_test.go

@@ -192,12 +192,22 @@ var minRequiredVersionsByORMName = map[string]struct {
 // tenants.
 var minTenantVersion = version.MustParse("v20.2.0-alpha")
 
-func testORM(
-	t *testing.T, language, orm string, tableNames testTableNames, columnNames testColumnNames,
-) {
+type testInfo struct {
+	language, orm string
+	tableNames    testTableNames  // defaults to defaultTestTableNames
+	columnNames   testColumnNames // defaults to defaultTestColumnNames
+}
+
+func testORM(t *testing.T, info testInfo) {
+	if info.tableNames == (testTableNames{}) {
+		info.tableNames = defaultTestTableNames
+	}
+	if info.columnNames.IsEmpty() {
+		info.columnNames = defaultTestColumnNames
+	}
 	app := application{
-		language: language,
-		orm:      orm,
+		language: info.language,
+		orm:      info.orm,
 	}
 
 	type testCase struct {
@@ -213,7 +223,7 @@ func testORM(
 
 		crdbVersion := getVersionFromDB(t, db)
 		// Check that this ORM can be run with the given cockroach version.
-		if info, ok := minRequiredVersionsByORMName[orm]; ok {
+		if info, ok := minRequiredVersionsByORMName[info.orm]; ok {
 			if !crdbVersion.AtLeast(info.v) {
 				t.Skip(info.skipMsg)
 			}
@@ -248,8 +258,8 @@ func testORM(
 			td := testDriver{
 				db:          tc.db,
 				dbName:      app.dbName(),
-				tableNames:  tableNames,
-				columnNames: columnNames,
+				tableNames:  info.tableNames,
+				columnNames: info.columnNames,
 			}
 
 			t.Run("FirstRun", func(t *testing.T) {
@@ -331,33 +341,38 @@ func testORM(
 }
 
 func TestGORM(t *testing.T) {
-	testORM(t, "go", "gorm", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "go", orm: "gorm"})
 }
 
 func TestGOPG(t *testing.T) {
-	testORM(t, "go", "gopg", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "go", orm: "gopg"})
 }
 
 func TestHibernate(t *testing.T) {
-	testORM(t, "java", "hibernate", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "java", orm: "hibernate"})
 }
 
 func TestSequelize(t *testing.T) {
-	testORM(t, "node", "sequelize", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "node", orm: "sequelize"})
 }
 
 func TestSQLAlchemy(t *testing.T) {
-	testORM(t, "python", "sqlalchemy", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "python", orm: "sqlalchemy"})
 }
 
 func TestDjango(t *testing.T) {
-	testORM(t, "python", "django", djangoTestTableNames, djangoTestColumnNames)
+	testORM(t, testInfo{
+		language:    "python",
+		orm:         "django",
+		tableNames:  djangoTestTableNames,
+		columnNames: djangoTestColumnNames,
+	})
 }
 
 func TestActiveRecord(t *testing.T) {
-	testORM(t, "ruby", "activerecord", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "ruby", orm: "activerecord"})
 }
 
 func TestActiveRecord4(t *testing.T) {
-	testORM(t, "ruby", "ar4", defaultTestTableNames, defaultTestColumnNames)
+	testORM(t, testInfo{language: "ruby", orm: "ar4"})
 }

testing/test_driver.go

@@ -25,6 +25,10 @@ type testColumnNames struct {
 	ordersProductsColumns []string
 }
 
+func (tcn testColumnNames) IsEmpty() bool {
+	return len(tcn.customersColumns)+len(tcn.ordersColumns)+len(tcn.productsColumns)+len(tcn.ordersProductsColumns) == 0
+}
+
 // These need to be variables so that their address can be taken.
 var (
 	customerName1 = "Billy"