Changeset 32659 in osm for applications/editors/josm/plugins/mapillary/test

Timestamp:

2016-07-15T15:25:20+02:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Rework join and unjoin command

File:

• applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java (modified) (4 diffs)

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java

@@ -177 +177 @@
   @Test
   public void commandJoinClass() {
-    CommandJoin cmd1 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
-    CommandJoin cmd2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
+    CommandJoin cmd1 = new CommandJoin(img1, img2);
+    CommandJoin cmd2 = new CommandJoin(img2, img3);
 
     this.record.addCommand(cmd1);
@@ -189 +189 @@
     assertEquals(3, img1.getSequence().getImages().size());
     assertEquals(img3, img1.next().next());
-
-    try {
-      this.record.addCommand(new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected output.
-    }
+  }
+  
+  @Test(expected=NullPointerException.class)
+  public void commandJoinNull1() {
+    new CommandJoin(img1, null);
+  }
+  
+  @Test(expected=NullPointerException.class)
+  public void commandJoinNull2() {
+    new CommandJoin(null, img1);
   }
 
@@ -203 +206 @@
   @Test
   public void commandUnjoinClass() {
-    CommandJoin join1 = new CommandJoin(
-            Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2}));
-    CommandJoin join2 = new CommandJoin(
-            Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3}));
+    CommandJoin join1 = new CommandJoin(this.img1, this.img2);
+    CommandJoin join2 = new CommandJoin(this.img2, this.img3);
 
     CommandUnjoin cmd1 = new CommandUnjoin(
@@ -238 +239 @@
   @Test
   public void commandDeleteTest() {
-    CommandJoin join1 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
-    CommandJoin join2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
+    CommandJoin join1 = new CommandJoin(img1, img2);
+    CommandJoin join2 = new CommandJoin(img2, img3);
 
     CommandDelete cmd1 = new CommandDelete(