jsonschema: represent integer keywords as ints
Some JSON Schema keywords, like minLength, are logically integers.
The JSON Schema spec allows them to be written as floating-point
values with zero fractional part, which is a reasonable choice, since
JSON doesn't distinguish the two.
We could simply validate these fields as integers in the normal course
of events (namely, validating the schema against its meta-schema),
but this CL does a little better: it uses *int struct fields for
these keywords, preventing them from ever being non-integers.
The UnmarshalJSON method still accepts integral floating-point values.
Marshaling is unaffected, and the results don't change: encoding/json
has always marshaled integral floats without the decimal part.
Other choices:
- Leave them as float64: you could then get away with
Schema{MinLength: Ptr(1.5)}
and though you couldn't get far with that, it's still irksome.
- json.Number: same problem as float64, plus it's even harder to write
as a literal.
- int64: now `Ptr(1)` doesn't work (it's a *int, not a *int64).
Anyway, these keywords all compare against len(x) in Go, which
is of type int.
Change-Id: Ie3f08bd8a5deaf2a21344d6ab873551c011b12d5
Reviewed-on: https://go-review.googlesource.com/c/tools/+/668315
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Robert Findley <rfindley@google.com>
This commit is contained in:
parent
0def4e0327
commit
40185dd013
1 changed files with 132 additions and 25 deletions
|
|
@ -6,14 +6,16 @@ package jsonschema
|
|||
|
||||
import (
|
||||
"encoding/json"
|
||||
"regexp"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestMarshal(t *testing.T) {
|
||||
func TestGoRoundTrip(t *testing.T) {
|
||||
// Verify that Go representations round-trip.
|
||||
for _, s := range []*Schema{
|
||||
{Type: "null"},
|
||||
{Types: []string{"null", "number"}},
|
||||
{Type: "string", MinLength: Ptr(20.0)},
|
||||
{Type: "string", MinLength: Ptr(20)},
|
||||
{Minimum: Ptr(20.0)},
|
||||
{Items: &Schema{Type: "integer"}},
|
||||
{Const: Ptr(any(0))},
|
||||
|
|
@ -38,3 +40,69 @@ func TestMarshal(t *testing.T) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestJSONRoundTrip(t *testing.T) {
|
||||
// Verify that JSON texts for schemas marshal into equivalent forms.
|
||||
// We don't expect everything to round-trip perfectly. For example, "true" and "false"
|
||||
// will turn into their object equivalents.
|
||||
// But most things should.
|
||||
// Some of these cases test Schema.{UnM,M}arshalJSON.
|
||||
// Most of others follow from the behavior of encoding/json, but they are still
|
||||
// valuable as regression tests of this package's behavior.
|
||||
for _, tt := range []struct {
|
||||
in, want string
|
||||
}{
|
||||
{`true`, `{}`}, // boolean schemas become object schemas
|
||||
{`false`, `{"not":{}}`},
|
||||
{`{"type":"", "enum":null}`, `{}`}, // empty fields are omitted
|
||||
{`{"minimum":1}`, `{"minimum":1}`},
|
||||
{`{"minimum":1.0}`, `{"minimum":1}`}, // floating-point integers lose their fractional part
|
||||
{`{"minLength":1.0}`, `{"minLength":1}`}, // some floats are unmarshaled into ints, but you can't tell
|
||||
{
|
||||
// map keys are sorted
|
||||
`{"$vocabulary":{"b":true, "a":false}}`,
|
||||
`{"$vocabulary":{"a":false,"b":true}}`,
|
||||
},
|
||||
{`{"unk":0}`, `{}`}, // unknown fields are dropped, unfortunately
|
||||
} {
|
||||
var s Schema
|
||||
if err := json.Unmarshal([]byte(tt.in), &s); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
data, err := json.Marshal(s)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if got := string(data); got != tt.want {
|
||||
t.Errorf("%s:\ngot %s\nwant %s", tt.in, got, tt.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnmarshalErrors(t *testing.T) {
|
||||
for _, tt := range []struct {
|
||||
in string
|
||||
want string // error must match this regexp
|
||||
}{
|
||||
{`1`, "cannot unmarshal number"},
|
||||
{`{"type":1}`, `invalid value for "type"`},
|
||||
{`{"minLength":1.5}`, `minLength:.*not an int`},
|
||||
{`{"maxLength":1.5}`, `maxLength:.*not an int`},
|
||||
{`{"minItems":1.5}`, `minItems:.*not an int`},
|
||||
{`{"maxItems":1.5}`, `maxItems:.*not an int`},
|
||||
{`{"minProperties":1.5}`, `minProperties:.*not an int`},
|
||||
{`{"maxProperties":1.5}`, `maxProperties:.*not an int`},
|
||||
{`{"minContains":1.5}`, `minContains:.*not an int`},
|
||||
{`{"maxContains":1.5}`, `maxContains:.*not an int`},
|
||||
} {
|
||||
var s Schema
|
||||
err := json.Unmarshal([]byte(tt.in), &s)
|
||||
if err == nil {
|
||||
t.Fatalf("%s: no error but expected one", tt.in)
|
||||
}
|
||||
if !regexp.MustCompile(tt.want).MatchString(err.Error()) {
|
||||
t.Errorf("%s: error %q does not match %q", tt.in, err, tt.want)
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue