Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui/layer
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java
r12632 r12636 27 27 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource; 28 28 import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo; 29 import org.openstreetmap.josm.Main;30 29 import org.openstreetmap.josm.data.imagery.ImageryInfo; 31 30 import org.openstreetmap.josm.data.imagery.TileLoaderFactory; 32 31 import org.openstreetmap.josm.data.osm.DataSet; 32 import org.openstreetmap.josm.gui.MainApplication; 33 33 import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings; 34 34 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 149 149 @Before 150 150 public void setUp() { 151 Main .getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));151 MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 152 152 testLayer = new TileSourceStubLayer(); 153 153 testLayer.addInvalidationListener(l -> invalidated.set(true)); -
trunk/test/unit/org/openstreetmap/josm/gui/layer/AutosaveTaskTest.java
r12635 r12636 22 22 import org.junit.Rule; 23 23 import org.junit.Test; 24 import org.openstreetmap.josm.Main;25 24 import org.openstreetmap.josm.data.coor.LatLon; 26 25 import org.openstreetmap.josm.data.osm.DataSet; 27 26 import org.openstreetmap.josm.data.osm.Node; 27 import org.openstreetmap.josm.gui.MainApplication; 28 28 import org.openstreetmap.josm.gui.layer.AutosaveTask.AutosaveLayerInfo; 29 29 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 130 130 public void testAutosaveIgnoresUnmodifiedLayer() { 131 131 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "OsmData", null); 132 Main .getLayerManager().addLayer(layer);132 MainApplication.getLayerManager().addLayer(layer); 133 133 try { 134 134 task.schedule(); … … 166 166 DataSet data = new DataSet(); 167 167 OsmDataLayer layer = new OsmDataLayer(data, "OsmData", null); 168 Main .getLayerManager().addLayer(layer);168 MainApplication.getLayerManager().addLayer(layer); 169 169 try { 170 170 task.schedule(); … … 206 206 DataSet data1 = new DataSet(); 207 207 OsmDataLayer layer1 = new OsmDataLayer(data1, "OsmData", null); 208 Main .getLayerManager().addLayer(layer1);208 MainApplication.getLayerManager().addLayer(layer1); 209 209 210 210 DataSet data2 = new DataSet(); … … 215 215 assertEquals(0, countFiles()); 216 216 // also test adding layer later 217 Main .getLayerManager().addLayer(layer2);217 MainApplication.getLayerManager().addLayer(layer2); 218 218 219 219 data1.addPrimitive(new Node(new LatLon(10, 10))); -
trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
r12632 r12636 17 17 import org.junit.Rule; 18 18 import org.junit.Test; 19 import org.openstreetmap.josm.Main;20 19 import org.openstreetmap.josm.TestUtils; 21 20 import org.openstreetmap.josm.data.gpx.GpxData; … … 210 209 GpxLayer layer = getMinimalGpxLayer(); 211 210 try { 212 Main .getLayerManager().addLayer(layer);211 MainApplication.getLayerManager().addLayer(layer); 213 212 assertTrue(layer.getMenuEntries().length > 0); 214 213 layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, layer.data.getMetaBounds()); 215 214 } finally { 216 Main .getLayerManager().removeLayer(layer);215 MainApplication.getLayerManager().removeLayer(layer); 217 216 } 218 217 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
r12632 r12636 7 7 import org.junit.Rule; 8 8 import org.junit.Test; 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.data.gpx.GpxData; 11 10 import org.openstreetmap.josm.data.osm.DataSet; … … 35 34 public void testPlayHeadMarker() { 36 35 try { 37 Main .getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null));36 MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 38 37 MapFrame map = MainApplication.getMap(); 39 38 MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null); 40 39 assertNull(map.mapView.playHeadMarker); 41 Main .getLayerManager().addLayer(layer);40 MainApplication.getLayerManager().addLayer(layer); 42 41 assertNotNull(map.mapView.playHeadMarker); 43 Main .getLayerManager().removeLayer(layer);42 MainApplication.getLayerManager().removeLayer(layer); 44 43 } finally { 45 44 if (MainApplication.isDisplayingMapView()) { -
trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
r12630 r12636 12 12 import org.junit.Test; 13 13 import org.openstreetmap.josm.JOSMFixture; 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.TestUtils; 16 15 import org.openstreetmap.josm.actions.ExpertToggleAction; … … 45 44 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 46 45 try { 47 Main .getLayerManager().addLayer(layer);46 MainApplication.getLayerManager().addLayer(layer); 48 47 int n = OsmDataLayer.PROPERTY_RECENT_RELATIONS_NUMBER.get(); 49 48 assertTrue(n > 0); … … 61 60 assertTrue(layer.getRecentRelations().isEmpty()); 62 61 } finally { 63 Main .getLayerManager().removeLayer(layer);62 MainApplication.getLayerManager().removeLayer(layer); 64 63 } 65 64 } … … 135 134 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 136 135 try { 137 Main .getLayerManager().addLayer(layer);136 MainApplication.getLayerManager().addLayer(layer); 138 137 assertTrue(layer.getMenuEntries().length > 0); 139 138 layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, new Bounds(LatLon.ZERO)); 140 139 } finally { 141 Main .getLayerManager().removeLayer(layer);140 MainApplication.getLayerManager().removeLayer(layer); 142 141 } 143 142 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/TMSLayerTest.java
r12632 r12636 6 6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.data.imagery.ImageryInfo; 10 9 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; 10 import org.openstreetmap.josm.gui.MainApplication; 11 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 12 … … 51 51 private static void test(ImageryType expected, TMSLayer layer) { 52 52 try { 53 Main .getLayerManager().addLayer(layer);53 MainApplication.getLayerManager().addLayer(layer); 54 54 assertEquals(expected, layer.getInfo().getImageryType()); 55 55 } finally { 56 56 // Ensure we clean the place before leaving, even if test fails. 57 Main .getLayerManager().removeLayer(layer);57 MainApplication.getLayerManager().removeLayer(layer); 58 58 } 59 59 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/ValidatorLayerTest.java
r10436 r12636 10 10 import org.junit.Test; 11 11 import org.openstreetmap.josm.JOSMFixture; 12 import org.openstreetmap.josm. Main;12 import org.openstreetmap.josm.gui.MainApplication; 13 13 14 14 /** … … 33 33 try { 34 34 layer = new ValidatorLayer(); 35 Main .getLayerManager().addLayer(layer);35 MainApplication.getLayerManager().addLayer(layer); 36 36 assertFalse(layer.isMergable(null)); 37 37 assertNotNull(layer.getIcon()); … … 42 42 // Ensure we clean the place before leaving, even if test fails. 43 43 if (layer != null) { 44 Main .getLayerManager().removeLayer(layer);44 MainApplication.getLayerManager().removeLayer(layer); 45 45 } 46 46 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/WMSLayerTest.java
r12632 r12636 6 6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.data.imagery.ImageryInfo; 10 9 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; 10 import org.openstreetmap.josm.gui.MainApplication; 11 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 12 … … 31 31 public void testWMSLayer() { 32 32 WMSLayer wms = new WMSLayer(new ImageryInfo("test wms", "http://localhost")); 33 Main .getLayerManager().addLayer(wms);33 MainApplication.getLayerManager().addLayer(wms); 34 34 try { 35 35 assertEquals(ImageryType.WMS, wms.getInfo().getImageryType()); 36 36 } finally { 37 37 // Ensure we clean the place before leaving, even if test fails. 38 Main .getLayerManager().removeLayer(wms);38 MainApplication.getLayerManager().removeLayer(wms); 39 39 } 40 40 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java
r11383 r12636 12 12 import org.junit.Rule; 13 13 import org.junit.Test; 14 import org.openstreetmap.josm.Main;15 14 import org.openstreetmap.josm.TestUtils; 16 15 import org.openstreetmap.josm.data.osm.DataSet; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.layer.GpxLayer; 18 18 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 45 45 assertTrue(reader.parse(true)); 46 46 GpxLayer gpxLayer = new GpxLayer(reader.getGpxData()); 47 Main .getLayerManager().addLayer(gpxLayer);48 assertEquals(1, Main .getLayerManager().getLayers().size());47 MainApplication.getLayerManager().addLayer(gpxLayer); 48 assertEquals(1, MainApplication.getLayerManager().getLayers().size()); 49 49 new Loader( 50 50 Collections.singleton(new File(TestUtils.getRegressionDataFile(12255, "G0016941.JPG"))), 51 51 gpxLayer).run(); 52 assertEquals(2, Main .getLayerManager().getLayers().size());53 GeoImageLayer layer = Main .getLayerManager().getLayersOfType(GeoImageLayer.class).iterator().next();52 assertEquals(2, MainApplication.getLayerManager().getLayers().size()); 53 GeoImageLayer layer = MainApplication.getLayerManager().getLayersOfType(GeoImageLayer.class).iterator().next(); 54 54 assertEquals(gpxLayer, layer.getGpxLayer()); 55 55 List<ImageEntry> images = layer.getImages(); -
trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackActionTest.java
r12358 r12636 7 7 import org.junit.Rule; 8 8 import org.junit.Test; 9 import org.openstreetmap.josm.Main;10 9 import org.openstreetmap.josm.TestUtils; 11 10 import org.openstreetmap.josm.data.gpx.GpxData; 12 11 import org.openstreetmap.josm.data.osm.DataSet; 12 import org.openstreetmap.josm.gui.MainApplication; 13 13 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 14 14 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 33 33 final OsmDataLayer layer = new OsmDataLayer(new DataSet(), DownloadAlongTrackActionTest.class.getName(), null); 34 34 try { 35 Main .getLayerManager().addLayer(layer);35 MainApplication.getLayerManager().addLayer(layer); 36 36 // Perform action 37 37 final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + file); … … 39 39 } finally { 40 40 // Ensure we clean the place before leaving, even if test fails. 41 Main .getLayerManager().removeLayer(layer);41 MainApplication.getLayerManager().removeLayer(layer); 42 42 } 43 43 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackActionTest.java
r12632 r12636 9 9 import org.junit.Rule; 10 10 import org.junit.Test; 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.data.gpx.GpxData; 13 12 import org.openstreetmap.josm.data.imagery.ImageryInfo; 13 import org.openstreetmap.josm.gui.MainApplication; 14 14 import org.openstreetmap.josm.gui.layer.GpxLayerTest; 15 15 import org.openstreetmap.josm.gui.layer.TMSLayer; … … 48 48 TMSLayer layer = new TMSLayer(new ImageryInfo("OSM TMS", "https://a.tile.openstreetmap.org/{zoom}/{x}/{y}.png", "tms", null, null)); 49 49 try { 50 Main .getLayerManager().addLayer(layer);50 MainApplication.getLayerManager().addLayer(layer); 51 51 TMSLayer.getCache().clear(); 52 52 assertTrue(TMSLayer.getCache().getMatching(".*").isEmpty()); … … 59 59 } finally { 60 60 // Ensure we clean the place before leaving, even if test fails. 61 Main .getLayerManager().removeLayer(layer);61 MainApplication.getLayerManager().removeLayer(layer); 62 62 } 63 63 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayerTest.java
r12632 r12636 18 18 import org.openstreetmap.josm.data.gpx.GpxLink; 19 19 import org.openstreetmap.josm.data.gpx.WayPoint; 20 import org.openstreetmap.josm.gui.MainApplication; 20 21 import org.openstreetmap.josm.testutils.JOSMTestRules; 21 22 … … 49 50 assertEquals(Color.magenta, MarkerLayer.getGenericColor()); 50 51 MarkerLayer layer = new MarkerLayer(new GpxData(), "foo", null, null); 51 Main .getLayerManager().addLayer(layer);52 MainApplication.getLayerManager().addLayer(layer); 52 53 53 54 assertEquals("foo", layer.getName());
Note:
See TracChangeset
for help on using the changeset viewer.