Skip to content

Commit 74f4a25

Browse files
Fixed formating
1 parent 9197ed1 commit 74f4a25

File tree

3 files changed

+53
-50
lines changed

3 files changed

+53
-50
lines changed

src/org/sosy_lab/java_smt/solvers/mathsat5/Mathsat5NativeApiTest.java

+9-8
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,6 @@ public void enumTypeTest() throws SolverException, InterruptedException {
537537

538538
private final ExecutorService executor = Executors.newSingleThreadExecutor();
539539

540-
541540
@SuppressWarnings("unused")
542541
private long createSharedEnv(long sibling) {
543542
long cfg = msat_create_config();
@@ -569,13 +568,15 @@ public void bug339Test() throws ExecutionException, InterruptedException {
569568
long prover = createSharedEnv(this.env);
570569
msat_assert_formula(prover, formula);
571570

572-
Future<?> task1 = executor.submit(() -> {
573-
try {
574-
assertThat(msat_check_sat(prover)).isFalse();
575-
} catch (InterruptedException | SolverException pE) {
576-
throw new RuntimeException(pE);
577-
}
578-
});
571+
Future<?> task1 =
572+
executor.submit(
573+
() -> {
574+
try {
575+
assertThat(msat_check_sat(prover)).isFalse();
576+
} catch (InterruptedException | SolverException pE) {
577+
throw new RuntimeException(pE);
578+
}
579+
});
579580

580581
assert task1.get() == null;
581582
}

src/org/sosy_lab/java_smt/test/Bug339Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public void fixedTest() throws InterruptedException, ExecutionException {
7171
}
7272
});
7373

74-
assert task1.get() == null;
74+
assert task1.get() == null;
7575
}
7676
}

src/org/sosy_lab/java_smt/test/SolverThreadLocalTest.java

+43-41
Original file line numberDiff line numberDiff line change
@@ -218,36 +218,37 @@ public <T> void nonlocalInterpolationTest() throws InterruptedException, Executi
218218
(InterpolatingProverEnvironment<T>) context.newProverEnvironmentWithInterpolation()) {
219219
T id1 = prover.push(f1);
220220

221-
Future<?> task1 = executor.submit(
222-
() -> {
223-
try {
224-
// FIXME: Exception for CVC5
225-
// java.lang.IllegalStateException:
226-
// You tried to use push() on an CVC5 assertion stack illegally.
227-
// at org.sosy_lab.java_smt.solvers.cvc5.CVC5AbstractProver.pushImpl
228-
// (CVC5AbstractProver.java:89)
229-
// at org.sosy_lab.java_smt.basicimpl.AbstractProver.push
230-
// (AbstractProver.java:88)
231-
// at ..
232-
prover.push(f2);
233-
234-
// FIXME: Exception for MathSAT (bug #339)
235-
// java.lang.StackOverflowError
236-
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5NativeApi.msat_solve
237-
// (Native Method)
238-
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5NativeApi.msat_check_sat
239-
// (Mathsat5NativeApi.java:156)
240-
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5AbstractProver.isUnsat
241-
// (Mathsat5AbstractProver.java:106)
242-
// at org.sosy_lab.java_smt.test.ProverEnvironmentSubject.isUnsatisfiable
243-
// (ProverEnvironmentSubject.java:67)
244-
// at ..
245-
assertThat(prover).isUnsatisfiable();
246-
247-
} catch (SolverException | InterruptedException pE) {
248-
throw new RuntimeException(pE);
249-
}
250-
});
221+
Future<?> task1 =
222+
executor.submit(
223+
() -> {
224+
try {
225+
// FIXME: Exception for CVC5
226+
// java.lang.IllegalStateException:
227+
// You tried to use push() on an CVC5 assertion stack illegally.
228+
// at org.sosy_lab.java_smt.solvers.cvc5.CVC5AbstractProver.pushImpl
229+
// (CVC5AbstractProver.java:89)
230+
// at org.sosy_lab.java_smt.basicimpl.AbstractProver.push
231+
// (AbstractProver.java:88)
232+
// at ..
233+
prover.push(f2);
234+
235+
// FIXME: Exception for MathSAT (bug #339)
236+
// java.lang.StackOverflowError
237+
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5NativeApi.msat_solve
238+
// (Native Method)
239+
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5NativeApi.msat_check_sat
240+
// (Mathsat5NativeApi.java:156)
241+
// at org.sosy_lab.java_smt.solvers.mathsat5.Mathsat5AbstractProver.isUnsat
242+
// (Mathsat5AbstractProver.java:106)
243+
// at org.sosy_lab.java_smt.test.ProverEnvironmentSubject.isUnsatisfiable
244+
// (ProverEnvironmentSubject.java:67)
245+
// at ..
246+
assertThat(prover).isUnsatisfiable();
247+
248+
} catch (SolverException | InterruptedException pE) {
249+
throw new RuntimeException(pE);
250+
}
251+
});
251252

252253
assert task1.get() == null;
253254

@@ -271,19 +272,20 @@ public <T> void nonlocalInterpolationTest() throws InterruptedException, Executi
271272
executor.awaitTermination(100, TimeUnit.MILLISECONDS);
272273
prover.pop();
273274

274-
Future<?> task3 = executor.submit(
275-
() -> {
276-
try {
277-
prover.pop();
275+
Future<?> task3 =
276+
executor.submit(
277+
() -> {
278+
try {
279+
prover.pop();
278280

279-
prover.push(itp.get());
280-
prover.push(f2);
281+
prover.push(itp.get());
282+
prover.push(f2);
281283

282-
assertThat(prover).isUnsatisfiable();
283-
} catch (SolverException | InterruptedException | ExecutionException pE) {
284-
throw new RuntimeException(pE);
285-
}
286-
});
284+
assertThat(prover).isUnsatisfiable();
285+
} catch (SolverException | InterruptedException | ExecutionException pE) {
286+
throw new RuntimeException(pE);
287+
}
288+
});
287289

288290
assert task3.get() == null;
289291
}

0 commit comments

Comments
 (0)