Changeset 12726 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair

Timestamp:

2017-09-04T23:45:49+02:00 (7 years ago)

Author:

Don-vip

Message:

see #13036 - deprecate Command() default constructor, fix unit tests and java warnings

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/ConflictResolverTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/ConflictResolverTest.java

@@ -5 +5 @@
 import static org.junit.Assert.assertNotNull;
 
+import java.util.NoSuchElementException;
+
 import org.junit.Rule;
 import org.junit.Test;
@@ -10 +12 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -32 +35 @@
      * Unit test of {@link ConflictResolver#buildResolveCommand} - empty case.
      */
-    @Test
+    @Test(expected = NoSuchElementException.class)
     public void testBuildResolveCommandEmpty() {
         assertNotNull(new ConflictResolver().buildResolveCommand());
@@ -47 +50 @@
         Node n2 = new Node(LatLon.NORTH_POLE);
         n2.put("source", "theirs");
+        new DataSet(n1, n2);
         resolver.populate(new Conflict<>(n1, n2));
         resolver.decideRemaining(MergeDecisionType.KEEP_MINE);
@@ -62 +66 @@
         Way w2 = new Way();
         w2.put("source", "theirs");
+        new DataSet(w1, w2);
         resolver.populate(new Conflict<>(w1, w2));
         resolver.decideRemaining(MergeDecisionType.KEEP_MINE);
@@ -77 +82 @@
         Relation r2 = new Relation();
         r2.put("source", "theirs");
+        new DataSet(r1, r2);
         resolver.populate(new Conflict<>(r1, r2));
         resolver.decideRemaining(MergeDecisionType.KEEP_MINE);