Simplify tests

Author: antonmedv

parser_test.go

@@ -133,6 +133,14 @@ var parseTests = []parseTest{
 		"len(foo)",
 		builtinNode{"len", []Node{nameNode{"foo"}}},
 	},
+	{
+		`foo matches "foo"`,
+		matchesNode{left: nameNode{"foo"}, right: textNode{"foo"}},
+	},
+	{
+		`foo matches regex`,
+		matchesNode{left: nameNode{"foo"}, right: nameNode{"regex"}},
+	},
 }
 
 type parseErrorTest struct {
@@ -178,6 +186,10 @@ func TestParse(t *testing.T) {
 			t.Errorf("%s:\n%v", test.input, err)
 			continue
 		}
+		if m, ok := actual.(matchesNode); ok {
+			m.r = nil
+			actual = m
+		}
 		if !reflect.DeepEqual(actual, test.expected) {
 			t.Errorf("%s:\ngot\n\t%#v\nexpected\n\t%#v", test.input, actual, test.expected)
 		}
@@ -195,43 +207,3 @@ func TestParse_error(t *testing.T) {
 		}
 	}
 }
-
-func TestParse_matches(t *testing.T) {
-	node, err := Parse(`foo matches "foo"`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m, ok := node.(matchesNode)
-	if !ok {
-		t.Fatalf("expected to me matchesNode, got %T", node)
-	}
-
-	if !reflect.DeepEqual(m.left, nameNode{"foo"}) || !reflect.DeepEqual(m.right, textNode{"foo"}) {
-		t.Fatalf("left or right side of matches operator invalid: %#v", m)
-	}
-
-	if m.r == nil {
-		t.Fatal("regexp should be compiled")
-	}
-}
-
-func TestParse_matches_dynamic(t *testing.T) {
-	node, err := Parse(`foo matches regex`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m, ok := node.(matchesNode)
-	if !ok {
-		t.Fatalf("expected to me matchesNode, got %T", node)
-	}
-
-	if !reflect.DeepEqual(m.left, nameNode{"foo"}) || !reflect.DeepEqual(m.right, nameNode{"regex"}) {
-		t.Fatalf("left or right side of matches operator invalid: %#v", m)
-	}
-
-	if m.r != nil {
-		t.Fatal("regexp should not be compiled")
-	}
-}

print_test.go

@@ -48,6 +48,10 @@ var printTests = []printTest{
 		conditionalNode{nameNode{"a"}, nameNode{"a"}, nameNode{"b"}},
 		"a ? a : b",
 	},
+	{
+		matchesNode{left: nameNode{"foo"}, right: textNode{"foobar"}},
+		"(foo matches \"foobar\")",
+	},
 }
 
 func TestPrint(t *testing.T) {
@@ -61,31 +65,12 @@ func TestPrint(t *testing.T) {
 		if err != nil {
 			t.Errorf("%s: can't parse printed expression", actual)
 		}
+		if m, ok := ast.(matchesNode); ok {
+			m.r = nil
+			ast = m
+		}
 		if !reflect.DeepEqual(ast, test.input) {
 			t.Errorf("%s:\ngot\n\t%#v\nexpected\n\t%#v", test.expected, ast, test.input)
 		}
 	}
 }
-
-func TestPrint_matches(t *testing.T) {
-	input := matchesNode{left: nameNode{"foo"}, right: textNode{"foobar"}}
-	expected := "(foo matches \"foobar\")"
-
-	actual := fmt.Sprintf("%v", input)
-	if actual != expected {
-		t.Errorf("%s:\ngot\n\t%#v\nexpected\n\t%#v", expected, actual, expected)
-	}
-	// Parse again and check if ast same as before.
-	ast, err := Parse(actual)
-	if err != nil {
-		t.Errorf("%s: can't parse printed expression", actual)
-	}
-
-	// Clear parsed regexp.
-	m := ast.(matchesNode)
-	m.r = nil
-
-	if !reflect.DeepEqual(m, input) {
-		t.Errorf("%s:\ngot\n\t%#v\nexpected\n\t%#v", expected, m, input)
-	}
-}