fixed : compile warrnings.

[importpicture/importpicture.git] / src / test / java / osm / jp / gpx / ElementMapTRKPTTest.java

diff --git a/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java b/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java
index 6820b27..92a3f01 100644 (file)
--- a/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java
+++ b/src/test/java/osm/jp/gpx/ElementMapTRKPTTest.java
@@ -94,7 +94,7 @@ public class ElementMapTRKPTTest {
         };
 
         TagTrkpt createElement(String[] values) throws ParseException {
-               TagTrkpt trkpt = new TagTrkpt(new Double(values[1]), new Double(values[2]));
+               TagTrkpt trkpt = new TagTrkpt(Double.valueOf(values[1]), Double.valueOf(values[2]));
             trkpt.setTime(ImportPicture.toUTCDate(values[0]));
             if (values[3] != null) {
                 trkpt.setEle(values[3]);
@@ -147,29 +147,29 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:18Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
             assertThat(tag.eleStr, is(nullValue()));
-            assertThat(tag.lat, is(new Double(values[0][1])));
-            assertThat(tag.lon, is(new Double(values[0][2])));
-            assertThat(tag.magvarStr, is(nullValue()));
+            assertThat(tag.lat, is(Double.valueOf(values[0][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[0][2])));
+            assertNull(tag.magvarStr);
         }
 
         @Test
         public void get_19() throws ParseException {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:19Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
-            assertThat(tag.eleStr, is(nullValue()));
-            assertThat(tag.lat, is(new Double(values[0][1])));
-            assertThat(tag.lon, is(new Double(values[0][2])));
-            assertThat(tag.magvarStr, is(nullValue()));
+            assertNull(tag.eleStr);
+            assertThat(tag.lat, is(Double.valueOf(values[0][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[0][2])));
+            assertNull(tag.magvarStr);
         }
 
         @Test
         public void get_20() throws ParseException {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:20Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:18Z"));
-            assertThat(tag.eleStr, is(nullValue()));
-            assertThat(tag.lat, is(new Double(values[0][1])));
-            assertThat(tag.lon, is(new Double(values[0][2])));
-            assertThat(tag.magvarStr, is(nullValue()));
+            assertNull(tag.eleStr);
+            assertThat(tag.lat, is(Double.valueOf(values[0][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[0][2])));
+            assertNull(tag.magvarStr);
         }
 
         @Test
@@ -177,9 +177,9 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:21Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
             assertThat(tag.eleStr, is("614.90"));
-            assertThat(tag.lat, is(new Double(values[1][1])));
-            assertThat(tag.lon, is(new Double(values[1][2])));
-            assertThat(tag.magvarStr, is(notNullValue()));
+            assertThat(tag.lat, is(Double.valueOf(values[1][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[1][2])));
+            assertNotNull(tag.magvarStr);
         }
 
         @Test
@@ -187,9 +187,9 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:22Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
             assertThat(tag.eleStr, is("614.90"));
-            assertThat(tag.lat, is(new Double(values[1][1])));
-            assertThat(tag.lon, is(new Double(values[1][2])));
-            assertThat(tag.magvarStr, is(notNullValue()));
+            assertThat(tag.lat, is(Double.valueOf(values[1][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[1][2])));
+            assertNotNull(tag.magvarStr);
         }
 
         @Test
@@ -197,9 +197,9 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:23Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:21Z"));
             assertThat(tag.eleStr, is("614.90"));
-            assertThat(tag.lat, is(new Double(values[1][1])));
-            assertThat(tag.lon, is(new Double(values[1][2])));
-            assertThat(tag.magvarStr, is(notNullValue()));
+            assertThat(tag.lat, is(Double.valueOf(values[1][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[1][2])));
+            assertNotNull(tag.magvarStr);
         }
 
         @Test
@@ -207,8 +207,8 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:24Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
             assertThat(tag.eleStr, is("615.00"));
-            assertThat(tag.lat, is(new Double(values[2][1])));
-            assertThat(tag.lon, is(new Double(values[2][2])));
+            assertThat(tag.lat, is(Double.valueOf(values[2][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[2][2])));
             assertThat(tag.magvarStr, is(notNullValue()));
         }
 
@@ -217,8 +217,8 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:25Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
             assertThat(tag.eleStr, is("615.00"));
-            assertThat(tag.lat, is(new Double(values[2][1])));
-            assertThat(tag.lon, is(new Double(values[2][2])));
+            assertThat(tag.lat, is(Double.valueOf(values[2][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[2][2])));
             assertThat(tag.magvarStr, is(notNullValue()));
         }
 
@@ -227,8 +227,8 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:26Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:24Z"));
             assertThat(tag.eleStr, is("615.00"));
-            assertThat(tag.lat, is(new Double(values[2][1])));
-            assertThat(tag.lon, is(new Double(values[2][2])));
+            assertThat(tag.lat, is(Double.valueOf(values[2][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[2][2])));
             assertThat(tag.magvarStr, is(notNullValue()));
         }
 
@@ -237,9 +237,9 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:27Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
             assertThat(tag.eleStr, is("615.03"));
-            assertThat(tag.lat, is(new Double(values[3][1])));
-            assertThat(tag.lon, is(new Double(values[3][2])));
-            assertThat(tag.magvarStr, is(notNullValue()));
+            assertThat(tag.lat, is(Double.valueOf(values[3][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[3][2])));
+            assertNotNull(tag.magvarStr);
         }
 
         @Test
@@ -247,8 +247,8 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:28Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
             assertThat(tag.eleStr, is("615.03"));
-            assertThat(tag.lat, is(new Double(values[3][1])));
-            assertThat(tag.lon, is(new Double(values[3][2])));
+            assertThat(tag.lat, is(Double.valueOf(values[3][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[3][2])));
             assertThat(tag.magvarStr, is(notNullValue()));
         }
 
@@ -257,8 +257,8 @@ public class ElementMapTRKPTTest {
             TagTrkpt tag = map.getValue(ImportPicture.toUTCDate("2017-05-29T01:23:30Z"));
             assertThat(sdf.format(tag.time), is("2017-05-29T10:23:27Z"));
             assertThat(tag.eleStr, is("615.03"));
-            assertThat(tag.lat, is(new Double(values[3][1])));
-            assertThat(tag.lon, is(new Double(values[3][2])));
+            assertThat(tag.lat, is(Double.valueOf(values[3][1])));
+            assertThat(tag.lon, is(Double.valueOf(values[3][2])));
             assertThat(tag.magvarStr, is(notNullValue()));
         }