Changeset 14694 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2019-01-13T15:19:55+01:00 (6 years ago)

Author:

Don-vip

Message:

see #16073 - allow to ignore error only based on its last part

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/StyledMapRendererTest.java (modified) (2 diffs)
• gui/preferences/imagery/ImageryPreferenceTestIT.java (modified) (7 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRendererTest.java

@@ -6 +6 @@
 
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
 
@@ -85 +86 @@
     @Test
     public void testEqualsContract() {
+        TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(StyleRecord.class).usingGetClass()
             .suppress(Warning.NONFINAL_FIELDS)

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

@@ -76 +76 @@
 public class ImageryPreferenceTestIT {
 
+    private static final String ERROR_SEP = " -> ";
     private static final LatLon GREENWICH = new LatLon(51.47810, -0.00170);
     private static final int DEFAULT_ZOOM = 12;
@@ -157 +158 @@
         if (notIgnoredErrors.contains(errorMsg))
             notIgnoredErrors.remove(errorMsg);
-        return addError(errorsToIgnore.contains(errorMsg) ? ignoredErrors : errors, info, errorMsg);
+        return addError(isIgnoredError(errorMsg) ? ignoredErrors : errors, info, errorMsg);
+    }
+
+    private boolean isIgnoredError(String errorMsg) {
+        int idx = errorMsg.lastIndexOf(ERROR_SEP);
+        return errorsToIgnore.contains(errorMsg) || (idx > -1 && errorsToIgnore.contains(errorMsg.substring(idx + ERROR_SEP.length())));
     }
 
@@ -190 +196 @@
                 } catch (IOException e) {
                     if (response.getResponseCode() < 300) {
-                        addError(info, url + " -> " + e);
+                        addError(info, url + ERROR_SEP + e);
                     }
                 } finally {
@@ -196 +202 @@
                 }
             } catch (IOException e) {
-                addError(info, url + " -> " + e);
+                addError(info, url + ERROR_SEP + e);
             }
         }
@@ -244 +250 @@
 
     private static String zoomMarker(int zoom) {
-        return " -> zoom " + zoom + " -> ";
+        return " -> zoom " + zoom + ERROR_SEP;
     }
 
@@ -338 +344 @@
             }
         } catch (IOException | RuntimeException | WMSGetCapabilitiesException | WMTSGetCapabilitiesException e) {
-            addError(info, info.getUrl() + " -> " + e.toString());
+            addError(info, info.getUrl() + ERROR_SEP + e.toString());
         }
 
@@ -347 +353 @@
 
     private static boolean isZoomError(String error) {
-        String[] parts = error.split(" -> ");
+        String[] parts = error.split(ERROR_SEP);
         String lastPart = parts.length > 0 ? parts[parts.length - 1].toLowerCase(Locale.ENGLISH) : "";
         return lastPart.contains("bbox")