added tests for static method calls

joeferner · joeferner · commit 78f857bf2501 · 2012-01-22T00:29:25.000-05:00
diff --git a/src/methodCallBaton.cpp b/src/methodCallBaton.cpp
@@ -151,12 +151,16 @@ void StaticMethodCallBaton::execute(JNIEnv *env) {
 
   m_resultType = javaGetType(env, returnType);
   jobject result = env->CallObjectMethod(m_method, method_invoke, NULL, m_args);
-  m_result = env->NewGlobalRef(result);
+
   jthrowable err = env->ExceptionOccurred();
   if(err) {
     m_error = (jthrowable)env->NewGlobalRef(err);
     m_errorString = "Error running static method";
+    env->ExceptionClear();
+    return;
   }
+
+  m_result = env->NewGlobalRef(result);
 }
 
 void InstanceMethodCallBaton::execute(JNIEnv *env) {
@@ -176,12 +180,16 @@ void InstanceMethodCallBaton::execute(JNIEnv *env) {
 
   m_resultType = javaGetType(env, returnType);
   jobject result = env->CallObjectMethod(m_method, method_invoke, m_javaObject->getObject(), m_args);
-  m_result = env->NewGlobalRef(result);
+
   jthrowable err = env->ExceptionOccurred();
   if(err) {
     m_error = (jthrowable)env->NewGlobalRef(err);
     m_errorString = "Error running instance method";
+    env->ExceptionClear();
+    return;
   }
+
+  m_result = env->NewGlobalRef(result);
 }
 
 NewInstanceBaton::NewInstanceBaton(
diff --git a/test/Test.class b/test/Test.class
diff --git a/test/Test.java b/test/Test.java
@@ -6,4 +6,8 @@ public Test() {}
   public Test(int i) { this.i = i; }
   
   public int getInt() { return i; }
+  
+  public static String staticMethod() { return "staticMethod called"; }
+  public static int staticMethod(int i) { return i + 1; }
+  public static void staticMethodThrows(Exception ex) throws Exception { throw ex; }
 }
diff --git a/test/java-callStaticMethod-test.js b/test/java-callStaticMethod-test.js
@@ -0,0 +1,103 @@
+
+var java = require("./testHelpers").java;
+
+var nodeunit = require("nodeunit");
+var util = require("util");
+
+exports['Java - Call Static Method'] = nodeunit.testCase({
+  "callStaticMethod": function(test) {
+    java.callStaticMethod("Test", "staticMethod", function(err, result) {
+      test.ok(result);
+      test.equal(result, "staticMethod called");
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync": function(test) {
+    var result = java.callStaticMethodSync("Test", "staticMethod");
+    test.ok(result);
+    test.equal(result, "staticMethod called");
+    test.done();
+  },
+
+  "callStaticMethod with args": function(test) {
+    java.callStaticMethod("Test", "staticMethod", 42, function(err, result) {
+      test.ok(result);
+      test.equal(result, 43);
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync with args": function(test) {
+    var result = java.callStaticMethodSync("Test", "staticMethod", 42);
+    test.ok(result);
+    test.equal(result, 43);
+    test.done();
+  },
+
+  "callStaticMethod bad class name": function(test) {
+    java.callStaticMethod("BadClassName", "staticMethod", function(err, result) {
+      test.ok(err);
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync bad class name": function(test) {
+    test.throws(function() {
+      java.callStaticMethodSync("BadClassName", "staticMethod");
+    });
+    test.done();
+  },
+
+  "callStaticMethod bad arg types": function(test) {
+    java.callStaticMethod("Test", "staticMethod", "z", function(err, result) {
+      test.ok(err);
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync bad arg types": function(test) {
+    test.throws(function() {
+      java.callStaticMethodSync("Test", "staticMethod", "z");
+    });
+    test.done();
+  },
+  
+  "callStaticMethod bad number of args": function(test) {
+    java.callStaticMethod("Test", "staticMethod", 42, "z", function(err, result) {
+      test.ok(err);
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync bad number of args": function(test) {
+    test.throws(function() {
+      java.callStaticMethodSync("Test", "staticMethod", 42, "z");
+    });
+    test.done();
+  },
+  
+  "callStaticMethod exception thrown from method": function(test) {
+    var ex = java.newInstanceSync("java.lang.Exception", "my exception");
+    java.callStaticMethod("Test", "staticMethodThrows", ex, function(err, result) {
+      test.ok(err);
+      test.ok(err.toString().match(/my exception/));
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "callStaticMethodSync exception thrown from method": function(test) {
+    var ex = java.newInstanceSync("java.lang.Exception", "my exception");
+    try {
+      java.callStaticMethodSync("Test", "staticMethodThrows", ex);
+      test.fail("should throw");
+    } catch(err) {
+      test.ok(err.toString().match(/my exception/));
+    }
+    test.done();
+  },
+});

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,8 @@ public Test() {}`
`6`	`6`	`public Test(int i) { this.i = i; }`
`7`	`7`
`8`	`8`	`public int getInt() { return i; }`
	`9`	`+`
	`10`	`+ public static String staticMethod() { return "staticMethod called"; }`
	`11`	`+ public static int staticMethod(int i) { return i + 1; }`
	`12`	`+ public static void staticMethodThrows(Exception ex) throws Exception { throw ex; }`
`9`	`13`	`}`