};
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]);
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
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
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
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
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()));
}
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()));
}
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()));
}
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
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()));
}
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()));
}