fix #3368: New placeholer [LOG] for twitter template

1 files changed, 17 insertions, 3 deletions

diff --git a/tests/src/cgeo/geocaching/twitter/TwitterTest.java b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
index f8a4f85..92bda71 100644
--- a/tests/src/cgeo/geocaching/twitter/TwitterTest.java
+++ b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
@@ -1,7 +1,9 @@
 package cgeo.geocaching.twitter;
 
 import cgeo.geocaching.Geocache;
+import cgeo.geocaching.LogEntry;
 import cgeo.geocaching.Trackable;
+import cgeo.geocaching.enumerations.LogType;
 import cgeo.geocaching.settings.Settings;
 import cgeo.geocaching.settings.TestSettings;
 
@@ -29,7 +31,19 @@ public class TwitterTest extends TestCase {
             Geocache cache = new Geocache();
             cache.setGeocode("GC1234");
             cache.setName("TwitterTest");
-            assertEquals("I found TwitterTest (http://coord.info/GC1234). #cgeo #geocaching", Twitter.getStatusMessage(cache));
+            assertEquals("I found TwitterTest (http://coord.info/GC1234). #cgeo #geocaching", Twitter.getStatusMessage(cache, null));
+        } finally {
+            TestSettings.setCacheTwitterMessage(oldMessage);
+        }
+    }
+
+    public static void testCacheMessageWithLogContent() {
+        final String oldMessage = Settings.getCacheTwitterMessage();
+        try {
+            TestSettings.setCacheTwitterMessage("[LOG]");
+            Geocache cache = new Geocache();
+            LogEntry log = new LogEntry("me", 0, LogType.FOUND_IT, "log text");
+            assertEquals("log text #cgeo #geocaching", Twitter.getStatusMessage(cache, log));
         } finally {
             TestSettings.setCacheTwitterMessage(oldMessage);
         }
@@ -38,11 +52,11 @@ public class TwitterTest extends TestCase {
     public static void testAvoidDuplicateTags() {
         final String oldMessage = Settings.getCacheTwitterMessage();
         try {
-            TestSettings.setCacheTwitterMessage("[NAME] #cgeo");
+            TestSettings.setCacheTwitterMessage("[NAME] #cgeo #mytag");
             Geocache cache = new Geocache();
             cache.setGeocode("GC1234");
             cache.setName("TwitterTest");
-            assertEquals("TwitterTest #cgeo #geocaching", Twitter.getStatusMessage(cache));
+            assertEquals("TwitterTest #cgeo #mytag #geocaching", Twitter.getStatusMessage(cache, null));
         } finally {
             TestSettings.setCacheTwitterMessage(oldMessage);
         }