add php5 tests

node/name/t_name_test.go

@@ -7,11 +7,11 @@ import (
 
 	"github.com/z7zmey/php-parser/node/expr"
 	"github.com/z7zmey/php-parser/node/name"
-	"github.com/z7zmey/php-parser/walker"
 
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/z7zmey/php-parser/node"
 	"github.com/z7zmey/php-parser/node/stmt"
+	"github.com/z7zmey/php-parser/php5"
 	"github.com/z7zmey/php-parser/php7"
 )
 
@@ -45,7 +45,9 @@ func TestName(t *testing.T) {
 	}
 
 	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
 
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
 
@@ -66,7 +68,9 @@ func TestFullyQualified(t *testing.T) {
 	}
 
 	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
 
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
 
@@ -87,91 +91,8 @@ func TestRelative(t *testing.T) {
 	}
 
 	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
 
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
 	assertEqual(t, expected, actual)
 }
-
-// Test Name nodes visitors
-
-var nameNodesTests = []struct {
-	node                node.Node // node
-	expectedVisitedKeys []string  // visited keys
-	expectedAttributes  map[string]interface{}
-}{
-	{
-		&name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
-		[]string{"Parts"},
-		nil,
-	},
-	{
-		&name.FullyQualified{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
-		[]string{"Parts"},
-		nil,
-	},
-	{
-		&name.Relative{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
-		[]string{"Parts"},
-		nil,
-	},
-	{
-		&name.NamePart{Value: "foo"},
-		[]string{},
-		map[string]interface{}{"Value": "foo"},
-	},
-}
-
-type visitorMock struct {
-	visitChildren bool
-	visitedKeys   []string
-}
-
-func (v *visitorMock) EnterNode(n walker.Walker) bool { return v.visitChildren }
-func (v *visitorMock) GetChildrenVisitor(key string) walker.Visitor {
-	v.visitedKeys = append(v.visitedKeys, key)
-	return &visitorMock{v.visitChildren, nil}
-}
-func (v *visitorMock) LeaveNode(n walker.Walker) {}
-
-func TestNameVisitorDisableChildren(t *testing.T) {
-	for _, tt := range nameNodesTests {
-		v := &visitorMock{false, nil}
-		tt.node.Walk(v)
-
-		expected := []string{}
-		actual := v.visitedKeys
-
-		diff := pretty.Compare(expected, actual)
-		if diff != "" {
-			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
-		}
-	}
-}
-
-func TestNameVisitor(t *testing.T) {
-	for _, tt := range nameNodesTests {
-		v := &visitorMock{true, nil}
-		tt.node.Walk(v)
-
-		expected := tt.expectedVisitedKeys
-		actual := v.visitedKeys
-
-		diff := pretty.Compare(expected, actual)
-		if diff != "" {
-			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
-		}
-	}
-}
-
-// test Attributes()
-
-func TestNameAttributes(t *testing.T) {
-	for _, tt := range nameNodesTests {
-		expected := tt.expectedAttributes
-		actual := tt.node.Attributes()
-
-		diff := pretty.Compare(expected, actual)
-		if diff != "" {
-			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
-		}
-	}
-}

node/name/t_visitor_test.go

@@ -0,0 +1,95 @@
+package name_test
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/z7zmey/php-parser/node/name"
+	"github.com/z7zmey/php-parser/walker"
+
+	"github.com/kylelemons/godebug/pretty"
+	"github.com/z7zmey/php-parser/node"
+)
+
+var nameNodesTests = []struct {
+	node                node.Node // node
+	expectedVisitedKeys []string  // visited keys
+	expectedAttributes  map[string]interface{}
+}{
+	{
+		&name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
+		[]string{"Parts"},
+		nil,
+	},
+	{
+		&name.FullyQualified{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
+		[]string{"Parts"},
+		nil,
+	},
+	{
+		&name.Relative{Parts: []node.Node{&name.NamePart{Value: "foo"}}},
+		[]string{"Parts"},
+		nil,
+	},
+	{
+		&name.NamePart{Value: "foo"},
+		[]string{},
+		map[string]interface{}{"Value": "foo"},
+	},
+}
+
+type visitorMock struct {
+	visitChildren bool
+	visitedKeys   []string
+}
+
+func (v *visitorMock) EnterNode(n walker.Walker) bool { return v.visitChildren }
+func (v *visitorMock) GetChildrenVisitor(key string) walker.Visitor {
+	v.visitedKeys = append(v.visitedKeys, key)
+	return &visitorMock{v.visitChildren, nil}
+}
+func (v *visitorMock) LeaveNode(n walker.Walker) {}
+
+func TestNameVisitorDisableChildren(t *testing.T) {
+	for _, tt := range nameNodesTests {
+		v := &visitorMock{false, nil}
+		tt.node.Walk(v)
+
+		expected := []string{}
+		actual := v.visitedKeys
+
+		diff := pretty.Compare(expected, actual)
+		if diff != "" {
+			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
+		}
+	}
+}
+
+func TestNameVisitor(t *testing.T) {
+	for _, tt := range nameNodesTests {
+		v := &visitorMock{true, nil}
+		tt.node.Walk(v)
+
+		expected := tt.expectedVisitedKeys
+		actual := v.visitedKeys
+
+		diff := pretty.Compare(expected, actual)
+		if diff != "" {
+			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
+		}
+	}
+}
+
+// test Attributes()
+
+func TestNameAttributes(t *testing.T) {
+	for _, tt := range nameNodesTests {
+		expected := tt.expectedAttributes
+		actual := tt.node.Attributes()
+
+		diff := pretty.Compare(expected, actual)
+		if diff != "" {
+			t.Errorf("%s diff: (-expected +actual)\n%s", reflect.TypeOf(tt.node), diff)
+		}
+	}
+}