Changeset 32065 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2016-02-11T23:17:26+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Fix the unit tests that were failing after last commit, because they used an invalid image-key

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/utils/ValidationUtil.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/MapillaryDataTest.java (modified) (7 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceTest.java (modified) (4 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/history/MapillaryRecordTest.java (modified) (7 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/ValidationUtil.java

@@ -43 +43 @@
   public static void throwExceptionForInvalidImgKey(String imgKey, boolean nullAllowed) {
     if (!validateSequenceKey(imgKey)) {
-      throw new IllegalArgumentException(I18n.tr("The image key ''{{0}}'' is invalid!", imgKey));
+      throw new IllegalArgumentException(I18n.tr("The image key ''{0}'' is invalid!", imgKey));
     }
     if (!nullAllowed && imgKey == null) {
@@ -59 +59 @@
   public static void throwExceptionForInvalidSeqKey(String seqKey, boolean nullAllowed) {
     if (!validateSequenceKey(seqKey)) {
-      throw new IllegalArgumentException(I18n.tr("The sequence key ''{{0}}'' is invalid!", seqKey));
+      throw new IllegalArgumentException(I18n.tr("The sequence key ''{0}'' is invalid!", seqKey));
     }
     if (!nullAllowed && seqKey == null) {

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

@@ -19 +19 @@
 public class MapillaryDataTest extends AbstractTest {
 
-  MapillaryData data;
-  MapillaryImage img1;
-  MapillaryImage img2;
-  MapillaryImage img3;
-  MapillaryImage img4;
-  MapillarySequence seq;
+  private MapillaryData data;
+  private MapillaryImage img1;
+  private MapillaryImage img2;
+  private MapillaryImage img3;
+  private MapillaryImage img4;
+  private MapillarySequence seq;
 
   /**
@@ -32 +32 @@
   @Before
   public void setUp() {
-    this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 90);
-    this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 90);
-    this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 90);
-    this.img4 = new MapillaryImage("key4", new LatLon(0.4, 0.4), 90);
+    this.img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 90);
+    this.img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 90);
+    this.img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 90);
+    this.img4 = new MapillaryImage("key4__________________", new LatLon(0.4, 0.4), 90);
     this.seq = new MapillarySequence();
 
-    this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { this.img1,
-        this.img2, this.img3, this.img4 }));
+    this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { img1, img2, img3, img4 }));
     this.img1.setSequence(this.seq);
     this.img2.setSequence(this.seq);
@@ -61 +60 @@
     this.data.add(this.img1);
     assertEquals(1, this.data.getImages().size());
-    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img2,
-        this.img3 })));
+    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img2, this.img3 })));
     assertEquals(3, this.data.getImages().size());
-    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img3,
-        this.img4 })));
+    this.data.add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[] { this.img3, this.img4 })));
     assertEquals(4, this.data.getImages().size());
   }
@@ -75 +72 @@
   public void sizeTest() {
     assertEquals(4, this.data.size());
-    this.data.add(new MapillaryImage("key5", new LatLon(0.1, 0.1), 90));
+    this.data.add(new MapillaryImage("key5__________________", new LatLon(0.1, 0.1), 90));
     assertEquals(5, this.data.size());
   }
@@ -112 +109 @@
    */
   @Test
-  public void NextAndPreviousTest() {
+  public void nextAndPreviousTest() {
     this.data.setSelectedImage(this.img1);
 
@@ -129 +126 @@
       fail();
     } catch (IllegalStateException e) {
-    } catch (Exception e) {
-      fail();
     }
     // Test IllegalStateException thrown by selectPrevious() when the
@@ -138 +133 @@
       fail();
     } catch (IllegalStateException e) {
-    } catch (Exception e) {
-      fail();
     }
   }

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

@@ -18 +18 @@
 public class MapillarySequenceTest {
 
-  MapillaryImage img1;
-  MapillaryImage img2;
-  MapillaryImage img3;
-  MapillaryImage img4;
-  MapillarySequence seq;
+  private MapillaryImage img1;
+  private MapillaryImage img2;
+  private MapillaryImage img3;
+  private MapillaryImage img4;
+  private MapillarySequence seq;
 
   /**
@@ -30 +30 @@
   @Before
   public void setUp() {
-    this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 90);
-    this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 90);
-    this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 90);
-    this.img4 = new MapillaryImage("key4", new LatLon(0.4, 0.4), 90);
-    this.seq = new MapillarySequence();
+    img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 90);
+    img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 90);
+    img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 90);
+    img4 = new MapillaryImage("key4__________________", new LatLon(0.4, 0.4), 90);
+    seq = new MapillarySequence();
 
-    this.seq.add(Arrays.asList(new MapillaryAbstractImage[] { this.img1,
-        this.img2, this.img3, this.img4 }));
-    this.img1.setSequence(this.seq);
-    this.img2.setSequence(this.seq);
-    this.img3.setSequence(this.seq);
-    this.img4.setSequence(this.seq);
+    seq.add(Arrays.asList(new MapillaryAbstractImage[] { img1, img2, img3, img4 }));
+    img1.setSequence(seq);
+    img2.setSequence(seq);
+    img3.setSequence(seq);
+    img4.setSequence(seq);
   }
 
@@ -64 +63 @@
     // that is not in the sequence.
     try {
-      this.seq.next(new MapillaryImage("key5", new LatLon(0.5, 0.5), 90));
+      this.seq.next(new MapillaryImage("key5__________________", new LatLon(0.5, 0.5), 90));
       fail();
     } catch (IllegalArgumentException e) {
-    } catch (Exception e) {
-      fail();
     }
     // Test IllegalArgumentException when asking for the previous image of an
@@ -76 +73 @@
       fail();
     } catch (IllegalArgumentException e) {
-    } catch (Exception e) {
-      fail();
     }
   }

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

@@ -32 +32 @@
 public class MapillaryRecordTest extends AbstractTest {
 
-  MapillaryRecord record;
-  MapillaryImage img1;
-  MapillaryImage img2;
-  MapillaryImage img3;
+  private MapillaryRecord record;
+  private MapillaryImage img1;
+  private MapillaryImage img2;
+  private MapillaryImage img3;
 
   /**
@@ -43 +43 @@
   @Before
   public void setUp() {
-    this.record = new MapillaryRecord();
-    this.img1 = new MapillaryImage("key1", new LatLon(0.1, 0.1), 0.1);
-    this.img2 = new MapillaryImage("key2", new LatLon(0.2, 0.2), 0.2);
-    this.img3 = new MapillaryImage("key3", new LatLon(0.3, 0.3), 0.3);
+    record = new MapillaryRecord();
+    img1 = new MapillaryImage("key1__________________", new LatLon(0.1, 0.1), 0.1);
+    img2 = new MapillaryImage("key2__________________", new LatLon(0.2, 0.2), 0.2);
+    img3 = new MapillaryImage("key3__________________", new LatLon(0.3, 0.3), 0.3);
     MapillaryLayer.getInstance().getData().getImages().clear();
   }
@@ -112 +112 @@
   public void commandMoveTest() {
     CommandMove cmd1 = new CommandMove(
-            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
+            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2})),
             0.1, 0.1);
     CommandMove cmd2 = new CommandMove(
-            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2})),
+            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2})),
             0.1, 0.1);
 
@@ -176 +176 @@
   @Test
   public void commandJoinClass() {
-    CommandJoin cmd1 = new CommandJoin(
-            Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2}));
-    CommandJoin cmd2 = new CommandJoin(
-            Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3}));
-
-    this.record.addCommand(cmd1);
-    assertEquals(2, this.img1.getSequence().getImages().size());
-    assertEquals(this.img2, this.img1.next());
-    this.record.undo();
-    assertEquals(1, this.img1.getSequence().getImages().size());
-    this.record.redo();
-    this.record.addCommand(cmd2);
-    assertEquals(3, this.img1.getSequence().getImages().size());
-    assertEquals(this.img3, this.img1.next().next());
+    CommandJoin cmd1 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
+    CommandJoin cmd2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
+
+    this.record.addCommand(cmd1);
+    assertEquals(2, img1.getSequence().getImages().size());
+    assertEquals(img2, img1.next());
+    this.record.undo();
+    assertEquals(1, img1.getSequence().getImages().size());
+    this.record.redo();
+    this.record.addCommand(cmd2);
+    assertEquals(3, img1.getSequence().getImages().size());
+    assertEquals(img3, img1.next().next());
 
     try {
-      this.record.addCommand(new CommandJoin(Arrays
-              .asList(new MapillaryAbstractImage[]{this.img1, this.img2,
-                      this.img3})));
+      this.record.addCommand(new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
       fail();
     } catch (IllegalArgumentException e) {
       // Expected output.
-    } catch (Exception e) {
-      fail();
     }
   }
@@ -231 +225 @@
 
     try {
-      this.record.addCommand(new CommandUnjoin(Arrays
-              .asList(new MapillaryAbstractImage[]{this.img1, this.img2,
-                      this.img3})));
+      this.record.addCommand(new CommandUnjoin(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
       fail();
     } catch (IllegalArgumentException e) {
       // Expected output.
-    } catch (Exception e) {
-      fail();
     }
   }
@@ -247 +237 @@
   @Test
   public void commandDeleteTest() {
-    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(Arrays.asList(new MapillaryAbstractImage[]{img1, img2}));
+    CommandJoin join2 = new CommandJoin(Arrays.asList(new MapillaryAbstractImage[]{img2, img3}));
 
     CommandDelete cmd1 = new CommandDelete(
-            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1})));
+            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1})));
     CommandDelete cmd2 = new CommandDelete(
-            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img2, this.img3})));
+            new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img2, img3})));
 
     this.record.addCommand(join1);
@@ -261 +249 @@
 
     MapillaryLayer
-            .getInstance()
-            .getData()
-            .add(
-                    new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{this.img1, this.img2,
-                            this.img3})));
+        .getInstance()
+        .getData()
+        .add(new ConcurrentSkipListSet<>(Arrays.asList(new MapillaryAbstractImage[]{img1, img2, img3})));
 
     this.record.addCommand(cmd1);