Skip to content

Commit fd1ab6f

Browse files
fenollpfenollp
committed
rebased
Signed-off-by: Pierre Fenoll <[email protected]>
1 parent e02391f commit fd1ab6f

File tree

3 files changed

+47
-41
lines changed

3 files changed

+47
-41
lines changed

‎go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
2121
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
2222
github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
2323
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
24+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
25+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
26+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
27+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
28+
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
29+
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
2430
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2531
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
2632
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎openapi3/schema_issue289_test.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package openapi3
22

33
import (
4-
"testing"
4+
"testing"
55

6-
"github.com/stretchr/testify/require"
6+
"github.com/stretchr/testify/require"
77
)
88

99
func TestIssue289(t *testing.T) {
10-
spec := []byte(`components:
10+
spec := []byte(`components:
1111
schemas:
1212
Server:
1313
properties:
@@ -29,15 +29,15 @@ func TestIssue289(t *testing.T) {
2929
openapi: "3.0.1"
3030
`)
3131

32-
s, err := NewSwaggerLoader().LoadSwaggerFromData(spec)
33-
require.NoError(t, err)
32+
s, err := NewSwaggerLoader().LoadSwaggerFromData(spec)
33+
require.NoError(t, err)
3434

35-
err = s.CompileSchemas()
36-
require.NoError(t, err)
35+
err = s.CompileSchemas()
36+
require.NoError(t, err)
3737

38-
err = s.Components.Schemas["Server"].Value.VisitData(s, map[string]interface{}{
39-
"name": "kin-openapi",
40-
"address": "127.0.0.1",
41-
})
42-
require.EqualError(t, err, ErrOneOfConflict.Error())
38+
err = s.Components.Schemas["Server"].Value.VisitData(s, map[string]interface{}{
39+
"name": "kin-openapi",
40+
"address": "127.0.0.1",
41+
})
42+
require.EqualError(t, err, ErrOneOfConflict.Error())
4343
}

‎openapi3filter/validate_readonly_test.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package openapi3filter
22

33
import (
4-
"bytes"
5-
"encoding/json"
6-
"net/http"
7-
"testing"
4+
"bytes"
5+
"encoding/json"
6+
"net/http"
7+
"testing"
88

9-
"github.com/getkin/kin-openapi/openapi3"
10-
"github.com/stretchr/testify/require"
9+
"github.com/getkin/kin-openapi/openapi3"
10+
"github.com/stretchr/testify/require"
1111
)
1212

1313
func TestValidatingRequestBodyWithReadOnlyProperty(t *testing.T) {
14-
const spec = `{
14+
const spec = `{
1515
"openapi": "3.0.3",
1616
"info": {
1717
"version": "1.0.0",
@@ -60,32 +60,32 @@ func TestValidatingRequestBodyWithReadOnlyProperty(t *testing.T) {
6060
}
6161
`
6262

63-
type Request struct {
64-
ID string `json:"_id"`
65-
}
63+
type Request struct {
64+
ID string `json:"_id"`
65+
}
6666

67-
sl := openapi3.NewSwaggerLoader()
68-
l, err := sl.LoadSwaggerFromData([]byte(spec))
69-
require.NoError(t, err)
70-
router := NewRouter().WithSwagger(l)
67+
sl := openapi3.NewSwaggerLoader()
68+
l, err := sl.LoadSwaggerFromData([]byte(spec))
69+
require.NoError(t, err)
70+
router := NewRouter().WithSwagger(l)
7171

72-
err = l.CompileSchemas()
73-
require.NoError(t, err)
72+
err = l.CompileSchemas()
73+
require.NoError(t, err)
7474

75-
b, err := json.Marshal(Request{ID: "bt6kdc3d0cvp6u8u3ft0"})
76-
require.NoError(t, err)
75+
b, err := json.Marshal(Request{ID: "bt6kdc3d0cvp6u8u3ft0"})
76+
require.NoError(t, err)
7777

78-
httpReq, err := http.NewRequest(http.MethodPost, "/accounts", bytes.NewReader(b))
79-
require.NoError(t, err)
80-
httpReq.Header.Add("Content-Type", "application/json")
78+
httpReq, err := http.NewRequest(http.MethodPost, "/accounts", bytes.NewReader(b))
79+
require.NoError(t, err)
80+
httpReq.Header.Add("Content-Type", "application/json")
8181

82-
route, pathParams, err := router.FindRoute(httpReq.Method, httpReq.URL)
83-
require.NoError(t, err)
82+
route, pathParams, err := router.FindRoute(httpReq.Method, httpReq.URL)
83+
require.NoError(t, err)
8484

85-
err = ValidateRequest(sl.Context, &RequestValidationInput{
86-
Request: httpReq,
87-
PathParams: pathParams,
88-
Route: route,
89-
})
90-
require.NoError(t, err)
85+
err = ValidateRequest(sl.Context, &RequestValidationInput{
86+
Request: httpReq,
87+
PathParams: pathParams,
88+
Route: route,
89+
})
90+
require.NoError(t, err)
9191
}

0 commit comments

Comments
 (0)