Skip to content

Commit 7fa900d

Browse files
committed
Update tests
1 parent f7c9b16 commit 7fa900d

File tree

2 files changed

+43
-8
lines changed

2 files changed

+43
-8
lines changed

plugin/utils.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ func validateIP(ip net.IP) bool {
154154
// validateAddressPort validates an address:port string.
155155
func validateAddressPort(addressPort string) (bool, error) {
156156
// Split the address and port.
157+
// TODO: Support IPv6.
157158
data := strings.Split(strings.TrimSpace(addressPort), ":")
158159
if len(data) != AddressPortPairLength {
159160
return false, ErrInvalidAddressPortPair

plugin/utils_test.go

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -283,17 +283,51 @@ func Test_GetTablesFromQuery_AlterMultiple(t *testing.T) {
283283
}
284284

285285
func Test_validateAddressPort_Hostname(t *testing.T) {
286-
assert.True(t, validateAddressPort("localhost:5432"))
287-
assert.True(t, validateAddressPort(" localhost:5432"))
288-
assert.True(t, validateAddressPort("localhost:5432 "))
289-
assert.True(t, validateAddressPort(" localhost:5432 "))
286+
valid, err := validateAddressPort("localhost:5432")
287+
assert.True(t, valid)
288+
assert.Nil(t, err)
289+
290+
valid, err = validateAddressPort(" localhost:5432")
291+
assert.True(t, valid)
292+
assert.Nil(t, err)
293+
294+
valid, err = validateAddressPort("localhost:5432 ")
295+
assert.True(t, valid)
296+
assert.Nil(t, err)
297+
298+
valid, err = validateAddressPort(" localhost:5432 ")
299+
assert.True(t, valid)
300+
assert.Nil(t, err)
301+
}
302+
303+
func Test_validateAddressPort_Fails(t *testing.T) {
304+
valid, err := validateAddressPort("localhost")
305+
assert.False(t, valid)
306+
assert.NotNil(t, err)
307+
}
308+
309+
func Test_validateHostPort_Fails(t *testing.T) {
310+
valid, err := validateHostPort("127.0.0.1")
311+
assert.False(t, valid)
312+
assert.NotNil(t, err)
290313
}
291314

292315
func Test_validateAddressPort_IPv4(t *testing.T) {
293-
assert.True(t, validateAddressPort("127.0.0.1:5432"))
294-
assert.True(t, validateAddressPort(" 127.0.0.1:5432"))
295-
assert.True(t, validateAddressPort("127.0.0.1:5432 "))
296-
assert.True(t, validateAddressPort(" 127.0.0.1:5432 "))
316+
valid, err := validateAddressPort("127.0.0.1:5432")
317+
assert.True(t, valid)
318+
assert.Nil(t, err)
319+
320+
valid, err = validateAddressPort(" 127.0.0.1:5432")
321+
assert.True(t, valid)
322+
assert.Nil(t, err)
323+
324+
valid, err = validateAddressPort("127.0.0.1:5432 ")
325+
assert.True(t, valid)
326+
assert.Nil(t, err)
327+
328+
valid, err = validateAddressPort(" 127.0.0.1:5432 ")
329+
assert.True(t, valid)
330+
assert.Nil(t, err)
297331
}
298332

299333
func Test_isBusy(t *testing.T) {

0 commit comments

Comments
 (0)