Changeset 10397 in josm for trunk

Timestamp:

2016-06-16T13:43:21+02:00 (8 years ago)

Author:

Don-vip

Message:

gsoc-core - fix LayerManagerTest with new custom JUnit rule/matcher to check for exception root causes

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/layer/LayerManagerTest.java (modified) (9 diffs)
• testutils/ExpectedRootException.java (added)
• testutils/ThrowableRootCauseMatcher.java (added)

trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.layer;
 
+import static org.hamcrest.CoreMatchers.any;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11 +12 @@
 
 import java.awt.Graphics2D;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18 +20 @@
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.data.Bounds;
@@ -27 +30 @@
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.testutils.ExpectedRootException;
 import org.openstreetmap.josm.tools.Predicates;
+import org.openstreetmap.josm.tools.bugreport.ReportedException;
 
 /**
@@ -119 +124 @@
             layerOrderChanged = e;
         }
-
     }
 
     protected LayerManager layerManager;
+
+    /**
+     * Rule used to expect exceptions.
+     */
+    @Rule
+    public ExpectedRootException thrown = ExpectedRootException.none();
 
     /**
@@ -182 +192 @@
      * {@link LayerManager#addLayer(Layer)}: duplicate layers
      */
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testAddLayerFails() {
+        thrown.expect(ReportedException.class);
+        thrown.expectCause(any(InvocationTargetException.class));
+        thrown.expectRootCause(any(IllegalArgumentException.class));
+
         AbstractTestLayer layer1 = new AbstractTestLayer();
         layerManager.addLayer(layer1);
@@ -192 +206 @@
      * {@link LayerManager#addLayer(Layer)}: illegal default layer position
      */
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testAddLayerIllegalPosition() {
+        thrown.expect(ReportedException.class);
+        thrown.expectCause(any(InvocationTargetException.class));
+        thrown.expectRootCause(any(IndexOutOfBoundsException.class));
+
         AbstractTestLayer layer1 = new AbstractTestLayer() {
             @Override
@@ -260 +278 @@
      * {@link LayerManager#moveLayer(Layer, int)} fails for wrong index
      */
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test
     public void testMoveLayerFailsRange() {
+        thrown.expect(ReportedException.class);
+        thrown.expectCause(any(InvocationTargetException.class));
+        thrown.expectRootCause(any(IndexOutOfBoundsException.class));
+
         AbstractTestLayer layer1 = new AbstractTestLayer();
         AbstractTestLayer layer2 = new AbstractTestLayer();
@@ -272 +294 @@
      * {@link LayerManager#moveLayer(Layer, int)} fails for wrong layer
      */
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void testMoveLayerFailsNotInList() {
+        thrown.expect(ReportedException.class);
+        thrown.expectCause(any(InvocationTargetException.class));
+        thrown.expectRootCause(any(IllegalArgumentException.class));
+
         AbstractTestLayer layer1 = new AbstractTestLayer();
         AbstractTestLayer layer2 = new AbstractTestLayer();