Changeset 10937 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

Timestamp:

2016-09-03T12:24:18+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:S3658 - Unit tests should throw exceptions

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModelTest.java

@@ -61 +61 @@
                 break;
             }
-            try {
-                int[] rows = (int[]) idx[i];
-                if (rows.length != 2) {
-                    fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows));
-                }
-                if (rows[0] > rows[1]) {
-                    fail("illegal selection range. lower bound > upper bound ");
-                }
-                for (int j = rows[0]; j <= rows[1]; j++) {
-                    assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
-                }
-            } catch (ClassCastException e) {
-                fail("illegal selection range:" + idx[i]);
+            int[] rows = (int[]) idx[i];
+            if (rows.length != 2) {
+                fail("illegal selection range. Either null or not length 2: " + Arrays.toString(rows));
+            }
+            if (rows[0] > rows[1]) {
+                fail("illegal selection range. lower bound > upper bound ");
+            }
+            for (int j = rows[0]; j <= rows[1]; j++) {
+                assertTrue("expected row " + j + " to be selected", model.isSelectedIndex(j));
             }
         }