Changeset 32053 in osm for applications/editors/josm

Timestamp:

2016-02-08T20:24:03+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Revert r32045

Because the directory test/data/ is now in the classpath for the ant build, that change is no longer needed.
That commit broke the gradle build, because it relies on the code of the unit tests of JOSM, which is currently not used by gradle.

This reverts commit 2937ff4ff22485662d7ed75622d88f8e376d26dc.

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 IOException {
+  public void testUntaggedImage() throws URISyntaxException, IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/untagged.jpg");
+    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/untagged.jpg").toURI());
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -31 +31 @@
 
   @Test
-  public void testLatLonOnlyImage() throws IOException {
+  public void testLatLonOnlyImage() throws URISyntaxException, IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/latLonOnly.jpg");
+    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/latLonOnly.jpg").toURI());
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -46 +46 @@
 
   @Test
-  public void testGpsDirectionOnlyImage() throws IOException {
+  public void testGpsDirectionOnlyImage() throws URISyntaxException, IOException {
     long startTime = System.currentTimeMillis() / 1000 * 1000; // Rounding to last full second
-    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/gpsDirectionOnly.jpg");
+    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/gpsDirectionOnly.jpg").toURI());
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -60 +60 @@
 
   @Test
-  public void testDateTimeOnlyImage() throws IOException {
+  public void testDateTimeOnlyImage() throws URISyntaxException, IOException {
     TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
-    final File untaggedFile = new File(TestUtils.getTestDataRoot() + "exifTestImages/dateTimeOnly.jpg");
+    final File untaggedFile = new File(ImageUtil.class.getResource("/exifTestImages/dateTimeOnly.jpg").toURI());
     LatLon defaultLL = new LatLon(42, -73);
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(untaggedFile, defaultLL);
@@ -79 +79 @@
 
   @Test
-  public void testImageDirectory() throws IOException {
-    final File imageDirectory = new File(TestUtils.getTestDataRoot() + "exifTestImages");
+  public void testImageDirectory() throws URISyntaxException, IOException {
+    final File imageDirectory = new File(ImageUtil.class.getResource("/exifTestImages/").toURI());
     List<MapillaryImportedImage> images = ImageUtil.readImagesFrom(imageDirectory, new LatLon(42,-73));
     assertEquals(5, images.size());
@@ -89 +89 @@
     TestUtil.testUtilityClass(ImageUtil.class);
   }
+
 }