Move withApp to TestSupport

Author: finestructure

Tests/AppTests/AnalyzeErrorTests.swift

@@ -12,56 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import Testing
-
 @testable import App
 
 import Dependencies
 import Fluent
 import ShellOut
-
-
-#warning("Move this")
+import Testing
 import Vapor
-private func withApp(_ setup: (Application) async throws -> Void = { _ in },
-                     _ updateValuesForOperation: (inout DependencyValues) async throws -> Void = { _ in },
-                     _ logHandler: LogHandler? = nil,
-                     environment: Environment = .testing,
-                     _ test: (Application) async throws -> Void) async throws {
-    try await AppTestCase.setupDb(environment)
-    let app = try await AppTestCase.setupApp(environment)
-
-    return try await run {
-        try await setup(app)
-        try await withDependencies(updateValuesForOperation) {
-            let logger = logHandler.map { handler in Logger(label: "test", factory: { _ in handler }) }
-            try await withDependencies {
-                if let logger {
-                    $0.logger.set(to: logger)
-                }
-            } operation: {
-                try await test(app)
-            }
-        }
-    } defer: {
-        try await app.asyncShutdown()
-    }
-}
-
-
-
-private func defaultShellRun(command: ShellOutCommand, path: String) throws -> String {
-    switch command {
-        case .swiftDumpPackage where path.hasSuffix("foo-1"):
-            return packageSwift1
-
-        case .swiftDumpPackage where path.hasSuffix("foo-2"):
-            return packageSwift2
-
-        default:
-            return ""
-    }
-}
 
 
 // Test analysis error handling.
@@ -257,6 +214,20 @@ extension AnalyzeErrorTests {
 }
 
 
+private func defaultShellRun(command: ShellOutCommand, path: String) throws -> String {
+    switch command {
+        case .swiftDumpPackage where path.hasSuffix("foo-1"):
+            return packageSwift1
+
+        case .swiftDumpPackage where path.hasSuffix("foo-2"):
+            return packageSwift2
+
+        default:
+            return ""
+    }
+}
+
+
 private extension GitClient {
     struct SetupError: Error { }
     static var analyzeErrorTestsMock: Self {

Tests/AppTests/Helpers/TestSupport.swift

@@ -0,0 +1,44 @@
+// Copyright Dave Verwer, Sven A. Schmidt, and other contributors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+@testable import App
+
+import Dependencies
+import Vapor
+
+
+func withApp(_ setup: (Application) async throws -> Void = { _ in },
+             _ updateValuesForOperation: (inout DependencyValues) async throws -> Void = { _ in },
+             _ logHandler: LogHandler? = nil,
+             environment: Environment = .testing,
+             _ test: (Application) async throws -> Void) async throws {
+    try await AppTestCase.setupDb(environment)
+    let app = try await AppTestCase.setupApp(environment)
+
+    return try await run {
+        try await setup(app)
+        try await withDependencies(updateValuesForOperation) {
+            let logger = logHandler.map { handler in Logger(label: "test", factory: { _ in handler }) }
+            try await withDependencies {
+                if let logger {
+                    $0.logger.set(to: logger)
+                }
+            } operation: {
+                try await test(app)
+            }
+        }
+    } defer: {
+        try await app.asyncShutdown()
+    }
+}