diff --git a/test/integration/vm/shortcuts.go b/test/integration/vm/shortcuts.go new file mode 100644 index 00000000..15aa813a --- /dev/null +++ b/test/integration/vm/shortcuts.go @@ -0,0 +1,10 @@ +package vm_test + +import ( + "github.com/MontFerret/ferret/test/integration/base" +) + +type UseCase = base.TestCase + +var NewCase = base.NewCase +var Skip = base.Skip diff --git a/test/integration/vm/vm_member_test.go b/test/integration/vm/vm_member_test.go index 126e616c..a976c516 100644 --- a/test/integration/vm/vm_member_test.go +++ b/test/integration/vm/vm_member_test.go @@ -8,6 +8,8 @@ import ( "strings" "testing" + "github.com/MontFerret/ferret/test/integration/base" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/parser" "github.com/MontFerret/ferret/pkg/runtime" @@ -181,7 +183,7 @@ func TestMemberReservedWords(t *testing.T) { So(err, ShouldBeNil) - out, err := Exec(prog, true, vm.WithFunctions(c.Functions())) + out, err := base.Exec(prog, true, vm.WithFunctions(c.Functions())) So(err, ShouldBeNil) So(out, ShouldEqual, expected.String()) diff --git a/test/integration/vm/vm_op_ternary_test.go b/test/integration/vm/vm_op_ternary_test.go index 42150208..dcb3f46d 100644 --- a/test/integration/vm/vm_op_ternary_test.go +++ b/test/integration/vm/vm_op_ternary_test.go @@ -3,6 +3,8 @@ package vm_test import ( "fmt" + "github.com/MontFerret/ferret/test/integration/base" + . "github.com/smartystreets/goconvey/convey" "github.com/MontFerret/ferret/pkg/compiler" @@ -42,7 +44,7 @@ func TestTernaryOperator(t *testing.T) { So(err, ShouldBeNil) - out, err := Run(p) + out, err := base.Run(p) So(err, ShouldBeNil) diff --git a/test/integration/vm/vm_variable_test.go b/test/integration/vm/vm_variable_test.go index 4d8fffce..47851386 100644 --- a/test/integration/vm/vm_variable_test.go +++ b/test/integration/vm/vm_variable_test.go @@ -4,6 +4,8 @@ import ( "fmt" "testing" + "github.com/MontFerret/ferret/test/integration/base" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" "github.com/MontFerret/ferret/pkg/vm" @@ -94,7 +96,7 @@ func TestVariables(t *testing.T) { So(p, ShouldHaveSameTypeAs, &vm.Program{}) counter := -1 - out, err := Run(p, vm.WithFunction("COUNTER", func(ctx gocontext.Context, args ...runtime.Value) (runtime.Value, error) { + out, err := base.Run(p, vm.WithFunction("COUNTER", func(ctx gocontext.Context, args ...runtime.Value) (runtime.Value, error) { counter++ return runtime.NewInt(counter), nil @@ -116,7 +118,7 @@ func TestVariables(t *testing.T) { So(p, ShouldHaveSameTypeAs, &vm.Program{}) counter := -1 - out, err := Run(p, vm.WithFunction("COUNTER", func(ctx gocontext.Context, args ...runtime.Value) (runtime.Value, error) { + out, err := base.Run(p, vm.WithFunction("COUNTER", func(ctx gocontext.Context, args ...runtime.Value) (runtime.Value, error) { counter++ return runtime.NewInt(counter), nil