Additional test 2

Author: timvaillancourt

go/base/utils_test.go

@@ -37,11 +37,12 @@ func TestValidateConnection(t *testing.T) {
 			Port:     mysql.DefaultInstancePort,
 		},
 	}
-	// check valid port matches on plain mysql
+	// check valid port matches connectionConfig
 	{
 		migrationContext := &MigrationContext{Log: NewDefaultLogger()}
 		serverInfo := &mysql.ServerInfo{
-			Port: gosql.NullInt64{Int64: mysql.DefaultInstancePort, Valid: true},
+			Port:      gosql.NullInt64{Int64: mysql.DefaultInstancePort, Valid: true},
+			ExtraPort: gosql.NullInt64{Int64: mysql.DefaultInstancePort + 1, Valid: true},
 		}
 		test.S(t).ExpectNil(ValidateConnection(serverInfo, connectionConfig, migrationContext, "test"))
 	}
@@ -51,9 +52,7 @@ func TestValidateConnection(t *testing.T) {
 			Log:       NewDefaultLogger(),
 			AliyunRDS: true,
 		}
-		serverInfo := &mysql.ServerInfo{
-			Port: gosql.NullInt64{Int64: 0, Valid: false},
-		}
+		serverInfo := &mysql.ServerInfo{}
 		test.S(t).ExpectNil(ValidateConnection(serverInfo, connectionConfig, migrationContext, "test"))
 	}
 	// check NULL port validates when AzureMySQL=true
@@ -62,9 +61,7 @@ func TestValidateConnection(t *testing.T) {
 			Log:        NewDefaultLogger(),
 			AzureMySQL: true,
 		}
-		serverInfo := &mysql.ServerInfo{
-			Port: gosql.NullInt64{Int64: 0, Valid: false},
-		}
+		serverInfo := &mysql.ServerInfo{}
 		test.S(t).ExpectNil(ValidateConnection(serverInfo, connectionConfig, migrationContext, "test"))
 	}
 	// check NULL port validates when GoogleCloudPlatform=true
@@ -73,9 +70,7 @@ func TestValidateConnection(t *testing.T) {
 			Log:                 NewDefaultLogger(),
 			GoogleCloudPlatform: true,
 		}
-		serverInfo := &mysql.ServerInfo{
-			Port: gosql.NullInt64{Int64: 0, Valid: false},
-		}
+		serverInfo := &mysql.ServerInfo{}
 		test.S(t).ExpectNil(ValidateConnection(serverInfo, connectionConfig, migrationContext, "test"))
 	}
 	// check extra_port validates when port=NULL
@@ -86,7 +81,7 @@ func TestValidateConnection(t *testing.T) {
 		}
 		test.S(t).ExpectNil(ValidateConnection(serverInfo, connectionConfig, migrationContext, "test"))
 	}
-	// check validation fails when port does not match connectionConfig
+	// check validation fails when valid port does not match connectionConfig
 	{
 		migrationContext := &MigrationContext{Log: NewDefaultLogger()}
 		serverInfo := &mysql.ServerInfo{