aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBananeweizen <bananeweizen@gmx.de>2013-10-26 08:07:18 +0200
committerBananeweizen <bananeweizen@gmx.de>2013-10-26 08:07:18 +0200
commit771850cff1d0a4e897cd004aa074e33bcaede5db (patch)
tree9dbba33d90d045ef7f346cc352e2ac74129aedaf /tests
parentb16bda3e384516af6fea23c6fa699e6870dcd391 (diff)
downloadcgeo-771850cff1d0a4e897cd004aa074e33bcaede5db.zip
cgeo-771850cff1d0a4e897cd004aa074e33bcaede5db.tar.gz
cgeo-771850cff1d0a4e897cd004aa074e33bcaede5db.tar.bz2
fix #3378: Placeholder [LOG] not working for TB tweets
Diffstat (limited to 'tests')
-rw-r--r--tests/src/cgeo/geocaching/twitter/TwitterTest.java16
1 files changed, 14 insertions, 2 deletions
diff --git a/tests/src/cgeo/geocaching/twitter/TwitterTest.java b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
index 92bda71..9de5e2f 100644
--- a/tests/src/cgeo/geocaching/twitter/TwitterTest.java
+++ b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
@@ -18,7 +18,7 @@ public class TwitterTest extends TestCase {
Trackable tb = new Trackable();
tb.setName("Travel bug");
tb.setGeocode("TB1234");
- assertEquals("I touched Travel bug (http://www.geocaching.com//track/details.aspx?tracker=TB1234). #cgeo #geocaching", Twitter.getStatusMessage(tb));
+ assertEquals("I touched Travel bug (http://www.geocaching.com//track/details.aspx?tracker=TB1234). #cgeo #geocaching", Twitter.getStatusMessage(tb, null));
} finally {
TestSettings.setTrackableTwitterMessage(oldMessage);
}
@@ -42,13 +42,25 @@ public class TwitterTest extends TestCase {
try {
TestSettings.setCacheTwitterMessage("[LOG]");
Geocache cache = new Geocache();
- LogEntry log = new LogEntry("me", 0, LogType.FOUND_IT, "log text");
+ LogEntry log = new LogEntry(0, LogType.FOUND_IT, "log text");
assertEquals("log text #cgeo #geocaching", Twitter.getStatusMessage(cache, log));
} finally {
TestSettings.setCacheTwitterMessage(oldMessage);
}
}
+ public static void testTrackableMessageWithLogContent() {
+ final String oldMessage = Settings.getCacheTwitterMessage();
+ try {
+ TestSettings.setTrackableTwitterMessage("[LOG]");
+ Trackable trackable = new Trackable();
+ LogEntry log = new LogEntry(0, LogType.FOUND_IT, "trackable log text");
+ assertEquals("trackable log text #cgeo #geocaching", Twitter.getStatusMessage(trackable, log));
+ } finally {
+ TestSettings.setTrackableTwitterMessage(oldMessage);
+ }
+ }
+
public static void testAvoidDuplicateTags() {
final String oldMessage = Settings.getCacheTwitterMessage();
try {