improve tests.

Author: kfriedberger

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

@@ -185,7 +185,7 @@ public void testGetRationals() throws SolverException, InterruptedException {
   /** Test that different names are no problem for Bools in the model. */
   @Test
   public void testGetBooleans() throws SolverException, InterruptedException {
-    // Some names are specificly chosen to test the Boolector model
+    // Some names are specifically chosen to test the Boolector model
     for (String name : VARIABLE_NAMES) {
       testModelGetters(bmgr.makeVariable(name), bmgr.makeBoolean(true), true, name);
     }
@@ -1208,7 +1208,7 @@ public void testGetArrays4() throws SolverException, InterruptedException {
         ImmutableList.of(BigInteger.valueOf(5)));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   @SuppressWarnings("CheckReturnValue")
   public void testGetArrays4invalid() throws SolverException, InterruptedException {
     requireParser();
@@ -1230,7 +1230,9 @@ public void testGetArrays4invalid() throws SolverException, InterruptedException
       assertThat(prover).isSatisfiable();
 
       try (Model m = prover.getModel()) {
-        m.evaluate(amgr.makeArray("arr", ARRAY_TYPE_INT_INT));
+        assertThrows(
+            IllegalArgumentException.class,
+            () -> m.evaluate(amgr.makeArray("arr", ARRAY_TYPE_INT_INT)));
       }
     }
   }
@@ -2311,15 +2313,15 @@ public void modelAfterSolverCloseTest() throws SolverException, InterruptedExcep
   public void testGenerateModelsOption() throws SolverException, InterruptedException {
     try (ProverEnvironment prover = context.newProverEnvironment()) { // no option
       assertThat(prover).isSatisfiable();
-      assertThrows(IllegalArgumentException.class, () -> prover.getModel());
+      assertThrows(IllegalStateException.class, () -> prover.getModel());
     }
   }
 
   @Test
   public void testGenerateModelsOption2() throws SolverException, InterruptedException {
     try (ProverEnvironment prover = context.newProverEnvironment()) { // no option
       assertThat(prover).isSatisfiable();
-      assertThrows(IllegalArgumentException.class, () -> prover.getModelAssignments());
+      assertThrows(IllegalStateException.class, () -> prover.getModelAssignments());
     }
   }