fix tets

Author: madsodgaard

Sources/JExtractSwiftLib/ImportedDecls.swift

@@ -38,8 +38,8 @@ package class ImportedNominalType: ImportedDecl {
 
   init(swiftNominal: SwiftNominalTypeDeclaration, lookupContext: SwiftTypeLookupContext) throws {
     self.swiftNominal = swiftNominal
-    self.inheritedTypes = try swiftNominal.inheritanceTypes?.compactMap {
-      try SwiftType($0.type, lookupContext: lookupContext)
+    self.inheritedTypes = swiftNominal.inheritanceTypes?.compactMap {
+      try? SwiftType($0.type, lookupContext: lookupContext)
     } ?? []
   }
 

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -256,7 +256,10 @@ extension JNISwift2JavaGenerator {
       printer.print("@ThreadSafe // Sendable")
     }
     var implements = ["JNISwiftInstance"]
-    implements += decl.inheritedTypes.compactMap(\.asNominalTypeDeclaration).filter { $0.kind == .protocol }.map(\.name)
+    implements += decl.inheritedTypes
+      .compactMap(\.asNominalTypeDeclaration)
+      .filter { $0.kind == .protocol }
+      .map(\.name)
     let implementsClause = implements.joined(separator: ", ")
     printer.printBraceBlock("public final class \(decl.swiftNominal.name) implements \(implementsClause)") { printer in
       body(&printer)
@@ -428,11 +431,11 @@ extension JNISwift2JavaGenerator {
     var parameters = translatedDecl.translatedFunctionSignature.parameters.map { $0.parameter.renderParameter() }
     let throwsClause = translatedDecl.isThrowing ? " throws Exception" : ""
 
-    let generics = translatedDecl.translatedFunctionSignature.parameters.reduce(into: [String: [JavaType]]()) { generics, parameter in
+    let generics = translatedDecl.translatedFunctionSignature.parameters.reduce(into: [(String, [JavaType])]()) { generics, parameter in
       guard case .generic(let name, let extends) = parameter.parameter.type else {
         return
       }
-      generics[name] = extends
+      generics.append((name, extends))
     }
       .map { "\($0) extends \($1.compactMap(\.className).joined(separator: " & "))" }
       .joined(separator: ", ")

Tests/JExtractSwiftTests/JNI/JNIClassTests.swift

@@ -55,9 +55,12 @@ struct JNIClassTests {
 
         import org.swift.swiftkit.core.*;
         import org.swift.swiftkit.core.util.*;
+        import java.util.*;
+        import java.util.concurrent.atomic.AtomicBoolean;
+        import org.swift.swiftkit.core.annotations.*;
         """,
         """
-        public final class MyClass extends JNISwiftInstance {
+        public final class MyClass implements JNISwiftInstance {
           static final String LIB_NAME = "SwiftModule";
 
           @SuppressWarnings("unused")
@@ -68,9 +71,21 @@ struct JNIClassTests {
           }
         """,
         """
-          private MyClass(long selfPointer, SwiftArena swiftArena) {
-            super(selfPointer, swiftArena);
-          }
+        private final long selfPointer;
+        """,
+        """
+        public long $memoryAddress() {
+          return this.selfPointer;
+        }
+        """,
+        """
+        private MyClass(long selfPointer, SwiftArena swiftArena) {
+          SwiftObjects.requireNonZero(selfPointer, "selfPointer");
+          this.selfPointer = selfPointer;
+        
+          // Only register once we have fully initialized the object since this will need the object pointer.
+          swiftArena.register(this);
+        }
         """,
         """
         public static MyClass wrapMemoryAddressUnsafe(long selfPointer, SwiftArena swiftArena) {
@@ -92,7 +107,7 @@ struct JNIClassTests {
       expectedChunks: [
         """
         @Override
-        protected Runnable $createDestroyFunction() {
+        public Runnable $createDestroyFunction() {
           long self$ = this.$memoryAddress();
           if (CallTraces.TRACE_DOWNCALLS) {
             CallTraces.traceDowncall("MyClass.$createDestroyFunction",

Tests/JExtractSwiftTests/JNI/JNIEnumTests.swift

@@ -39,9 +39,12 @@ struct JNIEnumTests {
 
         import org.swift.swiftkit.core.*;
         import org.swift.swiftkit.core.util.*;
+        import java.util.*;
+        import java.util.concurrent.atomic.AtomicBoolean;
+        import org.swift.swiftkit.core.annotations.*;
         """,
         """
-        public final class MyEnum extends JNISwiftInstance {
+        public final class MyEnum implements JNISwiftInstance {
           static final String LIB_NAME = "SwiftModule";
 
           @SuppressWarnings("unused")
@@ -53,7 +56,19 @@ struct JNIEnumTests {
         """,
         """
         private MyEnum(long selfPointer, SwiftArena swiftArena) {
-          super(selfPointer, swiftArena);
+          SwiftObjects.requireNonZero(selfPointer, "selfPointer");
+          this.selfPointer = selfPointer;
+        
+          // Only register once we have fully initialized the object since this will need the object pointer.
+          swiftArena.register(this);
+        }
+        """,
+        """
+        private final long selfPointer;
+        """,
+        """
+        public long $memoryAddress() {
+          return this.selfPointer;
         }
         """,
         """
@@ -66,7 +81,7 @@ struct JNIEnumTests {
         """,
         """
         @Override
-        protected Runnable $createDestroyFunction() {
+        public Runnable $createDestroyFunction() {
         long self$ = this.$memoryAddress();
         if (CallTraces.TRACE_DOWNCALLS) {
           CallTraces.traceDowncall("MyEnum.$createDestroyFunction",

Tests/JExtractSwiftTests/JNI/JNIModuleTests.swift

@@ -46,6 +46,7 @@ struct JNIModuleTests {
       import org.swift.swiftkit.core.*;
       import org.swift.swiftkit.core.util.*;
       import java.util.*;
+      import java.util.concurrent.atomic.AtomicBoolean;
       import org.swift.swiftkit.core.annotations.*;
 
       public final class SwiftModule {

Tests/JExtractSwiftTests/JNI/JNIOptionalTests.swift

@@ -127,12 +127,12 @@ struct JNIOptionalTests {
             result$ = innerResult$.getJNIValue(in: environment!) 
             var flag$ = Int8(1)
             environment.interface.SetByteArrayRegion(environment, result_discriminator$, 0, 1, &flag$)
-          } // render(_:_:) @ JExtractSwiftLib/JNISwift2JavaGenerator+NativeTranslation.swift:649
+          }
           else {
             result$ = String.jniPlaceholderValue
             var flag$ = Int8(0)
             environment.interface.SetByteArrayRegion(environment, result_discriminator$, 0, 1, &flag$)
-          } // render(_:_:) @ JExtractSwiftLib/JNISwift2JavaGenerator+NativeTranslation.swift:659
+          }
           return result$
         }
         """
@@ -190,12 +190,12 @@ struct JNIOptionalTests {
             result$ = _resultBits$.getJNIValue(in: environment!) 
             var flag$ = Int8(1)
             environment.interface.SetByteArrayRegion(environment, result_discriminator$, 0, 1, &flag$)
-          } // render(_:_:) @ JExtractSwiftLib/JNISwift2JavaGenerator+NativeTranslation.swift:649
+          }
           else {
             result$ = 0
             var flag$ = Int8(0)
             environment.interface.SetByteArrayRegion(environment, result_discriminator$, 0, 1, &flag$)
-          } // render(_:_:) @ JExtractSwiftLib/JNISwift2JavaGenerator+NativeTranslation.swift:659
+          }
           return result$
         }
         """
@@ -243,7 +243,7 @@ struct JNIOptionalTests {
         func Java_com_example_swift_SwiftModule__00024optionalJavaKitClass__Ljava_lang_Long_2(environment: UnsafeMutablePointer<JNIEnv?>!, thisClass: jclass, arg: jobject?) {
           SwiftModule.optionalJavaKitClass(arg.map {
             return JavaLong(javaThis: $0, environment: environment!)
-          } // render(_:_:) @ JExtractSwiftLib/JNISwift2JavaGenerator+NativeTranslation.swift:691
+          }
           )
         }
         """