From 7bc40aa963626383dbb6a5cb6fe10736dc1d74fa Mon Sep 17 00:00:00 2001 From: zelig Date: Sun, 15 Mar 2015 18:42:17 +0700 Subject: [PATCH] jsre: remove assetpath using GOPATH from test --- jsre/jsre_test.go | 43 +++++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/jsre/jsre_test.go b/jsre/jsre_test.go index 67b5ea906..e4decf2f4 100644 --- a/jsre/jsre_test.go +++ b/jsre/jsre_test.go @@ -2,15 +2,11 @@ package jsre import ( "github.com/obscuren/otto" - "os" - "path" "testing" "github.com/ethereum/go-ethereum/ethutil" ) -var defaultAssetPath = path.Join(os.Getenv("GOPATH"), "src", "github.com", "ethereum", "go-ethereum", "cmd", "mist", "assets", "ext") - type testNativeObjectBinding struct { toVal func(interface{}) otto.Value } @@ -42,20 +38,15 @@ func TestExec(t *testing.T) { if !val.IsString() { t.Errorf("expected string value, got %v", val) } - - // this errors - err = jsre.Exec(path.Join(defaultAssetPath, "bignumber.min.js")) - if err != nil { - t.Errorf("expected no error, got %v", err) - } - _, err = jsre.Run("x = new BigNumber(123.4567);") - if err != nil { - t.Errorf("expected no error, got %v", err) + exp := "testMsg" + got, _ := val.ToString() + if exp != got { + t.Errorf("expected '%v', got '%v'", exp, got) } } func TestBind(t *testing.T) { - jsre := New(defaultAssetPath) + jsre := New("/tmp") jsre.Bind("no", &testNativeObjectBinding{jsre.ToVal}) @@ -70,16 +61,24 @@ func TestBind(t *testing.T) { t.Logf("no: %v", pp) } -func TestRequire(t *testing.T) { - jsre := New(defaultAssetPath) +func TestLoadScript(t *testing.T) { + jsre := New("/tmp") - _, err := jsre.Run("x = new BigNumber(123.4567);") - if err == nil { - t.Errorf("expected error, got nothing") - } - _, err = jsre.Run(`loadScript("bignumber.min.js"); x = new BigNumber(123.4567)`) + ethutil.WriteFile("/tmp/test.js", []byte(`msg = "testMsg"`)) + _, err := jsre.Run(`loadScript("test.js")`) if err != nil { t.Errorf("expected no error, got %v", err) } - + val, err := jsre.Run("msg") + if err != nil { + t.Errorf("expected no error, got %v", err) + } + if !val.IsString() { + t.Errorf("expected string value, got %v", val) + } + exp := "testMsg" + got, _ := val.ToString() + if exp != got { + t.Errorf("expected '%v', got '%v'", exp, got) + } }