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

Timestamp:

2015-08-05T16:28:26+02:00 (9 years ago)

Author:

nokutu

Message:

Created several utils classes

Location:

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

Files:

• AbstractTest.java (modified) (1 diff)
• ImportTest.java (modified) (2 diffs)
• UploadTest.java (modified) (4 diffs)
• utils (added)
• utils/TestUtil.java (moved) (moved from applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/util/TestUtil.java ) (1 diff)

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

@@ -2 +2 @@
 
 import org.junit.BeforeClass;
-import org.openstreetmap.josm.plugins.mapillary.util.TestUtil;
+import org.openstreetmap.josm.plugins.mapillary.utils.TestUtil;
 
 /**

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryImportAction;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
 /**
@@ -61 +62 @@
     num[2] = new RationalNumber(0, 1);
     String ref = GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH;
-    assertEquals(1, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(1, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     ref = GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH;
-    assertEquals(-1, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(-1, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     num[0] = new RationalNumber(180, 1);
-    assertEquals(-180, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(-180, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
     num[0] = new RationalNumber(190, 1);
-    assertEquals(170, MapillaryImportAction.degMinSecToDouble(num, ref), 0.01);
+    assertEquals(170, MapillaryUtils.degMinSecToDouble(num, ref), 0.01);
   }
-
 }

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

@@ -19 +19 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryImportAction;
-import org.openstreetmap.josm.plugins.mapillary.oauth.OAuthUtils;
+import org.openstreetmap.josm.plugins.mapillary.oauth.UploadUtils;
+import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
 
 public class UploadTest extends AbstractTest {
@@ -33 +34 @@
     File updatedFile = null;
     try {
-      updatedFile = OAuthUtils.updateFile(img);
+      updatedFile = UploadUtils.updateFile(img);
       ImageMetadata metadata = Imaging.getMetadata(updatedFile);
       final JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
@@ -48 +49 @@
       assertTrue(jpegMetadata
           .findEXIFValueWithExactMatch(ExifTagConstants.EXIF_TAG_DATE_TIME_ORIGINAL) != null);
-      assertEquals(0, MapillaryImportAction.degMinSecToDouble(
+      assertEquals(0, MapillaryUtils.degMinSecToDouble(
           (RationalNumber[]) jpegMetadata.findEXIFValueWithExactMatch(
               GpsTagConstants.GPS_TAG_GPS_LATITUDE).getValue(),
@@ -55 +56 @@
                   GpsTagConstants.GPS_TAG_GPS_LATITUDE_REF).getValue()
               .toString()), 0.01);
-      assertEquals(0, MapillaryImportAction.degMinSecToDouble(
+      assertEquals(0, MapillaryUtils.degMinSecToDouble(
           (RationalNumber[]) jpegMetadata.findEXIFValueWithExactMatch(
               GpsTagConstants.GPS_TAG_GPS_LONGITUDE).getValue(),

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

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.util;
+package org.openstreetmap.josm.plugins.mapillary.utils;
 
 import java.io.File;