fix tests after merge train (#686)

fenollp · web-flow · commit 834a79102402 · 2022-11-29T18:19:02.000+01:00
diff --git a/openapi3filter/issue641_test.go b/openapi3filter/issue641_test.go
@@ -69,7 +69,7 @@ paths:
 			name:   "failed allof pattern",
 			spec:   allOfSpec,
 			req:    `/items?test=999999`,
-			errStr: `parameter "test" in query has an error: string doesn't match the regular expression`,
+			errStr: `parameter "test" in query has an error: string "999999" doesn't match the regular expression "^[0-9]{1,4}$"`,
 		},
 	}
 
diff --git a/openapi3filter/options_test.go b/openapi3filter/options_test.go
@@ -41,8 +41,7 @@ paths:
 		panic(err)
 	}
 
-	err = doc.Validate(loader.Context)
-	if err != nil {
+	if err = doc.Validate(loader.Context); err != nil {
 		panic(err)
 	}
 
diff --git a/openapi3filter/req_resp_decoder.go b/openapi3filter/req_resp_decoder.go
@@ -579,8 +579,7 @@ func (d *urlValuesDecoder) parseValue(v string, schema *openapi3.SchemaRef) (int
 		var value interface{}
 		var err error
 		for _, sr := range schema.Value.AnyOf {
-			value, err = d.parseValue(v, sr)
-			if err == nil {
+			if value, err = d.parseValue(v, sr); err == nil {
 				return value, nil
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ paths:`
`69`	`69`	`name: "failed allof pattern",`
`70`	`70`	`spec: allOfSpec,`
`71`	`71`	req: `/items?test=999999`,
`72`		- errStr: `parameter "test" in query has an error: string doesn't match the regular expression`,
	`72`	+ errStr: `parameter "test" in query has an error: string "999999" doesn't match the regular expression "^[0-9]{1,4}$"`,
`73`	`73`	`},`
`74`	`74`	`}`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ paths:`
`41`	`41`	`panic(err)`
`42`	`42`	`}`
`43`	`43`
`44`		`- err = doc.Validate(loader.Context)`
`45`		`- if err != nil {`
	`44`	`+ if err = doc.Validate(loader.Context); err != nil {`
`46`	`45`	`panic(err)`
`47`	`46`	`}`
`48`	`47`
Original file line number	Diff line number	Diff line change
`@@ -579,8 +579,7 @@ func (d urlValuesDecoder) parseValue(v string, schema openapi3.SchemaRef) (int`
`579`	`579`	`var value interface{}`
`580`	`580`	`var err error`
`581`	`581`	`for _, sr := range schema.Value.AnyOf {`
`582`		`- value, err = d.parseValue(v, sr)`
`583`		`- if err == nil {`
	`582`	`+ if value, err = d.parseValue(v, sr); err == nil {`
`584`	`583`	`return value, nil`
`585`	`584`	`}`
`586`	`585`	`}`