1 files changed, 53 insertions, 22 deletions

diff --git a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
index 319a3b2..cd130db 100644
--- a/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/TrackablesTest.java
@@ -1,8 +1,10 @@
 package cgeo.geocaching.connector.gc;
 
+import cgeo.geocaching.Image;
 import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.TrackableLog;
-import cgeo.geocaching.cgTrackable;
+import cgeo.geocaching.Trackable;
+import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 import cgeo.geocaching.test.R;
 import cgeo.geocaching.utils.BaseUtils;
@@ -12,51 +14,65 @@ import java.util.List;
 public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
 
     public void testLogPageWithTrackables() {
-        List<TrackableLog> tbLogs = GCParser.parseTrackableLog(getFileContent(R.raw.log_with_2tb));
+        final List<TrackableLog> tbLogs = GCParser.parseTrackableLog(getFileContent(R.raw.log_with_2tb));
         assertNotNull(tbLogs);
         assertEquals(2, tbLogs.size());
-        TrackableLog log = tbLogs.get(0);
+        final TrackableLog log = tbLogs.get(0);
         assertEquals("Steffen's Kaiserwagen", log.name);
         assertEquals("1QG1EE", log.trackCode);
     }
 
     public void testLogPageWithoutTrackables() {
-        List<TrackableLog> tbLogs = GCParser.parseTrackableLog(getFileContent(R.raw.log_without_tb));
+        final List<TrackableLog> tbLogs = GCParser.parseTrackableLog(getFileContent(R.raw.log_without_tb));
         assertNotNull(tbLogs);
         assertEquals(0, tbLogs.size());
     }
 
     public void testTrackable() {
-        final cgTrackable trackable = getTB2R124();
+        final Trackable trackable = getTB2R124();
         assertEquals("TB2R124", trackable.getGeocode());
         assertEquals("Bor. Dortmund - FC Schalke 04", trackable.getName());
         assertEquals("Spiridon Lui", trackable.getOwner());
     }
 
     public void testTrackableWithoutImage() {
-        final cgTrackable trackable = getTB2R124();
+        final Trackable trackable = getTB2R124();
         assertNull(trackable.getImage());
         assertNotNull(trackable.getDetails());
     }
 
     public void testTrackableWithLogImages() {
-        final cgTrackable trackable = getTBXATG();
+        final Trackable trackable = getTBXATG();
         assertEquals("TBXATG", trackable.getGeocode());
 
-        List<LogEntry> log = trackable.getLogs();
-        // second log entry has several images; just check first two
-        assertEquals("http://img.geocaching.com/track/log/large/f2e24c50-394c-4d74-8fb4-87298d8bff1d.jpg", log.get(4).getLogImages().get(0).getUrl());
-        assertEquals("7b Welcome to Geowoodstock", log.get(4).getLogImages().get(0).getTitle());
-        assertEquals("http://img.geocaching.com/track/log/large/b57c29c3-134e-4202-a2a1-69ce8920b055.jpg", log.get(4).getLogImages().get(1).getUrl());
-        assertEquals("8 Crater Lake Natl Park Oregon", log.get(4).getLogImages().get(1).getTitle());
+        final List<LogEntry> log = trackable.getLogs();
+        assertNotNull(log);
+        assertEquals(10, log.size());
+        // log entry 4 has several images; just check first two
+
+        final List<Image> log4Images = log.get(4).getLogImages();
+        assertNotNull(log4Images);
+        assertEquals(5, log4Images.size());
+        assertEquals("http://img.geocaching.com/track/log/large/f2e24c50-394c-4d74-8fb4-87298d8bff1d.jpg", log4Images.get(0).getUrl());
+        assertEquals("7b Welcome to Geowoodstock", log4Images.get(0).getTitle());
+        assertEquals("http://img.geocaching.com/track/log/large/b57c29c3-134e-4202-a2a1-69ce8920b055.jpg", log4Images.get(1).getUrl());
+        assertEquals("8 Crater Lake Natl Park Oregon", log4Images.get(1).getTitle());
 
         // third log entry has one image
-        assertEquals("http://img.geocaching.com/track/log/large/0096b42d-4d10-45fa-9be2-2d08c0d5cc61.jpg", log.get(5).getLogImages().get(0).getUrl());
-        assertEquals("Traverski&#39;s GC Univ coin on tour", log.get(5).getLogImages().get(0).getTitle());
+        final List<Image> log5Images = log.get(5).getLogImages();
+        assertNotNull(log5Images);
+        assertEquals(1, log5Images.size());
+        assertEquals("http://img.geocaching.com/track/log/large/0096b42d-4d10-45fa-9be2-2d08c0d5cc61.jpg", log5Images.get(0).getUrl());
+        assertEquals("Traverski&#39;s GC Univ coin on tour", log5Images.get(0).getTitle());
+
+        for (LogEntry entry : log) {
+            assertFalse(entry.log.startsWith("<div>"));
+        }
+        assertEquals("traveling", log.get(0).log);
     }
 
     public void testParseTrackableWithoutReleaseDate() {
-        cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb14wfv), null);
+        final Trackable trackable = parseTrackable(R.raw.tb14wfv);
         assertNotNull(trackable);
         assertEquals("The Brickster", trackable.getName());
         assertEquals("Adrian C", trackable.getOwner());
@@ -69,7 +85,7 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
     }
 
     public void testParseRelativeLink() {
-        final cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb4cwjx), null);
+        final Trackable trackable = parseTrackable(R.raw.tb4cwjx);
         assertNotNull(trackable);
         assertEquals("The Golden Lisa", trackable.getName());
         final String goal = trackable.getGoal();
@@ -78,16 +94,31 @@ public class TrackablesTest extends AbstractResourceInstrumentationTestCase {
         assertTrue(goal.contains("href=\"http://www.geocaching.com/seek/cache_details.aspx?wp=GC3B7PD#\""));
     }
 
-    private cgTrackable getTB2R124() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tb2r124)), null);
+    private Trackable parseTrackable(int trackablePage) {
+        final String pageContent = getFileContent(trackablePage);
+        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(pageContent), null);
+    }
+
+    public void testParseMarkMissing() {
+        final Trackable trackable = parseTrackable(R.raw.tb29ggq);
+        assertNotNull(trackable);
+        final List<LogEntry> logs = trackable.getLogs();
+        assertNotNull(logs);
+        assertFalse(logs.isEmpty());
+        final LogEntry marked = logs.get(4);
+        assertEquals(LogType.MARKED_MISSING, marked.type);
+    }
+
+    private Trackable getTB2R124() {
+        return parseTrackable(R.raw.trackable_tb2r124);
     }
 
-    private cgTrackable getTBXATG() {
-        return GCParser.parseTrackable(BaseUtils.replaceWhitespace(getFileContent(R.raw.trackable_tbxatg)), null);
+    private Trackable getTBXATG() {
+        return parseTrackable(R.raw.trackable_tbxatg);
     }
 
     public void testParseTrackableNotExisting() {
-        cgTrackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null);
+        final Trackable trackable = GCParser.parseTrackable(getFileContent(R.raw.tb_not_existing), null);
         assertNull(trackable);
     }