mguay22
diff --git a/‎test/Test$StaticEnum.class‎
0 Bytes b/‎test/Test$StaticEnum.class‎
0 Bytes
diff --git a/‎test/Test$SubClass.class‎
0 Bytes b/‎test/Test$SubClass.class‎
0 Bytes
diff --git a/‎test/Test$SuperClass.class‎
0 Bytes b/‎test/Test$SuperClass.class‎
0 Bytes
diff --git a/‎test/Test.class‎
228 Bytes b/‎test/Test.class‎
228 Bytes
diff --git a/‎test/Test.java‎
Lines changed: 2 additions & 0 deletions b/‎test/Test.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎test/java-callStaticMethod-test.js‎
Lines changed: 67 additions & 5 deletions b/‎test/java-callStaticMethod-test.js‎
Lines changed: 67 additions & 5 deletions
@@ -19,6 +19,8 @@ public Test() {}
   public static int staticMethod(int i) { return i + 1; }
   public static void staticMethodThrows(Exception ex) throws Exception { throw ex; }
   public void methodThrows(Exception ex) throws Exception { throw ex; }
+  public static void staticMethodThrowsNewException() throws Exception { throw new Exception("my exception"); }
+  public void methodThrowsNewException() throws Exception { throw new Exception("my exception"); }
 
   public static int staticMethodOverload(String a) { return 1; }
   public static int staticMethodOverload(int a) { return 2; }
 
@@ -106,18 +106,21 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     test.done();
   },
 
-  "callStaticMethod exception thrown from method": function(test) {
+  "callStaticMethod exception thrown from method (sync)": function(test) {
     var ex = java.newInstanceSync("java.lang.Exception", "my exception");
-    java.callStaticMethod("Test", "staticMethodThrows", ex, function(err, result) {
+    var result;
+    try {
+      result = java.callStaticMethodSync("Test", "staticMethodThrows", ex);
+    } catch (err) {
       test.ok(err);
       test.equals('my exception', err.cause.getMessageSync());
       test.ok(err.toString().match(/my exception/));
       test.ok(!result);
       test.done();
-    });
+    }
   },
 
-  "callStaticMethodSync exception thrown from method": function(test) {
+  "staticMethodThrows exception thrown from method (sync)": function(test) {
     var ex = java.newInstanceSync("java.lang.Exception", "my exception");
     try {
       java.callStaticMethodSync("Test", "staticMethodThrows", ex);
@@ -128,7 +131,38 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     test.done();
   },
 
-  "callMethodSync exception thrown from method": function(test) {
+  "staticMethodThrows 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.equals('my exception', err.cause.getMessageSync());
+      test.ok(err.toString().match(/my exception/));
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "staticMethodThrowsNewException exception thrown from method (sync)": function(test) {
+    try {
+      java.callStaticMethodSync("Test", "staticMethodThrowsNewException");
+      test.fail("should throw");
+    } catch (err) {
+      test.ok(err.toString().match(/my exception/));
+    }
+    test.done();
+  },
+
+  "staticMethodThrowsNewException exception thrown from method": function(test) {
+    java.callStaticMethod("Test", "staticMethodThrowsNewException", function(err, result) {
+      test.ok(err);
+      test.equals('my exception', err.cause.getMessageSync());
+      test.ok(err.toString().match(/my exception/));
+      test.ok(!result);
+      test.done();
+    });
+  },
+
+  "methodThrows exception thrown from method (sync)": function(test) {
     var ex = java.newInstanceSync("java.lang.Exception", "my exception");
     var myTest = java.newInstanceSync("Test");
     try {
@@ -140,6 +174,34 @@ exports['Java - Call Static Method'] = nodeunit.testCase({
     test.done();
   },
 
+  "methodThrows exception thrown from method": function(test) {
+    var ex = java.newInstanceSync("java.lang.Exception", "my exception");
+    var myTest = java.newInstanceSync("Test");
+    return myTest.methodThrows(ex, function(err) {
+      test.ok(err.toString().match(/my exception/));
+      test.done();
+    });
+  },
+
+  "methodThrowsNewException exception thrown from method (sync)": function(test) {
+    var myTest = java.newInstanceSync("Test");
+    try {
+      myTest.methodThrowsNewExceptionSync();
+      test.fail("should throw");
+    } catch (err) {
+      test.ok(err.toString().match(/my exception/));
+    }
+    test.done();
+  },
+
+  "methodThrowsNewException exception thrown from method": function(test) {
+    var myTest = java.newInstanceSync("Test");
+    return myTest.methodThrowsNewException(function(err) {
+      test.ok(err.toString().match(/my exception/));
+      test.done();
+    });
+  },
+
   "char array": function(test) {
     var charArray = java.newArray("char", "hello world\n".split(''));
     java.callStaticMethod("Test", "staticMethodCharArrayToString", charArray, function(err, result) {