wip

Author: ktoso

Sources/SwiftJava/JVM/JavaVirtualMachine.swift

@@ -190,8 +190,7 @@ extension JavaVirtualMachine {
 
     // If we failed to attach, report that.
     if let attachError = VMError(fromJNIError: attachResult) {
-      // throw attachError
-      fatalError("JVM Error: \(attachError)")
+      fatalError("JVM attach error: \(attachError)")
     }
 
     JavaVirtualMachine.destroyTLS.set(jniEnv!)

Tests/SwiftJavaToolLibTests/CompileJavaWrapTools.swift

@@ -98,6 +98,8 @@ func assertWrapJavaOutput(
     classpath: classpath.map(\.path),
     replace: false
   )
+
+  defer { try! jvm.destroyJVM() } // if this fails, we're kinda domed anyway, so allow the try!
 
   var config = Configuration()
   config.minimumInputAccessLevelMode = .package

Tests/SwiftJavaToolLibTests/WrapJavaTests.swift

@@ -49,54 +49,49 @@ class WrapJavaTests: XCTestCase {
   }
 
   func testWrapJavaGenericMethod_singleGeneric() async throws {
-    do {
-      let classpathURL = try await compileJava(
-        """
-        package com.example;
+    let classpathURL = try await compileJava(
+      """
+      package com.example;
 
-        class Item<T> { 
-          final T value;
-          Item(T item) {
-            this.value = item;
-          }
+      class Item<T> { 
+        final T value;
+        Item(T item) {
+          this.value = item;
         }
-        class Pair<First, Second> { }
+      }
+      class Pair<First, Second> { }
 
-        class ExampleSimpleClass {
-          <KeyType> KeyType getGeneric(Item<KeyType> key) { return null; }
-        }
-        """)
+      class ExampleSimpleClass {
+        <KeyType> KeyType getGeneric(Item<KeyType> key) { return null; }
+      }
+      """)
 
-      try assertWrapJavaOutput(
-        javaClassNames: [
-          "com.example.Item",
-          "com.example.Pair",
-          "com.example.ExampleSimpleClass"
-        ],
-        classpath: [classpathURL],
-        expectedChunks: [
-          """
-          import CSwiftJavaJNI
-          import SwiftJava
-          """,
-          """
-          @JavaClass("com.example.ExampleSimpleClass")
-          open class ExampleSimpleClass: JavaObject {
-          """,
-          """
-          @JavaClass("com.example.ExampleSimpleClass")
-          open class ExampleSimpleClass: JavaObject {
-          """,
-          """
-          @JavaMethod
-          open func getGeneric<KeyType: AnyJavaObject>(_ arg0: Item<KeyType>?) -> KeyType {
-          """,
-        ]
-      )
-    } catch let error as Throwable { 
-      error.printStackTrace()
-      XCTFail("error: \(error)")
-    }
+    try assertWrapJavaOutput(
+      javaClassNames: [
+        "com.example.Item",
+        "com.example.Pair",
+        "com.example.ExampleSimpleClass"
+      ],
+      classpath: [classpathURL],
+      expectedChunks: [
+        """
+        import CSwiftJavaJNI
+        import SwiftJava
+        """,
+        """
+        @JavaClass("com.example.ExampleSimpleClass")
+        open class ExampleSimpleClass: JavaObject {
+        """,
+        """
+        @JavaClass("com.example.ExampleSimpleClass")
+        open class ExampleSimpleClass: JavaObject {
+        """,
+        """
+        @JavaMethod
+        open func getGeneric<KeyType: AnyJavaObject>(_ arg0: Item<KeyType>?) -> KeyType {
+        """,
+      ]
+    )
   }
 
   // This is just a warning in Java, but a hard error in Swift, so we must 'prune' generic params