aboutsummaryrefslogtreecommitdiff
path: root/spec/test
diff options
context:
space:
mode:
Diffstat (limited to 'spec/test')
-rw-r--r--spec/test/parser.go5
-rw-r--r--spec/test/parser_test.go49
2 files changed, 52 insertions, 2 deletions
diff --git a/spec/test/parser.go b/spec/test/parser.go
index 483e553..f255381 100644
--- a/spec/test/parser.go
+++ b/spec/test/parser.go
@@ -89,7 +89,8 @@ func DiffTree(expected, actual *Tree) []*TreeDiff {
if expected == nil && actual == nil {
return nil
}
- if actual.Kind != expected.Kind {
+ // _ matches any symbols.
+ if expected.Kind != "_" && actual.Kind != expected.Kind {
msg := fmt.Sprintf("unexpected kind: expected '%v' but got '%v'", expected.Kind, actual.Kind)
return []*TreeDiff{
newTreeDiff(expected, actual, msg),
@@ -103,7 +104,7 @@ func DiffTree(expected, actual *Tree) []*TreeDiff {
}
var diffs []*TreeDiff
for i, exp := range expected.Children {
- if ds := DiffTree(actual.Children[i], exp); len(ds) > 0 {
+ if ds := DiffTree(exp, actual.Children[i]); len(ds) > 0 {
diffs = append(diffs, ds...)
}
}
diff --git a/spec/test/parser_test.go b/spec/test/parser_test.go
index 41b7189..979202e 100644
--- a/spec/test/parser_test.go
+++ b/spec/test/parser_test.go
@@ -75,6 +75,26 @@ func TestDiffTree(t *testing.T) {
),
},
{
+ t1: NewTree("_"),
+ t2: NewTree("a"),
+ },
+ {
+ t1: NewTree("a",
+ NewTree("_"),
+ ),
+ t2: NewTree("a",
+ NewTree("b"),
+ ),
+ },
+ {
+ t1: NewTree("_",
+ NewTree("b"),
+ ),
+ t2: NewTree("a",
+ NewTree("b"),
+ ),
+ },
+ {
t1: NewTree("a"),
t2: NewTree("b"),
different: true,
@@ -139,6 +159,35 @@ func TestDiffTree(t *testing.T) {
),
different: true,
},
+ {
+ t1: NewTree("a",
+ NewTree("_"),
+ NewTree("c"),
+ ),
+ t2: NewTree("a",
+ NewTree("b"),
+ NewTree("x"),
+ ),
+ different: true,
+ },
+ {
+ t1: NewTree("_"),
+ t2: NewTree("a",
+ NewTree("b"),
+ ),
+ different: true,
+ },
+ {
+ t1: NewTree("a",
+ NewTree("_"),
+ ),
+ t2: NewTree("a",
+ NewTree("b",
+ NewTree("c"),
+ ),
+ ),
+ different: true,
+ },
}
for i, tt := range tests {
t.Run(fmt.Sprintf("#%v", i), func(t *testing.T) {