Changeset 12036 in josm

Timestamp:

2017-05-01T21:41:20+02:00 (7 years ago)

Author:

Don-vip

Message:

add more unit tests, javadoc

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java (added)
• test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+/**
+ * Exception thrown when a primitive or data set does not pass its integrity checks.
+ * @since 2399
+ */
 public class DataIntegrityProblemException extends RuntimeException {
 
     private final String htmlMessage;
 
+    /**
+     * Constructs a new {@code DataIntegrityProblemException}.
+     * @param message the detail message
+     */
     public DataIntegrityProblemException(String message) {
         this(message, null);
     }
 
+    /**
+     * Constructs a new {@code DataIntegrityProblemException}.
+     * @param message the detail message
+     * @param htmlMessage HTML-formatted error message. Can be null
+     */
     public DataIntegrityProblemException(String message, String htmlMessage) {
         super(message);
@@ -15 +28 @@
     }
 
+    /**
+     * Returns the HTML-formatted error message.
+     * @return the HTML-formatted error message, or null
+     */
     public String getHtmlMessage() {
         return htmlMessage;

trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 
@@ -58 +62 @@
 
     /**
+     * Unit test of methods {@link DataSet#addChangeSetTag} / {@link DataSet#getChangeSetTags}.
+     */
+    @Test
+    public void testChangesetTags() {
+        final DataSet ds = new DataSet();
+        assertTrue(ds.getChangeSetTags().isEmpty());
+        ds.addChangeSetTag("foo", "bar");
+        assertEquals("bar", ds.getChangeSetTags().get("foo"));
+    }
+
+    /**
+     * Unit test of methods {@link DataSet#allNonDeletedPrimitives}
+     *                    / {@link DataSet#allNonDeletedCompletePrimitives}
+     *                    / {@link DataSet#allNonDeletedPhysicalPrimitives}.
+     */
+    @Test
+    public void testAllNonDeleted() {
+        final DataSet ds = new DataSet();
+        assertTrue(ds.allNonDeletedPrimitives().isEmpty());
+        assertTrue(ds.allNonDeletedCompletePrimitives().isEmpty());
+        assertTrue(ds.allNonDeletedPhysicalPrimitives().isEmpty());
+
+        Node n1 = new Node(1); n1.setCoor(LatLon.NORTH_POLE); n1.setDeleted(true); n1.setIncomplete(false); ds.addPrimitive(n1);
+        Node n2 = new Node(2); n2.setCoor(LatLon.NORTH_POLE); n2.setDeleted(false); n2.setIncomplete(false); ds.addPrimitive(n2);
+        Node n3 = new Node(3); n3.setCoor(LatLon.NORTH_POLE); n3.setDeleted(false); n3.setIncomplete(true); ds.addPrimitive(n3);
+
+        Way w1 = new Way(1); w1.setDeleted(true); w1.setIncomplete(false); ds.addPrimitive(w1);
+        Way w2 = new Way(2); w2.setDeleted(false); w2.setIncomplete(false); ds.addPrimitive(w2);
+        Way w3 = new Way(3); w3.setDeleted(false); w3.setIncomplete(true); ds.addPrimitive(w3);
+
+        Relation r1 = new Relation(1); r1.setDeleted(true); r1.setIncomplete(false); ds.addPrimitive(r1);
+        Relation r2 = new Relation(2); r2.setDeleted(false); r2.setIncomplete(false); ds.addPrimitive(r2);
+        Relation r3 = new Relation(3); r3.setDeleted(false); r3.setIncomplete(true); ds.addPrimitive(r3);
+
+        assertEquals(new HashSet<>(Arrays.asList(n2, n3, w2, w3, r2, r3)),
+                new HashSet<>(ds.allNonDeletedPrimitives()));
+        assertEquals(new HashSet<>(Arrays.asList(n2, w2, r2)),
+                new HashSet<>(ds.allNonDeletedCompletePrimitives()));
+        assertEquals(new HashSet<>(Arrays.asList(n2, w2)),
+                new HashSet<>(ds.allNonDeletedPhysicalPrimitives()));
+    }
+
+    /**
      * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14186">Bug #14186</a>.
      */