fix tests

Author: madsodgaard

Samples/JExtractJNISampleApp/src/test/java/com/example/swift/MySwiftClassTest.java

@@ -14,24 +14,25 @@
 
 package com.example.swift;
 
-import com.example.swift.MySwiftLibrary;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.swift.swiftkit.core.ConfinedSwiftMemorySession;
 
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MySwiftClassTest {
     @Test
     void init_noParameters() {
-        MySwiftClass c = MySwiftClass.init();
-        assertNotNull(c);
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(arena);
+            assertNotNull(c);
+        }
     }
 
     @Test
     void init_withParameters() {
-        MySwiftClass c = MySwiftClass.init(1337, 42);
-        assertNotNull(c);
+        try (var arena = new ConfinedSwiftMemorySession(Thread.currentThread())) {
+            MySwiftClass c = MySwiftClass.init(1337, 42, arena);
+            assertNotNull(c);
+        }
     }
-
 }

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+SwiftThunkPrinting.swift

@@ -213,10 +213,10 @@ extension JNISwift2JavaGenerator {
     let cName =
       "Java_"
       + self.javaPackage.replacingOccurrences(of: ".", with: "_")
-      + "_\(parentName.nativeJNIEscaped)_"
-      + javaMethodName.nativeJNIEscaped
+      + "_\(parentName.escapedJNIIdentifier)_"
+      + javaMethodName.escapedJNIIdentifier
       + "__"
-      + jniSignature.nativeJNIEscaped
+      + jniSignature.escapedJNIIdentifier
 
     let translatedParameters = parameters.map {
       "\($0.name): \($0.type.jniTypeName)"
@@ -294,7 +294,7 @@ extension JNISwift2JavaGenerator {
 
 extension String {
   /// Returns a version of the string correctly escaped for a JNI
-  var nativeJNIEscaped: String {
+  var escapedJNIIdentifier: String {
     self.map {
       if $0 == "_" {
         return "_1"

Tests/JExtractSwiftTests/JNI/JNIClassTests.swift

@@ -44,8 +44,11 @@ struct JNIClassTests {
       // Swift module: SwiftModule
 
       package com.example.swift;
+      
+      import org.swift.swiftkit.core.*;
+      import org.swift.swiftkit.core.util.*;
 
-      public final class MyClass {
+      public final class MyClass extends JNISwiftInstance {
         static final String LIB_NAME = "SwiftModule";
       
         @SuppressWarnings("unused")
@@ -55,12 +58,25 @@ struct JNIClassTests {
           return true;
         }
       
-        private long selfPointer;
-      
-        private MyClass(long selfPointer) {
-          this.selfPointer = selfPointer;
+        public MyClass(long selfPointer, SwiftArena swiftArena) {
+          super(selfPointer, swiftArena);
         }
       """,
+      """
+      private static native void $destroy(long selfPointer);
+      """,
+      """
+      @Override
+      protected Runnable $createDestroyFunction() {
+        long $selfPointer = this.pointer(); 
+        return new Runnable() {
+          @Override
+          public void run() {
+            MyClass.$destroy($selfPointer);
+          }
+        };
+      }
+      """
     ])
   }
 
@@ -116,9 +132,9 @@ struct JNIClassTests {
           * public init(x: Int64, y: Int64)
           * }
           */
-        public static MyClass init(long x, long y) {
+        public static MyClass init(long x, long y, SwiftArena swiftArena$) {
           long selfPointer = MyClass.allocatingInit(x, y);
-          return new MyClass(selfPointer);
+          return new MyClass(selfPointer, swiftArena$);
         }
         """,
         """
@@ -128,9 +144,9 @@ struct JNIClassTests {
           * public init()
           * }
           */
-        public static MyClass init() {
+        public static MyClass init(SwiftArena swiftArena$) {
           long selfPointer = MyClass.allocatingInit();
-          return new MyClass(selfPointer);
+          return new MyClass(selfPointer, swiftArena$);
         }
         """,
         """
@@ -170,4 +186,24 @@ struct JNIClassTests {
       ]
     )
   }
+
+  @Test
+  func destroyFunction_swiftThunks() throws {
+    try assertOutput(
+      input: source,
+      .jni,
+      .swift,
+      detectChunkByInitialLines: 1,
+      expectedChunks: [
+        """
+        @_cdecl("Java_com_example_swift_MyClass__00024destroy__J")
+        func Java_com_example_swift_MyClass__00024destroy__J(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, selfPointer: jlong) {
+          let pointer = UnsafeMutablePointer<MyClass>(bitPattern: Int(Int64(fromJNI: selfPointer, in: environment!)))!
+          pointer.deinitialize(count: 1)
+          pointer.deallocate()
+        }
+        """
+      ]
+    )
+  }
 }