Changeset 12630 in josm for trunk/test/unit/org/openstreetmap/josm/gui
- Timestamp:
- 2017-08-24T00:15:51+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/gui
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/gui/MapScalerTest.java
r12564 r12630 38 38 Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 39 39 assertEquals(Color.WHITE, MapScaler.getColor()); 40 MapScaler ms = new MapScaler(Main .map.mapView);40 MapScaler ms = new MapScaler(MainApplication.getMap().mapView); 41 41 assertEquals("/MapView/Scaler", ms.helpTopic()); 42 42 ms.paint(TestUtils.newGraphics()); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/CommandStackDialogTest.java
r12564 r12630 11 11 import org.openstreetmap.josm.command.Command; 12 12 import org.openstreetmap.josm.data.osm.DataSet; 13 import org.openstreetmap.josm.gui.MainApplication; 14 import org.openstreetmap.josm.gui.MapFrame; 13 15 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 14 16 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 57 59 assertFalse(Main.main.undoRedo.redoCommands.isEmpty()); 58 60 61 MapFrame map = MainApplication.getMap(); 59 62 CommandStackDialog dlg = new CommandStackDialog(); 60 Main.map.addToggleDialog(dlg);63 map.addToggleDialog(dlg); 61 64 dlg.unfurlDialog(); 62 65 assertTrue(dlg.isVisible()); 63 Main.map.removeToggleDialog(dlg);66 map.removeToggleDialog(dlg); 64 67 dlg.hideDialog(); 65 68 assertFalse(dlg.isVisible()); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/ConflictDialogTest.java
r12564 r12630 17 17 import org.openstreetmap.josm.data.osm.RelationMember; 18 18 import org.openstreetmap.josm.data.osm.Way; 19 import org.openstreetmap.josm.gui.MainApplication; 19 20 import org.openstreetmap.josm.gui.dialogs.ConflictDialog.ConflictPainter; 20 21 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 57 58 public void testConflictPainter() { 58 59 Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 59 ConflictPainter cp = new ConflictPainter(Main.map.mapView, new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics()); 60 ConflictPainter cp = new ConflictPainter(MainApplication.getMap().mapView, 61 new BufferedImage(800, 600, BufferedImage.TYPE_3BYTE_BGR).createGraphics()); 60 62 Node n1 = new Node(1, 1); 61 63 n1.setCoor(new LatLon(1, 1)); -
trunk/test/unit/org/openstreetmap/josm/gui/dialogs/MapPaintDialogTest.java
r12564 r12630 6 6 import org.openstreetmap.josm.Main; 7 7 import org.openstreetmap.josm.data.osm.DataSet; 8 import org.openstreetmap.josm.gui.MainApplication; 8 9 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 9 10 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 29 30 public void testInfoAction() { 30 31 Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 31 Main .map.mapPaintDialog.new InfoAction().actionPerformed(null);32 MainApplication.getMap().mapPaintDialog.new InfoAction().actionPerformed(null); 32 33 } 33 34 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java
r12568 r12630 24 24 import org.openstreetmap.josm.data.osm.DataSet; 25 25 import org.openstreetmap.josm.data.projection.Projections; 26 import org.openstreetmap.josm.gui.MainApplication; 26 27 import org.openstreetmap.josm.gui.widgets.HtmlPanel; 27 28 import org.openstreetmap.josm.io.GpxReaderTest; … … 211 212 Main.getLayerManager().addLayer(layer); 212 213 assertTrue(layer.getMenuEntries().length > 0); 213 layer.paint(TestUtils.newGraphics(), Main .map.mapView, layer.data.getMetaBounds());214 layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, layer.data.getMetaBounds()); 214 215 } finally { 215 216 Main.getLayerManager().removeLayer(layer); -
trunk/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
r12564 r12630 10 10 import org.openstreetmap.josm.data.gpx.GpxData; 11 11 import org.openstreetmap.josm.data.osm.DataSet; 12 import org.openstreetmap.josm.gui.MainApplication; 13 import org.openstreetmap.josm.gui.MapFrame; 12 14 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 13 15 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 32 34 @Test 33 35 public void testPlayHeadMarker() { 36 MapFrame map = MainApplication.getMap(); 34 37 try { 35 38 Main.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "", null)); 36 39 MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null); 37 assertNull( Main.map.mapView.playHeadMarker);40 assertNull(map.mapView.playHeadMarker); 38 41 Main.getLayerManager().addLayer(layer); 39 assertNotNull( Main.map.mapView.playHeadMarker);42 assertNotNull(map.mapView.playHeadMarker); 40 43 Main.getLayerManager().removeLayer(layer); 41 44 } finally { 42 Main.map.mapView.playHeadMarker = null;45 map.mapView.playHeadMarker = null; 43 46 } 44 47 } -
trunk/test/unit/org/openstreetmap/josm/gui/layer/OsmDataLayerTest.java
r12159 r12630 22 22 import org.openstreetmap.josm.data.osm.Relation; 23 23 import org.openstreetmap.josm.data.osm.Way; 24 import org.openstreetmap.josm.gui.MainApplication; 24 25 25 26 /** … … 136 137 Main.getLayerManager().addLayer(layer); 137 138 assertTrue(layer.getMenuEntries().length > 0); 138 layer.paint(TestUtils.newGraphics(), Main .map.mapView, new Bounds(LatLon.ZERO));139 layer.paint(TestUtils.newGraphics(), MainApplication.getMap().mapView, new Bounds(LatLon.ZERO)); 139 140 } finally { 140 141 Main.getLayerManager().removeLayer(layer);
Note:
See TracChangeset
for help on using the changeset viewer.