Update tests for unions; several fixes #75
+192
−93
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,11 +3,7 @@ package gengo | |
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/ipld/go-ipld-prime" | ||
| "github.com/ipld/go-ipld-prime/schema" | ||
| ) | ||
|
|
||
|
|
@@ -28,32 +24,45 @@ func TestUnionKeyed(t *testing.T) { | |
| }), | ||
| )) | ||
|
|
||
| specs := []testcase{ | ||
| { | ||
| name: "InhabitantA", | ||
| typeJson: `{"String":"whee"}`, | ||
| reprJson: `{"a":"whee"}`, | ||
| typePoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| {"String", "whee"}, | ||
| //{"Strung", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| }, | ||
| reprPoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| {"a", "whee"}, | ||
| //{"b", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| }, | ||
| }, | ||
| { | ||
| name: "InhabitantB", | ||
| typeJson: `{"Strung":"whee"}`, | ||
| reprJson: `{"b":"whee"}`, | ||
| typePoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| //{"String", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| {"Strung", "whee"}, | ||
| }, | ||
| reprPoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| //{"a", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| {"b", "whee"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| test := func(t *testing.T, getPrototypeByName func(string) ipld.NodePrototype) { | ||
| np := getPrototypeByName("StrStr") | ||
| nrp := getPrototypeByName("StrStr.Repr") | ||
| for _, tcase := range specs { | ||
| tcase.Test(t, np, nrp) | ||
| } | ||
| } | ||
|
|
||
| t.Run("union-using-embed", func(t *testing.T) { | ||
|
|
@@ -107,40 +116,47 @@ func TestUnionKeyedComplexChildren(t *testing.T) { | |
| }), | ||
| )) | ||
|
|
||
| specs := []testcase{ | ||
| { | ||
| name: "InhabitantA", | ||
| typeJson: `{"String":"whee"}`, | ||
| reprJson: `{"a":"whee"}`, | ||
| typePoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| {"String", "whee"}, | ||
| //{"SmolStruct", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
|
There was a problem hiding this comment. nit: link to the issue in these TODOs? that way when the issue gets fixed, it's trivial to find the spots that can be improved |
||
| }, | ||
| reprPoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| {"a", "whee"}, | ||
| //{"b", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| }, | ||
| }, | ||
| { | ||
| name: "InhabitantB", | ||
| typeJson: `{"SmolStruct":{"s":"whee"}}`, | ||
| reprJson: `{"b":{"q":"whee"}}`, | ||
| typePoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| //{"String", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| {"SmolStruct", ipld.ReprKind_Map}, | ||
| {"SmolStruct/s", "whee"}, | ||
| }, | ||
| reprPoints: []testcasePoint{ | ||
| {"", ipld.ReprKind_Map}, | ||
| //{"a", ipld.ErrNotExists{}}, // TODO: need better error typing from traversal package. | ||
| {"b", ipld.ReprKind_Map}, | ||
| {"b/q", "whee"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| test := func(t *testing.T, getPrototypeByName func(string) ipld.NodePrototype) { | ||
| np := getPrototypeByName("WheeUnion") | ||
| nrp := getPrototypeByName("WheeUnion.Repr") | ||
| for _, tcase := range specs { | ||
| tcase.Test(t, np, nrp) | ||
| } | ||
| } | ||
|
|
||
| t.Run("union-using-embed", func(t *testing.T) { | ||
|
|
@@ -162,3 +178,77 @@ func TestUnionKeyedComplexChildren(t *testing.T) { | |
| }) | ||
| }) | ||
| } | ||
|
|
||
| // TestUnionKeyedReset puts a union inside a list, so that we can use the list's reuse of assembler as a test of the assembler's reset feature. | ||
| // The value inside the union is also more complex than a scalar value so that we test resetting gets passed down, too. | ||
|
There was a problem hiding this comment. so that we test that resetting... I'm pretty sure, but not 100% sure :) |
||
| func TestUnionKeyedReset(t *testing.T) { | ||
| ts := schema.TypeSystem{} | ||
| ts.Init() | ||
| adjCfg := &AdjunctCfg{} | ||
| ts.Accumulate(schema.SpawnString("String")) | ||
| ts.Accumulate(schema.SpawnStruct("SmolStruct", | ||
| []schema.StructField{ | ||
| schema.SpawnStructField("s", "String", false, false), | ||
| }, | ||
| schema.SpawnStructRepresentationMap(map[string]string{ | ||
| "s": "q", | ||
| }), | ||
| )) | ||
| ts.Accumulate(schema.SpawnUnion("WheeUnion", | ||
| []schema.TypeName{ | ||
| "String", | ||
| "SmolStruct", | ||
| }, | ||
| schema.SpawnUnionRepresentationKeyed(map[string]schema.TypeName{ | ||
| "a": "String", | ||
| "b": "SmolStruct", | ||
| }), | ||
| )) | ||
| ts.Accumulate(schema.SpawnList("OuterList", | ||
| "WheeUnion", false, | ||
| )) | ||
|
|
||
| specs := []testcase{ | ||
| { | ||
| typeJson: `[{"SmolStruct":{"s":"one"}}, {"SmolStruct":{"s":"two"}}, {"String":"three"}]`, | ||
| reprJson: `[{"b":{"q":"one"}}, {"b":{"q":"two"}}, {"a":"three"}]`, | ||
| typePoints: []testcasePoint{ | ||
| {"0/SmolStruct/s", "one"}, | ||
| {"1/SmolStruct/s", "two"}, | ||
| {"2/String", "three"}, | ||
| }, | ||
| reprPoints: []testcasePoint{ | ||
| {"0/b/q", "one"}, | ||
| {"1/b/q", "two"}, | ||
| {"2/a", "three"}, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| test := func(t *testing.T, getPrototypeByName func(string) ipld.NodePrototype) { | ||
|
There was a problem hiding this comment. These setup blocks (this and a dozen or so lines below) are getting somewhat redundant. It might soon be time to try to extract something here. I've been wary to do this prematurely, and it'll be a bit tricky because reasons for doing distinct gen invocation are various (e.g. in these tests, it's always poking |
||
| np := getPrototypeByName("OuterList") | ||
| nrp := getPrototypeByName("OuterList.Repr") | ||
| for _, tcase := range specs { | ||
| tcase.Test(t, np, nrp) | ||
| } | ||
| } | ||
|
|
||
| t.Run("union-using-embed", func(t *testing.T) { | ||
|
There was a problem hiding this comment. nitpicking some more, but these should be CamelCase for the sake of consistency. There are some examples in https://golang.org/pkg/testing/ too. |
||
| adjCfg.CfgUnionMemlayout = map[schema.TypeName]string{"WheeUnion": "embedAll"} | ||
|
|
||
| prefix := "union-keyed-reset-using-embed" | ||
| pkgName := "main" | ||
| genAndCompileAndTest(t, prefix, pkgName, ts, adjCfg, func(t *testing.T, getPrototypeByName func(string) ipld.NodePrototype) { | ||
| test(t, getPrototypeByName) | ||
| }) | ||
| }) | ||
| t.Run("union-using-interface", func(t *testing.T) { | ||
| adjCfg.CfgUnionMemlayout = map[schema.TypeName]string{"WheeUnion": "interface"} | ||
|
|
||
| prefix := "union-keyed-reset-using-interface" | ||
| pkgName := "main" | ||
| genAndCompileAndTest(t, prefix, pkgName, ts, adjCfg, func(t *testing.T, getPrototypeByName func(string) ipld.NodePrototype) { | ||
| test(t, getPrototypeByName) | ||
| }) | ||
| }) | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been entertaining the thought of putting some methods on this
testcasestructure so that one can "derive" variations of them with only some fields changed, which could be useful for tests like this that poke at variations in representation.Could be a future work thing.