From 6e55b37f12639db4bc93f3f087e15efc73e23501 Mon Sep 17 00:00:00 2001 From: spinillos Date: Fri, 21 Jul 2023 12:48:31 +0200 Subject: [PATCH] Fixes test results --- testdata/invalidlineage/defonly.txtar | 2 +- testdata/invalidlineage/empty.txtar | 2 +- testdata/isappendonly/invalid/boundaries.txtar | 4 ++-- testdata/isappendonly/invalid/default.txtar | 4 ++-- testdata/isappendonly/invalid/embedref.txtar | 6 +++--- testdata/isappendonly/invalid/nested.txtar | 6 +++--- testdata/isappendonly/invalid/noref.txtar | 4 ++-- testdata/isappendonly/invalid/optional.txtar | 4 ++-- testdata/isappendonly/invalid/refstruct.txtar | 4 ++-- testdata/isappendonly/invalid/stringconstraint.txtar | 10 +++++----- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/testdata/invalidlineage/defonly.txtar b/testdata/invalidlineage/defonly.txtar index 9ab558e..aabab15 100644 --- a/testdata/invalidlineage/defonly.txtar +++ b/testdata/invalidlineage/defonly.txtar @@ -5,4 +5,4 @@ import "github.com/grafana/thema" thema.#Lineage -- out/bindfail -- invalid lineage, #Lineage.name must be concrete: - ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:16:2 + ../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:16:2 diff --git a/testdata/invalidlineage/empty.txtar b/testdata/invalidlineage/empty.txtar index 777c9f6..2d4f5aa 100644 --- a/testdata/invalidlineage/empty.txtar +++ b/testdata/invalidlineage/empty.txtar @@ -1,4 +1,4 @@ -- in.cue -- -- out/bindfail -- not a lineage, missing #Lineage.name: - ../../../../../../../in.cue:1:1 + ../../../../../../in.cue:1:1 diff --git a/testdata/isappendonly/invalid/boundaries.txtar b/testdata/isappendonly/invalid/boundaries.txtar index 2fcdada..e1ed005 100644 --- a/testdata/isappendonly/invalid/boundaries.txtar +++ b/testdata/isappendonly/invalid/boundaries.txtar @@ -22,6 +22,6 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field anInt not present in {anInt:*12 | >0 & <=24 & int}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:7:10 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:7:10 missing field "anInt" diff --git a/testdata/isappendonly/invalid/default.txtar b/testdata/isappendonly/invalid/default.txtar index 79ea3b7..aff983d 100644 --- a/testdata/isappendonly/invalid/default.txtar +++ b/testdata/isappendonly/invalid/default.txtar @@ -22,6 +22,6 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field aunion not present in {aunion:*"bar" | "foo" | "baz"}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:16:13 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:16:13 missing field "aunion" diff --git a/testdata/isappendonly/invalid/embedref.txtar b/testdata/isappendonly/invalid/embedref.txtar index 2009192..fcfe49c 100644 --- a/testdata/isappendonly/invalid/embedref.txtar +++ b/testdata/isappendonly/invalid/embedref.txtar @@ -32,8 +32,8 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field #EmbedRef not present in {#EmbedRef:{refField1:string,refField2:1},refField1:string,refField2:1}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:21:13 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:21:13 field refField2 not present in {refField1:string,refField2:1}: - ../../../../../../../../in.cue:24:20 + ../../../../../../../in.cue:24:20 missing field "#EmbedRef" diff --git a/testdata/isappendonly/invalid/nested.txtar b/testdata/isappendonly/invalid/nested.txtar index fee3a79..545ddfd 100644 --- a/testdata/isappendonly/invalid/nested.txtar +++ b/testdata/isappendonly/invalid/nested.txtar @@ -27,8 +27,8 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field aNewOptionalField not present in {aField:string}: - ../../../../../../../../in.cue:8:13 + ../../../../../../../in.cue:8:13 field anObject not present in {anObject:{aField:string}}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:7:10 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:7:10 missing field "anObject" diff --git a/testdata/isappendonly/invalid/noref.txtar b/testdata/isappendonly/invalid/noref.txtar index 2acd39d..1268fd5 100644 --- a/testdata/isappendonly/invalid/noref.txtar +++ b/testdata/isappendonly/invalid/noref.txtar @@ -34,7 +34,7 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field #Baz not present in {someField:string,#Baz:{run:string,tell:bytes}}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:22:13 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:22:13 missing field "#Baz" required field is optional in subsumed value: dat diff --git a/testdata/isappendonly/invalid/optional.txtar b/testdata/isappendonly/invalid/optional.txtar index 00d9d27..1397d03 100644 --- a/testdata/isappendonly/invalid/optional.txtar +++ b/testdata/isappendonly/invalid/optional.txtar @@ -23,6 +23,6 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field aNewOptionalField not present in {aField:string}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:7:10 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:7:10 missing field "aNewOptionalField" diff --git a/testdata/isappendonly/invalid/refstruct.txtar b/testdata/isappendonly/invalid/refstruct.txtar index d17ac98..4346aea 100644 --- a/testdata/isappendonly/invalid/refstruct.txtar +++ b/testdata/isappendonly/invalid/refstruct.txtar @@ -33,7 +33,7 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field aBaz not present in {aBaz:{run:string,dat:>=-2147483648 & <=2147483647 & int},#Baz:{run:string,dat:>=-2147483648 & <=2147483647 & int}}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:22:13 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:22:13 missing field "aBaz" required field is optional in subsumed value: tell diff --git a/testdata/isappendonly/invalid/stringconstraint.txtar b/testdata/isappendonly/invalid/stringconstraint.txtar index 7f14013..bf02813 100644 --- a/testdata/isappendonly/invalid/stringconstraint.txtar +++ b/testdata/isappendonly/invalid/stringconstraint.txtar @@ -35,10 +35,10 @@ lin2: schemas: [{ }] -- out/isappendonly-fail -- field aString not present in {aString:strings.MinRunes(2),anObject:{aField:int}}: - ../../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 - ../../../../../../../../in.cue:25:10 + ../../../../../../../cue.mod/pkg/github.com/grafana/thema/lineage.cue:223:10 + ../../../../../../../in.cue:25:10 missing field "aString" invalid value strings.MinRunes(2) (does not satisfy strings.MinRunes(1)): error in call to strings.MinRunes: non-concrete value string: - ../../../../../../../../in.cue:13:21 - ../../../../../../../../in.cue:13:38 - ../../../../../../../../in.cue:26:21 + ../../../../../../../in.cue:13:21 + ../../../../../../../in.cue:13:38 + ../../../../../../../in.cue:26:21