Merge branch 'issue-4416' into upstream

Conflicts:
	main/src/cgeo/geocaching/connector/gc/GCLogin.java

5 files changed, 7 insertions, 7 deletions

diff --git a/tests/res/raw/own_cache.htm b/tests/res/raw/own_cache.htm
index 4d26e2e..c222bcd 100644
--- a/tests/res/raw/own_cache.htm
+++ b/tests/res/raw/own_cache.htm
@@ -424,7 +424,7 @@ Sys.WebForms.PageRequestManager._initialize('ctl00$uxMainScriptManager', 'aspnet
                 <div id="ctl00_ContentBody_mcd2">

                     Hidden

                     :

-                    31/Mar/2012

+                    2013-03-31

                     

                 </div>

                 <div>

diff --git a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
index 09139f2..ddd2310 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC1ZXX2.java
@@ -86,7 +86,7 @@ public class GC1ZXX2 extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return GCLogin.parseGcCustomDate("16/10/2009", getDateFormat());
+            return GCLogin.parseGcCustomDate("2009-10-16", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
index c125422..781810e 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2CJPF.java
@@ -121,7 +121,7 @@ public class GC2CJPF extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return GCLogin.parseGcCustomDate("31/07/2010", getDateFormat());
+            return GCLogin.parseGcCustomDate("2010-07-31", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }
diff --git a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
index a1337cd..be27a2e 100644
--- a/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
+++ b/tests/src/cgeo/geocaching/test/mock/GC2JVEH.java
@@ -89,7 +89,7 @@ public class GC2JVEH extends MockedCache {
     @Override
     public Date getHiddenDate() {
         try {
-            return GCLogin.parseGcCustomDate("28/11/2010", getDateFormat());
+            return GCLogin.parseGcCustomDate("2010-11-28", getDateFormat());
         } catch (ParseException e) {
             // intentionally left blank
         }
diff --git a/tests/src/cgeo/geocaching/test/mock/MockedCache.java b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
index cd482f8..0ef6488 100644
--- a/tests/src/cgeo/geocaching/test/mock/MockedCache.java
+++ b/tests/src/cgeo/geocaching/test/mock/MockedCache.java
@@ -12,14 +12,14 @@ import cgeo.geocaching.utils.TextUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.mapsforge.core.IOUtils;
 
+import junit.framework.Assert;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 
-import junit.framework.Assert;
-
 public abstract class MockedCache implements ICache {
 
     final protected Geopoint coords;
@@ -44,7 +44,7 @@ public abstract class MockedCache implements ICache {
     }
 
     public static String getDateFormat() {
-        return "dd/MM/yyyy";
+        return "yyyy-MM-dd";
     }
 
     /*