move tests

Author: madsodgaard

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/MySwiftClass.swift

@@ -91,26 +91,6 @@ public class MySwiftClass {
     return self.x + other.longValue()
   }
 
-  public func optionalBool(input: Optional<Bool>) -> Bool? {
-    return input
-  }
-
-  public func optionalByte(input: Optional<Int8>) -> Int8? {
-    return input
-  }
-
-  public func optionalChar(input: Optional<UInt16>) -> UInt16? {
-    return input
-  }
-
-  public func optionalShort(input: Optional<Int16>) -> Int16? {
-    return input
-  }
-
-  public func optionalInt(input: Optional<Int32>) -> Int32? {
-    return input
-  }
-
 //   public func optionalMethodClass(input: MySwiftClass?) -> <Optional<MySwiftClass>> {
 //     if let input {
 //       return MySwiftClass(x: input.x * 10, y: input.y * 10)

Samples/JExtractJNISampleApp/Sources/MySwiftLibrary/Optionals.swift

@@ -0,0 +1,33 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2025 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+public func optionalBool(input: Optional<Bool>) -> Bool? {
+  return input
+}
+
+public func optionalByte(input: Optional<Int8>) -> Int8? {
+  return input
+}
+
+public func optionalChar(input: Optional<UInt16>) -> UInt16? {
+  return input
+}
+
+public func optionalShort(input: Optional<Int16>) -> Int16? {
+  return input
+}
+
+public func optionalInt(input: Optional<Int32>) -> Int32? {
+  return input
+}

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

@@ -153,51 +153,6 @@ void addXWithJavaLong() {
         }
     }
 
-    @Test
-    void optionalBool() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
-            MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            assertEquals(Optional.empty(), c1.optionalBool(Optional.empty()));
-            assertEquals(Optional.of(true), c1.optionalBool(Optional.of(true)));
-        }
-    }
-
-    @Test
-    void optionalByte() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
-            MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            assertEquals(Optional.empty(), c1.optionalByte(Optional.empty()));
-            assertEquals(Optional.of((byte) 1) , c1.optionalByte(Optional.of((byte) 1)));
-        }
-    }
-
-    @Test
-    void optionalChar() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
-            MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            assertEquals(Optional.empty(), c1.optionalChar(Optional.empty()));
-            assertEquals(Optional.of((char) 42), c1.optionalChar(Optional.of((char) 42)));
-        }
-    }
-
-    @Test
-    void optionalShort() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
-            MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            assertEquals(Optional.empty(), c1.optionalShort(Optional.empty()));
-            assertEquals(Optional.of((short) -250), c1.optionalShort(Optional.of((short) -250)));
-        }
-    }
-
-    @Test
-    void optionalInt() {
-        try (var arena = new ConfinedSwiftMemorySession()) {
-            MySwiftClass c1 = MySwiftClass.init(20, 10, arena);
-            assertEquals(OptionalInt.empty(), c1.optionalInt(OptionalInt.empty()));
-            assertEquals(OptionalInt.of(999), c1.optionalInt(OptionalInt.of(999)));
-        }
-    }
-
 //    @Test
 //    void optionalMethodClass() {
 //        try (var arena = new ConfinedSwiftMemorySession()) {

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

@@ -0,0 +1,55 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+package com.example.swift;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.Optional;
+import java.util.OptionalInt;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class OptionalsTest {
+    @Test
+    void optionalBool() {
+        assertEquals(Optional.empty(), MySwiftLibrary.optionalBool(Optional.empty()));
+        assertEquals(Optional.of(true), MySwiftLibrary.optionalBool(Optional.of(true)));
+    }
+
+    @Test
+    void optionalByte() {
+        assertEquals(Optional.empty(), MySwiftLibrary.optionalByte(Optional.empty()));
+        assertEquals(Optional.of((byte) 1) , MySwiftLibrary.optionalByte(Optional.of((byte) 1)));
+    }
+
+    @Test
+    void optionalChar() {
+        assertEquals(Optional.empty(), MySwiftLibrary.optionalChar(Optional.empty()));
+        assertEquals(Optional.of((char) 42), MySwiftLibrary.optionalChar(Optional.of((char) 42)));
+    }
+
+    @Test
+    void optionalShort() {
+        assertEquals(Optional.empty(), MySwiftLibrary.optionalShort(Optional.empty()));
+        assertEquals(Optional.of((short) -250), MySwiftLibrary.optionalShort(Optional.of((short) -250)));
+    }
+
+    @Test
+    void optionalInt() {
+        assertEquals(OptionalInt.empty(), MySwiftLibrary.optionalInt(OptionalInt.empty()));
+        assertEquals(OptionalInt.of(999), MySwiftLibrary.optionalInt(OptionalInt.of(999)));
+    }
+}

Sources/JExtractSwiftLib/JNI/JNISwift2JavaGenerator+JavaBindingsPrinting.swift

@@ -63,6 +63,7 @@ extension JNISwift2JavaGenerator {
   private func printModule(_ printer: inout CodePrinter) {
     printHeader(&printer)
     printPackage(&printer)
+    printImports(&printer)
 
     printModuleClass(&printer) { printer in
       printer.print(