Changeset 9490 in josm for trunk/src

Timestamp:

2016-01-16T18:27:55+01:00 (9 years ago)

Author:

Don-vip

Message:

see #12377 - add multipolygon unit test

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTest.java (modified) (3 diffs)
• RelationChecker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -31 +31 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.tools.Pair;
@@ -43 +43 @@
 public class MultipolygonTest extends Test {
 
-    protected static final int WRONG_MEMBER_TYPE = 1601;
-    protected static final int WRONG_MEMBER_ROLE = 1602;
-    protected static final int NON_CLOSED_WAY = 1603;
-    protected static final int MISSING_OUTER_WAY = 1604;
-    protected static final int INNER_WAY_OUTSIDE = 1605;
-    protected static final int CROSSING_WAYS = 1606;
-    protected static final int OUTER_STYLE_MISMATCH = 1607;
-    protected static final int INNER_STYLE_MISMATCH = 1608;
-    protected static final int NOT_CLOSED = 1609;
-    protected static final int NO_STYLE = 1610;
-    protected static final int NO_STYLE_POLYGON = 1611;
-    protected static final int OUTER_STYLE = 1613;
+    /** Non-Way in multipolygon */
+    public static final int WRONG_MEMBER_TYPE = 1601;
+    /** No useful role for multipolygon member */
+    public static final int WRONG_MEMBER_ROLE = 1602;
+    /** Multipolygon is not closed */
+    public static final int NON_CLOSED_WAY = 1603;
+    /** No outer way for multipolygon */
+    public static final int MISSING_OUTER_WAY = 1604;
+    /** Multipolygon inner way is outside */
+    public static final int INNER_WAY_OUTSIDE = 1605;
+    /** Intersection between multipolygon ways */
+    public static final int CROSSING_WAYS = 1606;
+    /** Style for outer way mismatches / With the currently used mappaint style(s) the style for outer way mismatches polygon */
+    public static final int OUTER_STYLE_MISMATCH = 1607;
+    /** With the currently used mappaint style the style for inner way equals the multipolygon style */
+    public static final int INNER_STYLE_MISMATCH = 1608;
+    /** Area style way is not closed */
+    public static final int NOT_CLOSED = 1609;
+    /** No area style for multipolygon */
+    public static final int NO_STYLE = 1610;
+    /** Multipolygon relation should be tagged with area tags and not the outer way(s) */
+    public static final int NO_STYLE_POLYGON = 1611;
+    /** Area style on outer way */
+    public static final int OUTER_STYLE = 1613;
 
     private static volatile ElemStyles styles;
@@ -303 +315 @@
             }
             // Diamond operator does not work with Java 9 here
+            @SuppressWarnings("unused")
             List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
             newPrimitives.add(0, r);

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -36 +36 @@
 public class RelationChecker extends Test {
 
-    protected static final int ROLE_UNKNOWN      = 1701;
-    protected static final int ROLE_EMPTY        = 1702;
-    protected static final int WRONG_TYPE        = 1703;
-    protected static final int HIGH_COUNT        = 1704;
-    protected static final int LOW_COUNT         = 1705;
-    protected static final int ROLE_MISSING      = 1706;
-    protected static final int RELATION_UNKNOWN  = 1707;
-    protected static final int RELATION_EMPTY    = 1708;
+    /** Role {0} unknown in templates {1} */
+    public static final int ROLE_UNKNOWN      = 1701;
+    /** Empty role type found when expecting one of {0} */
+    public static final int ROLE_EMPTY        = 1702;
+    /** Role member does not match expression {0} in template {1} */
+    public static final int WRONG_TYPE        = 1703;
+    /** Number of {0} roles too high ({1}) */
+    public static final int HIGH_COUNT        = 1704;
+    /** Number of {0} roles too low ({1}) */
+    public static final int LOW_COUNT         = 1705;
+    /** Role {0} missing */
+    public static final int ROLE_MISSING      = 1706;
+    /** Relation type is unknown */
+    public static final int RELATION_UNKNOWN  = 1707;
+    /** Relation is empty */
+    public static final int RELATION_EMPTY    = 1708;
 
     /**
@@ -256 +264 @@
             // convert in localization friendly way to string of accepted types
             String typesStr = Utils.join("/", Utils.transform(types, new Utils.Function<TaggingPresetType, Object>() {
+                @Override
                 public Object apply(TaggingPresetType x) {
                     return tr(x.getName());
@@ -297 +306 @@
             if (!allroles.containsKey(key)) {
                 String templates = Utils.join("/", Utils.transform(allroles.keySet(), new Utils.Function<String, Object>() {
+                    @Override
                     public Object apply(String x) {
                         return tr(x);