Changeset 12636 in josm for trunk/test/unit/org/openstreetmap/josm/actions
- Timestamp:
- 2017-08-24T22:53:50+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/actions
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
r12562 r12636 13 13 import org.junit.Rule; 14 14 import org.junit.Test; 15 import org.openstreetmap.josm.Main;16 15 import org.openstreetmap.josm.TestUtils; 17 16 import org.openstreetmap.josm.data.imagery.ImageryInfo; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.layer.TMSLayer; 19 19 import org.openstreetmap.josm.gui.layer.WMSLayer; … … 58 58 @Test 59 59 public void testActionPerformedEnabledTms() { 60 assertTrue(Main .getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());60 assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); 61 61 new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).actionPerformed(null); 62 List<TMSLayer> tmsLayers = Main .getLayerManager().getLayersOfType(TMSLayer.class);62 List<TMSLayer> tmsLayers = MainApplication.getLayerManager().getLayersOfType(TMSLayer.class); 63 63 assertEquals(1, tmsLayers.size()); 64 Main .getLayerManager().removeLayer(tmsLayers.get(0));64 MainApplication.getLayerManager().removeLayer(tmsLayers.get(0)); 65 65 } 66 66 … … 77 77 new AddImageryLayerAction(new ImageryInfo("localhost", "http://localhost:" + wireMockRule.port() + "/wms?", 78 78 "wms_endpoint", null, null)).actionPerformed(null); 79 List<WMSLayer> wmsLayers = Main .getLayerManager().getLayersOfType(WMSLayer.class);79 List<WMSLayer> wmsLayers = MainApplication.getLayerManager().getLayersOfType(WMSLayer.class); 80 80 assertEquals(1, wmsLayers.size()); 81 81 82 Main .getLayerManager().removeLayer(wmsLayers.get(0));82 MainApplication.getLayerManager().removeLayer(wmsLayers.get(0)); 83 83 } 84 84 … … 88 88 @Test 89 89 public void testActionPerformedDisabled() { 90 assertTrue(Main .getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());90 assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); 91 91 try { 92 92 new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null); … … 94 94 assertEquals("Parameter 'info.url' must not be null", expected.getMessage()); 95 95 } 96 assertTrue(Main .getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());96 assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); 97 97 } 98 98 } -
trunk/test/unit/org/openstreetmap/josm/actions/AlignInLineActionTest.java
r12632 r12636 16 16 import org.openstreetmap.josm.data.osm.Node; 17 17 import org.openstreetmap.josm.data.osm.Way; 18 import org.openstreetmap.josm.gui.MainApplication; 18 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 19 20 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 68 69 69 70 try { 70 Main .getLayerManager().addLayer(layer);71 MainApplication.getLayerManager().addLayer(layer); 71 72 72 73 // Create an open way. … … 79 80 } finally { 80 81 // Ensure we clean the place before leaving, even if test fails. 81 Main .getLayerManager().removeLayer(layer);82 MainApplication.getLayerManager().removeLayer(layer); 82 83 } 83 84 … … 109 110 110 111 try { 111 Main .getLayerManager().addLayer(layer);112 MainApplication.getLayerManager().addLayer(layer); 112 113 113 114 // Create a closed way. … … 119 120 } finally { 120 121 // Ensure we clean the place before leaving, even if test fails. 121 Main .getLayerManager().removeLayer(layer);122 MainApplication.getLayerManager().removeLayer(layer); 122 123 } 123 124 … … 150 151 151 152 try { 152 Main .getLayerManager().addLayer(layer);153 MainApplication.getLayerManager().addLayer(layer); 153 154 154 155 // Create 2 ways. … … 163 164 } finally { 164 165 // Ensure we clean the place before leaving, even if test fails. 165 Main .getLayerManager().removeLayer(layer);166 MainApplication.getLayerManager().removeLayer(layer); 166 167 } 167 168 -
trunk/test/unit/org/openstreetmap/josm/actions/CopyActionTest.java
r10604 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.data.coor.LatLon; 21 20 import org.openstreetmap.josm.data.osm.DataSet; 22 21 import org.openstreetmap.josm.data.osm.Node; 23 22 import org.openstreetmap.josm.data.osm.Way; 23 import org.openstreetmap.josm.gui.MainApplication; 24 24 import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils; 25 25 import org.openstreetmap.josm.gui.datatransfer.data.PrimitiveTransferData; … … 66 66 assertTrue(action.warningShown); 67 67 68 Main .getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "test", null));68 MainApplication.getLayerManager().addLayer(new OsmDataLayer(new DataSet(), "test", null)); 69 69 action.warningShown = false; 70 70 … … 97 97 data.setSelected(way); 98 98 99 Main .getLayerManager().addLayer(new OsmDataLayer(data, "test", null));99 MainApplication.getLayerManager().addLayer(new OsmDataLayer(data, "test", null)); 100 100 101 101 CopyAction action = new CopyAction() { -
trunk/test/unit/org/openstreetmap/josm/actions/CreateCircleActionTest.java
r12632 r12636 11 11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.data.coor.EastNorth; 15 14 import org.openstreetmap.josm.data.coor.LatLon; … … 18 17 import org.openstreetmap.josm.data.osm.Node; 19 18 import org.openstreetmap.josm.data.osm.Way; 19 import org.openstreetmap.josm.gui.MainApplication; 20 20 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 21 21 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 67 67 action.setEnabled(true); 68 68 try { 69 Main .getLayerManager().addLayer(layer);69 MainApplication.getLayerManager().addLayer(layer); 70 70 action.actionPerformed(null); 71 71 } finally { 72 72 // Ensure we clean the place before leaving, even if test fails. 73 Main .getLayerManager().removeLayer(layer);73 MainApplication.getLayerManager().removeLayer(layer); 74 74 } 75 75 … … 138 138 action.setEnabled(true); 139 139 try { 140 Main .getLayerManager().addLayer(layer);140 MainApplication.getLayerManager().addLayer(layer); 141 141 action.actionPerformed(null); 142 142 } finally { 143 143 // Ensure we clean the place before leaving, even if test fails. 144 Main .getLayerManager().removeLayer(layer);144 MainApplication.getLayerManager().removeLayer(layer); 145 145 } 146 146 -
trunk/test/unit/org/openstreetmap/josm/actions/DeleteLayerActionTest.java
r11101 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.osm.DataSet; 10 import org.openstreetmap.josm.gui.MainApplication; 11 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 12 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 36 36 // OsmDataLayer 37 37 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 38 Main .getLayerManager().addLayer(layer);39 assertNotNull(Main .getLayerManager().getActiveLayer());38 MainApplication.getLayerManager().addLayer(layer); 39 assertNotNull(MainApplication.getLayerManager().getActiveLayer()); 40 40 action.actionPerformed(null); 41 assertNull(Main .getLayerManager().getActiveLayer());41 assertNull(MainApplication.getLayerManager().getActiveLayer()); 42 42 } 43 43 } -
trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java
r12632 r12636 26 26 import org.openstreetmap.josm.data.osm.RelationMember; 27 27 import org.openstreetmap.josm.data.osm.Way; 28 import org.openstreetmap.josm.gui.MainApplication; 28 29 import org.openstreetmap.josm.gui.layer.Layer; 29 30 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 60 61 DataSet ds = OsmReader.parseDataSet(is, null); 61 62 Layer layer = new OsmDataLayer(ds, null, null); 62 Main .getLayerManager().addLayer(layer);63 MainApplication.getLayerManager().addLayer(layer); 63 64 try { 64 65 new JoinAreasAction().join(ds.getWays()); 65 66 } finally { 66 67 // Ensure we clean the place before leaving, even if test fails. 67 Main .getLayerManager().removeLayer(layer);68 MainApplication.getLayerManager().removeLayer(layer); 68 69 } 69 70 } … … 81 82 assertEquals(10, ds.getWays().size()); 82 83 Layer layer = new OsmDataLayer(ds, null, null); 83 Main .getLayerManager().addLayer(layer);84 MainApplication.getLayerManager().addLayer(layer); 84 85 for (String ref : new String[]{"A", "B", "C", "D", "E"}) { 85 86 System.out.print("Joining ways " + ref); … … 112 113 113 114 // set current edit layer 114 Main .getLayerManager().addLayer(new OsmDataLayer(dsToJoin, "join", null));115 MainApplication.getLayerManager().addLayer(new OsmDataLayer(dsToJoin, "join", null)); 115 116 116 117 Collection<OsmPrimitive> testPrims = dsToJoin.getPrimitives(osm -> osm.get("test") != null); -
trunk/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java
r12632 r12636 8 8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.data.osm.DataSet; 11 import org.openstreetmap.josm.gui.MainApplication; 12 12 import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer; 13 13 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 38 38 action = new MergeLayerAction(); 39 39 } 40 for (TestLayer testLayer : Main .getLayerManager().getLayersOfType(TestLayer.class)) {41 Main .getLayerManager().removeLayer(testLayer);40 for (TestLayer testLayer : MainApplication.getLayerManager().getLayersOfType(TestLayer.class)) { 41 MainApplication.getLayerManager().removeLayer(testLayer); 42 42 } 43 43 } … … 48 48 @Test 49 49 public void testMergeNoSourceLayer() { 50 assertNull(Main .getLayerManager().getActiveLayer());50 assertNull(MainApplication.getLayerManager().getActiveLayer()); 51 51 action.actionPerformed(null); 52 assertEquals(0, Main .getLayerManager().getLayers().size());52 assertEquals(0, MainApplication.getLayerManager().getLayers().size()); 53 53 } 54 54 … … 59 59 public void testMergeNoTargetLayer() { 60 60 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 61 Main .getLayerManager().addLayer(layer);62 assertEquals(1, Main .getLayerManager().getLayers().size());61 MainApplication.getLayerManager().addLayer(layer); 62 assertEquals(1, MainApplication.getLayerManager().getLayers().size()); 63 63 assertNull(action.merge(layer)); 64 assertEquals(1, Main .getLayerManager().getLayers().size());64 assertEquals(1, MainApplication.getLayerManager().getLayers().size()); 65 65 } 66 66 … … 73 73 OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), "1", null); 74 74 OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "2", null); 75 Main .getLayerManager().addLayer(layer1);76 Main .getLayerManager().addLayer(layer2);77 assertEquals(2, Main .getLayerManager().getLayers().size());75 MainApplication.getLayerManager().addLayer(layer1); 76 MainApplication.getLayerManager().addLayer(layer2); 77 assertEquals(2, MainApplication.getLayerManager().getLayers().size()); 78 78 action.merge(layer2).get(); 79 assertEquals(1, Main .getLayerManager().getLayers().size());79 assertEquals(1, MainApplication.getLayerManager().getLayers().size()); 80 80 } 81 81 } -
trunk/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
r12359 r12636 10 10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.Main;13 12 import org.openstreetmap.josm.TestUtils; 14 13 import org.openstreetmap.josm.actions.OrthogonalizeAction.Direction; … … 18 17 import org.openstreetmap.josm.data.osm.Node; 19 18 import org.openstreetmap.josm.data.osm.Way; 19 import org.openstreetmap.josm.gui.MainApplication; 20 20 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 21 21 import org.openstreetmap.josm.io.OsmReader; … … 100 100 final DataSet ds = OsmReader.parseDataSet(in, null); 101 101 // TODO: Executing commands depends on active edit layer 102 Main .getLayerManager().addLayer(new OsmDataLayer(ds, "ds", null));102 MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, "ds", null)); 103 103 for (String s : search) { 104 104 ds.addSelected(SubclassFilteredCollection.filter(ds.allPrimitives(), SearchCompiler.compile(s))); -
trunk/test/unit/org/openstreetmap/josm/actions/PurgeActionTest.java
r12632 r12636 11 11 import org.junit.Rule; 12 12 import org.junit.Test; 13 import org.openstreetmap.josm.Main;14 13 import org.openstreetmap.josm.TestUtils; 15 14 import org.openstreetmap.josm.data.osm.DataSet; 16 15 import org.openstreetmap.josm.data.osm.Way; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 18 18 import org.openstreetmap.josm.io.IllegalDataException; … … 45 45 DataSet ds = OsmReader.parseDataSet(is, null); 46 46 OsmDataLayer layer = new OsmDataLayer(ds, null, null); 47 Main .getLayerManager().addLayer(layer);47 MainApplication.getLayerManager().addLayer(layer); 48 48 try { 49 49 for (Way w : ds.getWays()) { … … 61 61 } finally { 62 62 // Ensure we clean the place before leaving, even if test fails. 63 Main .getLayerManager().removeLayer(layer);63 MainApplication.getLayerManager().removeLayer(layer); 64 64 } 65 65 } -
trunk/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.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.coor.EastNorth; 13 12 import org.openstreetmap.josm.data.osm.DataSet; … … 16 15 import org.openstreetmap.josm.data.osm.RelationMember; 17 16 import org.openstreetmap.josm.data.osm.Way; 17 import org.openstreetmap.josm.gui.MainApplication; 18 18 import org.openstreetmap.josm.gui.layer.Layer; 19 19 import org.openstreetmap.josm.gui.layer.OsmDataLayer; … … 49 49 @Test 50 50 public void testNoDataSet() { 51 assertNull(Main .getLayerManager().getEditDataSet());51 assertNull(MainApplication.getLayerManager().getEditDataSet()); 52 52 assertEquals(0, SelectByInternalPointAction.getSurroundingObjects(null).size()); 53 53 assertNull(SelectByInternalPointAction.getSmallestSurroundingObject(null)); … … 77 77 ds.addPrimitive(r); 78 78 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 79 Main .getLayerManager().addLayer(layer);79 MainApplication.getLayerManager().addLayer(layer); 80 80 return layer; 81 81 } … … 109 109 public void testPerformSelection() { 110 110 initDataSet(); 111 DataSet ds = Main .getLayerManager().getEditDataSet();111 DataSet ds = MainApplication.getLayerManager().getEditDataSet(); 112 112 113 113 assertEquals(0, ds.getSelected().size()); -
trunk/test/unit/org/openstreetmap/josm/actions/SimplifyWayActionTest.java
r12632 r12636 20 20 import org.openstreetmap.josm.data.osm.Node; 21 21 import org.openstreetmap.josm.data.osm.Way; 22 import org.openstreetmap.josm.gui.MainApplication; 22 23 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 23 24 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 73 74 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 74 75 try { 75 Main .getLayerManager().addLayer(layer);76 MainApplication.getLayerManager().addLayer(layer); 76 77 assertTrue(ds.getSelected().isEmpty()); 77 78 action.actionPerformed(null); 78 79 } finally { 79 Main .getLayerManager().removeLayer(layer);80 MainApplication.getLayerManager().removeLayer(layer); 80 81 } 81 82 } … … 90 91 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 91 92 try { 92 Main .getLayerManager().addLayer(layer);93 MainApplication.getLayerManager().addLayer(layer); 93 94 assertEquals(1, ds.getSelected().size()); 94 95 action.actionPerformed(null); 95 96 } finally { 96 Main .getLayerManager().removeLayer(layer);97 MainApplication.getLayerManager().removeLayer(layer); 97 98 } 98 99 } … … 109 110 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 110 111 try { 111 Main .getLayerManager().addLayer(layer);112 MainApplication.getLayerManager().addLayer(layer); 112 113 assertEquals(11, ds.getSelected().size()); 113 114 action.actionPerformed(null); 114 115 } finally { 115 Main .getLayerManager().removeLayer(layer);116 MainApplication.getLayerManager().removeLayer(layer); 116 117 } 117 118 } -
trunk/test/unit/org/openstreetmap/josm/actions/SplitWayActionTest.java
r12632 r12636 24 24 import org.openstreetmap.josm.data.osm.RelationMember; 25 25 import org.openstreetmap.josm.data.osm.Way; 26 import org.openstreetmap.josm.gui.MainApplication; 26 27 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 27 28 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 91 92 92 93 try { 93 Main .getLayerManager().addLayer(layer);94 MainApplication.getLayerManager().addLayer(layer); 94 95 action.actionPerformed(null); 95 96 } finally { 96 97 // Ensure we clean the place before leaving, even if test fails. 97 Main .getLayerManager().removeLayer(layer);98 MainApplication.getLayerManager().removeLayer(layer); 98 99 } 99 100 -
trunk/test/unit/org/openstreetmap/josm/actions/UnGlueActionTest.java
r12632 r12636 13 13 import org.openstreetmap.josm.data.osm.Node; 14 14 import org.openstreetmap.josm.data.osm.Way; 15 import org.openstreetmap.josm.gui.MainApplication; 15 16 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 16 17 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 52 53 OsmDataLayer layer = new OsmDataLayer(ds, "", null); 53 54 try { 54 Main .getLayerManager().addLayer(layer);55 MainApplication.getLayerManager().addLayer(layer); 55 56 assertTrue(ds.getSelected().isEmpty()); 56 57 assertTrue(ds.allPrimitives().isEmpty()); … … 58 59 assertTrue(ds.allPrimitives().isEmpty()); 59 60 } finally { 60 Main .getLayerManager().removeLayer(layer);61 MainApplication.getLayerManager().removeLayer(layer); 61 62 } 62 63 } … … 73 74 ds.setSelected(n); 74 75 try { 75 Main .getLayerManager().addLayer(layer);76 MainApplication.getLayerManager().addLayer(layer); 76 77 assertEquals(1, ds.getSelected().size()); 77 78 assertEquals(1, ds.allPrimitives().size()); … … 79 80 assertEquals(1, ds.allPrimitives().size()); 80 81 } finally { 81 Main .getLayerManager().removeLayer(layer);82 MainApplication.getLayerManager().removeLayer(layer); 82 83 } 83 84 } … … 100 101 ds.setSelected(n1); 101 102 try { 102 Main .getLayerManager().addLayer(layer);103 MainApplication.getLayerManager().addLayer(layer); 103 104 assertEquals(1, ds.getSelected().size()); 104 105 assertEquals(3, ds.allPrimitives().size()); … … 106 107 assertEquals(3, ds.allPrimitives().size()); 107 108 } finally { 108 Main .getLayerManager().removeLayer(layer);109 MainApplication.getLayerManager().removeLayer(layer); 109 110 } 110 111 } … … 133 134 ds.setSelected(n1); 134 135 try { 135 Main .getLayerManager().addLayer(layer);136 MainApplication.getLayerManager().addLayer(layer); 136 137 assertEquals(1, ds.getSelected().size()); 137 138 assertEquals(5, ds.allPrimitives().size()); … … 139 140 assertEquals(6, ds.allPrimitives().size()); 140 141 } finally { 141 Main .getLayerManager().removeLayer(layer);142 MainApplication.getLayerManager().removeLayer(layer); 142 143 } 143 144 } -
trunk/test/unit/org/openstreetmap/josm/actions/UnJoinNodeWayActionTest.java
r10945 r12636 8 8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.data.coor.EastNorth; 12 11 import org.openstreetmap.josm.data.osm.DataSet; 13 12 import org.openstreetmap.josm.data.osm.Node; 14 13 import org.openstreetmap.josm.data.osm.Way; 14 import org.openstreetmap.josm.gui.MainApplication; 15 15 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 16 16 import org.openstreetmap.josm.testutils.JOSMTestRules; … … 75 75 action.setEnabled(true); 76 76 try { 77 Main .getLayerManager().addLayer(layer);77 MainApplication.getLayerManager().addLayer(layer); 78 78 action.actionPerformed(null); 79 79 } finally { 80 80 // Ensure we clean the place before leaving, even if test fails. 81 Main .getLayerManager().removeLayer(layer);81 MainApplication.getLayerManager().removeLayer(layer); 82 82 } 83 83 -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/AddNoteActionTest.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.notes.Note; 13 12 import org.openstreetmap.josm.data.osm.DataSet; … … 39 38 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 40 39 try { 41 Main .getLayerManager().addLayer(layer);40 MainApplication.getLayerManager().addLayer(layer); 42 41 AddNoteAction mapMode = new AddNoteAction(new NoteData(Collections.<Note>emptyList())); 43 42 MapFrame map = MainApplication.getMap(); … … 47 46 assertTrue(map.selectMapMode(oldMapMode)); 48 47 } finally { 49 Main .getLayerManager().removeLayer(layer);48 MainApplication.getLayerManager().removeLayer(layer); 50 49 } 51 50 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.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.TestUtils; 11 10 import org.openstreetmap.josm.actions.mapmode.DeleteAction.DeleteMode; … … 37 36 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 38 37 try { 39 Main .getLayerManager().addLayer(layer);38 MainApplication.getLayerManager().addLayer(layer); 40 39 DeleteAction mapMode = new DeleteAction(); 41 40 MapFrame map = MainApplication.getMap(); … … 45 44 assertTrue(map.selectMapMode(oldMapMode)); 46 45 } finally { 47 Main .getLayerManager().removeLayer(layer);46 MainApplication.getLayerManager().removeLayer(layer); 48 47 } 49 48 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
r12632 r12636 55 55 DataSet dataSet = new DataSet(); 56 56 OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null); 57 Main .getLayerManager().addLayer(layer);57 MainApplication.getLayerManager().addLayer(layer); 58 58 59 59 // fix map view position … … 101 101 } finally { 102 102 // Ensure we clean the place before leaving, even if test fails. 103 Main .getLayerManager().removeLayer(layer);103 MainApplication.getLayerManager().removeLayer(layer); 104 104 } 105 105 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.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.TestUtils; 11 10 import org.openstreetmap.josm.actions.mapmode.ExtrudeAction.Mode; … … 37 36 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 38 37 try { 39 Main .getLayerManager().addLayer(layer);38 MainApplication.getLayerManager().addLayer(layer); 40 39 ExtrudeAction mapMode = new ExtrudeAction(); 41 40 MapFrame map = MainApplication.getMap(); … … 45 44 assertTrue(map.selectMapMode(oldMapMode)); 46 45 } finally { 47 Main .getLayerManager().removeLayer(layer);46 MainApplication.getLayerManager().removeLayer(layer); 48 47 } 49 48 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.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.TestUtils; 11 10 import org.openstreetmap.josm.actions.mapmode.ImproveWayAccuracyAction.State; … … 37 36 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 38 37 try { 39 Main .getLayerManager().addLayer(layer);38 MainApplication.getLayerManager().addLayer(layer); 40 39 ImproveWayAccuracyAction mapMode = new ImproveWayAccuracyAction(); 41 40 MapFrame map = MainApplication.getMap(); … … 45 44 assertTrue(map.selectMapMode(oldMapMode)); 46 45 } finally { 47 Main .getLayerManager().removeLayer(layer);46 MainApplication.getLayerManager().removeLayer(layer); 48 47 } 49 48 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
r12024 r12636 6 6 import java.awt.geom.Point2D; 7 7 8 import org.openstreetmap.josm.Main;9 8 import org.openstreetmap.josm.data.coor.EastNorth; 9 import org.openstreetmap.josm.gui.MainApplication; 10 10 import org.openstreetmap.josm.gui.MapView; 11 11 import org.openstreetmap.josm.gui.layer.MainLayerManager; … … 13 13 class MapViewMock extends MapView { 14 14 MapViewMock() { 15 this(Main .getLayerManager());15 this(MainApplication.getLayerManager()); 16 16 } 17 17 -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.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.TestUtils; 11 10 import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Mode; … … 38 37 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 39 38 try { 40 Main .getLayerManager().addLayer(layer);39 MainApplication.getLayerManager().addLayer(layer); 41 40 MapFrame map = MainApplication.getMap(); 42 41 ParallelWayAction mapMode = new ParallelWayAction(map); … … 46 45 assertTrue(map.selectMapMode(oldMapMode)); 47 46 } finally { 48 Main .getLayerManager().removeLayer(layer);47 MainApplication.getLayerManager().removeLayer(layer); 49 48 } 50 49 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/PlayHeadDragModeTest.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.osm.DataSet; 11 10 import org.openstreetmap.josm.gui.MainApplication; … … 36 35 OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null); 37 36 try { 38 Main .getLayerManager().addLayer(layer);37 MainApplication.getLayerManager().addLayer(layer); 39 38 PlayHeadDragMode mapMode = new PlayHeadDragMode(PlayHeadMarker.create()); 40 39 MapFrame map = MainApplication.getMap(); … … 44 43 assertTrue(map.selectMapMode(oldMapMode)); 45 44 } finally { 46 Main .getLayerManager().removeLayer(layer);45 MainApplication.getLayerManager().removeLayer(layer); 47 46 } 48 47 } -
trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
r12632 r12636 89 89 90 90 Main.pref.put("edit.initial-move-delay", "0"); 91 Main .getLayerManager().addLayer(layer);91 MainApplication.getLayerManager().addLayer(layer); 92 92 try { 93 93 MapFrame map = MainApplication.getMap(); … … 145 145 } finally { 146 146 // Ensure we clean the place before leaving, even if test fails. 147 Main .getLayerManager().removeLayer(layer);147 MainApplication.getLayerManager().removeLayer(layer); 148 148 } 149 149 }
Note:
See TracChangeset
for help on using the changeset viewer.