Skip to content

Commit 503b69d

Browse files
committed
repair rebase / spotless
1 parent f2beed1 commit 503b69d

File tree

13 files changed

+41
-66
lines changed

13 files changed

+41
-66
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
/**
1313
* This class manages the different paths in the output folder.
14+
*
1415
* @author Alexander Weigl
1516
* @version 1 (02.02.24)
1617
*/
@@ -37,6 +38,7 @@ public Path getReadmeFile() {
3738

3839
/**
3940
* Initialize/create the necessary directories.
41+
*
4042
* @throws IOException if the output folder is not write or the folders can not be created.
4143
*/
4244
public void init() throws IOException {
@@ -47,7 +49,8 @@ public void init() throws IOException {
4749

4850
private void installAntFile() throws IOException {
4951
try (var buildXml = getClass().getResourceAsStream("/de/uka/ilkd/key/tcg/build.xml")) {
50-
Files.copy(Objects.requireNonNull(buildXml), getAntFile(), StandardCopyOption.REPLACE_EXISTING);
52+
Files.copy(Objects.requireNonNull(buildXml), getAntFile(),
53+
StandardCopyOption.REPLACE_EXISTING);
5154
}
5255
}
5356
}

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,12 @@ public IProgramMethod getMUT() {
5252
@Nullable
5353
public String getMUTCall() {
5454
var m = getMUT();
55-
if (m == null) return null;
55+
if (m == null)
56+
return null;
5657

5758
var name = m.getFullName();
58-
if (name == null) return null;
59+
if (name == null)
60+
return null;
5961

6062
StringBuilder params = new StringBuilder();
6163
for (ParameterDeclaration p : m.getParameters()) {
@@ -93,7 +95,7 @@ public KeYJavaType getTypeOfClassUnderTest() {
9395

9496
@Nullable
9597
public KeYJavaType getReturnType() {
96-
var mut = getMUT();
98+
var mut = getMUT();
9799
return mut != null ? mut.getType() : null;
98100
}
99101

@@ -119,7 +121,7 @@ public JTerm getPreConTerm() {
119121
if (c instanceof FunctionalOperationContract t) {
120122
OriginalVariables orig = t.getOrigVars();
121123
return t.getPre(services.getTypeConverter().getHeapLDT().getHeap(), orig.self,
122-
orig.params, orig.atPres, services);
124+
orig.params, orig.atPres, services);
123125
}
124126
// no pre <==> false
125127
return services.getTermBuilder().ff();
@@ -209,7 +211,7 @@ private String processUpdate(JTerm update) {
209211
return "";
210212
}
211213
return " \n" + up.lhs().sort() + " " + up.lhs().toString() + " = " + update.sub(0)
212-
+ ";";
214+
+ ";";
213215
}
214216
StringBuilder result = new StringBuilder();
215217
for (JTerm sub : update.subs()) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import org.jspecify.annotations.Nullable;
4242
import org.key_project.logic.op.Function;
4343
import org.key_project.logic.sort.Sort;
44-
import org.key_project.logic.sort.Sort;
4544
import org.key_project.prover.sequent.SequentFormula;
4645
import org.key_project.util.java.StringUtil;
4746

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import de.uka.ilkd.key.control.KeYEnvironment;
1212
import de.uka.ilkd.key.proof.Proof;
13-
import de.uka.ilkd.key.prover.ProverTaskListener;
1413
import de.uka.ilkd.key.settings.DefaultSMTSettings;
1514
import de.uka.ilkd.key.settings.NewSMTTranslationSettings;
1615
import de.uka.ilkd.key.settings.ProofDependentSMTSettings;
@@ -25,33 +24,29 @@
2524
import de.uka.ilkd.key.testgen.smt.testgen.TGPhase;
2625
import de.uka.ilkd.key.testgen.smt.testgen.TestGenerationLifecycleListener;
2726

27+
import org.key_project.prover.engine.ProverTaskListener;
28+
2829
public record TestgenFacade(TestGenerationSettings settings) {
2930
public static Callable<Boolean> generateTestcasesTask(KeYEnvironment<?> env, Proof proof,
30-
TestGenerationSettings settings,
31-
TestGenerationLifecycleListener log) {
31+
TestGenerationSettings settings,
32+
TestGenerationLifecycleListener log) {
3233
return () -> {
3334
generateTestcases(env, proof, settings, log);
3435
return true;
3536
};
3637
}
3738

38-
/**
39-
* @param env
40-
* @param proof
41-
* @param settings
42-
* @param log
43-
* @throws InterruptedException
44-
*/
4539
public static void generateTestcases(KeYEnvironment<?> env, Proof proof,
46-
TestGenerationSettings settings,
47-
TestGenerationLifecycleListener log) throws InterruptedException {
40+
TestGenerationSettings settings,
41+
TestGenerationLifecycleListener log) throws InterruptedException {
4842
final TGReporter reporter = new TGReporter(log);
4943

5044
final TestCaseGenerator tg = new TestCaseGenerator(proof, settings, reporter);
5145

5246
NewSMTTranslationSettings newSettings = new NewSMTTranslationSettings();
5347
ProofDependentSMTSettings pdSettings = ProofDependentSMTSettings.getDefaultSettingsData();
54-
ProofIndependentSMTSettings piSettings = ProofIndependentSMTSettings.getDefaultSettingsData();
48+
ProofIndependentSMTSettings piSettings =
49+
ProofIndependentSMTSettings.getDefaultSettingsData();
5550

5651
piSettings.setTimeout(10000);
5752
final var smtSettings = new DefaultSMTSettings(pdSettings, piSettings, newSettings, proof);
@@ -60,7 +55,7 @@ public static void generateTestcases(KeYEnvironment<?> env, Proof proof,
6055
launcher.addListener(new SolverLauncherListener() {
6156
@Override
6257
public void launcherStopped(SolverLauncher launcher,
63-
Collection<SMTSolver> finishedSolvers) {
58+
Collection<SMTSolver> finishedSolvers) {
6459
try {
6560
var first = finishedSolvers.iterator().next();
6661
if (first.getException() != null) {
@@ -80,7 +75,7 @@ public void launcherStopped(SolverLauncher launcher,
8075

8176
@Override
8277
public void launcherStarted(Collection<SMTProblem> problems,
83-
Collection<SolverType> solverTypes, SolverLauncher launcher) {
78+
Collection<SolverType> solverTypes, SolverLauncher launcher) {
8479
}
8580
});
8681

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/SemanticsBlastingMacro.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Set;
77

88
import de.uka.ilkd.key.macros.AbstractBlastingMacro;
9+
910
import org.key_project.prover.proof.rulefilter.RuleFilter;
1011
import org.key_project.prover.rules.Rule;
1112

@@ -126,8 +127,9 @@ public String getDescription() {
126127

127128
private record NameRuleFilter(Set<String> rules) implements RuleFilter {
128129

129-
@Override
130-
public boolean filter(Rule rule) {
131-
return rules.contains(rule.name().toString());
130+
@Override
131+
public boolean filter(Rule rule) {
132+
return rules.contains(rule.name().toString());
133+
}
132134
}
133-
}}
135+
}

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/macros/TestGenMacro.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,13 @@
55

66
import java.util.Set;
77

8-
import de.uka.ilkd.key.logic.PosInOccurrence;
98
import de.uka.ilkd.key.macros.FilterStrategy;
109
import de.uka.ilkd.key.macros.ModalityCache;
1110
import de.uka.ilkd.key.macros.StrategyProofMacro;
1211
import de.uka.ilkd.key.proof.Goal;
1312
import de.uka.ilkd.key.proof.Node;
1413
import de.uka.ilkd.key.proof.Proof;
15-
import de.uka.ilkd.key.rule.Rule;
16-
import de.uka.ilkd.key.rule.RuleApp;
17-
import de.uka.ilkd.key.strategy.NumberRuleAppCost;
18-
import de.uka.ilkd.key.strategy.RuleAppCost;
19-
import de.uka.ilkd.key.testgen.settings.TestGenerationSettings;
2014
import de.uka.ilkd.key.strategy.Strategy;
21-
import de.uka.ilkd.key.strategy.feature.MutableState;
2215
import de.uka.ilkd.key.testgen.TestGenerationSettings;
2316

2417
import org.key_project.logic.Name;
@@ -31,7 +24,6 @@
3124
import org.key_project.prover.strategy.costbased.RuleAppCost;
3225

3326
import org.jspecify.annotations.NonNull;
34-
3527
import org.jspecify.annotations.Nullable;
3628

3729
public class TestGenMacro extends StrategyProofMacro {
@@ -74,17 +66,8 @@ class TestGenStrategy extends FilterStrategy {
7466
* the modality cache used by this strategy
7567
*/
7668
private final ModalityCache modalityCache = new ModalityCache();
77-
static {
78-
unwindRules = new HashSet<>();
79-
unwindRules.add("loopUnwind");
80-
unwindRules.add("doWhileUnwind");
81-
unwindRules.add("methodCall");
82-
unwindRules.add("methodCallWithAssignment");
83-
unwindRules.add("staticMethodCall");
84-
unwindRules.add("staticMethodCallWithAssignment");
85-
}
8669

87-
private static boolean isUnwindRule(@Nullable Rule rule) {
70+
private static boolean isUnwindRule(org.key_project.prover.rules.Rule rule) {
8871
if (rule == null) {
8972
return false;
9073
}

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/oracle/OracleGenerator.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
import java.util.*;
77

88
import de.uka.ilkd.key.java.Services;
9+
import de.uka.ilkd.key.ldt.JavaDLTheory;
910
import de.uka.ilkd.key.logic.Name;
1011
import de.uka.ilkd.key.logic.op.*;
1112
import de.uka.ilkd.key.logic.sort.SortImpl;
1213
import de.uka.ilkd.key.smt.NumberTranslation;
1314
import de.uka.ilkd.key.testgen.ReflectionClassCreator;
1415
import de.uka.ilkd.key.testgen.oracle.OracleUnaryTerm.Op;
1516

16-
import org.key_project.logic.Name;
17-
import org.key_project.logic.op.Function;
18-
import org.key_project.logic.sort.Sort;
1917
import org.key_project.logic.Name;
2018
import org.key_project.logic.Term;
2119
import org.key_project.logic.op.Function;
@@ -27,7 +25,6 @@
2725
import org.slf4j.Logger;
2826
import org.slf4j.LoggerFactory;
2927

30-
import static de.uka.ilkd.key.ldt.JavaDLTheory.FORMULA;
3128
import static de.uka.ilkd.key.testgen.Constants.*;
3229

3330
public class OracleGenerator {
@@ -52,6 +49,7 @@ public class OracleGenerator {
5249
private Set<String> truePredicates = new TreeSet<>();
5350

5451
private Set<String> falsePredicates = new TreeSet<>();
52+
5553
private final Set<String> prestateTerms = new TreeSet<>();
5654

5755
private final Map<Sort, OracleMethod> invariants = new HashMap<>();
@@ -467,7 +465,7 @@ private OracleTerm translateSelect(Term term, boolean initialSelect) {
467465

468466
if (!initialSelect && isPreHeap(heapTerm)
469467
&& term.sort().extendsTrans(services.getJavaInfo().getJavaLangObject().getSort())) {
470-
return new OracleConstant(TestCaseGenerator.OLDMap + ".get(" + value + ")",
468+
return new OracleConstant(OLD_MAP + ".get(" + value + ")",
471469
term.sort());
472470
}
473471

@@ -589,9 +587,9 @@ private OracleMethod createIfThenElseMethod(Term term, boolean initialSelect) {
589587
private String getSetName(Sort s) {
590588

591589
if (s.equals(JavaDLTheory.FORMULA)) {
592-
return TestCaseGenerator.ALL_BOOLS;
590+
return ALL_BOOLS;
593591
} else if (s.equals(services.getTypeConverter().getIntegerLDT().targetSort())) {
594-
return TestCaseGenerator.ALL_INTS;
592+
return ALL_INTS;
595593
} else if (s.equals(services.getTypeConverter().getLocSetLDT().targetSort())) {
596594
throw new RuntimeException("Not implemented yet.");
597595
// return TestCaseGenerator.ALL_LOCSETS
@@ -607,7 +605,7 @@ private String getSetName(Sort s) {
607605
}
608606

609607

610-
return TestCaseGenerator.ALL_OBJECTS;
608+
return ALL_OBJECTS;
611609
}
612610

613611
private OracleMethod createQuantifierMethod(Term term, boolean initialSelect) {

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/oracle/OracleLocationSet.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
public sealed
1010

1111
interface OracleLocationSet
12-
permits AllLocsLocationSet, EmptyOracleLocationSet, OracleDefaultLocationSet
13-
{
12+
permits AllLocsLocationSet, EmptyOracleLocationSet, OracleDefaultLocationSet {
1413

1514
static OracleLocationSet singleton(OracleLocation loc) {
1615
var result = new OracleDefaultLocationSet();

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/oracle/OracleMethodCall.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.jspecify.annotations.Nullable;
1010

1111
public record OracleMethodCall(OracleMethod method, List<? extends OracleTerm> args,
12-
@Nullable OracleTerm caller)
12+
@Nullable OracleTerm caller)
1313
implements OracleTerm {
1414
public OracleMethodCall(OracleMethod method, List<? extends OracleTerm> args) {
1515
this(method, args, null);

key.core.testgen/src/main/java/de/uka/ilkd/key/testgen/oracle/OracleTerm.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* SPDX-License-Identifier: GPL-2.0-only */
44
package de.uka.ilkd.key.testgen.oracle;
55

6-
public sealed
7-
interface OracleTerm
8-
permits OracleBinTerm, OracleConstant, OracleMethodCall, OracleType, OracleUnaryTerm, OracleVariable
9-
{
6+
public sealed interface OracleTerm
7+
permits OracleBinTerm, OracleConstant, OracleMethodCall, OracleType, OracleUnaryTerm,
8+
OracleVariable {
109
}

0 commit comments

Comments
 (0)