maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
z7zmey 2018-02-04 21:44:58 +02:00
parent fb21f2dca5
commit 2ddcbb52a4
8 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/name/name_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func assertEqual(t *testing.T, expected interface{}, actual interface{}) { func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@ -44,7 +44,7 @@ func TestName(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -65,7 +65,7 @@ func TestFullyQualified(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -86,7 +86,7 @@ func TestRelative(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }

8
node/node_test.go
View File

@ -12,7 +12,7 @@ import (
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func assertEqual(t *testing.T, expected interface{}, actual interface{}) { func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@ -41,7 +41,7 @@ func TestIdentifier(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -132,7 +132,7 @@ func TestArgumentNode(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -198,7 +198,7 @@ func TestParameterNode(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }

12
node/scalar/encapsed_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/scalar" "github.com/z7zmey/php-parser/node/scalar"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func TestSimpleVar(t *testing.T) { func TestSimpleVar(t *testing.T) {
@ -29,7 +29,7 @@ func TestSimpleVar(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -56,7 +56,7 @@ func TestSimpleVarPropertyFetch(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -79,7 +79,7 @@ func TestDollarOpenCurlyBraces(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -105,7 +105,7 @@ func TestDollarOpenCurlyBracesDimNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -131,7 +131,7 @@ func TestCurlyOpenMethodCall(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)

4
node/scalar/magic_constant_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/scalar" "github.com/z7zmey/php-parser/node/scalar"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func TestMagicConstant(t *testing.T) { func TestMagicConstant(t *testing.T) {
@ -22,7 +22,7 @@ func TestMagicConstant(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)

16
node/scalar/numbers_test.go
View File

@ -9,7 +9,7 @@ import (
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/scalar" "github.com/z7zmey/php-parser/node/scalar"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func assertEqual(t *testing.T, expected interface{}, actual interface{}) { func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@ -36,7 +36,7 @@ func TestLNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -52,7 +52,7 @@ func TestDNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -68,7 +68,7 @@ func TestFloat(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -84,7 +84,7 @@ func TestBinaryLNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -100,7 +100,7 @@ func TestBinaryDNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -116,7 +116,7 @@ func TestHLNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -132,7 +132,7 @@ func TestHDNumber(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }

18
node/scalar/string_test.go
View File

@ -8,7 +8,7 @@ import (
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/scalar" "github.com/z7zmey/php-parser/node/scalar"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func TestDoubleQuotedScalarString(t *testing.T) { func TestDoubleQuotedScalarString(t *testing.T) {
@ -22,7 +22,7 @@ func TestDoubleQuotedScalarString(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -39,7 +39,7 @@ func TestDoubleQuotedScalarStringWithEscapedVar(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -59,7 +59,7 @@ func TestMultilineDoubleQuotedScalarString(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -77,7 +77,7 @@ func TestSingleQuotedScalarString(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -97,7 +97,7 @@ func TestMultilineSingleQuotedScalarString(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -118,7 +118,7 @@ CAD;
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -139,7 +139,7 @@ CAD;
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)
@ -160,7 +160,7 @@ CAD;
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
if diff := pretty.Compare(expected, actual); diff != "" { if diff := pretty.Compare(expected, actual); diff != "" {
t.Errorf("diff: (-expected +actual)\n%s", diff) t.Errorf("diff: (-expected +actual)\n%s", diff)

10
node/stmt/alt_if_test.go
View File

@ -10,7 +10,7 @@ import (
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
"github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node"
"github.com/z7zmey/php-parser/node/stmt" "github.com/z7zmey/php-parser/node/stmt"
"github.com/z7zmey/php-parser/parser" "github.com/z7zmey/php-parser/php7"
) )
func assertEqual(t *testing.T, expected interface{}, actual interface{}) { func assertEqual(t *testing.T, expected interface{}, actual interface{}) {
@ -41,7 +41,7 @@ func TestAltIf(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -68,7 +68,7 @@ func TestAltElseIf(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -92,7 +92,7 @@ func TestAltElse(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }
@ -128,7 +128,7 @@ func TestAltElseElseIf(t *testing.T) {
}, },
} }
actual, _, _ := parser.ParsePhp7(bytes.NewBufferString(src), "test.php") actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
assertEqual(t, expected, actual) assertEqual(t, expected, actual)
} }

2
node/visitor_test.go
View File

@ -31,7 +31,7 @@ var nodesToTest = []struct {
{ {
&node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}}, &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}},
[]string{"Expr"}, []string{"Expr"},
map[string]interface{}{"Variadic": true}, map[string]interface{}{"IsReference": false, "Variadic": true},
}, },
{ {
&node.Parameter{ &node.Parameter{