Changeset 14449 in josm

Timestamp:

2018-11-25T15:00:02+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #17027 - clean output of TaggingPresetPreferenceTestIT

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java (modified) (4 diffs)
• src/org/openstreetmap/josm/tools/XmlObjectParser.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

@@ -21 +21 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Predicate;
 
@@ -128 +129 @@
     private boolean originalSelectionEmpty;
 
+    /** The completable future task of asynchronous icon loading */
+    private CompletableFuture<Void> iconFuture;
+
     /**
      * Create an empty tagging preset. This will not have any items and
@@ -215 +219 @@
         File arch = TaggingPresetReader.getZipIcons();
         final Collection<String> s = Config.getPref().getList("taggingpreset.icon.sources", null);
-        ImageProvider imgProv = new ImageProvider(iconName);
-        imgProv.setDirs(s);
-        imgProv.setId("presets");
-        imgProv.setArchive(arch);
-        imgProv.setOptional(true);
-        imgProv.getResourceAsync(result -> {
-            if (result != null) {
-                GuiHelper.runInEDT(() -> result.attachImageIcon(this));
-            } else {
-                Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
-            }
-        });
+        this.iconFuture = new ImageProvider(iconName)
+            .setDirs(s)
+            .setId("presets")
+            .setArchive(arch)
+            .setOptional(true)
+            .getResourceAsync(result -> {
+                if (result != null) {
+                    GuiHelper.runInEDT(() -> result.attachImageIcon(this));
+                } else {
+                    Logging.warn(toString() + ": " + PRESET_ICON_ERROR_MSG_PREFIX + iconName);
+                }
+            });
     }
 
@@ -648 +652 @@
         return actionParser.saveAction(new ToolbarPreferences.ActionDefinition(this));
     }
+
+    /**
+     * Returns the completable future task that performs icon loading, if any.
+     * @return the completable future task that performs icon loading, or null
+     * @since 14449
+     */
+    public CompletableFuture<Void> getIconLoadingTask() {
+        return iconFuture;
+    }
 }

trunk/src/org/openstreetmap/josm/tools/XmlObjectParser.java

@@ -146 +146 @@
                     f.set(c, getValueForClass(f.getType(), value));
                 } else {
+                    String setter;
                     if (fieldName.startsWith(lang)) {
                         int l = lang.length();
-                        fieldName = "set" + fieldName.substring(l, l + 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(l + 1);
+                        setter = "set" + fieldName.substring(l, l + 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(l + 1);
                     } else {
-                        fieldName = "set" + fieldName.substring(0, 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(1);
+                        setter = "set" + fieldName.substring(0, 1).toUpperCase(Locale.ENGLISH) + fieldName.substring(1);
                     }
-                    Method m = entry.getMethod(fieldName);
+                    Method m = entry.getMethod(setter);
                     if (m != null) {
                         m.invoke(c, getValueForClass(m.getParameterTypes()[0], value));

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreferenceTestIT.java

@@ -8 +8 @@
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import org.junit.Rule;
@@ -50 +54 @@
         Config.getPref().putInt("socket.timeout.connect", 30);
         Config.getPref().putInt("socket.timeout.read", 60);
-        Map<Object, Throwable> allErrors = new HashMap<>();
-        Set<String> allMessages = new HashSet<>();
+        Map<String, Throwable> allErrors = new HashMap<>();
+        Map<String, Set<String>> allMessages = new HashMap<>();
         for (ExtendedSourceEntry source : sources) {
             System.out.println(source.url);
@@ -83 +87 @@
     }
 
-    private static void testPresets(Set<String> allMessages, ExtendedSourceEntry source) throws SAXException, IOException {
+    private static void testPresets(Map<String, Set<String>> allMessages, ExtendedSourceEntry source) throws SAXException, IOException {
         Collection<TaggingPreset> presets = TaggingPresetReader.readAll(source.url, true);
         assertFalse(presets.isEmpty());
+        // wait for asynchronous icon loading
+        presets.stream().map(TaggingPreset::getIconLoadingTask).filter(Objects::nonNull).forEach(t -> {
+            try {
+                t.get(30, TimeUnit.SECONDS);
+            } catch (InterruptedException | ExecutionException | TimeoutException e) {
+                Logging.error(e);
+            }
+        });
         Collection<String> errorsAndWarnings = Logging.getLastErrorAndWarnings();
         boolean error = false;
@@ -93 +105 @@
                 // ignore https://github.com/yopaseopor/traffic_signs_preset_JOSM because of far too frequent missing icons errors
                 if (!source.url.contains("yopaseopor/traffic_signs")) {
-                    allMessages.add(message);
+                    allMessages.computeIfAbsent(source.url, x -> new TreeSet<>()).add(message);
                 }
             }