[jextract/jni] Add support for importing nested types (swiftlang#429)

Author: madsodgaard

Sources/SwiftJavaToolLib/JavaClassTranslator.swift

@@ -874,6 +874,7 @@ extension JavaClassTranslator {
   /// method.
   func isOverride(_ method: Method) -> Bool {
     var currentSuperclass = effectiveJavaSuperclass
+    print("currentSuperclass = \(currentSuperclass)")
     while let currentSuperclassNonOpt = currentSuperclass {
       // Set the loop up for the next run.
       defer {

Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift

@@ -24,7 +24,6 @@ struct JNINestedTypesTests {
     public class B {
       public func g(c: C) {}
 
-    extension MyNamespace { 
       public struct C {
         public func h(b: B) {}
       }

Tests/SwiftJavaTests/BasicRuntimeTests.swift

@@ -56,7 +56,7 @@ class BasicRuntimeTests: XCTestCase {
     do {
       _ = try URL("bad url", environment: environment)
     } catch {
-      XCTAssertEqual(String(describing: error), "java.net.MalformedURLException: no protocol: bad url")
+      XCTAssertEqual(String(describing: error), "java.net.MalformedURLException(no protocol: bad url)")
     }
   }
 

Tests/SwiftJavaToolLibTests/CompileJavaWrapTools.swift

@@ -19,7 +19,7 @@ import JavaNet
 import SwiftJavaShared
 import SwiftJavaConfigurationShared
 import _Subprocess
-import Testing // import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
+import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
 import Foundation
 
 fileprivate func createTemporaryDirectory(in directory: Foundation.URL) throws -> Foundation.URL {
@@ -164,7 +164,7 @@ let failureMessage = "Expected chunk: \n" +
       "\n" + 
       "not found in:\n" +
       "\(swiftCompleteOutputText)"
-    #expect(checkAgainstText.contains(checkAgainstExpectedChunk), 
+    XCTAssertTrue(checkAgainstText.contains(checkAgainstExpectedChunk), 
       "\(failureMessage)")
   }
 }

Tests/SwiftJavaToolLibTests/WrapJavaTests.swift

@@ -19,11 +19,11 @@ import SwiftJavaShared
 import JavaNet
 import SwiftJavaConfigurationShared
 import _Subprocess
-import Testing // import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
+import XCTest // NOTE: Workaround for https://github.com/swiftlang/swift-java/issues/43
 
-final class WrapJavaTests {
+final class WrapJavaTests: XCTestCase {
 
-  @Test
+  // @Test
   func testWrapJavaFromCompiledJavaSource() async throws {
     let classpathURL = try await compileJava(
       """
@@ -50,7 +50,7 @@ final class WrapJavaTests {
     )
   }
 
-  @Test
+  // @Test
   func testWrapJavaGenericMethod_singleGeneric() async throws {
     let classpathURL = try await compileJava(
       """
@@ -98,7 +98,7 @@ final class WrapJavaTests {
   }
 
   // This is just a warning in Java, but a hard error in Swift, so we must 'prune' generic params
-  @Test
+  // @Test
   func testWrapJavaGenericMethod_pruneNotUsedGenericParam() async throws {
     let classpathURL = try await compileJava(
       """
@@ -136,7 +136,7 @@ final class WrapJavaTests {
     )
   }
 
-  @Test
+  // @Test
   func testWrapJavaGenericMethod_multipleGenerics() async throws {
     let classpathURL = try await compileJava(
       """
@@ -204,7 +204,7 @@ final class WrapJavaTests {
  7 |   @JavaMethod
  8 |   @_nonoverride public convenience init(_ arg0: String, environment: JNIEnvironment? = nil)
   */
-  @Test
+  // @Test
   func testGenericSuperclass() async throws {
     return  // FIXME: we need this