Changeset 15098 in josm for trunk/test

Timestamp:

2019-05-20T01:20:35+02:00 (6 years ago)

Author:

Don-vip

Message:

nicer test names

Location:

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

Files:

• AbstractExtendedSourceEntryTestCase.java (added)
• MapPaintPreferenceTestIT.java (modified) (6 diffs)
• TaggingPresetPreferenceTestIT.java (modified) (8 diffs)

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

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
@@ -35 +34 @@
  */
 @RunWith(ParallelParameterized.class)
-public class MapPaintPreferenceTestIT {
+public class MapPaintPreferenceTestIT extends AbstractExtendedSourceEntryTestCase {
 
     /**
@@ -43 +42 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public static JOSMTestRules test = new JOSMTestRules().https().timeout(15000*60).parameters();
-
-    /** Entry to test */
-    private final ExtendedSourceEntry source;
-    private final List<String> ignoredErrors = new ArrayList<>();
-    private static final List<String> errorsToIgnore = new ArrayList<>();
 
     /**
@@ -66 +60 @@
     public static List<Object[]> data() throws Exception {
         ImageProvider.clearCache();
-        return new MapPaintPreference.MapPaintSourceEditor().loadAndGetAvailableSources().stream()
-                .map(x -> new Object[] {x.getDisplayName(), x.url, x}).collect(Collectors.toList());
+        return getTestParameters(new MapPaintPreference.MapPaintSourceEditor().loadAndGetAvailableSources());
     }
 
@@ -77 +70 @@
      */
     public MapPaintPreferenceTestIT(String displayName, String url, ExtendedSourceEntry source) {
-        this.source = source;
+        super(source);
     }
 
@@ -116 +109 @@
         assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
     }
-
-    private static boolean isIgnoredSubstring(String substring) {
-        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x));
-    }
 }

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

@@ -7 +7 @@
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -17 +16 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.stream.Collectors;
 
 import org.junit.BeforeClass;
@@ -41 +39 @@
  */
 @RunWith(Parameterized.class)
-public class TaggingPresetPreferenceTestIT {
+public class TaggingPresetPreferenceTestIT extends AbstractExtendedSourceEntryTestCase {
 
     /**
@@ -49 +47 @@
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public static JOSMTestRules test = new JOSMTestRules().https().timeout(10000*60).parameters();
-
-    /** Entry to test */
-    private final ExtendedSourceEntry source;
-    private final List<String> ignoredErrors = new ArrayList<>();
-    private static final List<String> errorsToIgnore = new ArrayList<>();
 
     /**
@@ -77 +70 @@
     public static List<Object[]> data() throws Exception {
         ImageProvider.clearCache();
-        return new TaggingPresetPreference.TaggingPresetSourceEditor().loadAndGetAvailableSources().stream()
-                .map(x -> new Object[] {x.getDisplayName(), x.url, x}).collect(Collectors.toList());
+        return getTestParameters(new TaggingPresetPreference.TaggingPresetSourceEditor().loadAndGetAvailableSources());
     }
 
@@ -88 +80 @@
      */
     public TaggingPresetPreferenceTestIT(String displayName, String url, ExtendedSourceEntry source) {
-        this.source = source;
+        super(source);
     }
 
@@ -113 +105 @@
         assertTrue(errors.toString(), errors.isEmpty());
         assumeTrue(ignoredErrors.toString(), ignoredErrors.isEmpty());
-    }
-
-    private void handleException(Exception e, Set<String> errors) {
-        e.printStackTrace();
-        String s = source.url + " => " + e.toString();
-        if (isIgnoredSubstring(s)) {
-            ignoredErrors.add(s);
-        } else {
-            errors.add(s);
-        }
     }
 
@@ -152 +134 @@
         }
     }
-
-    private static boolean isIgnoredSubstring(String substring) {
-        return errorsToIgnore.parallelStream().anyMatch(x -> substring.contains(x));
-    }
 }