Changeset 11175 in josm for trunk/test/unit

Timestamp:

2016-10-27T00:32:44+02:00 (8 years ago)

Author:

simon04

Message:

APIDataSet: simplify implementation using streams, add test

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/APIDataSetTest.java (modified) (3 diffs)

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -12 +13 @@
 import org.openstreetmap.josm.actions.upload.CyclicUploadDependencyException;
 import org.openstreetmap.josm.data.APIDataSet;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -104 +106 @@
         assertEquals(1, toUpdate.size());
         assertEquals(r4, toUpdate.get(0));
+
+        final ConflictCollection cc4 = new ConflictCollection();
+        cc4.add(r4, r4);
+        assertTrue(apiDataSet.participatesInConflict(cc4));
+        final ConflictCollection cc1 = new ConflictCollection();
+        cc1.add(r1, r1);
+        assertFalse(apiDataSet.participatesInConflict(cc1));
     }