Try-catch blocks in OrderStatistic* test suites not nested

Author: lembergerth

src/org/sosy_lab/common/collect/OrderStatisticMapTestSuite.java

@@ -177,18 +177,20 @@ public void testSubmapView_outOfBounds_add() {
       putEntry(subMap, ELEMS.get(0));
       fail();
     } catch (IllegalArgumentException expected) {
-      try {
-        putEntry(subMap, ELEMS.get(3));
-        fail();
-      } catch (IllegalArgumentException expected2) {
-        try {
-          // the first 3 elements are in the range of the sublist, but the last isn't
-          subMap.putAll(toAdd);
-          fail();
-        } catch (IllegalArgumentException expected3) {
-          // expected outcome
-        }
-      }
+      // expected outcome
+    }
+    try {
+      putEntry(subMap, ELEMS.get(3));
+      fail();
+    } catch (IllegalArgumentException expected) {
+      // expected outcome
+    }
+    try {
+      // the first 3 elements are in the range of the sublist, but the last isn't
+      subMap.putAll(toAdd);
+      fail();
+    } catch (IllegalArgumentException expected) {
+      // expected outcome
     }
   }
 
@@ -326,12 +328,13 @@ public void testGetEntryByRank_outOfBounds() {
       map.getEntryByRank(-1);
       fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
     } catch (IndexOutOfBoundsException expected) {
-      try {
-        map.getEntryByRank(ELEMS.size());
-        fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
-      } catch (IndexOutOfBoundsException expected2) {
-        // expected outcome
-      }
+      // expected outcome
+    }
+    try {
+      map.getEntryByRank(ELEMS.size());
+      fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
     }
   }
 
@@ -413,12 +416,13 @@ public void testGetKeyByRank_outOfBounds() {
       map.getKeyByRank(-1);
       fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
     } catch (IndexOutOfBoundsException expected) {
-      try {
-        map.getKeyByRank(ELEMS.size());
-        fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
-      } catch (IndexOutOfBoundsException expected2) {
-        // expected outcome
-      }
+      // expected outcome
+    }
+    try {
+      map.getKeyByRank(ELEMS.size());
+      fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
     }
   }
 
@@ -518,17 +522,20 @@ public void testRemoveByRank_invalid() {
       map.removeByRank(-1);
       fail();
     } catch (IndexOutOfBoundsException expected) {
-      try {
-        map.removeByRank(map.size());
-        fail();
-      } catch (IndexOutOfBoundsException expected2) {
-        try {
-          emptyMap.removeByRank(0);
-          fail();
-        } catch (IndexOutOfBoundsException expected3) {
-          // expected outcome
-        }
-      }
+      // expected outcome
+    }
+    try {
+      map.removeByRank(map.size());
+      fail();
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
+    }
+    try {
+      emptyMap.removeByRank(0);
+      fail();
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
+
     }
   }
 

src/org/sosy_lab/common/collect/OrderStatisticSetTestSuite.java

@@ -122,18 +122,22 @@ public void testSubsetView_outOfBounds_add() {
       subSet.add(ELEMS[0]);
       fail();
     } catch (IllegalArgumentException expected) {
-      try {
-        subSet.add(ELEMS[3]);
-        fail();
-      } catch (IllegalArgumentException expected2) {
-        try {
-          // the first 3 elements are in the range of the sublist, but the last isn't
-          subSet.addAll(toAdd);
-          fail();
-        } catch (IllegalArgumentException expected3) {
-          // expected outcome
-        }
-      }
+      // expected outcome
+    }
+
+    try {
+      subSet.add(ELEMS[3]);
+      fail();
+    } catch (IllegalArgumentException expected) {
+      // expected outcome
+    }
+
+    try {
+      // the first 3 elements are in the range of the sublist, but the last isn't
+      subSet.addAll(toAdd);
+      fail();
+    } catch (IllegalArgumentException expected) {
+      // expected outcome
     }
   }
 
@@ -240,12 +244,13 @@ public void testGetByRank_outOfBounds() {
       set.getByRank(-1);
       fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
     } catch (IndexOutOfBoundsException expected) {
-      try {
-        set.getByRank(ELEMS.length);
-        fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
-      } catch (IndexOutOfBoundsException expected2) {
-        // this is expected
-      }
+      // expected outcome
+    }
+    try {
+      set.getByRank(ELEMS.length);
+      fail("Expected " + IndexOutOfBoundsException.class.getSimpleName());
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
     }
   }
 
@@ -335,17 +340,19 @@ public void testRemoveByRank_invalid() {
       set.removeByRank(-1);
       fail();
     } catch (IndexOutOfBoundsException expected) {
-      try {
-        set.removeByRank(set.size());
-        fail();
-      } catch (IndexOutOfBoundsException expected2) {
-        try {
-          emptySet.removeByRank(0);
-          fail();
-        } catch (IndexOutOfBoundsException expected3) {
-          // expected outcome
-        }
-      }
+      // expected outcome
+    }
+    try {
+      set.removeByRank(set.size());
+      fail();
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
+    }
+    try {
+      emptySet.removeByRank(0);
+      fail();
+    } catch (IndexOutOfBoundsException expected) {
+      // expected outcome
     }
   }