Changeset 31989 in osm for applications/editors/josm

Timestamp:

2016-01-16T17:47:43+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Add more tests for MapillaryLayer

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/MapillaryLayerTest.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java

@@ -76 +76 @@
    * @param image  The image to be added.
    * @param update Whether the map must be updated or not.
+   * @throws NullPointerException if parameter <code>image</code> is <code>null</code>
    */
   public synchronized void add(MapillaryAbstractImage image, boolean update) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -246 +246 @@
       img.setVisible(visible);
     }
-    MapillaryFilterDialog.getInstance().refresh();
+    if (Main.map != null) {
+      MapillaryFilterDialog.getInstance().refresh();
+    }
   }
 

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

@@ -3 +3 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
 
 import org.junit.Test;
@@ -26 +29 @@
     MapillaryLayer.getInstance().mergeFrom(dummyLayer);
   }
+
+  @Test
+  public void testSetVisible() {
+    MapillaryLayer.getInstance().getData().add(new MapillaryImportedImage(0.0, 0.0, 0.0, new File("")));
+    MapillaryLayer.getInstance().getData().add(new MapillaryImportedImage(0.0, 0.0, 0.0, new File("")));
+    MapillaryImportedImage invisibleImage = new MapillaryImportedImage(0.0, 0.0, 0.0, new File(""));
+    invisibleImage.setVisible(false);
+    MapillaryLayer.getInstance().getData().add(invisibleImage);
+
+    MapillaryLayer.getInstance().setVisible(false);
+    for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData().getImages()) {
+      assertEquals(false, img.isVisible());
+    }
+
+
+    MapillaryLayer.getInstance().setVisible(true);
+    for (MapillaryAbstractImage img : MapillaryLayer.getInstance().getData().getImages()) {
+      assertEquals(true, img.isVisible());
+    }
+  }
+
+  @Test
+  public void testGetInfoComponent() {
+    Object comp = MapillaryLayer.getInstance().getInfoComponent();
+    assertTrue(comp instanceof String);
+    assertTrue(((String)comp).length() >= 9);
+  }
+
+  @Test
+  public void testClearInstance() {
+    MapillaryLayer.getInstance();
+    assertTrue(MapillaryLayer.hasInstance());
+    MapillaryLayer.clearInstance();
+    assertFalse(MapillaryLayer.hasInstance());
+    MapillaryLayer.getInstance();
+    assertTrue(MapillaryLayer.hasInstance());
+  }
 }