fix errors from automerge

Author: wadoon

key.core/src/test/java/de/uka/ilkd/key/scripts/TestProofScriptCommand.java

@@ -15,8 +15,6 @@
 import de.uka.ilkd.key.control.DefaultUserInterfaceControl;
 import de.uka.ilkd.key.control.KeYEnvironment;
 import de.uka.ilkd.key.nparser.ParsingFacade;
-import de.uka.ilkd.key.java.Position;
-import de.uka.ilkd.key.parser.Location;
 import de.uka.ilkd.key.proof.Goal;
 import de.uka.ilkd.key.proof.Proof;
 import de.uka.ilkd.key.smt.newsmt2.MasterHandlerTest;
@@ -25,6 +23,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -37,7 +36,7 @@
  * see {@link MasterHandlerTest} from where I copied quite a bit.
  */
 public class TestProofScriptCommand {
-    public record TestInstance(String key, String script, String exception,
+    public record TestInstance(String key, String script, @Nullable String exception,
             String[] goals, Integer selectedGoal) {
     }
 
@@ -83,13 +82,13 @@ void testProofScript(File file, TestInstance data) throws Exception {
         try {
             pse.execute(env.getUi(), proof);
         } catch (ScriptException ex) {
-            assertTrue(props.containsKey("exception"),
+            assertTrue(data.exception != null && !data.exception.isEmpty(),
                 "An exception was not expected, but got " + ex.getMessage());
             // weigl: fix spurious error on Windows machine due to different file endings.
             String msg = ex.getMessage().trim().replaceAll("\r\n", "\n");
-            Assertions.assertTrue(msg.startsWith(props.get("exception").trim()),
+            Assertions.assertTrue(msg.startsWith(data.exception.trim()),
                 "Unexpected exception: " + ex.getMessage() + "\n expected: "
-                    + props.get("exception").trim());
+                    + data.exception.trim());
             return;
         }
 

key.core/src/test/java/de/uka/ilkd/key/smt/newsmt2/MasterHandlerTest.java

@@ -5,14 +5,11 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.*;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
@@ -37,7 +34,6 @@
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import org.assertj.core.api.Assertions;
 import org.jspecify.annotations.NonNull;
-import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.TestFactory;
@@ -152,8 +148,8 @@ private LoadedTestData load(String name) throws IOException, ProblemLoaderExcept
             if (javaSrc != null && !javaSrc.isEmpty()) {
                 Path srcDir = Files.createTempDirectory("SMT_key_" + name);
                 Path tmpSrc = srcDir.resolve("src.java");
-                Files.write(tmpSrc, sources);
-                lines.addFirst("\\javaSource \"" + srcDir + "\";\n");
+                Files.writeString(tmpSrc, javaSrc);
+                keySrc += "\\javaSource \"" + srcDir + "\";\n";
             }
 
             Path tmpKey = Files.createTempFile("SMT_key_%s".formatted(name), ".key");