added unit test for instanceOf and updated readme

joeferner · joeferner · commit 59d0c427af33 · 2013-11-11T20:31:59.000-05:00
diff --git a/README.md b/README.md
@@ -121,6 +121,7 @@ try {
  * [options](#javaOptions)
  * [import](#javaImport)
  * [newInstance](#javaNewInstance)
+ * [instanceOf](#javaInstanceOf)
  * [callStaticMethod](#javaCallStaticMethod)
  * [getStaticFieldValue](#javaGetStaticFieldValue)
  * [setStaticFieldValue](#javaSetStaticFieldValue)
@@ -203,6 +204,24 @@ __Example__
       // new list
     });
 
+<a name="javaInstanceOf" />
+**java.instanceOf(javaObject, className)**
+
+Determines of a javaObject is an instance of a class.
+
+__Arguments__
+
+ * javaObject - Instance of a java object returned from a method or from newInstance.
+ * className - A string class name.
+
+__Example__
+
+    var obj = java.newInstanceSync("my.package.SubClass");
+
+    if(java.instanceOf(obj, "my.package.SuperClass")) {
+      console.log("obj is an instance of SuperClass");
+    }
+
 <a name="javaCallStaticMethod" />
 **java.callStaticMethod(className, methodName, [args...], callback)**
 
diff --git a/src/java.cpp b/src/java.cpp
@@ -58,7 +58,7 @@ long my_getThreadId() {
   NODE_SET_PROTOTYPE_METHOD(s_ct, "newFloat", newFloat);
   NODE_SET_PROTOTYPE_METHOD(s_ct, "getStaticFieldValue", getStaticFieldValue);
   NODE_SET_PROTOTYPE_METHOD(s_ct, "setStaticFieldValue", setStaticFieldValue);
-  NODE_SET_PROTOTYPE_METHOD(s_ct, "instanceof", instanceof);
+  NODE_SET_PROTOTYPE_METHOD(s_ct, "instanceOf", instanceOf);
 
   target->Set(v8::String::NewSymbol("Java"), s_ct->GetFunction());
 }
@@ -823,7 +823,7 @@ void Java::destroyJVM(JavaVM** jvm, JNIEnv** env) {
   return v8::Undefined();
 }
 
-/*static*/ v8::Handle<v8::Value> Java::instanceof(const v8::Arguments& args) {
+/*static*/ v8::Handle<v8::Value> Java::instanceOf(const v8::Arguments& args) {
   v8::HandleScope scope;
   Java* self = node::ObjectWrap::Unwrap<Java>(args.This());
   v8::Handle<v8::Value> ensureJvmResults = self->ensureJvm();
diff --git a/src/java.h b/src/java.h
@@ -36,7 +36,7 @@ class Java : public node::ObjectWrap {
   static v8::Handle<v8::Value> newFloat(const v8::Arguments& args);
   static v8::Handle<v8::Value> getStaticFieldValue(const v8::Arguments& args);
   static v8::Handle<v8::Value> setStaticFieldValue(const v8::Arguments& args);
-  static v8::Handle<v8::Value> instanceof(const v8::Arguments& args);
+  static v8::Handle<v8::Value> instanceOf(const v8::Arguments& args);
   static v8::Handle<v8::Value> AccessorProhibitsOverwritingGetter(v8::Local<v8::String> name, const v8::AccessorInfo &info);
   static void AccessorProhibitsOverwritingSetter(v8::Local<v8::String> property, v8::Local<v8::Value> value, const v8::AccessorInfo &info);
   v8::Handle<v8::Value> ensureJvm();
diff --git a/test/simple-test.js b/test/simple-test.js
@@ -260,6 +260,14 @@ exports['Simple'] = nodeunit.testCase({
     test.equal(r[0], 1);
     test.equal(r[1], 2);
     test.done();
+  },
+
+  "instanceof test": function(test) {
+    var subclass = java.newInstanceSync("Test$SubClass");
+    if(!java.instanceOf(subclass, "Test$SuperClass")) {
+      test.fail(subclass.getNameSync() + " should be an instance of Test$SuperClass");
+    }
+    test.done();
   }
 
 });
