From 52ad315a0df8a346953e570e8be472709b81cc6a Mon Sep 17 00:00:00 2001
From: Ryo Nihei <nihei.dev@gmail.com>
Date: Sat, 11 Jun 2022 21:40:38 +0900
Subject: Support the underscore symbol matching any symbols in vartan-test
 command

---
 spec/test/parser.go      |  5 +++--
 spec/test/parser_test.go | 49 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

(limited to 'spec/test')

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
@@ -74,6 +74,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"),
@@ -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) {
-- 
cgit v1.2.3