Merge pull request #35956 from xiangpengzhao/add-port-split-testcase

Automatic merge from submit-queue (batch tested with PRs 36736, 35956, 35655, 37713, 38316) Optimize port_split_test test case. The `normalized` field doesn't take affect in current test case. This PR: 1. initializes valid and normalized cases with normalized=true. 2. adds some invalid cases. @resouer Thanks!

Merge pull request #35956 from xiangpengzhao/add-port-split-testcase
367b558f · Kubernetes Submit Queue · GitHub · 14ae96ad · 466fee86 · 367b558f
Commit 367b558f authored Dec 08, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 27 additions and 17 deletions

port_split_test.go pkg/util/net/port_split_test.go +27 -17

No files found.
--- a/pkg/util/net/port_split_test.go
+++ b/pkg/util/net/port_split_test.go
@@ -28,16 +28,18 @@ func TestSplitSchemeNamePort(t *testing.T) {
 		normalized         bool
 	}{
 		{
-			in:    "aoeu:asdf",
+			in:         "aoeu:asdf",
-			name:  "aoeu",
+			name:       "aoeu",
-			port:  "asdf",
+			port:       "asdf",
-			valid: true,
+			valid:      true,
+			normalized: true,
 		}, {
-			in:     "http:aoeu:asdf",
+			in:         "http:aoeu:asdf",
-			scheme: "http",
+			scheme:     "http",
-			name:   "aoeu",
+			name:       "aoeu",
-			port:   "asdf",
+			port:       "asdf",
-			valid:  true,
+			valid:      true,
+			normalized: true,
 		}, {
 			in:         "https:aoeu:",
 			scheme:     "https",
@@ -46,26 +48,34 @@ func TestSplitSchemeNamePort(t *testing.T) {
 			valid:      true,
 			normalized: false,
 		}, {
-			in:     "https:aoeu:asdf",
+			in:         "https:aoeu:asdf",
-			scheme: "https",
+			scheme:     "https",
-			name:   "aoeu",
+			name:       "aoeu",
-			port:   "asdf",
+			port:       "asdf",
-			valid:  true,
+			valid:      true,
+			normalized: true,
 		}, {
 			in:         "aoeu:",
 			name:       "aoeu",
 			valid:      true,
 			normalized: false,
 		}, {
+			in:         "aoeu",
+			name:       "aoeu",
+			valid:      true,
+			normalized: true,
+		}, {
 			in:    ":asdf",
 			valid: false,
 		}, {
 			in:    "aoeu:asdf:htns",
 			valid: false,
 		}, {
-			in:    "aoeu",
+			in:    "http::asdf",
-			name:  "aoeu",
+			valid: false,
-			valid: true,
+		}, {
+			in:    "http::",
+			valid: false,
 		}, {
 			in:    "",
 			valid: false,