CommandRunnerFake: Also throw on unmocked commands

Author: rockbruno

Tests/SourceKitBazelBSPTests/Fakes/CommandRunnerFake.swift

@@ -21,29 +21,48 @@ import Foundation
 
 @testable import SourceKitBazelBSP
 
+enum CommandRunnerFakeError: Error, LocalizedError {
+    case unregisteredCommand(String, String?)
+
+    var errorDescription: String? {
+        switch self {
+        case .unregisteredCommand(let cmd, let cwd):
+            return "Unexpected command: \(cmd) (cwd: \(cwd ?? "nil"))"
+        }
+    }
+}
+
 final class CommandRunnerFake: CommandRunner {
 
     private(set) var commands: [(command: String, cwd: String?)] = []
     private var responses: [String: String] = [:]
     private var errors: [String: Error] = [:]
 
     func setResponse(for command: String, cwd: String? = nil, response: String) {
-        responses[command + "|" + (cwd ?? "nil")] = response
+        responses[key(for: command, cwd: cwd)] = response
     }
 
     func setError(for command: String, cwd: String? = nil, error: Error) {
-        errors[command + "|" + (cwd ?? "nil")] = error
+        errors[key(for: command, cwd: cwd)] = error
     }
 
     func run(_ cmd: String, cwd: String?) throws -> String {
         commands.append((command: cmd, cwd: cwd))
 
-        if let error = errors[cmd + "|" + (cwd ?? "nil")] {
+        let cacheKey = key(for: cmd, cwd: cwd)
+        if let error = errors[cacheKey] {
             throw error
         }
 
-        return responses[cmd + "|" + (cwd ?? "nil")]
-            ?? "Response/error not registered for command: \(cmd)"
+        guard let response = responses[cacheKey] else {
+            throw CommandRunnerFakeError.unregisteredCommand(cmd, cwd)
+        }
+
+        return response
+    }
+
+    private func key(for command: String, cwd: String?) -> String {
+        return command + "|" + (cwd ?? "nil")
     }
 
     func reset() {

Tests/SourceKitBazelBSPTests/InitializeHandlerTests.swift

@@ -110,6 +110,9 @@ import Testing
             response: outputPath
         )
         commandRunner.setResponse(for: "xcrun --find swift", response: toolchain + "usr/bin/swift")
+        commandRunner.setResponse(for: "xcode-select --print-path", response: "foo")
+        commandRunner.setResponse(
+            for: "xcrun --sdk iphonesimulator --show-sdk-path", response: "bar")
 
         let handler = InitializeHandler(
             baseConfig: baseConfig,
@@ -154,6 +157,9 @@ import Testing
             response: outputPath
         )
         commandRunner.setResponse(for: "xcrun --find swift", response: toolchain + "usr/bin/swift")
+        commandRunner.setResponse(for: "xcode-select --print-path", response: "foo")
+        commandRunner.setResponse(
+            for: "xcrun --sdk iphonesimulator --show-sdk-path", response: "bar")
 
         let handler = InitializeHandler(
             baseConfig: baseConfig,

Tests/SourceKitBazelBSPTests/PrepareHandlerTests.swift

@@ -31,6 +31,7 @@ import Testing
         let commandRunner = CommandRunnerFake()
         let connection = LSPConnectionFake()
 
+        let rootUri = "/path/to/project"
         let baseConfig = BaseServerConfig(
             bazelWrapper: "bazel",
             targets: ["//HelloWorld"],
@@ -40,7 +41,7 @@ import Testing
 
         let initializedConfig = InitializedServerConfig(
             baseConfig: baseConfig,
-            rootUri: "/path/to/project",
+            rootUri: rootUri,
             outputBase: "/tmp/output_base",
             outputPath: "/tmp/output_path",
             devDir: "/Applications/Xcode.app/Contents/Developer",
@@ -52,6 +53,7 @@ import Testing
             "bazel --output_base=/tmp/output_base build //HelloWorld --config=index"
         commandRunner.setResponse(
             for: expectedCommand,
+            cwd: rootUri,
             response: "")
 
         let chmodCommand = "chmod -R 777 /tmp/output_base"
@@ -72,7 +74,7 @@ import Testing
         let ranCommands = commandRunner.commands
         #expect(ranCommands.count == 2)
         #expect(ranCommands[0].command == expectedCommand)
-        #expect(ranCommands[0].cwd == "/path/to/project")
+        #expect(ranCommands[0].cwd == rootUri)
         #expect(ranCommands[1].command == chmodCommand)
         #expect(ranCommands[1].cwd == nil)
     }