fix #2282: change recognition of unpublished caches

1 files changed, 30 insertions, 2 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);