Make tests independant of user settings

2 files changed, 77 insertions, 28 deletions

diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
index 843a48c..df94502 100644
--- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java
+++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java
@@ -70,7 +70,7 @@ public class cgeoApplicationTest extends CGeoTestCase {
         assertEquals("http://www.geocaching.com/images/wpttypes/21.gif", tb.getIconUrl());
         assertEquals("blafoo's Children Music CD", tb.getName());
         assertEquals("Travel Bug Dog Tag", tb.getType());
-        assertEquals(new GregorianCalendar(2009 - 1900, 8 - 1, 24), tb.getReleased());
+        assertEquals(new GregorianCalendar(2009, 8 - 1, 24).getTime(), tb.getReleased());
         assertEquals("Niedersachsen, Germany", tb.getOrigin());
         assertEquals("blafoo", tb.getOwner());
         assertEquals("0564a940-8311-40ee-8e76-7e91b2cf6284", tb.getOwnerGuid());
@@ -181,10 +181,20 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByCoords() {
-        final SearchResult search = GCParser.searchByCoords(new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, false);
-        assertNotNull(search);
-        assertTrue(18 <= search.getGeocodes().size());
-        assertTrue(search.getGeocodes().contains("GC1RMM2"));
+        // backup user settings
+        final boolean excludeMine = Settings.isExcludeMyCaches();
+        try {
+            // set up settings required for test
+            Settings.setExcludeMine(false);
+
+            final SearchResult search = GCParser.searchByCoords(new Geopoint("N 52° 24.972 E 009° 35.647"), CacheType.MYSTERY, false);
+            assertNotNull(search);
+            assertTrue(20 <= search.getGeocodes().size());
+            assertTrue(search.getGeocodes().contains("GC1RMM2"));
+        } finally {
+            // restore user settings
+            Settings.setExcludeMine(excludeMine);
+        }
     }
 
     /**
@@ -192,10 +202,21 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByOwner() {
-        final SearchResult search = GCParser.searchByOwner("blafoo", CacheType.MYSTERY, false);
-        assertNotNull(search);
-        assertEquals(3, search.getGeocodes().size());
-        assertTrue(search.getGeocodes().contains("GC36RT6"));
+        // backup user settings
+        final boolean excludeMine = Settings.isExcludeMyCaches();
+        try {
+            // set up settings required for test
+            Settings.setExcludeMine(false);
+
+            final SearchResult search = GCParser.searchByOwner("blafoo", CacheType.MYSTERY, false);
+            assertNotNull(search);
+            assertEquals(3, search.getGeocodes().size());
+            assertTrue(search.getGeocodes().contains("GC36RT6"));
+
+        } finally {
+            // restore user settings
+            Settings.setExcludeMine(excludeMine);
+        }
     }
 
     /**
@@ -203,10 +224,21 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByUsername() {
-        final SearchResult search = GCParser.searchByUsername("blafoo", CacheType.WEBCAM, false);
-        assertNotNull(search);
-        assertEquals(3, search.getTotal());
-        assertTrue(search.getGeocodes().contains("GCP0A9"));
+        // backup user settings
+        final boolean excludeMine = Settings.isExcludeMyCaches();
+        try {
+            // set up settings required for test
+            Settings.setExcludeMine(false);
+
+            final SearchResult search = GCParser.searchByUsername("blafoo", CacheType.WEBCAM, false);
+            assertNotNull(search);
+            assertEquals(3, search.getTotal());
+            assertTrue(search.getGeocodes().contains("GCP0A9"));
+
+        } finally {
+            // restore user settings
+            Settings.setExcludeMine(excludeMine);
+        }
     }
 
     /**
@@ -214,9 +246,14 @@ public class cgeoApplicationTest extends CGeoTestCase {
      */
     @MediumTest
     public static void testSearchByViewport() {
+        // backup user settings
+        final boolean excludeMine = Settings.isExcludeMyCaches();
         final Strategy strategy = Settings.getLiveMapStrategy();
 
         try {
+            // set up settings required for test
+            Settings.setExcludeMine(false);
+
             final GC2CJPF mockedCache = new GC2CJPF();
             deleteCacheFromDB(mockedCache.getGeocode());
 
@@ -248,6 +285,8 @@ public class cgeoApplicationTest extends CGeoTestCase {
             assertEquals(Settings.isPremiumMember(), parsedCache.isReliableLatLon());
 
         } finally {
+            // restore user settings
+            Settings.setExcludeMine(excludeMine);
             Settings.setLiveMapStrategy(strategy);
         }
     }
diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
index 12e7e22..ca1c058 100644
--- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
+++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java
@@ -1,6 +1,7 @@
 package cgeo.geocaching.connector.gc;
 
 import cgeo.geocaching.SearchResult;
+import cgeo.geocaching.Settings;
 import cgeo.geocaching.connector.ConnectorFactory;
 import cgeo.geocaching.geopoint.Geopoint;
 import cgeo.geocaching.geopoint.Viewport;
@@ -9,24 +10,33 @@ import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase;
 public class GCConnectorTest extends AbstractResourceInstrumentationTestCase {
 
     public static void testGetViewport() {
-        Login.login();
+        // backup user settings
+        final boolean excludeMine = Settings.isExcludeMyCaches();
+        try {
+            // set up settings required for test
+            Settings.setExcludeMine(false);
+            Login.login();
 
-        String[] tokens = Login.getMapTokens();
+            String[] tokens = Login.getMapTokens();
 
-        {
-            final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200"));
-            SearchResult searchResult = ConnectorFactory.searchByViewport(viewport, tokens);
-            assertNotNull(searchResult);
-            assertFalse(searchResult.isEmpty());
-            assertTrue(searchResult.getGeocodes().contains("GC211WG"));
-            // Spiel & Sport GC211WG N 52° 25.413 E 009° 36.049
-        }
+            {
+                final Viewport viewport = new Viewport(new Geopoint("N 52° 25.369 E 9° 35.499"), new Geopoint("N 52° 25.600 E 9° 36.200"));
+                SearchResult searchResult = ConnectorFactory.searchByViewport(viewport, tokens);
+                assertNotNull(searchResult);
+                assertFalse(searchResult.isEmpty());
+                assertTrue(searchResult.getGeocodes().contains("GC211WG"));
+                // Spiel & Sport GC211WG N 52° 25.413 E 009° 36.049
+            }
 
-        {
-            final Viewport viewport = new Viewport(new Geopoint("N 52° 24.000 E 9° 34.500"), new Geopoint("N 52° 26.000 E 9° 38.500"));
-            SearchResult searchResult = ConnectorFactory.searchByViewport(viewport, tokens);
-            assertNotNull(searchResult);
-            assertTrue(searchResult.getGeocodes().contains("GC211WG"));
+            {
+                final Viewport viewport = new Viewport(new Geopoint("N 52° 24.000 E 9° 34.500"), new Geopoint("N 52° 26.000 E 9° 38.500"));
+                SearchResult searchResult = ConnectorFactory.searchByViewport(viewport, tokens);
+                assertNotNull(searchResult);
+                assertTrue(searchResult.getGeocodes().contains("GC211WG"));
+            }
+        } finally {
+            // restore user settings
+            Settings.setExcludeMine(excludeMine);
         }
     }