Changeset 10475 in josm for trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

Timestamp:

2016-06-24T08:36:12+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13045 - Inconsistent timezone handling in tests/nmea (patch by michael2402) - gsoc-core

File:

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

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

@@ -15 +15 @@
 import java.util.TimeZone;
 
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -26 +32 @@
  */
 public class ExifReaderTest {
+    /**
+     * Set the timezone and timeout.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
 
     private File orientationSampleFile, directionSampleFile;
@@ -40 +52 @@
 
     /**
+     * Clean {@link DateUtils} state
+     */
+    @After
+    public void done() {
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
+    }
+
+    /**
      * Test time extraction
      * @throws ParseException if {@link ExifReader#readTime} fails to parse date/time of sample file
@@ -46 +66 @@
     public void testReadTime() throws ParseException {
         Date date = ExifReader.readTime(directionSampleFile);
-        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 17, 12, 05).getTime(), date);
+        assertEquals(new GregorianCalendar(2010, Calendar.MAY, 15, 15, 12, 05).getTime(), date);
     }
 
@@ -57 +77 @@
         Date date = ExifReader.readTime(new File("data_nodist/IMG_20150711_193419.jpg"));
         String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(date);
-        assertEquals("2015-07-11T19:34:19.100", dateStr);
+        assertEquals("2015-07-11T17:34:19.100", dateStr);
     }
 
@@ -97 +117 @@
         File file = new File(TestUtils.getRegressionDataFile(11685, "2015-11-08_15-33-27-Xiaomi_YI-Y0030832.jpg"));
         String dateStr = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").format(ExifReader.readTime(file));
-        assertEquals("2015-11-08T15:33:27.500", dateStr);
+        assertEquals("2015-11-08T14:33:27.500", dateStr);
     }
 }