diff -r 000000000000 -r 6474c204b198 js/src/jsapi-tests/testClassGetter.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jsapi-tests/testClassGetter.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,74 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ * vim: set ts=8 sts=4 et sw=4 tw=99:
+ *
+ * Tests the JSClass::getProperty hook
+ */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "jsapi-tests/tests.h"
+
+static int called_test_fn;
+static int called_test_prop_get;
+
+static bool test_prop_get( JSContext *cx, JS::HandleObject obj, JS::HandleId id, JS::MutableHandleValue vp )
+{
+    called_test_prop_get++;
+    return true;
+}
+
+static bool
+PTest(JSContext* cx, unsigned argc, jsval *vp);
+
+static const JSClass ptestClass = {
+    "PTest",
+    JSCLASS_HAS_PRIVATE,
+
+    JS_PropertyStub,       // add
+    JS_DeletePropertyStub, // delete
+    test_prop_get,         // get
+    JS_StrictPropertyStub, // set
+    JS_EnumerateStub,
+    JS_ResolveStub,
+    JS_ConvertStub
+};
+
+static bool
+PTest(JSContext* cx, unsigned argc, jsval *vp)
+{
+    JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
+    JSObject *obj = JS_NewObjectForConstructor(cx, &ptestClass, args);
+    if (!obj)
+        return false;
+    args.rval().setObject(*obj);
+    return true;
+}
+static bool test_fn(JSContext *cx, unsigned argc, jsval *vp)
+{
+    called_test_fn++;
+    return true;
+}
+
+static const JSFunctionSpec ptestFunctions[] = {
+    JS_FS( "test_fn", test_fn, 0, 0 ),
+    JS_FS_END
+};
+
+BEGIN_TEST(testClassGetter_isCalled)
+{
+    CHECK(JS_InitClass(cx, global, js::NullPtr(), &ptestClass, PTest, 0,
+                       nullptr, ptestFunctions, nullptr, nullptr));
+
+    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++) {
+        JS::RootedValue rval(cx);
+        CHECK(JS_CallFunctionName(cx, global, "check", JS::HandleValueArray::empty(),
+                                  &rval));
+        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)