Return List instead of Optional from binaryRunner()

3 files changed, 10 insertions, 11 deletions

diff --git a/src/test/java/org/shedlang/compiler/backends/ExampleTests.java b/src/test/java/org/shedlang/compiler/backends/ExampleTests.java
index adfdf5d8..1b6f7536 100644
--- a/src/test/java/org/shedlang/compiler/backends/ExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/ExampleTests.java
@@ -12,7 +12,7 @@ import org.shedlang.compiler.util.P;
 
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Optional;
+import java.util.List;
 import java.util.stream.Stream;
 
 import static org.zwobble.precisely.AssertThat.assertThat;
@@ -54,9 +54,8 @@ public abstract class ExampleTests {
     }
 
     private ExecutionResult runExampleBinary(String binary) throws IOException, InterruptedException {
-        var fullCommand = binaryRunner()
-            .map(binaryRunner -> P.vector(binaryRunner))
-            .orElse(P.vector())
+        var fullCommand = P.<String>vector()
+            .plusAll(binaryRunner())
             .plus(executableName(binary));
 
         return TestProcessRunner.runCaptureOutput(fullCommand);
@@ -64,7 +63,7 @@ public abstract class ExampleTests {
 
     protected abstract Backend backend();
 
-    protected abstract Optional<String> binaryRunner();
+    protected abstract List<String> binaryRunner();
 
     protected abstract String executableName(String binary);
 
diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioExampleTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioExampleTests.java
index bc19ffbf..ab8b19be 100644
--- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmPatioExampleTests.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.backends.llvm;
 import org.shedlang.compiler.backends.Backend;
 import org.shedlang.compiler.backends.ExampleTests;
 
-import java.util.Optional;
+import java.util.List;
 
 public class LlvmPatioExampleTests extends ExampleTests {
     @Override
@@ -12,8 +12,8 @@ public class LlvmPatioExampleTests extends ExampleTests {
     }
 
     @Override
-    protected Optional<String> binaryRunner() {
-        return Optional.empty();
+    protected List<String> binaryRunner() {
+        return List.of();
     }
 
     @Override
diff --git a/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioExampleTests.java b/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioExampleTests.java
index 37ffa780..82aaef2d 100644
--- a/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioExampleTests.java
+++ b/src/test/java/org/shedlang/compiler/backends/wasm/WasmPatioExampleTests.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.backends.wasm;
 import org.shedlang.compiler.backends.Backend;
 import org.shedlang.compiler.backends.ExampleTests;
 
-import java.util.Optional;
+import java.util.List;
 
 public class WasmPatioExampleTests extends ExampleTests {
     @Override
@@ -12,8 +12,8 @@ public class WasmPatioExampleTests extends ExampleTests {
     }
 
     @Override
-    protected Optional<String> binaryRunner() {
-        return Optional.of("wasmtime");
+    protected List<String> binaryRunner() {
+        return List.of("wasmtime");
     }
 
     @Override