working towards testing infra

ktoso · ktoso · commit d9656933d652 · 2025-11-05T12:05:58.000+09:00
diff --git a/Samples/SwiftJavaExtractJNISampleApp/LICENSE.txt b/Samples/SwiftJavaExtractJNISampleApp/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/Sources/SwiftJava/JVM/JavaVirtualMachine.swift b/Sources/SwiftJava/JVM/JavaVirtualMachine.swift
@@ -214,12 +214,18 @@ extension JavaVirtualMachine {
 // MARK: Shared Java Virtual Machine management.
 
 extension JavaVirtualMachine {
+
+  struct JVMState {
+    var jvm: JavaVirtualMachine?
+    var classpath: [String]
+  }
+
   /// The globally shared JavaVirtualMachine instance, behind a lock.
   ///
   /// TODO: If the use of the lock itself ends up being slow, we could
   /// use an atomic here instead because our access pattern is fairly
   /// simple.
-  private static let sharedJVM: LockedState<JavaVirtualMachine?> = .init(initialState: nil)
+  private static let sharedJVM: LockedState<JVMState> = .init(initialState: .init(jvm: nil, classpath: []))
 
   /// Access the shared Java Virtual Machine instance.
   ///
@@ -242,20 +248,36 @@ extension JavaVirtualMachine {
     classpath: [String] = [],
     vmOptions: [String] = [],
     ignoreUnrecognized: Bool = false,
-    replace: Bool = false
+    replace: Bool = false,
+    file: String = #fileID, line: Int = #line
   ) throws -> JavaVirtualMachine {
     precondition(!classpath.contains(where: { $0.contains(FileManager.pathSeparator) }), "Classpath element must not contain `\(FileManager.pathSeparator)`! Split the path into elements! Was: \(classpath)")
+    print("[swift] Get shared JVM at \(file):\(line): Classpath = \(classpath.joined(separator: ","))")
 
-    return try sharedJVM.withLock { (sharedJVMPointer: inout JavaVirtualMachine?) in
+    return try sharedJVM.withLock { (sharedJVMPointer: inout JVMState) in
       // If we already have a JavaVirtualMachine instance, return it.
       if replace {
-        print("[swift-java] Replace JVM instance!")
-        try sharedJVMPointer?.destroyJVM()
-        sharedJVMPointer = nil
+        print("[swift] Replace JVM instance")
+        if let jvm = sharedJVMPointer.jvm {
+          print("[swift] destroyJVM instance!")
+          try jvm.destroyJVM()
+          print("[swift] destroyJVM instance, done.")
+        }
+        sharedJVMPointer.jvm = nil
+        sharedJVMPointer.classpath = []
       } else {
-        if let existingInstance = sharedJVMPointer {
-          // FIXME: this isn't ideal; we silently ignored that we may have requested a different classpath or options
-          return existingInstance
+        if let existingInstance = sharedJVMPointer.jvm {
+          if classpath != sharedJVMPointer.classpath {
+            print("[swift] Return existing JVM instance, same classpath classpath.")
+            return existingInstance
+          } else {
+            fatalError(
+              """
+              Requested JVM with differnet classpath than stored as shared(), without passing 'replace: true'!
+              Was: \(sharedJVMPointer.classpath)
+              Requested: \(sharedJVMPointer.classpath)
+              """)
+          }
         }
       }
 
@@ -266,11 +288,18 @@ extension JavaVirtualMachine {
           // instance that we don't yet know about.
           var jvm: UnsafeMutablePointer<JavaVM?>? = nil
           var numJVMs: jsize = 0
+          if JNI_GetCreatedJavaVMs(nil, 0, &numJVMs) == JNI_OK, numJVMs == 0 {
+            print("[swift] Found JVMs: \(numJVMs), return existing one")
+          }
+
           if JNI_GetCreatedJavaVMs(&jvm, 1, &numJVMs) == JNI_OK, numJVMs >= 1 {
+            print("[swift] Found JVMs: \(numJVMs), return existing one")
             // Adopt this JVM into a new instance of the JavaVirtualMachine
             // wrapper.
+            // FIXME: account for classpath
             let javaVirtualMachine = JavaVirtualMachine(adoptingJVM: jvm!)
-            sharedJVMPointer = javaVirtualMachine
+            sharedJVMPointer.jvm = javaVirtualMachine
+            sharedJVMPointer.classpath = classpath
             return javaVirtualMachine
           }
 
@@ -280,6 +309,7 @@ extension JavaVirtualMachine {
           )
 
           // Create a new instance of the JVM.
+          print("[swift] Create JVM")
           let javaVirtualMachine: JavaVirtualMachine
           do {
             javaVirtualMachine = try JavaVirtualMachine(
@@ -295,7 +325,8 @@ extension JavaVirtualMachine {
             continue
           }
 
-          sharedJVMPointer = javaVirtualMachine
+          sharedJVMPointer.jvm = javaVirtualMachine
+          sharedJVMPointer.classpath = classpath
           return javaVirtualMachine
         }
       }
@@ -307,7 +338,8 @@ extension JavaVirtualMachine {
   /// This will allow the shared JavaVirtualMachine instance to be deallocated.
   public static func forgetShared() {
     sharedJVM.withLock { sharedJVMPointer in
-      sharedJVMPointer = nil
+      sharedJVMPointer.jvm = nil
+      sharedJVMPointer.classpath = []
     }
   }
 }
diff --git a/Tests/JExtractSwiftTests/FFMNestedTypesTests.swift b/Tests/JExtractSwiftTests/FFMNestedTypesTests.swift
@@ -35,7 +35,7 @@ final class FFMNestedTypesTests {
     let st = Swift2JavaTranslator(config: config)
     st.log.logLevel = .error
 
-    try st.analyze(file: "Fake.swift", text: class_interfaceFile)
+    try st.analyze(path: "Fake.swift", text: class_interfaceFile)
 
     let generator = FFMSwift2JavaGenerator(
       config: config,
diff --git a/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift b/Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift
@@ -35,7 +35,7 @@ final class JNINestedTypesTests {
     let st = Swift2JavaTranslator(config: config)
     st.log.logLevel = .error
 
-    try st.analyze(file: "Fake.swift", text: class_interfaceFile)
+    try st.analyze(path: "Fake.swift", text: class_interfaceFile)
 
     let generator = FFMSwift2JavaGenerator(
       config: config,
diff --git a/Tests/SwiftJavaToolLibTests/CompileJavaWrapTools.swift b/Tests/SwiftJavaToolLibTests/CompileJavaWrapTools.swift
@@ -18,7 +18,8 @@ import JavaUtilJar
 import SwiftJavaShared
 import SwiftJavaConfigurationShared
 import _Subprocess
-import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
+import Testing // import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
+import Foundation
 
 fileprivate func createTemporaryDirectory(in directory: URL) throws -> URL {
   let uuid = UUID().uuidString
@@ -66,9 +67,10 @@ func withJavaTranslator(
   file: StaticString = #filePath,
   line: UInt = #line
 ) throws {
+  print("New withJavaTranslator, for classpath: \(classpath)")
   let jvm = try JavaVirtualMachine.shared(
     classpath: classpath.map(\.path),
-    replace: false
+    replace: true
   )
   
   var config = Configuration()
@@ -96,10 +98,10 @@ func assertWrapJavaOutput(
 ) throws {
   let jvm = try JavaVirtualMachine.shared(
     classpath: classpath.map(\.path),
-    replace: false
+    replace: true
   )
-
-  defer { try! jvm.destroyJVM() } // if this fails, we're kinda domed anyway, so allow the try!
+  // Do NOT destroy the jvm here, because the JavaClasses will need to deinit,
+  // and do so while the env is still valid...
   
   var config = Configuration()
   config.minimumInputAccessLevelMode = .package
@@ -114,7 +116,6 @@ func assertWrapJavaOutput(
   let classLoader = try! JavaClass<JavaClassLoader>(environment: environment)
     .getSystemClassLoader()!
 
-
   // FIXME: deduplicate this
   translator.startNewFile()
 
@@ -161,7 +162,7 @@ func assertWrapJavaOutput(
       continue
     }
 
-    XCTFail("Expected chunk: \n" +
+    fatalError("Expected chunk: \n" +
       "\(expectedChunk.yellow)" + 
       "\n" + 
       "not found in:\n" +
diff --git a/Tests/SwiftJavaToolLibTests/WrapJavaTests.swift b/Tests/SwiftJavaToolLibTests/WrapJavaTests.swift
