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

Timestamp:

2016-01-31T11:38:09+01:00 (9 years ago)

Author:

nokutu

Message:

Replace the image reading methods in MapillaryUtils by the new ImageUtil class

Changes to the previous behaviour:

• directories are now recursively traversed instead of reading only the top level
• JPG- and PNG-files are now recognized by their magic bytes instead of the file extension
• the number of publicly visible methods for image reading has been reduced to one, which can process both files and directories as well as JPGs and PNGs

Location:

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary

Files:

• ImportTest.java (modified) (3 diffs)
• oauth/UploadTest.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary;
 
-import static org.junit.Assert.*;
-
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
@@ -10 +9 @@
 import javax.imageio.IIOException;
 
+import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.ImageUtil;
 
 /**
@@ -25 +25 @@
    */
   @Test
-  public void importNoTagsTest() {
+  public void importNoTagsTest() throws IOException {
     File image = new File("images/icon16.png");
-    MapillaryImportedImage img = MapillaryUtils.readNoTags(image,
-        new LatLon(0, 0));
+    MapillaryImportedImage img = ImageUtil.readImagesFrom(image, new LatLon(0, 0)).get(0);
     assertEquals(0, img.getCa(), 0.01);
     assertTrue(new LatLon(0, 0).equalsEpsilon(img.getLatLon()));

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.mapillary.AbstractTest;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
-import org.openstreetmap.josm.plugins.mapillary.oauth.UploadUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.ImageUtil;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
@@ -35 +35 @@
    */
   @Test
-  public void updateFileTest() {
+  public void updateFileTest() throws IOException {
     File image = new File("images/icon16.png");
-    MapillaryImportedImage img = MapillaryUtils.readNoTags(image,
-        new LatLon(0, 0));
+    MapillaryImportedImage img = ImageUtil.readImagesFrom(image, new LatLon(0, 0)).get(0);
     File updatedFile = null;
     try {