2 files changed, 50 insertions, 6 deletions
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
index 5323db7..dd71302 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCParserTest.java
@@ -24,14 +24,42 @@ import android.test.suitebuilder.annotation.MediumTest;
 import java.util.ArrayList;
 
 public class GCParserTest extends AbstractResourceInstrumentationTestCase {
-    public void testUnpublishedCache() {
-        final String page = getFileContent(R.raw.cache_unpublished);
+
+    public void testUnpublishedCacheNotOwner() {
+        final int cache = R.raw.cache_unpublished;
+        assertUnpublished(cache);
+    }
+
+    public void testUnpublishedCacheOwner() {
+        final int cache = R.raw.gc433yc_owner_unpublished;
+        assertUnpublished(cache);
+    }
+
+    private void assertUnpublished(final int cache) {
+        final String page = getFileContent(cache);
         SearchResult result = GCParser.parseCacheFromText(page, null);
         assertNotNull(result);
         assertTrue(result.isEmpty());
         assertEquals(StatusCode.UNPUBLISHED_CACHE, result.getError());
     }
 
+    public void testPublishedCacheWithUnpublishedInDescription1() {
+        assertPublishedCache(R.raw.gc430fm_published, "Cache is Unpublished");
+    }
+
+    public void testPublishedCacheWithUnpublishedInDescription2() {
+        assertPublishedCache(R.raw.gc431f2_published, "Needle in a Haystack");
+    }
+
+    private void assertPublishedCache(final int cachePage, final String cacheName) {
+        final String page = getFileContent(cachePage);
+        SearchResult result = GCParser.parseCacheFromText(page, null);
+        assertNotNull(result);
+        assertEquals(1, result.getCount());
+        cgCache cache = result.getFirstCacheFromResult(LoadFlags.LOAD_CACHE_OR_DB);
+        assertEquals(cacheName, cache.getName());
+    }
+
     public void testOwnCache() {
         final cgCache cache = parseCache(R.raw.own_cache);
         assertNotNull(cache);
diff --git a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
index 357c0cc..4c2655d 100644
--- a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
@@ -4,6 +4,7 @@ import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.TrackableLog;
 import cgeo.geocaching.cgImage;
 import cgeo.geocaching.cgTrackable;
+import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
 import cgeo.geocaching.utils.BaseUtils;
@@ -71,7 +72,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
     }
 
     public void testParseTrackableWithoutReleaseDate() {
-        cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb14wfv), null);
+        cgTrackable trackable = parseTrackable(R.raw.tb14wfv);
         assertNotNull(trackable);
         assertEquals("The Brickster", trackable.getName());
         assertEquals("Adrian C", trackable.getOwner());
@@ -84,7 +85,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
     }
 
     public void testParseRelativeLink() {
-        final cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb4cwjx), null);
+        final cgTrackable trackable = parseTrackable(R.raw.tb4cwjx);
         assertNotNull(trackable);
         assertEquals("The Golden Lisa", trackable.getName());
         final String goal = trackable.getGoal();
@@ -93,12 +94,27 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
         assertTrue(goal.contains("href=\"http://www.geocaching.com/seek/cache_details.aspx?wp=GC3B7PD#\""));
     }
 
+    private cgTrackable parseTrackable(int trackablePage) {
+        String pageContent = getFileContent(trackablePage);
+        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(pageContent), null);
+    }
+
+    public void testParseMarkMissing() {
+        final cgTrackable trackable = parseTrackable(R.raw.tb29ggq);
+        assertNotNull(trackable);
+        final List<LogEntry> logs = trackable.getLogs();
+        assertNotNull(logs);
+        assertFalse(logs.isEmpty());
+        LogEntry marked = logs.get(4);
+        assertEquals(LogType.MARKED_MISSING, marked.type);
+    }
+
     private cgTrackable getTB2R124() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tb2r124)), null);
+        return parseTrackable(R.raw.trackable_tb2r124);
     }
 
     private cgTrackable getTBXATG() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tbxatg)), null);
+        return parseTrackable(R.raw.trackable_tbxatg);
     }
 
     public void testParseTrackableNotExisting() {