Skip to content

Commit d06126e

Browse files
casualjimcasualjim
committed
Merge branch 'gen-spec'
2 parents 565063a + 359dec9 commit d06126e

File tree

4 files changed

+53
-53
lines changed

4 files changed

+53
-53
lines changed

‎api_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,36 @@ func TestServeError(t *testing.T) {
4040
func TestAPIErrors(t *testing.T) {
4141
err := New(402, "this failed %s", "yada")
4242
assert.Error(t, err)
43-
assert.Equal(t, 402, err.Code())
44-
assert.Equal(t, "this failed yada", err.Error())
43+
assert.EqualValues(t, 402, err.Code())
44+
assert.EqualValues(t, "this failed yada", err.Error())
4545

4646
err = NotFound("this failed %d", 1)
4747
assert.Error(t, err)
48-
assert.Equal(t, http.StatusNotFound, err.Code())
49-
assert.Equal(t, "this failed 1", err.Error())
48+
assert.EqualValues(t, http.StatusNotFound, err.Code())
49+
assert.EqualValues(t, "this failed 1", err.Error())
5050

5151
err = NotFound("")
5252
assert.Error(t, err)
53-
assert.Equal(t, http.StatusNotFound, err.Code())
54-
assert.Equal(t, "Not found", err.Error())
53+
assert.EqualValues(t, http.StatusNotFound, err.Code())
54+
assert.EqualValues(t, "Not found", err.Error())
5555

5656
err = NotImplemented("not implemented")
5757
assert.Error(t, err)
58-
assert.Equal(t, http.StatusNotImplemented, err.Code())
59-
assert.Equal(t, "not implemented", err.Error())
58+
assert.EqualValues(t, http.StatusNotImplemented, err.Code())
59+
assert.EqualValues(t, "not implemented", err.Error())
6060

6161
err = MethodNotAllowed("GET", []string{"POST", "PUT"})
6262
assert.Error(t, err)
63-
assert.Equal(t, http.StatusMethodNotAllowed, err.Code())
64-
assert.Equal(t, "method GET is not allowed, but [POST,PUT] are", err.Error())
63+
assert.EqualValues(t, http.StatusMethodNotAllowed, err.Code())
64+
assert.EqualValues(t, "method GET is not allowed, but [POST,PUT] are", err.Error())
6565

6666
err = InvalidContentType("application/saml", []string{"application/json", "application/x-yaml"})
6767
assert.Error(t, err)
68-
assert.Equal(t, http.StatusUnsupportedMediaType, err.Code())
69-
assert.Equal(t, "unsupported media type \"application/saml\", only [application/json application/x-yaml] are allowed", err.Error())
68+
assert.EqualValues(t, http.StatusUnsupportedMediaType, err.Code())
69+
assert.EqualValues(t, "unsupported media type \"application/saml\", only [application/json application/x-yaml] are allowed", err.Error())
7070

7171
err = InvalidResponseFormat("application/saml", []string{"application/json", "application/x-yaml"})
7272
assert.Error(t, err)
73-
assert.Equal(t, http.StatusNotAcceptable, err.Code())
74-
assert.Equal(t, "unsupported media type requested, only [application/json application/x-yaml] are available", err.Error())
73+
assert.EqualValues(t, http.StatusNotAcceptable, err.Code())
74+
assert.EqualValues(t, "unsupported media type requested, only [application/json application/x-yaml] are available", err.Error())
7575
}

‎auth_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ import (
88

99
func TestUnauthenticated(t *testing.T) {
1010
err := Unauthenticated("basic")
11-
assert.Equal(t, 401, err.Code())
11+
assert.EqualValues(t, 401, err.Code())
1212
assert.Equal(t, "unauthenticated for basic", err.Error())
1313
}

‎parsing_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99

1010
func TestParseError(t *testing.T) {
1111
err := NewParseError("Content-Type", "header", "application(", errors.New("unable to parse"))
12-
assert.Equal(t, 400, err.Code())
12+
assert.EqualValues(t, 400, err.Code())
1313
assert.Equal(t, "parsing Content-Type header from \"application(\" failed, because unable to parse", err.Error())
1414

1515
err = NewParseError("Content-Type", "", "application(", errors.New("unable to parse"))
16-
assert.Equal(t, 400, err.Code())
16+
assert.EqualValues(t, 400, err.Code())
1717
assert.Equal(t, "parsing Content-Type from \"application(\" failed, because unable to parse", err.Error())
1818
}

‎schema_test.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -10,181 +10,181 @@ import (
1010
func TestSchemaErrors(t *testing.T) {
1111
err := InvalidType("confirmed", "query", "boolean", nil)
1212
assert.Error(t, err)
13-
assert.Equal(t, 422, err.Code())
13+
assert.EqualValues(t, 422, err.Code())
1414
assert.Equal(t, "confirmed in query must be of type boolean", err.Error())
1515

1616
err = InvalidType("confirmed", "", "boolean", nil)
1717
assert.Error(t, err)
18-
assert.Equal(t, 422, err.Code())
18+
assert.EqualValues(t, 422, err.Code())
1919
assert.Equal(t, "confirmed must be of type boolean", err.Error())
2020

2121
err = InvalidType("confirmed", "query", "boolean", "hello")
2222
assert.Error(t, err)
23-
assert.Equal(t, 422, err.Code())
23+
assert.EqualValues(t, 422, err.Code())
2424
assert.Equal(t, "confirmed in query must be of type boolean: \"hello\"", err.Error())
2525

2626
err = InvalidType("confirmed", "query", "boolean", errors.New("hello"))
2727
assert.Error(t, err)
28-
assert.Equal(t, 422, err.Code())
28+
assert.EqualValues(t, 422, err.Code())
2929
assert.Equal(t, "confirmed in query must be of type boolean, because: hello", err.Error())
3030

3131
err = InvalidType("confirmed", "", "boolean", "hello")
3232
assert.Error(t, err)
33-
assert.Equal(t, 422, err.Code())
33+
assert.EqualValues(t, 422, err.Code())
3434
assert.Equal(t, "confirmed must be of type boolean: \"hello\"", err.Error())
3535

3636
err = InvalidType("confirmed", "", "boolean", errors.New("hello"))
3737
assert.Error(t, err)
38-
assert.Equal(t, 422, err.Code())
38+
assert.EqualValues(t, 422, err.Code())
3939
assert.Equal(t, "confirmed must be of type boolean, because: hello", err.Error())
4040

4141
err = DuplicateItems("uniques", "query")
4242
assert.Error(t, err)
43-
assert.Equal(t, 422, err.Code())
43+
assert.EqualValues(t, 422, err.Code())
4444
assert.Equal(t, "uniques in query shouldn't contain duplicates", err.Error())
4545

4646
err = DuplicateItems("uniques", "")
4747
assert.Error(t, err)
48-
assert.Equal(t, 422, err.Code())
48+
assert.EqualValues(t, 422, err.Code())
4949
assert.Equal(t, "uniques shouldn't contain duplicates", err.Error())
5050

5151
err = TooManyItems("something", "query", 5)
5252
assert.Error(t, err)
53-
assert.Equal(t, 422, err.Code())
53+
assert.EqualValues(t, 422, err.Code())
5454
assert.Equal(t, "something in query should have at most 5 items", err.Error())
5555

5656
err = TooManyItems("something", "", 5)
5757
assert.Error(t, err)
58-
assert.Equal(t, 422, err.Code())
58+
assert.EqualValues(t, 422, err.Code())
5959
assert.Equal(t, "something should have at most 5 items", err.Error())
6060

6161
err = TooFewItems("something", "", 5)
6262
assert.Error(t, err)
63-
assert.Equal(t, 422, err.Code())
63+
assert.EqualValues(t, 422, err.Code())
6464
assert.Equal(t, "something should have at least 5 items", err.Error())
6565

6666
err = ExceedsMaximum("something", "query", 5, false)
6767
assert.Error(t, err)
68-
assert.Equal(t, 422, err.Code())
68+
assert.EqualValues(t, 422, err.Code())
6969
assert.Equal(t, "something in query should be less than or equal to 5", err.Error())
7070

7171
err = ExceedsMaximum("something", "", 5, false)
7272
assert.Error(t, err)
73-
assert.Equal(t, 422, err.Code())
73+
assert.EqualValues(t, 422, err.Code())
7474
assert.Equal(t, "something should be less than or equal to 5", err.Error())
7575

7676
err = ExceedsMaximum("something", "query", 5, true)
7777
assert.Error(t, err)
78-
assert.Equal(t, 422, err.Code())
78+
assert.EqualValues(t, 422, err.Code())
7979
assert.Equal(t, "something in query should be less than 5", err.Error())
8080

8181
err = ExceedsMaximum("something", "", 5, true)
8282
assert.Error(t, err)
83-
assert.Equal(t, 422, err.Code())
83+
assert.EqualValues(t, 422, err.Code())
8484
assert.Equal(t, "something should be less than 5", err.Error())
8585

8686
err = ExceedsMinimum("something", "query", 5, false)
8787
assert.Error(t, err)
88-
assert.Equal(t, 422, err.Code())
88+
assert.EqualValues(t, 422, err.Code())
8989
assert.Equal(t, "something in query should be greater than or equal to 5", err.Error())
9090

9191
err = ExceedsMinimum("something", "", 5, false)
9292
assert.Error(t, err)
93-
assert.Equal(t, 422, err.Code())
93+
assert.EqualValues(t, 422, err.Code())
9494
assert.Equal(t, "something should be greater than or equal to 5", err.Error())
9595

9696
err = ExceedsMinimum("something", "query", 5, true)
9797
assert.Error(t, err)
98-
assert.Equal(t, 422, err.Code())
98+
assert.EqualValues(t, 422, err.Code())
9999
assert.Equal(t, "something in query should be greater than 5", err.Error())
100100

101101
err = ExceedsMinimum("something", "", 5, true)
102102
assert.Error(t, err)
103-
assert.Equal(t, 422, err.Code())
103+
assert.EqualValues(t, 422, err.Code())
104104
assert.Equal(t, "something should be greater than 5", err.Error())
105105

106106
err = NotMultipleOf("something", "query", 5)
107107
assert.Error(t, err)
108-
assert.Equal(t, 422, err.Code())
108+
assert.EqualValues(t, 422, err.Code())
109109
assert.Equal(t, "something in query should be a multiple of 5", err.Error())
110110

111111
err = NotMultipleOf("something", "", 5)
112112
assert.Error(t, err)
113-
assert.Equal(t, 422, err.Code())
113+
assert.EqualValues(t, 422, err.Code())
114114
assert.Equal(t, "something should be a multiple of 5", err.Error())
115115

116116
err = EnumFail("something", "query", "yada", []interface{}{"hello", "world"})
117117
assert.Error(t, err)
118-
assert.Equal(t, 422, err.Code())
118+
assert.EqualValues(t, 422, err.Code())
119119
assert.Equal(t, "something in query should be one of [hello world]", err.Error())
120120

121121
err = EnumFail("something", "", "yada", []interface{}{"hello", "world"})
122122
assert.Error(t, err)
123-
assert.Equal(t, 422, err.Code())
123+
assert.EqualValues(t, 422, err.Code())
124124
assert.Equal(t, "something should be one of [hello world]", err.Error())
125125

126126
err = Required("something", "query")
127127
assert.Error(t, err)
128-
assert.Equal(t, 422, err.Code())
128+
assert.EqualValues(t, 422, err.Code())
129129
assert.Equal(t, "something in query is required", err.Error())
130130

131131
err = Required("something", "")
132132
assert.Error(t, err)
133-
assert.Equal(t, 422, err.Code())
133+
assert.EqualValues(t, 422, err.Code())
134134
assert.Equal(t, "something is required", err.Error())
135135

136136
err = TooLong("something", "query", 5)
137137
assert.Error(t, err)
138-
assert.Equal(t, 422, err.Code())
138+
assert.EqualValues(t, 422, err.Code())
139139
assert.Equal(t, "something in query should be at most 5 chars long", err.Error())
140140

141141
err = TooLong("something", "", 5)
142142
assert.Error(t, err)
143-
assert.Equal(t, 422, err.Code())
143+
assert.EqualValues(t, 422, err.Code())
144144
assert.Equal(t, "something should be at most 5 chars long", err.Error())
145145

146146
err = TooShort("something", "query", 5)
147147
assert.Error(t, err)
148-
assert.Equal(t, 422, err.Code())
148+
assert.EqualValues(t, 422, err.Code())
149149
assert.Equal(t, "something in query should be at least 5 chars long", err.Error())
150150

151151
err = TooShort("something", "", 5)
152152
assert.Error(t, err)
153-
assert.Equal(t, 422, err.Code())
153+
assert.EqualValues(t, 422, err.Code())
154154
assert.Equal(t, "something should be at least 5 chars long", err.Error())
155155

156156
err = FailedPattern("something", "query", "\\d+")
157157
assert.Error(t, err)
158-
assert.Equal(t, 422, err.Code())
158+
assert.EqualValues(t, 422, err.Code())
159159
assert.Equal(t, "something in query should match '\\d+'", err.Error())
160160

161161
err = FailedPattern("something", "", "\\d+")
162162
assert.Error(t, err)
163-
assert.Equal(t, 422, err.Code())
163+
assert.EqualValues(t, 422, err.Code())
164164
assert.Equal(t, "something should match '\\d+'", err.Error())
165165

166166
err = InvalidTypeName("something")
167167
assert.Error(t, err)
168-
assert.Equal(t, 422, err.Code())
168+
assert.EqualValues(t, 422, err.Code())
169169
assert.Equal(t, "something is an invalid type name", err.Error())
170170

171171
err = AdditionalItemsNotAllowed("something", "query")
172172
assert.Error(t, err)
173-
assert.Equal(t, 422, err.Code())
173+
assert.EqualValues(t, 422, err.Code())
174174
assert.Equal(t, "something in query can't have additional items", err.Error())
175175

176176
err = AdditionalItemsNotAllowed("something", "")
177177
assert.Error(t, err)
178-
assert.Equal(t, 422, err.Code())
178+
assert.EqualValues(t, 422, err.Code())
179179
assert.Equal(t, "something can't have additional items", err.Error())
180180

181181
err = InvalidCollectionFormat("something", "query", "yada")
182182
assert.Error(t, err)
183-
assert.Equal(t, 422, err.Code())
183+
assert.EqualValues(t, 422, err.Code())
184184
assert.Equal(t, "the collection format \"yada\" is not supported for the query param \"something\"", err.Error())
185185

186186
err2 := CompositeValidationError()
187187
assert.Error(t, err2)
188-
assert.Equal(t, 422, err2.Code())
188+
assert.EqualValues(t, 422, err2.Code())
189189
assert.Equal(t, "validation failure list", err2.Error())
190190
}

0 commit comments

Comments
 (0)