Merge pull request #5 from ktoso/testing

ktoso · web-flow · commit 973b3781bb7a · 2024-09-27T10:46:01.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
@@ -51,7 +50,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"
@@ -90,7 +89,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"
@@ -131,7 +130,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"
@@ -172,7 +171,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"
@@ -215,7 +214,7 @@ final class MethodImportTests: XCTestCase {
     )
   }
 
-  func test_method_class_helloMemberFunction_self_wrapper() async throws {
+  @Test func method_class_helloMemberFunction_self_wrapper() async throws {
     let st = Swift2JavaTranslator(
       javaPackage: "com.example.swift",
       swiftModuleName: "__FakeModule"
@@ -258,7 +257,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"
@@ -293,7 +292,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`
`@@ -51,7 +50,7 @@ final class MethodImportTests: XCTestCase {`
`51`	`50`	`}`
`52`	`51`	`"""`
`53`	`52`
`54`		`- func test_method_helloWorld() async throws {`
	`53`	`+ @Test func method_helloWorld() async throws {`
`55`	`54`	`let st = Swift2JavaTranslator(`
`56`	`55`	`javaPackage: "com.example.swift",`
`57`	`56`	`swiftModuleName: "__FakeModule"`
`@@ -90,7 +89,7 @@ final class MethodImportTests: XCTestCase {`
`90`	`89`	`)`
`91`	`90`	`}`
`92`	`91`
`93`		`- func test_method_globalTakeInt() async throws {`
	`92`	`+ @Test func method_globalTakeInt() async throws {`
`94`	`93`	`let st = Swift2JavaTranslator(`
`95`	`94`	`javaPackage: "com.example.swift",`
`96`	`95`	`swiftModuleName: "__FakeModule"`
`@@ -131,7 +130,7 @@ final class MethodImportTests: XCTestCase {`
`131`	`130`	`)`
`132`	`131`	`}`
`133`	`132`
`134`		`- func test_method_globalTakeIntLongString() async throws {`
	`133`	`+ @Test func method_globalTakeIntLongString() async throws {`
`135`	`134`	`let st = Swift2JavaTranslator(`
`136`	`135`	`javaPackage: "com.example.swift",`
`137`	`136`	`swiftModuleName: "__FakeModule"`
`@@ -172,7 +171,7 @@ final class MethodImportTests: XCTestCase {`
`172`	`171`	`)`
`173`	`172`	`}`
`174`	`173`
`175`		`- func test_method_class_helloMemberFunction_self_memorySegment() async throws {`
	`174`	`+ @Test func method_class_helloMemberFunction_self_memorySegment() async throws {`
`176`	`175`	`let st = Swift2JavaTranslator(`
`177`	`176`	`javaPackage: "com.example.swift",`
`178`	`177`	`swiftModuleName: "__FakeModule"`
`@@ -215,7 +214,7 @@ final class MethodImportTests: XCTestCase {`
`215`	`214`	`)`
`216`	`215`	`}`
`217`	`216`
`218`		`- func test_method_class_helloMemberFunction_self_wrapper() async throws {`
	`217`	`+ @Test func method_class_helloMemberFunction_self_wrapper() async throws {`
`219`	`218`	`let st = Swift2JavaTranslator(`
`220`	`219`	`javaPackage: "com.example.swift",`
`221`	`220`	`swiftModuleName: "__FakeModule"`
`@@ -258,7 +257,7 @@ final class MethodImportTests: XCTestCase {`
`258`	`257`	`)`
`259`	`258`	`}`
`260`	`259`
`261`		`- func test_method_class_helloMemberFunction_wrapper() async throws {`
	`260`	`+ @Test func method_class_helloMemberFunction_wrapper() async throws {`
`262`	`261`	`let st = Swift2JavaTranslator(`
`263`	`262`	`javaPackage: "com.example.swift",`
`264`	`263`	`swiftModuleName: "__FakeModule"`
`@@ -293,7 +292,7 @@ final class MethodImportTests: XCTestCase {`
`293`	`292`	`)`
`294`	`293`	`}`
`295`	`294`
`296`		`- func test_method_class_makeInt_wrapper() async throws {`
	`295`	`+ @Test func method_class_makeInt_wrapper() async throws {`
`297`	`296`	`let st = Swift2JavaTranslator(`
`298`	`297`	`javaPackage: "com.example.swift",`
`299`	`298`	`swiftModuleName: "__FakeModule"`