Merge branch 'main' into jextract-nominal-type-resolution

ktoso · web-flow · commit 324ba5953083 · 2024-09-27T10:48:11.000+01:00
diff --git a/Tests/JExtractSwiftTests/Asserts/TextAssertions.swift b/Tests/JExtractSwiftTests/Asserts/TextAssertions.swift
@@ -12,9 +12,17 @@
 //===----------------------------------------------------------------------===//
 
 import JExtractSwift
-import XCTest
+import Testing
+import struct Foundation.CharacterSet
 
-func assertOutput(_ got: String, expected: String, file: StaticString = #filePath, line: UInt = #line) {
+func assertOutput(
+  _ got: String,
+  expected: String,
+  fileID: String = #fileID,
+  filePath: String = #filePath,
+  line: Int = #line,
+  column: Int = #column
+) {
   let gotLines = got.split(separator: "\n")
   let expectedLines = expected.split(separator: "\n")
 
@@ -39,7 +47,9 @@ func assertOutput(_ got: String, expected: String, file: StaticString = #filePat
 
       diffLineNumbers.append(no)
 
-      XCTAssertEqual(ge, ee, file: file, line: line)
+      let sourceLocation = SourceLocation(
+        fileID: fileID, filePath: filePath, line: line, column: column)
+      #expect(ge == ee, sourceLocation: sourceLocation)
     }
 
   }
diff --git a/Tests/JExtractSwiftTests/FuncImportTests.swift b/Tests/JExtractSwiftTests/FuncImportTests.swift
@@ -12,10 +12,9 @@
 //===----------------------------------------------------------------------===//
 
 import JExtractSwift
-import XCTest
+import Testing
 
-// TODO: Adopt Testing instead
-final class MethodImportTests: XCTestCase {
+final class MethodImportTests {
   let class_interfaceFile =
     """
     // swift-interface-format-version: 1.0
@@ -56,7 +55,7 @@ final class MethodImportTests: XCTestCase {
     }
     """
 
-  func test_method_helloWorld() async throws {
+  @Test func method_helloWorld() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -95,7 +94,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_globalTakeInt() async throws {
+  @Test func method_globalTakeInt() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -136,7 +135,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_globalTakeIntLongString() async throws {
+  @Test func method_globalTakeIntLongString() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -177,7 +176,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_class_helloMemberFunction_self_memorySegment() async throws {
+  @Test func method_class_helloMemberFunction_self_memorySegment() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -218,7 +217,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_class_helloMemberInExtension_self_memorySegment() async throws {
+  @Test func method_class_helloMemberFunction_self_wrapper() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -300,7 +299,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_class_helloMemberFunction_wrapper() async throws {
+  @Test func method_class_helloMemberFunction_wrapper() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -333,7 +332,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_class_makeInt_wrapper() async throws {
+  @Test func method_class_makeInt_wrapper() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
diff --git a/Tests/JExtractSwiftTests/FunctionDescriptorImportTests.swift b/Tests/JExtractSwiftTests/FunctionDescriptorImportTests.swift
@@ -12,10 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 import JExtractSwift
-import XCTest
+import Testing
 
-// TODO: Adopt Testing instead
-final class FunctionDescriptorTests: XCTestCase {
+@Suite
+final class FunctionDescriptorTests {
   let interfaceFile =
     """
     // swift-interface-format-version: 1.0
@@ -73,7 +73,8 @@ final class FunctionDescriptorTests: XCTestCase {
     try await body(output)
   }
 
-  func test_FunctionDescriptor_globalTakeInt() async throws {
+  @Test
+  func FunctionDescriptor_globalTakeInt() async throws {
     try await functionDescriptorTest("globalTakeInt") { output in
       assertOutput(
         output,
@@ -87,7 +88,8 @@ final class FunctionDescriptorTests: XCTestCase {
     }
   }
 
-  func test_FunctionDescriptor_globalTakeLongIntString() async throws {
+  @Test
+  func FunctionDescriptor_globalTakeLongIntString() async throws {
     try await functionDescriptorTest("globalTakeLongInt") { output in
       assertOutput(
         output,
@@ -102,7 +104,8 @@ final class FunctionDescriptorTests: XCTestCase {
     }
   }
 
-  func test_FunctionDescriptor_echoInt() async throws {
+  @Test
+  func FunctionDescriptor_echoInt() async throws {
     try await functionDescriptorTest("echoInt") { output in
       assertOutput(
         output,
diff --git a/Tests/JExtractSwiftTests/InitClassImportTests.swift b/Tests/JExtractSwiftTests/InitClassImportTests.swift
diff --git a/Tests/JExtractSwiftTests/SwiftDylibTests.swift b/Tests/JExtractSwiftTests/SwiftDylibTests.swift
@@ -12,22 +12,24 @@
 //===----------------------------------------------------------------------===//
 
 import JExtractSwift
-import XCTest
+import Testing
 
-final class SwiftDylibTests: XCTestCase {
+final class SwiftDylibTests {
+
+  @Test
   func test_nm() async throws {
     let dylib = SwiftDylib(path: ".build/arm64-apple-macosx/debug/libJavaKitExample.dylib")!
 
     let names = try await dylib.nmSymbolNames(grepDemangled: ["MySwiftClass", "len"])
 
-    XCTAssertTrue(
+    #expect(
       names.contains {
         $0.descriptiveName.contains("JavaKitExample.MySwiftClass.len.getter")
       }
     )
 
     let getter = names.findPropertyGetter()
-    XCTAssertEqual(getter?.mangledName, "$s14JavaKitExample12MySwiftClassC3lenSivg")
-    XCTAssertEqual(getter?.descriptiveName, "JavaKitExample.MySwiftClass.len.getter : Swift.Int")
+    #expect(getter?.mangledName == "$s14JavaKitExample12MySwiftClassC3lenSivg")
+    #expect(getter?.descriptiveName == "JavaKitExample.MySwiftClass.len.getter : Swift.Int")
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,9 @@`
`12`	`12`	`//===----------------------------------------------------------------------===//`
`13`	`13`
`14`	`14`	`import JExtractSwift`
`15`		`-import XCTest`
	`15`	`+import Testing`
`16`	`16`
`17`		`-// TODO: Adopt Testing instead`
`18`		`-final class MethodImportTests: XCTestCase {`
	`17`	`+final class MethodImportTests {`
`19`	`18`	`let class_interfaceFile =`
`20`	`19`	`"""`
`21`	`20`	`// swift-interface-format-version: 1.0`
`@@ -56,7 +55,7 @@ final class MethodImportTests: XCTestCase {`
`56`	`55`	`}`
`57`	`56`	`"""`
`58`	`57`
`59`		`- func test_method_helloWorld() async throws {`
	`58`	`+ @Test func method_helloWorld() async throws {`
`60`	`59`	`let st = Swift2JavaTranslator(`
`61`	`60`	`javaPackage: "com.example.swift",`
`62`	`61`	`swiftModuleName: "__FakeModule"`
`@@ -95,7 +94,7 @@ final class MethodImportTests: XCTestCase {`
`95`	`94`	`)`
`96`	`95`	`}`
`97`	`96`
`98`		`- func test_method_globalTakeInt() async throws {`
	`97`	`+ @Test func method_globalTakeInt() async throws {`
`99`	`98`	`let st = Swift2JavaTranslator(`
`100`	`99`	`javaPackage: "com.example.swift",`
`101`	`100`	`swiftModuleName: "__FakeModule"`
`@@ -136,7 +135,7 @@ final class MethodImportTests: XCTestCase {`
`136`	`135`	`)`
`137`	`136`	`}`
`138`	`137`
`139`		`- func test_method_globalTakeIntLongString() async throws {`
	`138`	`+ @Test func method_globalTakeIntLongString() async throws {`
`140`	`139`	`let st = Swift2JavaTranslator(`
`141`	`140`	`javaPackage: "com.example.swift",`
`142`	`141`	`swiftModuleName: "__FakeModule"`
`@@ -177,7 +176,7 @@ final class MethodImportTests: XCTestCase {`
`177`	`176`	`)`
`178`	`177`	`}`
`179`	`178`
`180`		`- func test_method_class_helloMemberFunction_self_memorySegment() async throws {`
	`179`	`+ @Test func method_class_helloMemberFunction_self_memorySegment() async throws {`
`181`	`180`	`let st = Swift2JavaTranslator(`
`182`	`181`	`javaPackage: "com.example.swift",`
`183`	`182`	`swiftModuleName: "__FakeModule"`
`@@ -218,7 +217,7 @@ final class MethodImportTests: XCTestCase {`
`218`	`217`	`)`
`219`	`218`	`}`
`220`	`219`
`221`		`- func test_method_class_helloMemberInExtension_self_memorySegment() async throws {`
	`220`	`+ @Test func method_class_helloMemberFunction_self_wrapper() async throws {`
`222`	`221`	`let st = Swift2JavaTranslator(`
`223`	`222`	`javaPackage: "com.example.swift",`
`224`	`223`	`swiftModuleName: "__FakeModule"`
`@@ -300,7 +299,7 @@ final class MethodImportTests: XCTestCase {`
`300`	`299`	`)`
`301`	`300`	`}`
`302`	`301`
`303`		`- func test_method_class_helloMemberFunction_wrapper() async throws {`
	`302`	`+ @Test func method_class_helloMemberFunction_wrapper() async throws {`
`304`	`303`	`let st = Swift2JavaTranslator(`
`305`	`304`	`javaPackage: "com.example.swift",`
`306`	`305`	`swiftModuleName: "__FakeModule"`
`@@ -333,7 +332,7 @@ final class MethodImportTests: XCTestCase {`
`333`	`332`	`)`
`334`	`333`	`}`
`335`	`334`
`336`		`- func test_method_class_makeInt_wrapper() async throws {`
	`335`	`+ @Test func method_class_makeInt_wrapper() async throws {`
`337`	`336`	`let st = Swift2JavaTranslator(`
`338`	`337`	`javaPackage: "com.example.swift",`
`339`	`338`	`swiftModuleName: "__FakeModule"`