Handle errors in tests

vapor-community · Oct 22, 2024 · 839cc5d · 839cc5d
1 parent 168b6d5
commit 839cc5d
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 56 deletions.
diff --git a/Tests/OrdersTests/OrdersTests.swift b/Tests/OrdersTests/OrdersTests.swift
@@ -377,14 +377,15 @@ struct OrdersTests {
                 }
             )
 
-            // Test `OrderDataMiddleware` update method
-            // TODO: Fix this test
-            // orderData.title = "Test Order 2"
-            // do {
-            //     try await orderData.update(on: app.db)
-            // } catch let error as HTTPClientError {
-            //     #expect(error.self == .remoteConnectionClosed)
-            // }
+            if !useEncryptedKey {
+                // Test `OrderDataMiddleware` update method
+                orderData.title = "Test Order 2"
+                do {
+                    try await orderData.update(on: app.db)
+                } catch let error as HTTPClientError {
+                    #expect(error.self == .remoteConnectionClosed)
+                }
+            }
         }
     }
 

diff --git a/Tests/OrdersTests/withApp.swift b/Tests/OrdersTests/withApp.swift
@@ -11,30 +11,35 @@ func withApp(
     _ body: (Application, OrdersService) async throws -> Void
 ) async throws {
     let app = try await Application.make(.testing)
-    try #require(isLoggingConfigured)
+    do {
+        try #require(isLoggingConfigured)
 
-    app.databases.use(.sqlite(.memory), as: .sqlite)
-    OrdersService.register(migrations: app.migrations)
-    app.migrations.add(CreateOrderData())
-    try await app.autoMigrate()
+        app.databases.use(.sqlite(.memory), as: .sqlite)
+        OrdersService.register(migrations: app.migrations)
+        app.migrations.add(CreateOrderData())
+        try await app.autoMigrate()
 
-    let delegate = TestOrdersDelegate()
-    let ordersService = try OrdersService(
-        app: app,
-        delegate: delegate,
-        signingFilesDirectory: "\(FileManager.default.currentDirectoryPath)/Tests/Certificates/",
-        pemCertificate: useEncryptedKey ? "encryptedcert.pem" : "certificate.pem",
-        pemPrivateKey: useEncryptedKey ? "encryptedkey.pem" : "key.pem",
-        pemPrivateKeyPassword: useEncryptedKey ? "password" : nil,
-        pushRoutesMiddleware: SecretMiddleware(secret: "foo"),
-        logger: app.logger
-    )
-    app.databases.middleware.use(OrderDataMiddleware(service: ordersService), on: .sqlite)
+        let delegate = TestOrdersDelegate()
+        let ordersService = try OrdersService(
+            app: app,
+            delegate: delegate,
+            signingFilesDirectory: "\(FileManager.default.currentDirectoryPath)/Tests/Certificates/",
+            pemCertificate: useEncryptedKey ? "encryptedcert.pem" : "certificate.pem",
+            pemPrivateKey: useEncryptedKey ? "encryptedkey.pem" : "key.pem",
+            pemPrivateKeyPassword: useEncryptedKey ? "password" : nil,
+            pushRoutesMiddleware: SecretMiddleware(secret: "foo"),
+            logger: app.logger
+        )
+        app.databases.middleware.use(OrderDataMiddleware(service: ordersService), on: .sqlite)
 
-    Zip.addCustomFileExtension("order")
+        Zip.addCustomFileExtension("order")
 
-    try await body(app, ordersService)
+        try await body(app, ordersService)
 
-    try await app.autoRevert()
+        try await app.autoRevert()
+    } catch {
+        try await app.asyncShutdown()
+        throw error
+    }
     try await app.asyncShutdown()
 }
diff --git a/Tests/PassesTests/PassesTests.swift b/Tests/PassesTests/PassesTests.swift
@@ -505,14 +505,15 @@ struct PassesTests {
                 }
             )
 
-            // Test `PassDataMiddleware` update method
-            // TODO: Fix this test
-            // passData.title = "Test Pass 2"
-            // do {
-            //     try await passData.update(on: app.db)
-            // } catch let error as HTTPClientError {
-            //     #expect(error.self == .remoteConnectionClosed)
-            // }
+            if !useEncryptedKey {
+                // Test `PassDataMiddleware` update method
+                passData.title = "Test Pass 2"
+                do {
+                    try await passData.update(on: app.db)
+                } catch let error as HTTPClientError {
+                    #expect(error.self == .remoteConnectionClosed)
+                }
+            }
         }
     }
 

diff --git a/Tests/PassesTests/withApp.swift b/Tests/PassesTests/withApp.swift
@@ -11,30 +11,35 @@ func withApp(
     _ body: (Application, PassesService) async throws -> Void
 ) async throws {
     let app = try await Application.make(.testing)
-    try #require(isLoggingConfigured)
+    do {
+        try #require(isLoggingConfigured)
 
-    app.databases.use(.sqlite(.memory), as: .sqlite)
-    PassesService.register(migrations: app.migrations)
-    app.migrations.add(CreatePassData())
-    try await app.autoMigrate()
+        app.databases.use(.sqlite(.memory), as: .sqlite)
+        PassesService.register(migrations: app.migrations)
+        app.migrations.add(CreatePassData())
+        try await app.autoMigrate()
 
-    let delegate = TestPassesDelegate()
-    let passesService = try PassesService(
-        app: app,
-        delegate: delegate,
-        signingFilesDirectory: "\(FileManager.default.currentDirectoryPath)/Tests/Certificates/",
-        pemCertificate: useEncryptedKey ? "encryptedcert.pem" : "certificate.pem",
-        pemPrivateKey: useEncryptedKey ? "encryptedkey.pem" : "key.pem",
-        pemPrivateKeyPassword: useEncryptedKey ? "password" : nil,
-        pushRoutesMiddleware: SecretMiddleware(secret: "foo"),
-        logger: app.logger
-    )
-    app.databases.middleware.use(PassDataMiddleware(service: passesService), on: .sqlite)
+        let delegate = TestPassesDelegate()
+        let passesService = try PassesService(
+            app: app,
+            delegate: delegate,
+            signingFilesDirectory: "\(FileManager.default.currentDirectoryPath)/Tests/Certificates/",
+            pemCertificate: useEncryptedKey ? "encryptedcert.pem" : "certificate.pem",
+            pemPrivateKey: useEncryptedKey ? "encryptedkey.pem" : "key.pem",
+            pemPrivateKeyPassword: useEncryptedKey ? "password" : nil,
+            pushRoutesMiddleware: SecretMiddleware(secret: "foo"),
+            logger: app.logger
+        )
+        app.databases.middleware.use(PassDataMiddleware(service: passesService), on: .sqlite)
 
-    Zip.addCustomFileExtension("pkpass")
+        Zip.addCustomFileExtension("pkpass")
 
-    try await body(app, passesService)
+        try await body(app, passesService)
 
-    try await app.autoRevert()
+        try await app.autoRevert()
+    } catch {
+        try await app.asyncShutdown()
+        throw error
+    }
     try await app.asyncShutdown()
 }