Skip to content

Commit d7d0301

Browse files
committed
fix test oracles in EndToEndTests
1 parent bb134dd commit d7d0301

1 file changed

Lines changed: 25 additions & 16 deletions

File tree

keyext.slicing/src/test/java/org/key_project/slicing/EndToEndTests.java

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ void sliceMultipleIterations() throws Exception {
8888
.resolve("reverseArray.proof");
8989
Pair<Proof, Path> iteration1 = sliceProofFullFilename(
9090
directory,
91-
5138, 4127, true, true, true);
91+
5270, 4183, true, true, true);
9292
var iteration2 =
93-
sliceProofFullFilename(iteration1.second, 4127, 4125, true, true, true);
93+
sliceProofFullFilename(iteration1.second, 4183, 4181, true, true, true);
9494
var iteration3 =
95-
sliceProofFullFilename(iteration2.second, 4125, 4123, true, true, true);
95+
sliceProofFullFilename(iteration2.second,4181, 4179, true, true, true);
9696
var iteration4 =
97-
sliceProofFullFilename(iteration3.second, 4123, 4121, true, true, true);
97+
sliceProofFullFilename(iteration3.second, 4179, 4177, true, true, true);
9898
var iteration5 =
99-
sliceProofFullFilename(iteration4.second, 4121, 4119, true, true, true);
99+
sliceProofFullFilename(iteration4.second, 4177, 4175, true, true, true);
100100
iteration5.first.dispose();
101101
iteration4.first.dispose();
102102
iteration3.first.dispose();
@@ -119,10 +119,10 @@ void sliceMultipleIterations() throws Exception {
119119
void sliceJavaProof() throws Exception {
120120
sliceProof(
121121
"../../../../../key.ui/examples/heap/verifyThis15_2_ParallelGcd/parallelGcd.proof",
122-
3238, 1336, true, false).dispose();
122+
3379, 1305, true, false).dispose();
123123
sliceProofOffline(
124124
"../../../../../key.ui/examples/heap/verifyThis15_2_ParallelGcd/parallelGcd.proof",
125-
3238, 1336, true, false).dispose();
125+
3379, 1305, true, false).dispose();
126126
}
127127

128128
/**
@@ -313,8 +313,16 @@ private Pair<Proof, Path> sliceProofFullFilename(Path proofFile, int expectedTot
313313
// analyze proof
314314
AnalysisResults results =
315315
tracker.get().analyze(doDependencyAnalysis, doDeduplicateRuleApps);
316-
assertEquals(expectedTotal, results.totalSteps);
317-
assertEquals(expectedInSlice, results.usefulStepsNr);
316+
if(expectedTotal>0) {
317+
assertEquals(expectedTotal, results.totalSteps);
318+
}else{
319+
LOGGER.info("total steps: {}", results.totalSteps);
320+
}
321+
if(expectedInSlice>0) {
322+
assertEquals(expectedInSlice, results.usefulStepsNr);
323+
}else{
324+
LOGGER.info("total steps in slice: {}", results.usefulStepsNr);
325+
}
318326
// slice proof
319327
DefaultUserInterfaceControl control = new DefaultUserInterfaceControl();
320328
SlicingProofReplayer slicer = SlicingProofReplayer.constructSlicer(control,
@@ -329,13 +337,14 @@ private Pair<Proof, Path> sliceProofFullFilename(Path proofFile, int expectedTot
329337
Assertions.assertTrue(slicedProof.closed(), "Proof is not closed");
330338
}
331339

332-
assertEquals(expectedInSlice
333-
+ slicedProof.closedGoals().size()
334-
- slicedProof.closedGoals().stream()
335-
.filter(x -> x.node().getAppliedRuleApp() instanceof SMTRuleApp)
336-
.count(),
337-
slicedProof.countNodes());
338-
340+
if(expectedInSlice>0) {
341+
assertEquals(expectedInSlice
342+
+ slicedProof.closedGoals().size()
343+
- slicedProof.closedGoals().stream()
344+
.filter(x -> x.node().getAppliedRuleApp() instanceof SMTRuleApp)
345+
.count(),
346+
slicedProof.countNodes());
347+
}
339348
return new Pair<>(slicedProof, tempFile);
340349
} finally {
341350
environment.dispose();

0 commit comments

Comments
 (0)