Changeset 14205 in josm for trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java

Timestamp:

2018-08-30T23:15:06+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16681 - Various enhancements for GPX correlation (patch by Bjoeni, modified)

File:

• trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java (moved) (moved from trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java ) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxTimezoneTest.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer.geoimage;
+package org.openstreetmap.josm.data.gpx;
 
 import static org.junit.Assert.assertEquals;
@@ -16 +16 @@
 
 /**
- * Unit tests of {@link Timezone} class.
+ * Unit tests of {@link GpxTimezone} class.
  */
-public class TimezoneTest {
+public class GpxTimezoneTest {
 
     /**
@@ -36 +36 @@
 
     /**
-     * Unit test of {@link Timezone#formatTimezone}.
+     * Unit test of {@link GpxTimezone#formatTimezone}.
      */
     @Test
     public void testFormatTimezone() {
-        assertEquals("+1:00", new Timezone(1).formatTimezone());
-        assertEquals("+6:30", new Timezone(6.5).formatTimezone());
-        assertEquals("-6:30", new Timezone(-6.5).formatTimezone());
-        assertEquals("+3:08", new Timezone(Math.PI).formatTimezone());
-        assertEquals("+2:43", new Timezone(Math.E).formatTimezone());
+        assertEquals("+1:00", new GpxTimezone(1).formatTimezone());
+        assertEquals("+6:30", new GpxTimezone(6.5).formatTimezone());
+        assertEquals("-6:30", new GpxTimezone(-6.5).formatTimezone());
+        assertEquals("+3:08", new GpxTimezone(Math.PI).formatTimezone());
+        assertEquals("+2:43", new GpxTimezone(Math.E).formatTimezone());
     }
 
     /**
-     * Unit test of {@link Timezone#parseTimezone}.
+     * Unit test of {@link GpxTimezone#parseTimezone}.
      * @throws ParseException in case of parsing error
      */
     @Test
     public void testParseTimezone() throws ParseException {
-        assertEquals(1, Timezone.parseTimezone("+01:00").getHours(), 1e-3);
-        assertEquals(1, Timezone.parseTimezone("+1:00").getHours(), 1e-3);
-        assertEquals(1.5, Timezone.parseTimezone("+01:30").getHours(), 1e-3);
-        assertEquals(11.5, Timezone.parseTimezone("+11:30").getHours(), 1e-3);
+        assertEquals(1, GpxTimezone.parseTimezone("+01:00").getHours(), 1e-3);
+        assertEquals(1, GpxTimezone.parseTimezone("+1:00").getHours(), 1e-3);
+        assertEquals(1.5, GpxTimezone.parseTimezone("+01:30").getHours(), 1e-3);
+        assertEquals(11.5, GpxTimezone.parseTimezone("+11:30").getHours(), 1e-3);
+        assertEquals(-11.5, GpxTimezone.parseTimezone("-11:30").getHours(), 1e-3);
     }
 }