Changeset 14217 in josm for trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

Timestamp:

2018-09-02T18:59:44+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16705 - RemoteControlHttpsServer: end mainloop if server.isClosed() (patch by ris)

File:

• trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandlerTest.java

@@ -29 +29 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules();
+    public JOSMTestRules test = new JOSMTestRules().main().assertionsInEDT().projection();
 
     private static AddNodeHandler newHandler(String url) throws RequestHandlerBadRequestException {
@@ -58 +58 @@
         thrown.expectMessage("NumberFormatException (empty String)");
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
-        try {
-            MainApplication.getLayerManager().addLayer(layer);
-            newHandler(null).handle();
-        } finally {
-            MainApplication.getLayerManager().removeLayer(layer);
-        }
+        MainApplication.getLayerManager().addLayer(layer);
+        newHandler(null).handle();
     }
 
@@ -95 +91 @@
     public void testNominalRequest() throws Exception {
         OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
-        try {
-            MainApplication.getLayerManager().addLayer(layer);
-            newHandler("https://localhost?lat=0&lon=0").handle();
-        } finally {
-            MainApplication.getLayerManager().removeLayer(layer);
-        }
+        MainApplication.getLayerManager().addLayer(layer);
+        newHandler("https://localhost?lat=0&lon=0").handle();
     }
 }