Changeset 10937 in josm for trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.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/TableCellRendererTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/TableCellRendererTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
 import java.util.Arrays;
@@ -53 +54 @@
     /**
      * Unit test of all table cell renderers against null values.
+     * @throws NoSuchMethodException no default constructor - to fix this, add a default constructor to the class
+     *                               or add the class to the SKIP_TEST list above
+     * @throws ReflectiveOperationException if an error occurs
      */
     @Test
-    public void testTableCellRenderer() {
+    public void testTableCellRenderer() throws ReflectiveOperationException {
         Reflections reflections = new Reflections("org.openstreetmap.josm");
         Set<Class<? extends TableCellRenderer>> renderers = reflections.getSubTypesOf(TableCellRenderer.class);
@@ -67 +71 @@
                 continue;
             }
-            TableCellRenderer tcr = createInstance(klass);
-            try {
-                tcr.getTableCellRendererComponent(tbl, null, false, false, 0, 0);
-            } catch (NullPointerException npe) {
-                npe.printStackTrace();
-                Assert.fail("NPE in getTableCellRendererComponent");
-            }
+            assertNotNull(createInstance(klass).getTableCellRendererComponent(tbl, null, false, false, 0, 0));
         }
     }
@@ -82 +80 @@
      * @param klass the class
      * @return an instance of the class
+     * @throws NoSuchMethodException no default constructor - to fix this, add a default constructor to the class
+     *                               or add the class to the SKIP_TEST list above
+     * @throws ReflectiveOperationException if an error occurs
      */
-    private static <T> T createInstance(Class<? extends T> klass) {
+    private static <T> T createInstance(Class<? extends T> klass) throws ReflectiveOperationException {
         boolean needOuterClass = klass.isMemberClass() && !Modifier.isStatic(klass.getModifiers());
         Constructor<? extends T> c;
-        try {
-            if (needOuterClass) {
-                c = klass.getDeclaredConstructor(klass.getDeclaringClass());
-            } else {
-                c = klass.getDeclaredConstructor();
-            }
-        } catch (NoSuchMethodException ex) {
-            // no default constructor - to fix this, add a default constructor
-            // to the class or add the class to the SKIP_TEST list above
-            Assert.fail("No default constructor - cannot test TableCellRenderer: " + ex);
-            return null;
-        } catch (SecurityException ex) {
-            throw new RuntimeException(ex);
+        if (needOuterClass) {
+            c = klass.getDeclaredConstructor(klass.getDeclaringClass());
+        } else {
+            c = klass.getDeclaredConstructor();
         }
         Utils.setObjectsAccessible(c);
-        T o;
-        try {
-            if (needOuterClass) {
-                Object outerInstance = createInstance(klass.getDeclaringClass());
-                o = c.newInstance(outerInstance);
-            } else {
-                o = c.newInstance();
-            }
-        } catch (InstantiationException | IllegalArgumentException | IllegalAccessException | InvocationTargetException ex) {
-            throw new RuntimeException(ex);
+        if (needOuterClass) {
+            return c.newInstance(createInstance(klass.getDeclaringClass()));
+        } else {
+            return c.newInstance();
         }
-        return o;
     }
-
 }