Merge pull request #856 from samueltardieu/fix-template-test

Fix text by requiring the current year to be present in output

1 files changed, 6 insertions, 1 deletions

diff --git a/tests/src/cgeo/geocaching/LogTemplateProviderTest.java b/tests/src/cgeo/geocaching/LogTemplateProviderTest.java
index 760dedd..21ce00e 100644
--- a/tests/src/cgeo/geocaching/LogTemplateProviderTest.java
+++ b/tests/src/cgeo/geocaching/LogTemplateProviderTest.java
@@ -1,5 +1,7 @@
 package cgeo.geocaching;
 
+import java.util.Calendar;
+
 import junit.framework.TestCase;
 
 public class LogTemplateProviderTest extends TestCase {
@@ -7,7 +9,10 @@ public class LogTemplateProviderTest extends TestCase {
     public static void testApplyTemplates() {
         final String noTemplates = " no templates ";
         assertEquals(noTemplates, LogTemplateProvider.applyTemplates(noTemplates, true));
-        assertTrue(LogTemplateProvider.applyTemplates("[DATE]", true).contains("."));
+
+        // This test can occasionally fail if the current year changes right after the next line.
+        final String currentYear = Integer.toString(Calendar.YEAR);
+        assertTrue(LogTemplateProvider.applyTemplates("[DATE]", true).contains(currentYear));
     }
 
 }