Changeset 7959 in josm for trunk/test/unit/org

Timestamp:

2015-01-11T23:32:39+01:00 (9 years ago)

Author:

bastiK

Message:

closes #10962 - fix tests

File:

• trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified) (6 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

@@ -22 +22 @@
 public class ExifReaderTest {
 
-    private File sampleFile;
+    private File orientationSampleFile, directionSampleFile;
     
     /**
@@ -30 +30 @@
     @Before
     public void setUp() throws Exception {
-        sampleFile = new File("data_nodist/exif-direction-example.jpg");
+        directionSampleFile = new File("data_nodist/exif-example_direction.jpg");
+        orientationSampleFile = new File("data_nodist/exif-example_orientation=6.jpg");
     }
 
@@ -39 +40 @@
     @Test
     public void testReadTime() throws ParseException {
-        Date date = ExifReader.readTime(sampleFile);
+        Date date = ExifReader.readTime(directionSampleFile);
         assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
     }
@@ -48 +49 @@
     @Test
     public void testReadOrientation() {
-        Integer orientation = ExifReader.readOrientation(sampleFile);
-        assertEquals(Integer.valueOf(1), orientation);
+        Integer orientation = ExifReader.readOrientation(orientationSampleFile);
+        assertEquals(Integer.valueOf(6), orientation);
     }
     
@@ -57 +58 @@
     @Test
     public void testReadLatLon() {
-        LatLon latlon = ExifReader.readLatLon(sampleFile);
+        LatLon latlon = ExifReader.readLatLon(directionSampleFile);
         assertNotNull(latlon);
         DecimalFormat f = new DecimalFormat("00.0");
@@ -69 +70 @@
     @Test
     public void testReadDirection() {
-        Double direction = ExifReader.readDirection(sampleFile);
+        Double direction = ExifReader.readDirection(directionSampleFile);
         assertEquals(new Double(46.5), direction);
     }