Changeset 17288 in josm for trunk/test/unit/org/openstreetmap/josm/gui/preferences/map/AbstractExtendedSourceEntryTestCase.java

Timestamp:

2020-10-31T01:21:14+01:00 (5 years ago)

Author:

Don-vip

Message:

see #16567 - fix integration tests

File:

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

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

@@ -20 +20 @@
     protected static final List<String> errorsToIgnore = new ArrayList<>();
 
-    /** Entry to test */
-    protected final ExtendedSourceEntry source;
-    protected final List<String> ignoredErrors = new ArrayList<>();
-
-    protected AbstractExtendedSourceEntryTestCase(ExtendedSourceEntry source) {
-        this.source = source;
-    }
-
     protected static List<Object[]> getTestParameters(Collection<ExtendedSourceEntry> entries) throws Exception {
         return entries.stream().map(x -> new Object[] {x.getDisplayName(), cleanUrl(x.url), x}).collect(Collectors.toList());
@@ -48 +40 @@
     }
 
-    protected final void handleException(Exception e, Set<String> errors) {
+    protected final void handleException(ExtendedSourceEntry source, Exception e, Set<String> errors, List<String> ignoredErrors) {
         e.printStackTrace();
         String s = source.url + " => " + e.toString();
-        if (isIgnoredSubstring(s)) {
+        if (isIgnoredSubstring(source, s)) {
             ignoredErrors.add(s);
         } else {
@@ -58 +50 @@
     }
 
-    protected boolean isIgnoredSubstring(String substring) {
+    protected boolean isIgnoredSubstring(ExtendedSourceEntry source, String substring) {
         return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x) || source.url.contains(x));
     }