Changeset 10432 in josm for trunk/test/unit
- Timestamp:
- 2016-06-20T00:06:54+02:00 (9 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/io/NoteImporterTest.java
r10396 r10432 7 7 import java.io.File; 8 8 9 import org.junit.Rule; 9 10 import org.junit.Test; 10 11 import org.openstreetmap.josm.Main; 11 12 import org.openstreetmap.josm.TestUtils; 12 import org.openstreetmap.josm. gui.layer.Layer;13 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 14 14 15 /** … … 18 19 19 20 /** 21 * Use the test rules to remove any layers and reset state. 22 */ 23 @Rule 24 public final JOSMTestRules rules = new JOSMTestRules(); 25 26 /** 20 27 * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12531">Bug #12531</a>. 21 28 */ 22 29 @Test 23 30 public void testTicket12531() { 24 if (Main.map != null) { 25 for (Layer l: Main.getLayerManager().getLayers()) { 26 Main.getLayerManager().removeLayer(l); 27 } 28 Main.main.setMapFrame(null); 29 } 31 Main.getLayerManager().resetState(); 30 32 assertNull(Main.map); 31 33 assertTrue(new NoteImporter().importDataHandleExceptions( -
trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
r10402 r10432 13 13 import org.openstreetmap.josm.Main; 14 14 import org.openstreetmap.josm.data.projection.Projections; 15 import org.openstreetmap.josm.gui.layer.MainLayerManager;16 15 import org.openstreetmap.josm.gui.util.GuiHelper; 17 16 import org.openstreetmap.josm.io.OsmApi; … … 223 222 }); 224 223 // Remove all layers 225 MainLayerManager lm = Main.getLayerManager(); 226 while (!lm.getLayers().isEmpty()) { 227 lm.removeLayer(lm.getLayers().get(0)); 228 } 224 Main.getLayerManager().resetState(); 229 225 230 226 // TODO: Remove global listeners and other global state.
Note:
See TracChangeset
for help on using the changeset viewer.