Issue 3655 swift testing post conversion cleanup

Tests/AppTests/AnalyzerTests.swift

@@ -738,7 +738,7 @@ import Vapor
 
             do {  // validate
                 #expect(try await Version.query(on: app.db).count() == 1)
-                let v = try await XCTUnwrapAsync(await Version.query(on: app.db).first())
+                let v = try #require(await Version.query(on: app.db).first())
                 #expect(v.docArchives == [.init(name: "foo", title: "Foo")])
             }
         }
@@ -763,7 +763,7 @@ import Vapor
 
             do {  // validate
                 #expect(try await Version.query(on: app.db).count() == 2)
-                let versions = try await XCTUnwrapAsync(await Version.query(on: app.db).sort(\.$commit).all())
+                let versions = try #require(await Version.query(on: app.db).sort(\.$commit).all())
                 #expect(versions[0].docArchives == [.init(name: "foo", title: "Foo")])
                 #expect(versions[1].docArchives == nil)
             }
@@ -834,7 +834,7 @@ import Vapor
                                                 packageInfo: .init(packageManifest: manifest, spiManifest: spiManifest))
 
             // read back and validate
-            let v = try await XCTUnwrapAsync(await Version.query(on: app.db).first())
+            let v = try #require(await Version.query(on: app.db).first())
             #expect(v.packageName == "foo")
             #expect(v.resolvedDependencies?.map(\.packageName) == nil)
             #expect(v.swiftVersions == ["1", "2", "3.0.0"].asSwiftVersions)

Tests/AppTests/ApiTests.swift

@@ -203,7 +203,7 @@ import Vapor
                             #expect(v.resolvedDependencies == [.init(packageName: "packageName",
                                                                      repositoryURL: "repositoryURL")])
                             // build failed, hence no package platform compatibility yet
-                            let p = try await XCTUnwrapAsync(try await Package.find(p.id, on: app.db))
+                            let p = try #require(try await Package.find(p.id, on: app.db))
                             #expect(p.platformCompatibility == [])
                         })
                 }
@@ -237,7 +237,7 @@ import Vapor
                             #expect(v.resolvedDependencies == [.init(packageName: "foo",
                                                                      repositoryURL: "http://foo/bar")])
                             // build ok now -> package is macos compatible
-                            let p = try await XCTUnwrapAsync(try await Package.find(p.id, on: app.db))
+                            let p = try #require(try await Package.find(p.id, on: app.db))
                             #expect(p.platformCompatibility == [.macOS])
                         })
                 }
@@ -262,7 +262,7 @@ import Vapor
                             let builds = try await Build.query(on: app.db).all()
                             #expect(Set(builds.map(\.id)) == Set([.id0, .id1]))
                             // additional ios build ok -> package is also ios compatible
-                            let p = try await XCTUnwrapAsync(try await Package.find(p.id, on: app.db))
+                            let p = try #require(try await Package.find(p.id, on: app.db))
                             #expect(p.platformCompatibility == [.iOS, .macOS])
                         })
                 }
@@ -376,10 +376,10 @@ import Vapor
                     "api/versions/\(versionId)/build-report",
                     headers: .applicationJSON,
                     body: body,
-                    afterResponse: { res in
+                    afterResponse: { res async throws in
                         // validation
                         #expect(res.status == .unauthorized)
-                        try await XCTAssertEqualAsync(try await Build.query(on: db).count(), 0)
+                        #expect(try await Build.query(on: db).count() == 0)
                     }
                 )
 
@@ -389,10 +389,10 @@ import Vapor
                     "api/versions/\(versionId)/build-report",
                     headers: .bearerApplicationJSON("wrong"),
                     body: body,
-                    afterResponse: { res in
+                    afterResponse: { res async throws in
                         // validation
                         #expect(res.status == .unauthorized)
-                        try await XCTAssertEqualAsync(try await Build.query(on: db).count(), 0)
+                        #expect(try await Build.query(on: db).count() == 0)
                     }
                 )
 
@@ -405,10 +405,10 @@ import Vapor
                         "api/versions/\(versionId)/build-report",
                         headers: .bearerApplicationJSON("secr3t"),
                         body: body,
-                        afterResponse: { res in
+                        afterResponse: { res async throws in
                             // validation
                             #expect(res.status == .unauthorized)
-                            try await XCTAssertEqualAsync(try await Build.query(on: db).count(), 0)
+                            #expect(try await Build.query(on: db).count() == 0)
                         }
                     )
                 }
@@ -491,7 +491,7 @@ import Vapor
                     body: body,
                     afterResponse: { res async throws in
                         // validation
-                        let p = try await XCTUnwrapAsync(await Package.find(p.id, on: app.db))
+                        let p = try #require(await Package.find(p.id, on: app.db))
 #if os(Linux)
                         if p.updatedAt == originalPackageUpdate {
                             logWarning()
@@ -707,10 +707,10 @@ import Vapor
                     "api/builds/\(buildId)/doc-report",
                     headers: .applicationJSON,
                     body: body,
-                    afterResponse: { res in
+                    afterResponse: { res async throws in
                         // validation
                         #expect(res.status == .unauthorized)
-                        try await XCTAssertEqualAsync(try await DocUpload.query(on: app.db).count(), 0)
+                        #expect(try await DocUpload.query(on: app.db).count() == 0)
                     }
                 )
 
@@ -720,10 +720,10 @@ import Vapor
                     "api/builds/\(buildId)/doc-report",
                     headers: .bearerApplicationJSON("wrong"),
                     body: body,
-                    afterResponse: { res in
+                    afterResponse: { res async throws in
                         // validation
                         #expect(res.status == .unauthorized)
-                        try await XCTAssertEqualAsync(try await DocUpload.query(on: app.db).count(), 0)
+                        #expect(try await DocUpload.query(on: app.db).count() == 0)
                     }
                 )
 
@@ -736,10 +736,10 @@ import Vapor
                         "api/builds/\(buildId)/doc-report",
                         headers: .bearerApplicationJSON("secr3t"),
                         body: body,
-                        afterResponse: { res in
+                        afterResponse: { res async throws in
                             // validation
                             #expect(res.status == .unauthorized)
-                            try await XCTAssertEqualAsync(try await DocUpload.query(on: app.db).count(), 0)
+                            #expect(try await DocUpload.query(on: app.db).count() == 0)
                         }
                     )
                 }

Tests/AppTests/BuildTests.swift

@@ -44,7 +44,7 @@ import Vapor
             try await b.save(on: app.db)
 
             do {  // validate
-                let b = try await XCTUnwrapAsync(try await Build.find(b.id, on: app.db))
+                let b = try #require(try await Build.find(b.id, on: app.db))
                 #expect(b.buildCommand == #"xcrun xcodebuild -scheme "Foo""#)
                 #expect(b.jobUrl == "https://example.com/jobs/1")
                 #expect(b.logUrl == "https://example.com/logs/1")
@@ -419,7 +419,7 @@ import Vapor
             try await UpdateBuildPendingToTriggered().prepare(on: app.db)
 
             // validate
-            let b = try await XCTUnwrapAsync(try await Build.find(.id0, on: app.db))
+            let b = try #require(try await Build.find(.id0, on: app.db))
             #expect(b.status == .triggered)
         }
     }

Tests/AppTests/BuildTriggerTests.swift

@@ -1311,7 +1311,7 @@ import Vapor
 
 
 private func updateBuildCreatedAt(id: Build.Id, addTimeInterval timeInterval: TimeInterval, on database: Database) async throws {
-    let b = try await XCTUnwrapAsync(await Build.find(id, on: database))
+    let b = try #require(await Build.find(id, on: database))
     b.createdAt = b.createdAt?.addingTimeInterval(timeInterval)
     try await b.save(on: database)
 }

Tests/AppTests/ErrorReportingTests.swift

@@ -30,7 +30,7 @@ import Testing
             try await Analyze.recordError(database: app.db,
                                           error: AppError.cacheDirectoryDoesNotExist(pkg.id, "path"))
             do {
-                let pkg = try await XCTUnwrapAsync(try await Package.find(pkg.id, on: app.db))
+                let pkg = try #require(try await Package.find(pkg.id, on: app.db))
                 #expect(pkg.status == .cacheDirectoryDoesNotExist)
                 #expect(pkg.processingStage == .analysis)
             }

Tests/AppTests/Helpers/Extensions.swift

@@ -16,34 +16,11 @@ import Foundation
 
 @testable import App
 import Fluent
-import XCTest
 
 
 // MARK: - Useful extensions
 
 
-extension XCTestCase {
-    var isRunningInCI: Bool {
-        ProcessInfo.processInfo.environment.keys.contains("GITHUB_WORKFLOW")
-    }
-
-    var runQueryPerformanceTests: Bool {
-        ProcessInfo.processInfo.environment.keys.contains("RUN_QUERY_PERFORMANCE_TESTS")
-    }
-
-    func assertEquals<Root, Value: Equatable>(_ values: [Root],
-                                              _ keyPath: KeyPath<Root, Value>,
-                                              _ expectations: [Value],
-                                              file: StaticString = #filePath,
-                                              line: UInt = #line) {
-        XCTAssertEqual(values.map { $0[keyPath: keyPath] },
-                       expectations,
-                       "\(values.map { $0[keyPath: keyPath] }) not equal to \(expectations)",
-                       file: (file), line: line)
-    }
-}
-
-
 extension Foundation.URL: Swift.ExpressibleByStringLiteral {
     public init(stringLiteral value: String) {
         precondition(!value.isEmpty, "cannot convert empty string to URL")

Tests/AppTests/Helpers/Snapshotting+html.swift

@@ -18,10 +18,14 @@ import Plot
 import SnapshotTesting
 import Dependencies
 
+
 extension Snapshotting where Value == String, Format == String {
-    public static let html = Snapshotting(pathExtension: "html", diffing: .lines)
+    public static var html: Snapshotting<String, String> {
+        Snapshotting(pathExtension: "html", diffing: .lines)
+    }
 }
 
+
 extension Snapshotting where Value == () -> HTML, Format == String {
     public static var html: Snapshotting {
         Snapshotting<String, String>.init(pathExtension: "html", diffing: .lines).pullback { node in
@@ -34,15 +38,11 @@ extension Snapshotting where Value == () -> HTML, Format == String {
     }
 }
 
+
 extension Snapshotting where Value == () -> Node<HTML.BodyContext>, Format == String {
     public static var html: Snapshotting {
         Snapshotting<() -> HTML, String>.html.pullback { node in
             { HTML(.body(node())) }
         }
     }
 }
-
-
-#warning("drop this")
-extension Snapshotting: @unchecked Swift.Sendable {}
-extension Diffing: @unchecked Swift.Sendable {}

Tests/AppTests/JoinedTests.swift

@@ -52,7 +52,7 @@ import Testing
             try await Repository(package: p).save(on: app.db)
 
             // MUT
-            let jpr = try await XCTUnwrapAsync(try await JPR.query(on: app.db).first())
+            let jpr = try #require(try await JPR.query(on: app.db).first())
 
             // validate
             #expect(jpr.repository != nil)
@@ -74,7 +74,7 @@ import Testing
             let p = try await savePackage(on: app.db, "1")
             try await Repository(package: p).save(on: app.db)
 
-            let jpr = try await XCTUnwrapAsync(try await JPR.query(on: app.db).first())
+            let jpr = try #require(try await JPR.query(on: app.db).first())
             let repo = try #require(jpr.repository)
             #expect(repo.name == nil)
             repo.name = "foo"
@@ -88,9 +88,9 @@ import Testing
                 #expect(jpr.repository?.name == "foo")
             }
             do { // ensure value is persisted
-                let r = try await XCTUnwrapAsync(try await Repository.query(on: app.db).first())
+                let r = try #require(try await Repository.query(on: app.db).first())
                 #expect(r.name == "foo")
-                let reloadedJPR = try await XCTUnwrapAsync(try await JPR.query(on: app.db).first())
+                let reloadedJPR = try #require(try await JPR.query(on: app.db).first())
                 #expect(reloadedJPR.repository?.name == "foo")
             }
         }

Tests/AppTests/PackageCollectionTests.swift

@@ -254,7 +254,7 @@ import Vapor
                                     swiftVersion: .v2).save(on: app.db)
                 }
             }
-            let v = try await XCTUnwrapAsync(try await VersionResult.query(on: app.db,filterBy: .urls(["1"])).first?.version)
+            let v = try #require(try await VersionResult.query(on: app.db,filterBy: .urls(["1"])).first?.version)
 
             // MUT
             let res = try #require(
@@ -310,7 +310,7 @@ import Vapor
                                   type: .library(.automatic),
                                   name: "product").save(on: app.db)
             }
-            let result = try await XCTUnwrapAsync(
+            let result = try #require(
                 try await VersionResult.query(on: app.db, filterBy: .urls(["1"])).first
             )
             let group = VersionResultGroup(package: result.package,
@@ -682,7 +682,7 @@ import Vapor
                     try await Version(package: p, latest: .release).save(on: app.db)
                     try await Repository(package: p).save(on: app.db)
                 }
-                let res = try await XCTUnwrapAsync(
+                let res = try #require(
                     try await VersionResult.query(on: app.db, filterBy: .urls(["2"])).first
                 )
                 let group = VersionResultGroup(package: res.package,

Tests/AppTests/PackageController+routesTests.swift

@@ -276,7 +276,7 @@ import Vapor
             </turbo-frame>
             """)
                 #expect(try await Repository.query(on: app.db).count() == 1)
-                let s3Readme = try await XCTUnwrapAsync(try await Repository.query(on: app.db).first()?.s3Readme)
+                let s3Readme = try #require(try await Repository.query(on: app.db).first()?.s3Readme)
                 #expect(s3Readme.isError)
             }
         }

Tests/AppTests/PackageInfoTests.swift

@@ -28,7 +28,7 @@ import Testing
                 .save(on: app.db)
             try await Version(package: p, latest: .defaultBranch, packageName: "package name")
                 .save(on: app.db)
-            let joined = try await XCTUnwrapAsync(try await Joined3<Package, Repository, Version>
+            let joined = try #require(try await Joined3<Package, Repository, Version>
                 .query(on: app.db, version: .defaultBranch)
                 .first())
 
@@ -49,7 +49,7 @@ import Testing
                 .save(on: app.db)
             try await Version(package: p, latest: .defaultBranch, packageName: nil)
                 .save(on: app.db)
-            let joined = try await XCTUnwrapAsync(try await Joined3<Package, Repository, Version>
+            let joined = try #require(try await Joined3<Package, Repository, Version>
                 .query(on: app.db, version: .defaultBranch)
                 .first())