aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMathieu Alorent <github@kumy.net>2015-05-19 18:36:57 +0200
committerMathieu Alorent <github@kumy.net>2015-05-19 18:36:57 +0200
commitc4cd93db89c7e8175e825dd46763397dbcbcd4d9 (patch)
tree28a0434ccb669811c2391d9919f9b7e043371a61 /tests
parent216b556931ea7068e3b843d028e341d244f82941 (diff)
downloadcgeo-c4cd93db89c7e8175e825dd46763397dbcbcd4d9.zip
cgeo-c4cd93db89c7e8175e825dd46763397dbcbcd4d9.tar.gz
cgeo-c4cd93db89c7e8175e825dd46763397dbcbcd4d9.tar.bz2
Fix #4813: `Missing` status for GK should be represented
Diffstat (limited to 'tests')
-rw-r--r--tests/res/raw/geokret141_xml.xml2
-rw-r--r--tests/res/raw/geokret145_xml.xml2
-rw-r--r--tests/src/cgeo/geocaching/TrackableTest.java2
-rw-r--r--tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java23
4 files changed, 27 insertions, 2 deletions
diff --git a/tests/res/raw/geokret141_xml.xml b/tests/res/raw/geokret141_xml.xml
index 24956d7..77083d0 100644
--- a/tests/res/raw/geokret141_xml.xml
+++ b/tests/res/raw/geokret141_xml.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<gkxml version="1.0" date="2014-09-03 21:49:59">
<geokrety><geokret id="46464" dist="0" owner_id="26422" type="0" image="14097735378mgfc.png"><![CDATA[c:geo One]]></geokret>
-<geokret id="46465" dist="0" owner_id="26422" type="4" image="14097736673tzjb.png"><![CDATA[c:geo Two]]></geokret>
+<geokret id="46465" dist="0" owner_id="26422" type="4" image="14097736673tzjb.png" missing="1"><![CDATA[c:geo Two]]></geokret>
</geokrety>
</gkxml> \ No newline at end of file
diff --git a/tests/res/raw/geokret145_xml.xml b/tests/res/raw/geokret145_xml.xml
index e32d6c2..7dff5fe 100644
--- a/tests/res/raw/geokret145_xml.xml
+++ b/tests/res/raw/geokret145_xml.xml
@@ -10,7 +10,7 @@ Bitte ignorieren.]]></description>
<datecreated>2015-03-29 00:12:15</datecreated>
<distancetravelled>2254</distancetravelled>
<state>5</state>
- <missing>0</missing>
+ <missing>1</missing>
<position latitude="51.31667" longitude="7.00000"/>
<waypoints>
<waypoint/>
diff --git a/tests/src/cgeo/geocaching/TrackableTest.java b/tests/src/cgeo/geocaching/TrackableTest.java
index 7dbe0a4..67caf20 100644
--- a/tests/src/cgeo/geocaching/TrackableTest.java
+++ b/tests/src/cgeo/geocaching/TrackableTest.java
@@ -75,6 +75,7 @@ public class TrackableTest extends AndroidTestCase {
trackable2.setLogs(logEntryList2);
trackable2.setTrackingcode("trackingcode");
trackable2.forceSetBrand(TrackableBrand.GEOKRETY);
+ trackable2.setMissing(true);
trackable1.mergeTrackable(trackable2);
@@ -94,6 +95,7 @@ public class TrackableTest extends AndroidTestCase {
assertThat(trackable1.getImage()).isEqualTo(trackable2.getImage());
assertThat(trackable1.getTrackingcode()).isEqualTo(trackable2.getTrackingcode());
assertThat(trackable1.getBrand()).isEqualTo(trackable2.getBrand());
+ assertThat(trackable1.isMissing()).isEqualTo(trackable2.isMissing());
assertThat(trackable1.getLogs()).hasSize(2);
assertThat(trackable1.getLogs().get(0)).isEqualTo(logEntry2);
diff --git a/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java b/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
index c2fab3f..97c71ad 100644
--- a/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/trackable/GeokretyParserTest.java
@@ -114,4 +114,27 @@ public class GeokretyParserTest extends AbstractResourceInstrumentationTestCase
"<br />" +
"Bitte ignorieren.");
}
+
+ public void testMissing() throws Exception {
+ final List<Trackable> trackables1 = GeokretyParser.parse(new InputSource(getResourceStream(R.raw.geokret145_xml)));
+ assertThat(trackables1).hasSize(1);
+ final Trackable trackable1 = trackables1.get(0);
+ assertThat(trackable1).isNotNull();
+ assertThat(trackable1.isMissing()).isTrue();
+
+ final List<Trackable> trackables2 = GeokretyParser.parse(new InputSource(getResourceStream(R.raw.geokret146_xml)));
+ assertThat(trackables2).hasSize(1);
+ final Trackable trackable2 = trackables2.get(0);
+ assertThat(trackable2).isNotNull();
+ assertThat(trackable2.isMissing()).isFalse();
+
+ final List<Trackable> trackables3 = GeokretyParser.parse(new InputSource(getResourceStream(R.raw.geokret141_xml)));
+ assertThat(trackables3).hasSize(2);
+ final Trackable trackable3 = trackables3.get(0);
+ assertThat(trackable3).isNotNull();
+ assertThat(trackable3.isMissing()).isFalse();
+ final Trackable trackable4 = trackables3.get(1);
+ assertThat(trackable4).isNotNull();
+ assertThat(trackable4.isMissing()).isTrue();
+ }
}