Merge pull request #3684 from SwiftPackageIndex/issue-3655-swift-testing-part-9

Issue 3655 swift testing part 9

Author: finestructure

Tests/AppTests/BuildResultTests.swift

@@ -14,29 +14,32 @@
 
 @testable import App
 
-import XCTVapor
-
-
-class BuildResultTests: AppTestCase {
-
-    func test_query() async throws {
-        // setup
-        let pkg = try await savePackage(on: app.db, "1".url)
-        let repo = try Repository(package: pkg)
-        try await repo.save(on: app.db)
-        let version = try Version(package: pkg)
-        try await version.save(on: app.db)
-        let build = try Build(version: version, platform: .iOS, status: .ok, swiftVersion: .init(5, 3, 0))
-        try await build.save(on: app.db)
-
-        // MUT
-        let res = try await BuildResult.query(on: app.db, buildId: build.id!)
-
-        // validate
-        XCTAssertEqual(res.build.id, build.id)
-        XCTAssertEqual(res.package.id, pkg.id)
-        XCTAssertEqual(res.repository.id, repo.id)
-        XCTAssertEqual(res.version.id, version.id)
+import Testing
+import Vapor
+
+
+@Suite struct BuildResultTests {
+
+    @Test func query() async throws {
+        try await withApp { app in
+            // setup
+            let pkg = try await savePackage(on: app.db, "1".url)
+            let repo = try Repository(package: pkg)
+            try await repo.save(on: app.db)
+            let version = try Version(package: pkg)
+            try await version.save(on: app.db)
+            let build = try Build(version: version, platform: .iOS, status: .ok, swiftVersion: .init(5, 3, 0))
+            try await build.save(on: app.db)
+            
+            // MUT
+            let res = try await BuildResult.query(on: app.db, buildId: build.id!)
+            
+            // validate
+            #expect(res.build.id == build.id)
+            #expect(res.package.id == pkg.id)
+            #expect(res.repository.id == repo.id)
+            #expect(res.version.id == version.id)
+        }
     }
 
 }

Tests/AppTests/BuildShowModelTests.swift

@@ -14,46 +14,49 @@
 
 @testable import App
 
-import XCTVapor
+import Testing
+import Vapor
 
 
-class BuildShowModelTests: AppTestCase {
+@Suite struct BuildShowModelTests {
 
     typealias Model = BuildShow.Model
 
-    func test_buildsURL() throws {
-        XCTAssertEqual(Model.mock.buildsURL, "/foo/bar/builds")
+    @Test func buildsURL() throws {
+        #expect(Model.mock.buildsURL == "/foo/bar/builds")
     }
 
-    func test_packageURL() throws {
-        XCTAssertEqual(Model.mock.packageURL, "/foo/bar")
+    @Test func packageURL() throws {
+        #expect(Model.mock.packageURL == "/foo/bar")
     }
 
-    func test_init() async throws {
-        // setup
-        let pkg = try await savePackage(on: app.db, "1".url)
-        try await Repository(package: pkg,
-                       defaultBranch: "main",
-                       forks: 42,
-                       license: .mit,
-                       name: "bar",
-                       owner: "foo",
-                       stars: 17,
-                       summary: "summary").save(on: app.db)
-        let version = try Version(id: UUID(), package: pkg, packageName: "Bar", reference: .branch("main"))
-        try await version.save(on: app.db)
-        let buildId = UUID()
-        try await Build(id: buildId, version: version, platform: .iOS, status: .ok, swiftVersion: .v3)
-            .save(on: app.db)
-        let result = try await BuildResult.query(on: app.db, buildId: buildId)
-
-        // MUT
-        let model = BuildShow.Model(result: result, logs: "logs")
-
-        // validate
-        XCTAssertEqual(model?.packageName, "Bar")
-        XCTAssertEqual(model?.versionId, version.id)
-        XCTAssertEqual(model?.buildInfo.logs, "logs")
+    @Test func Model_init() async throws {
+        try await withApp { app in
+            // setup
+            let pkg = try await savePackage(on: app.db, "1".url)
+            try await Repository(package: pkg,
+                                 defaultBranch: "main",
+                                 forks: 42,
+                                 license: .mit,
+                                 name: "bar",
+                                 owner: "foo",
+                                 stars: 17,
+                                 summary: "summary").save(on: app.db)
+            let version = try Version(id: UUID(), package: pkg, packageName: "Bar", reference: .branch("main"))
+            try await version.save(on: app.db)
+            let buildId = UUID()
+            try await Build(id: buildId, version: version, platform: .iOS, status: .ok, swiftVersion: .v3)
+                .save(on: app.db)
+            let result = try await BuildResult.query(on: app.db, buildId: buildId)
+            
+            // MUT
+            let model = BuildShow.Model(result: result, logs: "logs")
+            
+            // validate
+            #expect(model?.packageName == "Bar")
+            #expect(model?.versionId == version.id)
+            #expect(model?.buildInfo.logs == "logs")
+        }
     }
 
 }