Merge pull request #93 from php-java/fix/exception-handling

m3m0r7 · web-flow · commit e91092f58d61 · 2019-04-24T19:22:27.000+09:00
Handle the previous exception in UnableToCatchException
diff --git a/src/Kernel/Mnemonics/_invokestatic.php b/src/Kernel/Mnemonics/_invokestatic.php
@@ -89,10 +89,12 @@ public function execute(): void
             }
 
             throw new UnableToCatchException(
-                $expectedClass . ': ' . $e->getMessage()
+                $expectedClass . ': ' . $e->getMessage(),
+                0,
+                $e
             );
         }
-        
+
         if ($signature[0]['type'] !== 'void') {
             $this->pushToOperandStack($return);
         }
diff --git a/src/Kernel/Mnemonics/_invokevirtual.php b/src/Kernel/Mnemonics/_invokevirtual.php
@@ -82,7 +82,9 @@ public function execute(): void
             }
 
             throw new UnableToCatchException(
-                $expectedClass . ': ' . $e->getMessage()
+                $expectedClass . ': ' . $e->getMessage(),
+                0,
+                $e
             );
         }
 
diff --git a/tests/TryCatchTest.php b/tests/TryCatchTest.php
@@ -1,6 +1,8 @@
 <?php
 namespace PHPJava\Tests;
 
+use PHPJava\Exceptions\UnableToCatchException;
+use PHPJava\Packages\java\lang\IndexOutOfBoundsException;
 use PHPUnit\Framework\TestCase;
 
 class TryCatchTest extends Base
@@ -37,7 +39,7 @@ public function testPassthroughCatchStatement()
         );
     }
 
-    public function testImitationThroExceptionw()
+    public function testImitationThrowException()
     {
         $result = $this->initiatedJavaClasses['TryCatchTest']
             ->getInvoker()
@@ -50,4 +52,21 @@ public function testImitationThroExceptionw()
             $result
         );
     }
+
+    public function testImitationThrownExceptionHasPreviousException()
+    {
+        $this->expectException(IndexOutOfBoundsException::class);
+        $this->expectExceptionMessage('String index out of range: -1');
+
+        try {
+            $result = $this->initiatedJavaClasses['TryCatchTest']
+                ->getInvoker()
+                ->getStatic()
+                ->getMethods()
+                ->call('testImitationThrownExceptionHasPreviousException');
+        } catch (UnableToCatchException $e) {
+            // Unwrap the original exception
+            throw $e->getPrevious();
+        }
+    }
 }
diff --git a/tests/fixtures/java/TryCatchTest.java b/tests/fixtures/java/TryCatchTest.java
@@ -33,4 +33,9 @@ public static int testImitationThrowException()
 
         return 1;
     }
+
+    public static void testImitationThrownExceptionHasPreviousException()
+    {
+        "".charAt(-1);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,12 @@ public function execute(): void`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`throw new UnableToCatchException(`
`92`		`- $expectedClass . ': ' . $e->getMessage()`
	`92`	`+ $expectedClass . ': ' . $e->getMessage(),`
	`93`	`+ 0,`
	`94`	`+ $e`
`93`	`95`	`);`
`94`	`96`	`}`
`95`		`-`
	`97`	`+`
`96`	`98`	`if ($signature[0]['type'] !== 'void') {`
`97`	`99`	`$this->pushToOperandStack($return);`
`98`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ public function execute(): void`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`throw new UnableToCatchException(`
`85`		`- $expectedClass . ': ' . $e->getMessage()`
	`85`	`+ $expectedClass . ': ' . $e->getMessage(),`
	`86`	`+ 0,`
	`87`	`+ $e`
`86`	`88`	`);`
`87`	`89`	`}`
`88`	`90`
Original file line number	Diff line number	Diff line change
`@@ -33,4 +33,9 @@ public static int testImitationThrowException()`
`33`	`33`
`34`	`34`	`return 1;`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+ public static void testImitationThrownExceptionHasPreviousException()`
	`38`	`+ {`
	`39`	`+ "".charAt(-1);`
	`40`	`+ }`
`36`	`41`	`}`