Changeset 15100 in josm for trunk/test

Timestamp:

2019-05-20T02:17:34+02:00 (6 years ago)

Author:

Don-vip

Message:

ignore by url, increase timeout

Location:

trunk/test/unit/org/openstreetmap/josm/gui/preferences/map

Files:

• AbstractExtendedSourceEntryTestCase.java (modified) (1 diff)
• MapPaintPreferenceTestIT.java (modified) (1 diff)
• TaggingPresetPreferenceTestIT.java (modified) (1 diff)

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

@@ -58 +58 @@
     }
 
-    protected static boolean isIgnoredSubstring(String substring) {
-        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x));
+    protected boolean isIgnoredSubstring(String substring) {
+        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x) || source.url.contains(x));
     }
 }

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

@@ -99 +99 @@
 
         List<Throwable> errors = new ArrayList<>(style.getErrors());
-        errors.stream().map(Throwable::getMessage).filter(MapPaintPreferenceTestIT::isIgnoredSubstring).forEach(ignoredErrors::add);
+        errors.stream().map(Throwable::getMessage).filter(this::isIgnoredSubstring).forEach(ignoredErrors::add);
         errors.removeIf(e -> ignoredErrors.contains(e.getMessage()));
 
         List<String> warnings = new ArrayList<>(style.getWarnings());
-        warnings.stream().filter(MapPaintPreferenceTestIT::isIgnoredSubstring).forEach(ignoredErrors::add);
+        warnings.stream().filter(this::isIgnoredSubstring).forEach(ignoredErrors::add);
         warnings.removeAll(ignoredErrors);
 

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

@@ -46 +46 @@
     @ClassRule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().https().timeout(10000*60).parameters();
+    public static JOSMTestRules test = new JOSMTestRules().https().timeout(10000*90).parameters();
 
     /**