tests/016-test.py tests/017-test.py tests/018-test.py tests/019-test.py tests/020-test.py tests/021-test.py tests/022-test.py tests/023-test.py tests/024-test.py tests/025-test.py tests/026-test.py tests/027-test.py tests/029-test.py tests/030-test.py tests/031-test.py tests/032-test.py tests/033-test.py @@ -60,7 +60,6 @@ Function_call(Function* self, PyObject* args, PyObject* kwargs) item = PySequence_GetItem(args, idx); if(item == NULL) { - fprintf(stderr, "Failed to get element.\n"); free(argv); return NULL; } @@ -68,7 +67,6 @@ Function_call(Function* self, PyObject* args, PyObject* kwargs) argv[idx] = py2js(self->obj.cx, item); if(argv[idx] == JSVAL_VOID) { - fprintf(stderr, "Failed to convert value.\n"); free(argv); return NULL; } @@ -79,7 +77,6 @@ Function_call(Function* self, PyObject* args, PyObject* kwargs) parent = JSVAL_TO_OBJECT(self->parent); if(!JS_CallFunctionValue(cx, parent, func, argc, argv, &rval)) { - fprintf(stderr, "Failed to call function\n"); free(argv); PyErr_SetString(PyExc_RuntimeError, "Failed to execute JS Function."); return NULL; spidermonkey/jsfunction.c @@ -75,7 +75,7 @@ js_get_prop(JSContext* jscx, JSObject* jsobj, jsval key, jsval* val) PyObject* pykey = NULL; PyObject* pyval = NULL; JSBool ret = JS_FALSE; - + pycx = (Context*) JS_GetContextPrivate(jscx); if(pycx == NULL) goto cleanup; @@ -85,15 +85,18 @@ js_get_prop(JSContext* jscx, JSObject* jsobj, jsval key, jsval* val) pykey = js2py(pycx, key); if(pykey == NULL) goto cleanup; - //pyval = PyObject_GetItem(pyobj, pykey); + pyval = PyObject_GetItem(pyobj, pykey); if(pyval == NULL) pyval = PyObject_GetAttr(pyobj, pykey); - if(pyval == NULL) goto cleanup; - - *val = py2js(pycx, pyval); - if(*val != JSVAL_VOID) + if(pyval != NULL) { - ret = JS_TRUE; + *val = py2js(pycx, pyval); } + else + { + *val = JSVAL_VOID; + } + + ret = JS_TRUE; cleanup: // No CX decref cause it's not incref'ed @@ -316,8 +319,6 @@ js_call(JSContext* jscx, JSObject* jsobj, uintN argc, jsval* argv, jsval* rval) PyObject* pyobj = NULL; PyObject* tpl = NULL; PyObject* ret = NULL; - JSFunction* jsfunc = NULL; - JSObject* wrapper = NULL; pycx = (Context*) JS_GetContextPrivate(jscx); if(pycx == NULL) spidermonkey/pyobject.c @@ -1,4 +1,4 @@ import t @t.rt("creating runtime") def test(rt): - t.neq(rt, None) + t.ne(rt, None) tests/001-test.py @@ -3,4 +3,4 @@ import t def test(cx): nan = cx.execute("NaN;") t.eq(type(nan), float) - t.neq(nan, nan) + t.ne(nan, nan) tests/011-test.py @@ -1,4 +1,6 @@ import t @t.cx("mapping equality") def test(cx): - t.eq(cx.execute('var f={"foo": "bar"}; f;'), {"foo": "bar"}) + js = 'var d = {0: 0, "a": 1, 2: "b", "c": "d", "blah": 2.5}; d;' + py = {0: 0, "a": 1, 2: "b", "c": "d", "blah": 2.5} + t.eq(cx.execute(js), py) tests/014-test.py @@ -1,29 +1,45 @@ import unittest import spidermonkey -class rt(object): +class test(object): def __init__(self, lbl): self.lbl = lbl def __call__(self, func): - def t(): - rt = spidermonkey.Runtime() - func(rt) - t.func_name = "test %s" % self.lbl - return t + def run(): + func(*self.args()) + run.func_name = "test %s" % self.lbl + return run + def args(self, func): + raise NotImplementedError() -class cx(object): - def __init__(self, lbl): - self.lbl = lbl - def __call__(self, func): - def t(): - rt = spidermonkey.Runtime() - cx = rt.new_context() - func(cx) - t.func_name = "test %s" % self.lbl - return t +class rt(test): + def args(self): + return (spidermonkey.Runtime(),) + +class cx(test): + def args(self): + rt = spidermonkey.Runtime() + return (rt.new_context(),) + +class echo(test): + def args(self): + rt = spidermonkey.Runtime() + cx = rt.new_context() + echo = cx.execute("var echo = function(foo) {return foo;}; echo;") + return (echo,) def eq(a, b): assert a == b, "%r != %r" % (a, b) -def neq(a, b): +def ne(a, b): assert a != b, "%r == %r" % (a, b) + +def raises(exctype, func, *args, **kwargs): + try: + func(*args, **kwargs) + except exctype, inst: + pass + else: + raise AssertionError("Function %s did not raise %s" % ( + func.func_name, exctype.__name__)) + tests/t.py old-t/bind_test.py old-t/context_test.py old-t/define_function_test.py old-t/error_test.py old-t/roundtrip_test.py old-t/to_python_test.py old-t/unicode_test.py e5aea5d107a18d51e2d849bd14215d36e7e18ca6 Paul Davis davisp@puny.(none) http://github.com/defunkt/python-spidermonkey/commit/48041223a48c4e2ea44127c36420017a8bca6cf1 48041223a48c4e2ea44127c36420017a8bca6cf1 2009-03-04T21:08:48-08:00 2009-03-04T21:08:48-08:00 Adding more testing awesomeness! Yay! Adding translations of old tests. The test numbering scheme is not going to work. Going to need to do subdirectories. f555380f2c52c4e467c456ca7e904e0d58ed6ac4 Paul Davis davisp@puny.(none)