Convert RoutesTests

Author: finestructure

Tests/AppTests/RoutesTests.swift

@@ -12,82 +12,94 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import Foundation
+
 @testable import App
 
 import Dependencies
-import XCTVapor
+import Testing
 
 
-final class RoutesTests: AppTestCase {
+@Suite struct RoutesTests {
 
-    func test_documentation_images() async throws {
+    @Test func documentation_images() async throws {
         try await withDependencies {
             $0.environment.awsDocsBucket = { "docs-bucket" }
             $0.httpClient.fetchDocumentation = App.HTTPClient.echoURL()
         } operation: {
-            // MUT
-            try await app.test(.GET, "foo/bar/1.2.3/images/baz.png") { res async in
-                // validation
-                XCTAssertEqual(res.status, .ok)
-                XCTAssertEqual(res.content.contentType?.description, "application/octet-stream")
-                XCTAssertEqual(res.body.asString(), "/foo/bar/1.2.3/images/baz.png")
-            }
-            try await app.test(.GET, "foo/bar/1.2.3/images/BAZ.png") { res async in
-                // validation
-                XCTAssertEqual(res.status, .ok)
-                XCTAssertEqual(res.content.contentType?.description, "application/octet-stream")
-                XCTAssertEqual(res.body.asString(), "/foo/bar/1.2.3/images/BAZ.png")
+            try await withApp { app in
+                // MUT
+                try await app.test(.GET, "foo/bar/1.2.3/images/baz.png") { res async in
+                    // validation
+                    #expect(res.status == .ok)
+                    #expect(res.content.contentType?.description == "application/octet-stream")
+                    #expect(res.body.asString() == "/foo/bar/1.2.3/images/baz.png")
+                }
+                try await app.test(.GET, "foo/bar/1.2.3/images/BAZ.png") { res async in
+                    // validation
+                    #expect(res.status == .ok)
+                    #expect(res.content.contentType?.description == "application/octet-stream")
+                    #expect(res.body.asString() == "/foo/bar/1.2.3/images/BAZ.png")
+                }
             }
         }
     }
 
-    func test_documentation_img() async throws {
+    @Test func documentation_img() async throws {
         try await withDependencies {
             $0.environment.awsDocsBucket = { "docs-bucket" }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .ok }
         } operation: {
-            // MUT
-            try await app.test(.GET, "foo/bar/1.2.3/img/baz.png") { res async in
-                // validation
-                XCTAssertEqual(res.status, .ok)
+            try await withApp { app in
+                // MUT
+                try await app.test(.GET, "foo/bar/1.2.3/img/baz.png") { res async in
+                    // validation
+                    #expect(res.status == .ok)
+                }
             }
         }
     }
 
-    func test_documentation_videos() async throws {
+    @Test func documentation_videos() async throws {
         try await withDependencies {
             $0.environment.awsDocsBucket = { "docs-bucket" }
             $0.httpClient.fetchDocumentation = { @Sendable _ in .ok }
         } operation: {
-            // MUT
-            try await app.test(.GET, "foo/bar/1.2.3/videos/baz.mov") { res async in
-                // validation
-                XCTAssertEqual(res.status, .ok)
+            try await withApp { app in
+                // MUT
+                try await app.test(.GET, "foo/bar/1.2.3/videos/baz.mov") { res async in
+                    // validation
+                    #expect(res.status == .ok)
+                }
             }
         }
     }
 
-    func test_openapi() async throws {
-        try await app.test(.GET, "openapi/openapi.json") { res async in
-            XCTAssertEqual(res.status, .ok)
-            struct Response: Codable, Equatable {
-                var info: Info
-                struct Info: Codable, Equatable {
-                    var title: String
+    @Test func openapi() async throws {
+        try await withApp { app in
+            try await app.test(.GET, "openapi/openapi.json") { res async throws in
+                #expect(res.status == .ok)
+                struct Response: Codable, Equatable {
+                    var info: Info
+                    struct Info: Codable, Equatable {
+                        var title: String
+                    }
                 }
+                let decoded = try JSONDecoder().decode(Response.self, from: res.body)
+                #expect(decoded == Response(info: .init(title: "Swift Package Index API")))
             }
-            XCTAssertEqualJSON(res.body.asString(), Response(info: .init(title: "Swift Package Index API")))
         }
     }
 
-    func test_maintenanceMessage() throws {
-        try withDependencies {
+    @Test func maintenanceMessage() async throws {
+        try await withDependencies {
             $0.environment.dbId = { nil }
             $0.environment.maintenanceMessage = { "MAINTENANCE_MESSAGE" }
         } operation: {
-
-            try app.test(.GET, "/") { res in
-                XCTAssertContains(res.body.string, "MAINTENANCE_MESSAGE")
+            try await withApp { app in
+                try await app.test(.GET, "/") { res async in
+                    #expect(res.body.string.contains("MAINTENANCE_MESSAGE"))
+                }
             }
         }
     }