Changeset 14606 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2018-12-28T13:44:19+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - handle locale-dependent error messages such as XML parsing errors

File:

• trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java

@@ -81 +81 @@
     @ClassRule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().https().preferences().projection().projectionNadGrids()
+    public static JOSMTestRules test = new JOSMTestRules().https().i18n().preferences().projection().projectionNadGrids()
                                                    .timeout((int) TimeUnit.MINUTES.toMillis(40));
 
@@ -123 +123 @@
         ImageryLayerInfo.instance.load(false);
         return ImageryLayerInfo.instance.getDefaultLayers()
-                .stream().map(x -> new Object[] {x.getId(), x})
+                .stream()
+                .map(x -> new Object[] {x.getId(), x})
                 .collect(Collectors.toList());
     }
@@ -137 +138 @@
 
     private boolean addError(ImageryInfo info, String error) {
-        return !ignoredErrors.contains(error) &&
+        String errorMsg = error.replace('\n', ' ');
+        return !ignoredErrors.contains(errorMsg) &&
                errors.computeIfAbsent(info.getCountryCode(), x -> Collections.synchronizedMap(new TreeMap<>()))
                      .computeIfAbsent(info, x -> Collections.synchronizedList(new ArrayList<>()))
-                     .add(error);
+                     .add(errorMsg);
     }