Changeset 14605 in josm for trunk/test

Timestamp:

2018-12-27T21:06:59+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - convert single global test to one test per imagery entry

Slower, but this improves readbility and allows to focus on entries failing for several consecutive tries.

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (6 diffs)
• testutils/ParallelParameterized.java (added)
• testutils/ParallelScheduler.java (added)

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

@@ -14 +14 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import javax.imageio.ImageIO;
 
 import org.apache.commons.jcs.access.CacheAccess;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
 import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameters;
+import org.junit.runners.model.Statement;
 import org.openstreetmap.gui.jmapviewer.Coordinate;
 import org.openstreetmap.gui.jmapviewer.TileXY;
@@ -53 +59 @@
 import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.ParallelParameterized;
 import org.openstreetmap.josm.tools.HttpClient;
 import org.openstreetmap.josm.tools.HttpClient.Response;
@@ -63 +70 @@
  * Integration tests of {@link ImageryPreference} class.
  */
+@RunWith(ParallelParameterized.class)
 public class ImageryPreferenceTestIT {
 
@@ -71 +79 @@
      * Setup rule
      */
-    @Rule
+    @ClassRule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().https().preferences().projection().projectionNadGrids()
+    public static JOSMTestRules test = new JOSMTestRules().https().preferences().projection().projectionNadGrids()
                                                    .timeout((int) TimeUnit.MINUTES.toMillis(40));
 
+    static {
+        try {
+            test.apply(new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    // Do nothing. Hack needed because @Parameters are computed before anything else
+                }
+            }, Description.createSuiteDescription(ImageryPreferenceTestIT.class)).evaluate();
+        } catch (Throwable e) {
+            Logging.error(e);
+        }
+    }
+
+    /** Entry to test */
+    private final ImageryInfo info;
     private final Map<String, Map<ImageryInfo, List<String>>> errors = Collections.synchronizedMap(new TreeMap<>());
-    private final Map<String, byte[]> workingURLs = Collections.synchronizedMap(new TreeMap<>());
-
-    private TMSCachedTileLoaderJob helper;
-    private List<String> ignoredErrors;
+    private static final Map<String, byte[]> workingURLs = Collections.synchronizedMap(new TreeMap<>());
+
+    private static TMSCachedTileLoaderJob helper;
+    private static List<String> ignoredErrors;
 
     /**
@@ -86 +109 @@
      * @throws IOException in case of I/O error
      */
-    @Before
-    public void before() throws IOException {
+    @BeforeClass
+    public static void beforeClass() throws IOException {
         helper = new TMSCachedTileLoaderJob(null, null, new CacheAccess<>(null), new TileJobOptions(0, 0, null, 0), null);
         ignoredErrors = TestUtils.getIgnoredErrorMessages(ImageryPreferenceTestIT.class);
+    }
+
+    /**
+     * Returns list of imagery entries to test.
+     * @return list of imagery entries to test
+     */
+    @Parameters(name = "{0}")
+    public static List<Object[]> data() {
+        ImageryLayerInfo.instance.load(false);
+        return ImageryLayerInfo.instance.getDefaultLayers()
+                .stream().map(x -> new Object[] {x.getId(), x})
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Constructs a new {@code ImageryPreferenceTestIT} instance.
+     * @param id entry ID, used only to name tests
+     * @param info entry to test
+     */
+    public ImageryPreferenceTestIT(String id, ImageryInfo info) {
+        this.info = Objects.requireNonNull(info);
     }
 
@@ -336 +380 @@
 
     /**
-     * Test that available imagery entries are valid.
-     * @throws Exception in case of error
+     * Test that available imagery entry is valid.
      */
     @Test
-    public void testValidityOfAvailableImageryEntries() throws Exception {
-        ImageryLayerInfo.instance.load(false);
-        ImageryLayerInfo.instance.getDefaultLayers().parallelStream().forEach(this::checkEntry);
+    public void testValidityOfAvailableImageryEntry() {
+        checkEntry(info);
         assertTrue(errors.toString().replaceAll("\\}, ", "\n\\}, ").replaceAll(", ImageryInfo\\{", "\n      ,ImageryInfo\\{"),
                 errors.isEmpty());