fix tests and decl documentation

madsodgaard · madsodgaard · commit 7bd0ef65ade0 · 2025-08-12T13:32:38.000+02:00
diff --git a/Samples/JExtractJNISampleApp/src/test/java/com/example/swift/AlignmentEnumTest.java b/Samples/JExtractJNISampleApp/src/test/java/com/example/swift/AlignmentEnumTest.java
@@ -16,6 +16,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.swift.swiftkit.core.ConfinedSwiftMemorySession;
+import org.swift.swiftkit.core.SwiftArena;
 
 import java.util.Optional;
 
@@ -24,7 +25,7 @@
 public class AlignmentEnumTest {
     @Test
     void rawValue() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Optional<Alignment> invalid = Alignment.init("invalid", arena);
             assertFalse(invalid.isPresent());
 
diff --git a/Samples/JExtractJNISampleApp/src/test/java/com/example/swift/VehicleEnumTest.java b/Samples/JExtractJNISampleApp/src/test/java/com/example/swift/VehicleEnumTest.java
@@ -16,7 +16,9 @@
 
 import org.junit.jupiter.api.Test;
 import org.swift.swiftkit.core.ConfinedSwiftMemorySession;
+import org.swift.swiftkit.core.SwiftArena;
 
+import java.lang.foreign.Arena;
 import java.util.Optional;
 import java.util.OptionalInt;
 
@@ -25,31 +27,31 @@
 public class VehicleEnumTest {
     @Test
     void bicycle() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.bicycle(arena);
             assertNotNull(vehicle);
         }
     }
 
     @Test
     void car() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.car("Porsche 911", Optional.empty(), arena);
             assertNotNull(vehicle);
         }
     }
 
     @Test
     void motorbike() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.motorbike("Yamaha", 750, OptionalInt.empty(), arena);
             assertNotNull(vehicle);
         }
     }
 
     @Test
     void initName() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             assertFalse(Vehicle.init("bus", arena).isPresent());
             Optional<Vehicle> vehicle = Vehicle.init("car", arena);
             assertTrue(vehicle.isPresent());
@@ -59,15 +61,15 @@ void initName() {
 
     @Test
     void nameProperty() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.bicycle(arena);
             assertEquals("bicycle", vehicle.getName());
         }
     }
 
     @Test
     void isFasterThan() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle bicycle = Vehicle.bicycle(arena);
             Vehicle car = Vehicle.car("Porsche 911", Optional.empty(), arena);
             assertFalse(bicycle.isFasterThan(car));
@@ -77,7 +79,7 @@ void isFasterThan() {
 
     @Test
     void upgrade() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.bicycle(arena);
             assertEquals("bicycle", vehicle.getName());
             vehicle.upgrade();
@@ -89,7 +91,7 @@ void upgrade() {
 
     @Test
     void getAsBicycle() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.bicycle(arena);
             Vehicle.Bicycle bicycle = vehicle.getAsBicycle().orElseThrow();
             assertNotNull(bicycle);
@@ -98,7 +100,7 @@ void getAsBicycle() {
 
     @Test
     void getAsCar() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.car("BMW", Optional.empty(), arena);
             Vehicle.Car car = vehicle.getAsCar().orElseThrow();
             assertEquals("BMW", car.arg0());
@@ -111,7 +113,7 @@ void getAsCar() {
 
     @Test
     void getAsMotorbike() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.motorbike("Yamaha", 750, OptionalInt.empty(), arena);
             Vehicle.Motorbike motorbike = vehicle.getAsMotorbike().orElseThrow();
             assertEquals("Yamaha", motorbike.arg0());
@@ -126,7 +128,7 @@ void getAsMotorbike() {
 
     @Test
     void getAsTransformer() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.transformer(Vehicle.bicycle(arena), Vehicle.car("BMW", Optional.empty(), arena), arena);
             Vehicle.Transformer transformer = vehicle.getAsTransformer(arena).orElseThrow();
             assertTrue(transformer.front().getAsBicycle().isPresent());
@@ -136,7 +138,7 @@ void getAsTransformer() {
 
     @Test
     void getAsBoat() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.boat(OptionalInt.of(10), Optional.of((short) 1), arena);
             Vehicle.Boat boat = vehicle.getAsBoat().orElseThrow();
             assertEquals(OptionalInt.of(10), boat.passengers());
@@ -146,7 +148,7 @@ void getAsBoat() {
 
     @Test
     void associatedValuesAreCopied() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.car("BMW", Optional.empty(), arena);
             Vehicle.Car car = vehicle.getAsCar().orElseThrow();
             assertEquals("BMW", car.arg0());
@@ -160,7 +162,7 @@ void associatedValuesAreCopied() {
 
     @Test
     void getDiscriminator() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             assertEquals(Vehicle.Discriminator.BICYCLE, Vehicle.bicycle(arena).getDiscriminator());
             assertEquals(Vehicle.Discriminator.CAR, Vehicle.car("BMW", Optional.empty(), arena).getDiscriminator());
             assertEquals(Vehicle.Discriminator.MOTORBIKE, Vehicle.motorbike("Yamaha", 750, OptionalInt.empty(), arena).getDiscriminator());
@@ -170,7 +172,7 @@ void getDiscriminator() {
 
     @Test
     void getCase() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.bicycle(arena);
             Vehicle.Case caseElement = vehicle.getCase(arena);
             assertInstanceOf(Vehicle.Bicycle.class, caseElement);
@@ -179,7 +181,7 @@ void getCase() {
 
     @Test
     void switchGetCase() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
+        try (var arena = SwiftArena.ofConfined()) {
             Vehicle vehicle = Vehicle.car("BMW", Optional.empty(), arena);
             switch (vehicle.getCase(arena)) {
                 case Vehicle.Bicycle b:
diff --git a/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift b/Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift
@@ -349,22 +349,24 @@ extension JNISwift2JavaGenerator {
     guard let translatedDecl = translatedDecl(for: decl) else {
       fatalError("Decl was not translated, \(decl)")
     }
-    printJavaBindingWrapperMethod(&printer, translatedDecl)
+    printJavaBindingWrapperMethod(&printer, translatedDecl, importedFunc: decl)
   }
 
   private func printJavaBindingWrapperMethod(
     _ printer: inout CodePrinter,
     _ translatedDecl: TranslatedFunctionDecl,
+    importedFunc: ImportedFunc? = nil,
     prefix: (inout CodePrinter) -> Void = { _ in }
   ) {
     var modifiers = ["public"]
     if translatedDecl.isStatic {
       modifiers.append("static")
     }
 
+    let translatedSignature = translatedDecl.translatedFunctionSignature
     let resultType = translatedSignature.resultType.javaType
     var parameters = translatedDecl.translatedFunctionSignature.parameters.map { $0.parameter.renderParameter() }
-    let throwsClause = decl.isThrowing ? " throws Exception" : ""
+    let throwsClause = translatedDecl.isThrowing ? " throws Exception" : ""
 
     var annotationsStr = translatedSignature.annotations.map({ $0.render() }).joined(separator: "\n")
     if !annotationsStr.isEmpty { annotationsStr += "\n" }
@@ -373,7 +375,9 @@ extension JNISwift2JavaGenerator {
 
     // Print default global arena variation
     if config.effectiveMemoryManagementMode.requiresGlobalArena && translatedSignature.requiresSwiftArena {
-      printDeclDocumentation(&printer, decl)
+      if let importedFunc {
+        printDeclDocumentation(&printer, importedFunc)
+      }
       printer.printBraceBlock(
         "\(annotationsStr)\(modifiers.joined(separator: " ")) \(resultType) \(translatedDecl.name)(\(parametersStr))\(throwsClause)"
       ) { printer in
@@ -392,6 +396,9 @@ extension JNISwift2JavaGenerator {
     if translatedSignature.requiresSwiftArena {
       parameters.append("SwiftArena swiftArena$")
     }
+    if let importedFunc {
+      printDeclDocumentation(&printer, importedFunc)
+    }
     printer.printBraceBlock(
       "\(annotationsStr)\(modifiers.joined(separator: " ")) \(resultType) \(translatedDecl.name)(\(parameters.joined(separator: ", ")))\(throwsClause)"
     ) { printer in
