Changeset 32045 in osm for applications/editors/josm

Timestamp:

2016-02-03T00:37:16+01:00 (9 years ago)

Author:

donvip

Message:

[josm_mapillary] fix unit tests

File:

• applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/utils/ImageUtilsTest.java (modified) (7 diffs)

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

@@ -6 +6 @@
 import java.io.File;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.List;
 import java.util.TimeZone;
 
 import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
@@ -17 +17 @@
 
   @Test
-  public void testUntaggedImage() throws URISyntaxException, IOException {
+  public void testUntaggedImage() throws IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/untagged.jpg").toURI());
+    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/untagged.jpg");
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -31 +31 @@
 
   @Test
-  public void testLatLonOnlyImage() throws URISyntaxException, IOException {
+  public void testLatLonOnlyImage() throws IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/latLonOnly.jpg").toURI());
+    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/latLonOnly.jpg");
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -46 +46 @@
 
   @Test
-  public void testGpsDirectionOnlyImage() throws URISyntaxException, IOException {
+  public void testGpsDirectionOnlyImage() throws IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/gpsDirectionOnly.jpg").toURI());
+    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/gpsDirectionOnly.jpg");
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -60 +60 @@
 
   @Test
-  public void testDateTimeOnlyImage() throws URISyntaxException, IOException {
+  public void testDateTimeOnlyImage() throws IOException {
     TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/dateTimeOnly.jpg").toURI());
+    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/dateTimeOnly.jpg");
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -79 +79 @@
 
   @Test
-  public void testImageDirectory() throws URISyntaxException, IOException {
-    final File imageDirectory = new File(ImageUtil.class.getResource("/exifTestImages/").toURI());
+  public void testImageDirectory() throws IOException {
+    final File imageDirectory = new File(TestUtils.getTestDataRoot() + "exifTestImages");
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(imageDirectory, new LatLon(42,-73));
     assertEquals(5, images.size());
@@ -89 +89 @@
     TestUtil.testUtilityClass(ImageUtil.class);
   }
-
 }