Index: trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java (revision 19152) +++ trunk/test/unit/org/openstreetmap/josm/io/remotecontrol/handler/LoadAndZoomHandlerTest.java (revision 19153) @@ -5,4 +5,5 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -13,8 +14,12 @@ import java.nio.charset.StandardCharsets; import java.util.Collection; +import java.util.concurrent.ForkJoinPool; +import java.util.concurrent.ForkJoinTask; +import java.util.concurrent.atomic.AtomicBoolean; import com.github.tomakehurst.wiremock.client.WireMock; import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo; import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder; +import org.awaitility.Awaitility; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; @@ -24,4 +29,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType; import org.openstreetmap.josm.gui.MainApplication; +import org.openstreetmap.josm.gui.layer.OsmDataLayer; +import org.openstreetmap.josm.gui.util.GuiHelper; import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; @@ -41,4 +48,5 @@ class LoadAndZoomHandlerTest { private static final String DEFAULT_BBOX_URL = "https://localhost/load_and_zoom?left=0&bottom=0&right=0.001&top=0.001"; + private static final String DEFAULT_BBOX_URL_2 = "https://localhost/load_and_zoom?left=0.00025&bottom=0.00025&right=0.00075&top=0.00125"; private static LoadAndZoomHandler newHandler(String url) throws RequestHandlerBadRequestException { LoadAndZoomHandler req = new LoadAndZoomHandler(); @@ -65,4 +73,13 @@ " \n" + ""))); + // The scientific notation is ok server-side. + wireMockRuntimeInfo.getWireMock().register(WireMock.get("/api/0.6/map?bbox=2.5E-4,0.001,7.5E-4,0.00125") + .willReturn(WireMock.aResponse().withBody("\n" + + "\n" + + " \n" + + " \n" + + " \n" + + " \n" + + ""))); } @@ -141,20 +158,10 @@ assertDoesNotThrow(handler::handle); syncThreads(); - // The scientific notation is ok server-side. - final String mapCall = "/api/0.6/map?bbox=2.5E-4,0.001,7.5E-4,0.00125"; - final String commonNode = "visible=\"true\" version=\"1\" changeset=\"1\" timestamp=\"2000-01-01T00:00:00Z\" user=\"tsmock\" uid=\"1\""; - wireMockRuntimeInfo.getWireMock().register(WireMock.get(mapCall) - .willReturn(WireMock.aResponse().withBody("\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - ""))); - String request = "https://localhost/load_and_zoom?left=0.00025&bottom=0.00025&right=0.00075&top=0.00125"; - handler = newHandler(request); - assertDoesNotThrow(handler::handle); - syncThreads(); - wireMockRuntimeInfo.getWireMock().verifyThat(1, RequestPatternBuilder.newRequestPattern().withUrl(mapCall)); + + handler = newHandler(DEFAULT_BBOX_URL_2); + assertDoesNotThrow(handler::handle); + syncThreads(); + wireMockRuntimeInfo.getWireMock().verifyThat(1, RequestPatternBuilder.newRequestPattern() + .withUrl("/api/0.6/map?bbox=2.5E-4,0.001,7.5E-4,0.00125")); final DataSet ds = MainApplication.getLayerManager().getEditDataSet(); assertNotNull(ds); @@ -227,3 +234,61 @@ assertEquals("here", ds.getChangeSetTags().get("is")); } + + /** + * Non-regression test for #23821 + * @throws RequestHandlerBadRequestException If there is an issue with the handler + */ + @Test + void testNonRegression23821() throws RequestHandlerBadRequestException { + final AtomicBoolean block = new AtomicBoolean(false); + final Runnable runnable = () -> { + synchronized (block) { + while (!block.get()) { + try { + block.wait(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt();; + throw new RuntimeException(e); + } + } + } + }; + final DataSet wrongDataset = new DataSet(); + MainApplication.getLayerManager().addLayer(new OsmDataLayer(wrongDataset, + "LoadAndZoomHandlerTest#testNonRegression23821", null)); + ForkJoinTask task1; + ForkJoinTask task2; + try { + GuiHelper.runInEDT(runnable); + MainApplication.worker.submit(runnable); + // The processor makes a new handler for each request + // It is single-threaded, so blocking on one handler would fix the problem with the other handler. + // But we might as well work on multi-threading, since it is easier to test. :) + final LoadAndZoomHandler handler1 = newHandler(DEFAULT_BBOX_URL + "&new_layer=true&layer_name=OSMData"); + final LoadAndZoomHandler handler2 = newHandler(DEFAULT_BBOX_URL_2 + "&new_layer=false&layer_name=OSMData"); + // Use a separate threads to avoid blocking on this thread + final ForkJoinPool pool = ForkJoinPool.commonPool(); + task1 = pool.submit(() -> assertDoesNotThrow(handler1::handle)); + + // Make certain there is enough time for the first task to block + Awaitility.await().until(() -> true); + task2 = pool.submit(() -> assertDoesNotThrow(handler2::handle)); + } finally { + // Unblock UI/worker threads + synchronized (block) { + block.set(true); + block.notifyAll(); + } + } + + task1.join(); + task2.join(); + + syncThreads(); + assertEquals(2, MainApplication.getLayerManager().getLayers().size()); + final DataSet ds = MainApplication.getLayerManager().getEditDataSet(); + assertNotEquals(wrongDataset, ds); + assertTrue(wrongDataset.isEmpty()); + assertEquals(6, ds.allPrimitives().size()); + } }