red: magvar

diff --git a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
index a63e6fd..759f4e4 100644 (file)
--- a/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
+++ b/importPicture/test/osm/jp/gpx/ElementMapTRKPTTest.java
@@ -1,6 +1,7 @@
 package osm.jp.gpx;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.*;
 
@@ -164,7 +165,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -173,7 +174,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -182,7 +183,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -191,7 +192,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -200,7 +201,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -209,7 +210,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -218,7 +219,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -227,7 +228,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -236,7 +237,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -245,7 +246,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test
@@ -254,7 +255,7 @@ public class ElementMapTRKPTTest {
                        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])).doubleValue()));
-                       assertThat(tag.magvarStr, is(nullValue()));
+                       assertThat(tag.magvarStr, is(notNullValue()));
                }
 
                @Test