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

Timestamp:

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

Author:

Don-vip

Message:

see #16567 - fix integration tests

File:

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

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

@@ -10 +10 @@
 import java.util.List;
 
-import org.junit.ClassRule;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.preferences.sources.ExtendedSourceEntry;
@@ -26 +25 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.testutils.ParallelParameterized;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -34 +32 @@
  * Integration tests of {@link MapPaintPreference} class.
  */
-@RunWith(ParallelParameterized.class)
 class MapPaintPreferenceTestIT extends AbstractExtendedSourceEntryTestCase {
 
@@ -40 +37 @@
      * Setup rule
      */
-    @ClassRule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public static JOSMTestRules test = new JOSMTestRules().https().timeout(15000*60).parameters();
@@ -58 +55 @@
      * @throws Exception if an error occurs
      */
-    @Parameters(name = "{0} - {1}")
     public static List<Object[]> data() throws Exception {
         ImageProvider.clearCache();
@@ -65 +61 @@
 
     /**
-     * Constructs a new {@code MapPaintPreferenceTestIT}
+     * Test that map paint style is valid.
      * @param displayName displayed name
      * @param url URL
      * @param source source entry to test
-     */
-    MapPaintPreferenceTestIT(String displayName, String url, ExtendedSourceEntry source) {
-        super(source);
-    }
-
-    /**
-     * Test that map paint style is valid.
      * @throws Exception in case of error
      */
-    @Test
-    void testStyleValidity() throws Exception {
-        assumeFalse(isIgnoredSubstring(source.url));
+    @ParameterizedTest(name = "{0} - {1}")
+    @MethodSource("data")
+    void testStyleValidity(String displayName, String url, ExtendedSourceEntry source) throws Exception {
+        assumeFalse(isIgnoredSubstring(source, source.url));
         StyleSource style = MapPaintStyles.addStyle(source);
         if (style instanceof MapCSSStyleSource) {
@@ -100 +90 @@
         }
 
+        List<String> ignoredErrors = new ArrayList<>();
         List<Throwable> errors = new ArrayList<>(style.getErrors());
-        errors.stream().map(Throwable::getMessage).filter(this::isIgnoredSubstring).forEach(ignoredErrors::add);
+        errors.stream().map(Throwable::getMessage).filter(s -> isIgnoredSubstring(source, s)).forEach(ignoredErrors::add);
         errors.removeIf(e -> ignoredErrors.contains(e.getMessage()));
 
         List<String> warnings = new ArrayList<>(style.getWarnings());
-        warnings.stream().filter(this::isIgnoredSubstring).forEach(ignoredErrors::add);
+        warnings.stream().filter(s -> isIgnoredSubstring(source, s)).forEach(ignoredErrors::add);
         warnings.removeAll(ignoredErrors);