Merge from TM

This commit is contained in:
Luke Wagner 2010-07-05 14:08:20 -07:00
commit 6a7978aebd
2 changed files with 68 additions and 0 deletions

View File

@ -49,6 +49,7 @@ PROGRAM = jsapi-tests$(BIN_SUFFIX)
CPPSRCS = \
tests.cpp \
selfTest.cpp \
testClassGetter.cpp \
testConservativeGC.cpp \
testContexts.cpp \
testDebugger.cpp \

View File

@ -0,0 +1,67 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: set ts=8 sw=4 et tw=99:
*
* Tests the JSClass::getProperty hook
*/
#include "tests.h"
int called_test_fn;
int called_test_prop_get;
static JSBool test_prop_get( JSContext *cx, JSObject *obj, jsid id, jsval *vp )
{
called_test_prop_get++;
return JS_TRUE;
}
static JSBool
PTest(JSContext* cx, JSObject* obj, uintN argc, jsval *argv, jsval* rval)
{
return JS_TRUE;
}
static JSClass ptestClass = {
"PTest",
JSCLASS_HAS_PRIVATE,
JS_PropertyStub, // add
JS_PropertyStub, // delete
test_prop_get, // get
JS_PropertyStub, // set
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
static JSBool test_fn(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{
called_test_fn++;
return JS_TRUE;
}
static JSFunctionSpec ptestFunctions[] = {
JS_FS( "test_fn", test_fn, 0, 0, 0 ),
JS_FS_END
};
BEGIN_TEST(testClassGetter_isCalled)
{
JSObject *my_proto;
my_proto = JS_InitClass(cx, JS_GetGlobalObject(cx), NULL, &ptestClass, PTest, 0,
NULL, ptestFunctions, NULL, NULL);
EXEC("function check() { var o = new PTest(); o.test_fn(); o.test_value1; o.test_value2; o.test_value1; }");
for (int i = 1; i < 9; i++) {
jsvalRoot rval(cx);
CHECK(JS_CallFunctionName(cx, global, "check", 0, NULL, rval.addr()));
CHECK_SAME(INT_TO_JSVAL(called_test_fn), INT_TO_JSVAL(i));
CHECK_SAME(INT_TO_JSVAL(called_test_prop_get), INT_TO_JSVAL(4 * i));
}
return true;
}
END_TEST(testClassGetter_isCalled)