fix some tests

Author: wadoon

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/TestgenFacade.java

@@ -6,6 +6,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.concurrent.Callable;
 
 import de.uka.ilkd.key.control.KeYEnvironment;
@@ -66,7 +67,7 @@ public void launcherStopped(SolverLauncher launcher,
 
                     tg.generateJUnitTestSuite(finishedSolvers);
                     reporter.writeln("Compile the generated files using a Java compiler.");
-                } catch (IOException e) {
+                } catch (NoSuchElementException | IOException e) {
                     reporter.reportException(e);
                 }
             }

key.core/src/main/java/de/uka/ilkd/key/java/ast/expression/Assignment.java

@@ -4,6 +4,7 @@
 package de.uka.ilkd.key.java.ast.expression;
 
 import java.util.List;
+import java.util.Objects;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.ast.Comment;
@@ -130,4 +131,18 @@ public String reuseSignature(Services services, ExecutionContext ec) {
             return base;
         }
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof Assignment that))
+            return false;
+        if (!super.equals(o))
+            return false;
+        return kind == that.kind && Objects.equals(that.children, children);
+    }
+
+    @Override
+    protected int computeHashCode() {
+        return Objects.hash(kind, children);
+    }
 }

key.core/src/main/java/de/uka/ilkd/key/java/ast/expression/operator/BinaryOperator.java

@@ -114,4 +114,18 @@ public KeYJavaType getKeYJavaType(Services javaServ, ExecutionContext ec) {
     public void visit(Visitor v) {
         v.performActionOnBinaryOperator(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof BinaryOperator b))
+            return false;
+        return Objects.equals(getKind(), b.getKind()) && Objects.equals(children, b.children);
+    }
+
+    @Override
+    protected int computeHashCode() {
+        return Objects.hash(kind, children);
+    }
 }

key.core/src/main/java/de/uka/ilkd/key/java/ast/expression/operator/LogicFunctionalOperator.java

@@ -4,6 +4,7 @@
 package de.uka.ilkd.key.java.ast.expression.operator;
 
 import java.util.List;
+import java.util.Objects;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.ast.Comment;
@@ -105,4 +106,18 @@ public KeYJavaType getKeYJavaType(Services javaServ, ExecutionContext ec) {
     public void visit(Visitor v) {
         v.performActionOnLogicFunctionalOperator(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof LogicFunctionalOperator that))
+            return false;
+        if (!super.equals(o))
+            return false;
+        return function == that.function && Objects.equals(that.children, children);
+    }
+
+    @Override
+    protected int computeHashCode() {
+        return Objects.hash(function, children);
+    }
 }

key.core/src/main/java/de/uka/ilkd/key/java/ast/expression/operator/UnaryOperator.java

@@ -4,6 +4,7 @@
 package de.uka.ilkd.key.java.ast.expression.operator;
 
 import java.util.List;
+import java.util.Objects;
 
 import de.uka.ilkd.key.java.Services;
 import de.uka.ilkd.key.java.ast.Comment;
@@ -90,4 +91,18 @@ public KeYJavaType getKeYJavaType(Services javaServ, ExecutionContext ec) {
     public void visit(Visitor v) {
         v.performActionOnUnaryOperator(this);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof UnaryOperator that))
+            return false;
+        if (!super.equals(o))
+            return false;
+        return kind == that.kind && Objects.equals(that.children, children);
+    }
+
+    @Override
+    protected int computeHashCode() {
+        return Objects.hash(kind, children);
+    }
 }

key.core/src/main/java/de/uka/ilkd/key/proof/io/consistency/DiskFileRepo.java

@@ -12,6 +12,7 @@
 import java.nio.file.Paths;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.stream.Stream;
 
 import de.uka.ilkd.key.settings.GeneralSettings;
 
@@ -342,17 +343,15 @@ protected void dispose() {
      */
     private void deleteDiskContent() throws IOException {
         if (!isDisposed() && !GeneralSettings.keepFileRepos) {
-            try (var s = Files.walk(tmpDir)) {
-                s.sorted(Comparator.reverseOrder())
-                        // .map(Path::toFile)
-                        .forEach(path -> {
-                            try {
-                                Files.delete(path);
-                                // path.delete();
-                            } catch (IOException e) {
-                                LOGGER.info("Failed to delete file", e);
-                            }
-                        });
+            try (Stream<Path> s = Files.walk(tmpDir).sorted(Comparator.reverseOrder())) {
+                s.forEach(path -> {
+                    try {
+                        Files.deleteIfExists(path);
+                        // path.delete();
+                    } catch (IOException e) {
+                        LOGGER.info("Could not clean up temp directory {}", path);
+                    }
+                });
             }
         }
     }

key.core/src/main/java/de/uka/ilkd/key/rule/AuxiliaryContractBuilders.java

@@ -1635,7 +1635,8 @@ private StatementBlock constructAbruptTerminationIfCascade() {
                     KeYJavaASTFactory.returnClause(variables.result)));
             }
             ifCascade.add(KeYJavaASTFactory.ifThen(
-                new BinaryOperator(BinaryOperator.BinaryOperatorKind.NOT_EQUALS, variables.exception,
+                new BinaryOperator(BinaryOperator.BinaryOperatorKind.NOT_EQUALS,
+                    variables.exception,
                     NullLiteral.NULL),
                 KeYJavaASTFactory.throwClause(variables.exception)));
             return new StatementBlock(ifCascade.toArray(new Statement[0]));