Changeset 18011 in josm for trunk/test/unit/org

Timestamp:

2021-07-13T22:49:09+02:00 (3 years ago)

Author:

Don-vip

Message:

see #17177 - add debug log on saving, wait for saving in testMapillaryStyle, code style

File:

• trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/imagery/vectortile/mapbox/style/MapboxVectorStyleTest.java

@@ -21 +21 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -127 +128 @@
         MapCSSStyleSource styleSource2 = (MapCSSStyleSource) sources.get(source2).getStyleSources().get(0);
 
+        awaitSaveFinished();
+
+        assertTrue(styleSource1.url.endsWith("source1.mapcss"));
+        assertTrue(styleSource2.url.endsWith("source2.mapcss"));
+
+        MapCSSStyleSource mapCSSStyleSource1 = new MapCSSStyleSource(styleSource1.url, styleSource1.name, styleSource1.title);
+        MapCSSStyleSource mapCSSStyleSource2 = new MapCSSStyleSource(styleSource2.url, styleSource2.name, styleSource2.title);
+
+        assertEquals(styleSource1, mapCSSStyleSource1);
+        assertEquals(styleSource2, mapCSSStyleSource2);
+    }
+
+    private static void awaitSaveFinished() {
         AtomicBoolean saveFinished = new AtomicBoolean();
         MainApplication.worker.execute(() -> saveFinished.set(true));
         Awaitility.await().atMost(Durations.ONE_SECOND).until(saveFinished::get);
-
-        assertTrue(styleSource1.url.endsWith("source1.mapcss"));
-        assertTrue(styleSource2.url.endsWith("source2.mapcss"));
-
-        MapCSSStyleSource mapCSSStyleSource1 = new MapCSSStyleSource(styleSource1.url, styleSource1.name, styleSource1.title);
-        MapCSSStyleSource mapCSSStyleSource2 = new MapCSSStyleSource(styleSource2.url, styleSource2.name, styleSource2.title);
-
-        assertEquals(styleSource1, mapCSSStyleSource1);
-        assertEquals(styleSource2, mapCSSStyleSource2);
     }
 
@@ -165 +170 @@
         assertEquals(spritePath, style.getSpriteUrl());
 
-        AtomicBoolean saveFinished = new AtomicBoolean();
-        MainApplication.worker.execute(() -> saveFinished.set(true));
-        Awaitility.await().atMost(Durations.ONE_SECOND).until(saveFinished::get);
+        awaitSaveFinished();
 
         int scalar = 28; // 255 / 9 (could be 4, but this was a nicer number)
@@ -246 +249 @@
         assertNotNull(mapillarySource, style.toString());
         mapillarySource.getStyleSources().forEach(StyleSource::loadStyleSource);
-        assertEquals(1, mapillarySource.getStyleSources().size());
-        final MapCSSStyleSource mapillaryCssSource = (MapCSSStyleSource) mapillarySource.getStyleSources().get(0);
+        List<StyleSource> styleSources = mapillarySource.getStyleSources();
+        assertEquals(1, styleSources.size());
+        final MapCSSStyleSource mapillaryCssSource = (MapCSSStyleSource) styleSources.get(0);
+
+        awaitSaveFinished();
+
         assertTrue(mapillaryCssSource.getErrors().isEmpty(), mapillaryCssSource.getErrors().toString());
         final MapCSSRule mapillaryOverview = getRule(mapillaryCssSource, "node", "mapillary-overview");