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

Timestamp:

2015-07-27T14:52:11+02:00 (10 years ago)

Author:

floscher

Message:

Don't throw an exception in MapillaryImportedImage.getImage() when file==null

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/MapillaryImportedImage.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/ImportedImageTest.java (modified) (2 diffs)

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

@@ -63 +63 @@
    * Returns the pictures of the file.
    *
-   * @return A BufferedImage object containing the pictures.
+   * @return A BufferedImage object containing the picture,
+   *           or null if the {@link File} given in the constructor was null.
    * @throws IOException
-   * @throws IllegalArgumentException
-   *           if file is currently set to null
    */
   public BufferedImage getImage() throws IOException {
-    return ImageIO.read(file);
+    return file == null ? null : ImageIO.read(file);
   }
 

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
 import java.io.IOException;
+
+import javax.imageio.IIOException;
 
 import org.junit.Before;
@@ -13 +18 @@
     }
 
-    @Test(expected=IllegalArgumentException.class)
-    public void testNullFile() throws IOException {
+    @Test(expected=IIOException.class)
+    public void testInvalidFiles() throws IOException {
         MapillaryImportedImage img = new MapillaryImportedImage(0,0,0, null);
+        assertEquals(null, img.getImage());
+        assertEquals(null, img.getFile());
+
+        img = new MapillaryImportedImage(0, 0, 0, new File(""));
+        assertEquals(new File(""), img.getFile());
         img.getImage();
     }