test fixes

Author: ktoso

Samples/SwiftJavaExtractJNISampleApp/LICENSE.txt

@@ -44,4 +44,4 @@ public enum NestedEnum {
   public struct OneStruct {
     public init() {}
   }
-}
+}

Samples/SwiftJavaExtractJNISampleApp/Sources/MySwiftLibrary/NestedTypes.swift

@@ -11,9 +11,6 @@ open class Executable: AccessibleObject {
   @JavaMethod
   open func getModifiers() -> Int32
 
-  // @JavaMethod // FIXME why does this clash with Method.getTypeParameters?
-  // open func getTypeParameters() -> [TypeVariable<JavaObject>?]
-
   @JavaMethod
   open func getParameterTypes() -> [JavaClass<JavaObject>?]
 

Sources/JavaStdlib/JavaLangReflect/generated/Executable.swift

@@ -0,0 +1,21 @@
+//===----------------------------------------------------------------------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+
+import CSwiftJavaJNI
+
+extension JavaClass: CustomStringConvertible {
+  public var description: String {
+    toString()
+  }
+}

Sources/SwiftJava/JavaClass+CustomStringConvertible.swift

@@ -147,55 +147,19 @@ extension JavaTranslator {
     preferValueTypes: Bool,
     outerOptional: OptionalKind
   ) throws -> String {
-
-    //   if let method,
-    //      let parameterizedType = javaType.as(ParameterizedType.self) {
-    //     if method.getGenericParameterTypes().contains(where: {$0?.getTypeName() == javaType.getTypeName()}) {
-    //       fatalError("java type = \(javaType.as(ParameterizedType.self))")
-    //       return javaType.getTypeName()
-    //     }
-    //  }
-
-    if isGenericJavaType(javaType) {
-      if let method {
-        print("[swift] generic method! \(method.getDeclaringClass().getName()).\(method.getName())")
-        let genericOriginInfos = getGenericJavaTypeOriginInfo(javaType, from: method)
-        print("genericOriginInfos = \(genericOriginInfos)")
-      }
-    }
-
     // Replace type variables with their bounds.
     if let typeVariable = javaType.as(TypeVariable<GenericDeclaration>.self),
       typeVariable.getBounds().count == 1,
       let bound = typeVariable.getBounds()[0]
     {
-      print("[swift] was type var: \(typeVariable)")
-      print("[swift] was type var: \(typeVariable.toString())")
-      print("[swift] was type var: \(typeVariable.getClass().getName())")
-      print("[swift] was type var bound: \(bound)")
-      // let typeName = try getSwiftTypeNameAsString(
-      //   bound,
-      //   preferValueTypes: preferValueTypes,
-      //   outerOptional: outerOptional
-      // )
-      // print("[swift] was type var: \(typeVariable.toString()) ----> \(typeName)")
       return outerOptional.adjustTypeName(typeVariable.getName())
     }
 
-    if let paramType = javaType.as(ParameterizedType.self) { 
-      print("[swift] paramType = \(paramType)")
-      let typeArgs: [Type?] = paramType.getActualTypeArguments()
-      for typeArg in typeArgs {
-        print("Type arg = \(typeArg)")
-      }
-    }
-
     // Replace wildcards with their upper bound.
     if let wildcardType = javaType.as(WildcardType.self),
       wildcardType.getUpperBounds().count == 1,
       let bound = wildcardType.getUpperBounds()[0]
     {
-      print("[swift] was wildcard")
       // Replace a wildcard type with its first bound.
       return try getSwiftTypeNameAsString(
         bound,
@@ -206,7 +170,6 @@ extension JavaTranslator {
 
     // Handle array types by recursing into the component type.
     if let arrayType = javaType.as(GenericArrayType.self) {
-      print("[swift] was array")
       if preferValueTypes {
         let elementType = try getSwiftTypeNameAsString(
           arrayType.getGenericComponentType()!,
@@ -264,24 +227,18 @@ extension JavaTranslator {
       }
     }
 
-    print("[swift][swift-java][debug] Convert direct \(javaType)")
-
     // Handle direct references to Java classes.
     guard let javaClass = javaType.as(JavaClass<JavaObject>.self) else {
       throw TranslationError.unhandledJavaType(javaType)
     }
 
-    print("[swift][swift-java][debug] Java class \(javaClass) | \(javaClass.toString())")
-    if isGenericJavaType(javaType) {
-      print("[swift][swift-java][debug] is generic \(javaClass.toString())")
-    }
-
-
     let (swiftName, isOptional) = try getSwiftTypeName(javaClass, preferValueTypes: preferValueTypes)
-    var resultString = swiftName
-    if isOptional {
-      resultString = outerOptional.adjustTypeName(resultString)
-    }
+    let resultString =
+      if isOptional {
+         outerOptional.adjustTypeName(swiftName)
+      } else {
+        swiftName
+      }
     return resultString
   }
 

Sources/SwiftJavaToolLib/JavaTranslator.swift

@@ -13,13 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 import JExtractSwiftLib
-import SwiftJavaConfigurationShared
 import Testing
 
 @Suite
 struct JNINestedTypesTests {
   let source1 = """
-    """
   public class A {
     public class B {
       public func g(c: C) {}
@@ -28,14 +26,7 @@ struct JNINestedTypesTests {
         public func h(b: B) {}
       }
     }
-    """
-
   }
-  func test_nested_in_extension() throws {
-    var config = Configuration()
-    config.swiftModule = "__FakeModule"
-    let st = Swift2JavaTranslator(config: config)
-    st.log.logLevel = .error
 
   public func f(a: A, b: A.B, c: A.B.C) {}
   """
@@ -143,4 +134,4 @@ struct JNINestedTypesTests {
       ]
     )
   }
-}
+}

Tests/JExtractSwiftTests/JNI/JNINestedTypesTests.swift

@@ -73,7 +73,7 @@ class BasicRuntimeTests: XCTestCase {
     do {
       _ = try JavaClass<Nonexistent>(environment: environment)
     } catch {
-      XCTAssertEqual(String(describing: error), "java.lang.NoClassDefFoundError: org/swift/javakit/Nonexistent")
+      XCTAssertEqual(String(describing: error), "java.lang.NoClassDefFoundError(org/swift/javakit/Nonexistent)")
     }
   }