Fix unit tests (#22)

rapid7 · Oct 25, 2021 · ebe75b1 · ebe75b1
1 parent 16249a5
commit ebe75b1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/proxy/provider_test.go b/proxy/provider_test.go
@@ -254,7 +254,7 @@ var dataProviderParseEnvHTTPSProxy = []struct {
  {"HTTPS://test:8080", newTestProxy("https", "test", 8080, nil, "Environment[Key]"), nil},
  {"test:8999", newTestProxy("", "test", 8999, nil, "Environment[Key]"), nil},
  // Invalid
- {"://test:8080", nil, errors.New("parse ://test:8080: missing protocol scheme")},
+ {"://test:8080", nil, errors.New("parse \"://test:8080\": missing protocol scheme")},
  // TODO These error cases are introduced after Go 1.7
  //{"https", "https://[test:8080", nil, errors.New("parse https://[test:8080: missing ']' in host")},
  //{"https", "https://username:1412¶45124@test:8080", nil, errors.New("parse https://username:1412¶45124@test:8080: net/url: invalid userinfo")},
@@ -300,7 +300,7 @@ var dataProviderParseEnvURL = []struct {
  {"", nil, new(notFoundError)},
  {" ", nil, new(notFoundError)},
  // Invalid
- {"://test:8080", nil, errors.New("parse ://test:8080: missing protocol scheme")},
+ {"://test:8080", nil, errors.New("parse \"://test:8080\": missing protocol scheme")},
  // TODO These error cases are introduced after Go 1.7
  //{"https://[test:8080", nil, errors.New("parse https://[test:8080: missing ']' in host")},
  //{"https://username:1412¶45124@test:8080", nil, errors.New("parse https://username:1412¶45124@test:8080: net/url: invalid userinfo")},

diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go
@@ -77,12 +77,12 @@ var dataNewProxy = []struct {
  // Invalid port
  {
  &url.URL{Scheme: "https", Host: "testProxy:testPort"},
- nil, errors.New("SplitHostPort testProxy:testPort: strconv.ParseUint: parsing \"testPort\": invalid syntax"),
+ nil, errors.New("SplitHostPort \"testProxy:testPort\": strconv.ParseUint: parsing \"testPort\": invalid syntax"),
  },
  // Negative port
  {
  &url.URL{Scheme: "https", Host: "testProxy:-1"},
- nil, errors.New("SplitHostPort testProxy:-1: strconv.ParseUint: parsing \"-1\": invalid syntax"),
+ nil, errors.New("SplitHostPort \"testProxy:-1\": strconv.ParseUint: parsing \"-1\": invalid syntax"),
  },
  // Empty host
  {

diff --git a/proxy/url_test.go b/proxy/url_test.go
@@ -48,7 +48,7 @@ var dataParseURL = []struct {
  {"", "", &url.URL{}, nil},
  {"", "https", &url.URL{Scheme: "https"}, nil},
  // Invalid cases
- {"://test:8080", "", nil, errors.New("parse ://test:8080: missing protocol scheme")},
+ {"://test:8080", "", nil, errors.New("parse \"://test:8080\": missing protocol scheme")},
  // TODO These error cases are introduced after Go 1.7
  //{"https://[test:8080", "", nil, errors.New("parse https://[test:8080: missing ']' in host")},
  //{"https://username:1412¶45124@test:8080", "", nil, errors.New("parse https://username:1412¶45124@test:8080: net/url: invalid userinfo")},
@@ -166,13 +166,13 @@ var dataSplitHostPort = []struct {
  // port Max
  {&url.URL{Host: "test:65535"}, "test", 65535, nil},
  // Invalid - port NaN
- {&url.URL{Host: "test1:test2"}, "", 0, errors.New("SplitHostPort test1:test2: strconv.ParseUint: parsing \"test2\": invalid syntax")},
+ {&url.URL{Host: "test1:test2"}, "", 0, errors.New("SplitHostPort \"test1:test2\": strconv.ParseUint: parsing \"test2\": invalid syntax")},
  // Invalid - port Exceeded
- {&url.URL{Host: "test1:65536"}, "", 0, errors.New("SplitHostPort test1:65536: strconv.ParseUint: parsing \"65536\": value out of range")},
+ {&url.URL{Host: "test1:65536"}, "", 0, errors.New("SplitHostPort \"test1:65536\": strconv.ParseUint: parsing \"65536\": value out of range")},
  // Invalid - port signed
- {&url.URL{Host: "test1:-1"}, "", 0, errors.New("SplitHostPort test1:-1: strconv.ParseUint: parsing \"-1\": invalid syntax")},
+ {&url.URL{Host: "test1:-1"}, "", 0, errors.New("SplitHostPort \"test1:-1\": strconv.ParseUint: parsing \"-1\": invalid syntax")},
  // Invalid - nil URL
- {nil, "", 0, errors.New("SplitHostPort nil: nil URL")},
+ {nil, "", 0, errors.New("SplitHostPort \"nil\": nil URL")},
 }
 
 func TestSplitHostPort(t *testing.T) {