Fixing some more tests

Author: goergisn

Sources/Pipeline/SwiftInterfaceProducer.swift

@@ -1,10 +1,3 @@
-//
-//  File.swift
-//  
-//
-//  Created by Alexander Guretzki on 09/10/2024.
-//
-
 import Foundation
 
 /// Allows building of the old & new project and returns the `.swiftinterface` files

Sources/public-api-diff.swift

@@ -28,7 +28,10 @@ struct PublicApiDiff: AsyncParsableCommand {
     public func run() async throws {
 
         let logLevel: LogLevel = .debug
-        let projectType: ProjectType = .swiftPackage // Only needed when we have to produce the .swiftinterface files
+        let projectType: ProjectType = { // Only needed when we have to produce the .swiftinterface files
+            if let scheme { return .xcodeProject(scheme: scheme) }
+            return .swiftPackage
+        }()
         let swiftInterfaceType: SwiftInterfaceType = .public // Only needed when we have to produce the .swiftinterface files
 
         let fileHandler: FileHandling = FileManager.default

Tests/UnitTests/LoggerTests.swift

@@ -71,6 +71,8 @@ class LoggerTests: XCTestCase {
         let logFileLogger = LogFileLogger(fileHandler: fileHandler, outputFilePath: outputFilePath)
 
         logFileLogger.log("log", from: "test")
+        // Small sleep because the file manager calls are done on a detached Task and we want to guarantee the order
+        try await Task.sleep(for: .milliseconds(10))
         logFileLogger.debug("debug", from: "test")
 
         await fulfillment(of: [removeExpectation])

Tests/UnitTests/XcodeToolsTests.swift

@@ -13,11 +13,45 @@ class XcodeToolsTests: XCTestCase {
 
         let projectDirectoryPath = "PROJECT_DIRECTORY_PATH"
         let scheme = "SCHEME"
-        let projectType = ProjectType.swiftPackage
+        
+        try await testArchiving(
+            projectDirectoryPath: projectDirectoryPath,
+            scheme: scheme,
+            projectType: .swiftPackage
+        )
+    }
+    
+    func test_archive_xcodeProject() async throws {
+        
+        let projectDirectoryPath = "PROJECT_DIRECTORY_PATH"
+        let scheme = "SCHEME"
+        
+        try await testArchiving(
+            projectDirectoryPath: projectDirectoryPath,
+            scheme: scheme,
+            projectType: .xcodeProject(scheme: scheme)
+        )
+    }
+}
+
+private extension XcodeToolsTests {
+    
+    func testArchiving(
+        projectDirectoryPath: String,
+        scheme: String,
+        projectType: ProjectType
+    ) async throws {
 
         let archiveResult = "ARCHIVE_RESULT"
         let expectedDerivedDataPath = "\(projectDirectoryPath)/.build"
-        var expectedHandleExecuteCalls = ["cd \(projectDirectoryPath); xcodebuild clean build -scheme \"\(scheme)\" -destination \"generic/platform=iOS\" -derivedDataPath .build -sdk `xcrun --sdk iphonesimulator --show-sdk-path` BUILD_LIBRARY_FOR_DISTRIBUTION=YES -skipPackagePluginValidation"]
+        var expectedHandleExecuteCalls: [String] = {
+            switch projectType {
+            case .swiftPackage:
+                ["cd \(projectDirectoryPath); xcodebuild clean build -scheme \"\(scheme)\" -destination \"generic/platform=iOS\" -derivedDataPath .build -sdk `xcrun --sdk iphonesimulator --show-sdk-path` BUILD_LIBRARY_FOR_DISTRIBUTION=YES -skipPackagePluginValidation"]
+            case .xcodeProject(let scheme):
+                ["cd \(projectDirectoryPath); xcodebuild clean build -scheme \"\(scheme)\" -destination \"generic/platform=iOS\" -derivedDataPath .build -sdk `xcrun --sdk iphonesimulator --show-sdk-path` BUILD_LIBRARY_FOR_DISTRIBUTION=YES"]
+            }
+        }()
         var expectedHandleLogCalls: [(message: String, subsystem: String)] = [
             ("📦 Archiving SCHEME from PROJECT_DIRECTORY_PATH", "XcodeTools")
         ]