Changeset 16618 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
- Timestamp:
- 2020-06-14T11:54:13+02:00 (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
r11905 r16618 1 1 // License: GPL. For details, see LICENSE file. 2 2 package org.openstreetmap.josm.gui.layer; 3 4 import static org.hamcrest.CoreMatchers.any; 3 import static org.hamcrest.CoreMatchers.instanceOf; 4 import static org.hamcrest.CoreMatchers.is; 5 import static org.hamcrest.MatcherAssert.assertThat; 5 6 import static org.junit.Assert.assertEquals; 6 7 import static org.junit.Assert.assertFalse; … … 10 11 import static org.junit.Assert.assertTrue; 11 12 import static org.junit.Assert.fail; 13 import static org.junit.jupiter.api.Assertions.assertThrows; 14 import static org.openstreetmap.josm.testutils.ThrowableRootCauseMatcher.hasRootCause; 12 15 13 16 import java.awt.Component; … … 23 26 24 27 import org.junit.Before; 25 import org.junit.Rule;26 28 import org.junit.Test; 27 29 import org.openstreetmap.josm.data.Bounds; … … 33 35 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent; 34 36 import org.openstreetmap.josm.gui.util.GuiHelper; 35 import org.openstreetmap.josm.testutils.ExpectedRootException;36 37 import org.openstreetmap.josm.tools.bugreport.ReportedException; 37 38 … … 163 164 164 165 /** 165 * Rule used to expect exceptions.166 */167 @Rule168 public ExpectedRootException thrown = ExpectedRootException.none();169 170 /**171 166 * Set up test layer manager. 172 167 */ … … 228 223 @Test 229 224 public void testAddLayerFails() { 230 thrown.expect(ReportedException.class);231 thrown.expectCause(any(InvocationTargetException.class));232 thrown.expectRootCause(any(IllegalArgumentException.class));233 234 TestLayer layer1 = new TestLayer();235 layerManager.addLayer(layer1);236 layerManager.addLayer(layer1);225 Exception e = assertThrows(ReportedException.class, () -> { 226 TestLayer layer1 = new TestLayer(); 227 layerManager.addLayer(layer1); 228 layerManager.addLayer(layer1); 229 }); 230 assertThat(e.getCause(), is(instanceOf(InvocationTargetException.class))); 231 assertThat(e.getCause(), hasRootCause(is(instanceOf(IllegalArgumentException.class)))); 237 232 } 238 233 … … 242 237 @Test 243 238 public void testAddLayerIllegalPosition() { 244 thrown.expect(ReportedException.class);245 thrown.expectCause(any(InvocationTargetException.class));246 thrown.expectRootCause(any(IndexOutOfBoundsException.class));247 248 TestLayer layer1 = new TestLayer() {249 @Override250 public LayerPositionStrategy getDefaultLayerPosition() {251 return manager -> 42;252 }253 };254 layerManager.addLayer(layer1);239 Exception e = assertThrows(ReportedException.class, () -> { 240 TestLayer layer1 = new TestLayer() { 241 @Override 242 public LayerPositionStrategy getDefaultLayerPosition() { 243 return manager -> 42; 244 } 245 }; 246 layerManager.addLayer(layer1); 247 }); 248 assertThat(e.getCause(), is(instanceOf(InvocationTargetException.class))); 249 assertThat(e.getCause(), hasRootCause(is(instanceOf(IndexOutOfBoundsException.class)))); 255 250 } 256 251 … … 309 304 @Test 310 305 public void testMoveLayerFailsRange() { 311 thrown.expect(ReportedException.class);312 thrown.expectCause(any(InvocationTargetException.class));313 thrown.expectRootCause(any(IndexOutOfBoundsException.class));314 315 TestLayer layer1 = new TestLayer();316 TestLayer layer2 = new TestLayer();317 layerManager.addLayer(layer1);318 layerManager.addLayer(layer2);319 layerManager.moveLayer(layer2, 2);306 Exception e = assertThrows(ReportedException.class, () -> { 307 TestLayer layer1 = new TestLayer(); 308 TestLayer layer2 = new TestLayer(); 309 layerManager.addLayer(layer1); 310 layerManager.addLayer(layer2); 311 layerManager.moveLayer(layer2, 2); 312 }); 313 assertThat(e.getCause(), is(instanceOf(InvocationTargetException.class))); 314 assertThat(e.getCause(), hasRootCause(is(instanceOf(IndexOutOfBoundsException.class)))); 320 315 } 321 316 … … 325 320 @Test 326 321 public void testMoveLayerFailsNotInList() { 327 thrown.expect(ReportedException.class);328 thrown.expectCause(any(InvocationTargetException.class));329 thrown.expectRootCause(any(IllegalArgumentException.class));330 331 TestLayer layer1 = new TestLayer();332 TestLayer layer2 = new TestLayer();333 layerManager.addLayer(layer1);334 layerManager.moveLayer(layer2, 0);322 Exception e = assertThrows(ReportedException.class, () -> { 323 TestLayer layer1 = new TestLayer(); 324 TestLayer layer2 = new TestLayer(); 325 layerManager.addLayer(layer1); 326 layerManager.moveLayer(layer2, 0); 327 }); 328 assertThat(e.getCause(), is(instanceOf(InvocationTargetException.class))); 329 assertThat(e.getCause(), hasRootCause(is(instanceOf(IllegalArgumentException.class)))); 335 330 } 336 331
Note:
See TracChangeset
for help on using the changeset viewer.