diff options
Diffstat (limited to 'tests/src')
7 files changed, 77 insertions, 29 deletions
diff --git a/tests/src/cgeo/geocaching/StaticMapsProviderTest.java b/tests/src/cgeo/geocaching/StaticMapsProviderTest.java index bd790b4..2b11976 100644 --- a/tests/src/cgeo/geocaching/StaticMapsProviderTest.java +++ b/tests/src/cgeo/geocaching/StaticMapsProviderTest.java @@ -4,6 +4,7 @@ import cgeo.geocaching.enumerations.WaypointType; import cgeo.geocaching.files.LocalStorage; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import android.test.suitebuilder.annotation.Suppress; @@ -21,8 +22,8 @@ public class StaticMapsProviderTest extends TestCase { boolean backupStore = Settings.isStoreOfflineMaps(); boolean backupStoreWP = Settings.isStoreOfflineWpMaps(); - Settings.setStoreOfflineMaps(true); - Settings.setStoreOfflineWpMaps(true); + TestSettings.setStoreOfflineMaps(true); + TestSettings.setStoreOfflineWpMaps(true); try { Geopoint gp = new Geopoint(lat + 0.25d, lon + 0.25d); Geocache cache = new Geocache(); @@ -66,8 +67,8 @@ public class StaticMapsProviderTest extends TestCase { trailhead.setCoords(new Geopoint(lat + 0.24d + 2, lon + 0.25d + 2)); assertFalse(StaticMapsProvider.hasStaticMapForWaypoint(geocode, trailhead)); } finally { - Settings.setStoreOfflineWpMaps(backupStoreWP); - Settings.setStoreOfflineMaps(backupStore); + TestSettings.setStoreOfflineWpMaps(backupStoreWP); + TestSettings.setStoreOfflineMaps(backupStore); deleteCacheDirectory(geocode); } } diff --git a/tests/src/cgeo/geocaching/cgeoApplicationTest.java b/tests/src/cgeo/geocaching/cgeoApplicationTest.java index 26a86fe..83bf28d 100644 --- a/tests/src/cgeo/geocaching/cgeoApplicationTest.java +++ b/tests/src/cgeo/geocaching/cgeoApplicationTest.java @@ -14,6 +14,7 @@ import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.loaders.RecaptchaReceiver; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import cgeo.geocaching.test.RegExPerformanceTest; import cgeo.geocaching.test.mock.GC1ZXX2; import cgeo.geocaching.test.mock.GC2CJPF; @@ -159,7 +160,7 @@ public class cgeoApplicationTest extends CGeoTestCase { } finally { // restore user and password - Settings.setLogin(login.left, login.right); + TestSettings.setLogin(login.left, login.right); Settings.setMemberStatus(memberStatus); Login.login(); } @@ -185,7 +186,7 @@ public class cgeoApplicationTest extends CGeoTestCase { } finally { // restore user and password - Settings.setLogin(login.left, login.right); + TestSettings.setLogin(login.left, login.right); Settings.setMemberStatus(memberStatus); Login.login(); } @@ -202,15 +203,15 @@ public class cgeoApplicationTest extends CGeoTestCase { final boolean excludeDisabled = Settings.isExcludeDisabledCaches(); try { // set up settings required for test - Settings.setExcludeMine(false); - Settings.setExcludeDisabledCaches(false); + TestSettings.setExcludeMine(false); + TestSettings.setExcludeDisabledCaches(false); runnable.run(); } finally { // restore user settings - Settings.setExcludeMine(excludeMine); - Settings.setExcludeDisabledCaches(excludeDisabled); + TestSettings.setExcludeMine(excludeMine); + TestSettings.setExcludeDisabledCaches(excludeDisabled); } } @@ -280,7 +281,7 @@ public class cgeoApplicationTest extends CGeoTestCase { try { // set up settings required for test - Settings.setExcludeMine(false); + TestSettings.setExcludeMine(false); Settings.setCacheType(CacheType.ALL); final GC2CJPF mockedCache = new GC2CJPF(); @@ -369,7 +370,7 @@ public class cgeoApplicationTest extends CGeoTestCase { } finally { // restore user and password - Settings.setLogin(login.left, login.right); + TestSettings.setLogin(login.left, login.right); Settings.setMemberStatus(memberStatus); Login.login(); Settings.setLiveMapStrategy(strategy); @@ -412,7 +413,7 @@ public class cgeoApplicationTest extends CGeoTestCase { Login.logout(); // Modify login data to avoid an automatic login again - Settings.setLogin("c:geo", "c:geo"); + TestSettings.setLogin("c:geo", "c:geo"); Settings.setMemberStatus("Basic member"); } diff --git a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java index 373f27b..8ac2177 100644 --- a/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java +++ b/tests/src/cgeo/geocaching/connector/gc/GCConnectorTest.java @@ -7,6 +7,7 @@ import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.geopoint.Viewport; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { @@ -17,7 +18,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { final CacheType cacheType = Settings.getCacheType(); try { // set up settings required for test - Settings.setExcludeMine(false); + TestSettings.setExcludeMine(false); Settings.setCacheType(CacheType.ALL); Login.login(); @@ -40,7 +41,7 @@ public class GCConnectorTest extends AbstractResourceInstrumentationTestCase { } } finally { // restore user settings - Settings.setExcludeMine(excludeMine); + TestSettings.setExcludeMine(excludeMine); Settings.setCacheType(cacheType); } } diff --git a/tests/src/cgeo/geocaching/files/GPXImporterTest.java b/tests/src/cgeo/geocaching/files/GPXImporterTest.java index a8c6aca..03f917c 100644 --- a/tests/src/cgeo/geocaching/files/GPXImporterTest.java +++ b/tests/src/cgeo/geocaching/files/GPXImporterTest.java @@ -6,6 +6,7 @@ import cgeo.geocaching.cgData; import cgeo.geocaching.enumerations.CacheType; import cgeo.geocaching.enumerations.LoadFlags; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import cgeo.geocaching.test.AbstractResourceInstrumentationTestCase; import cgeo.geocaching.test.R; import cgeo.geocaching.utils.CancellableHandler; @@ -270,9 +271,9 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase { listId = cgData.createList("cgeogpxesTest"); importCacheStaticMaps = Settings.isStoreOfflineMaps(); - Settings.setStoreOfflineMaps(true); + TestSettings.setStoreOfflineMaps(true); importWpStaticMaps = Settings.isStoreOfflineWpMaps(); - Settings.setStoreOfflineWpMaps(true); + TestSettings.setStoreOfflineWpMaps(true); } @Override @@ -283,8 +284,8 @@ public class GPXImporterTest extends AbstractResourceInstrumentationTestCase { cgData.markDropped(cachesInList); cgData.removeList(listId); deleteDirectory(tempDir); - Settings.setStoreOfflineMaps(importCacheStaticMaps); - Settings.setStoreOfflineWpMaps(importWpStaticMaps); + TestSettings.setStoreOfflineMaps(importCacheStaticMaps); + TestSettings.setStoreOfflineWpMaps(importWpStaticMaps); super.tearDown(); } diff --git a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java index 3389658..3b7331c 100644 --- a/tests/src/cgeo/geocaching/geopoint/UnitsTest.java +++ b/tests/src/cgeo/geocaching/geopoint/UnitsTest.java @@ -2,6 +2,7 @@ package cgeo.geocaching.geopoint; import cgeo.CGeoTestCase; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import org.apache.commons.lang3.StringUtils; @@ -22,20 +23,20 @@ public class UnitsTest extends CGeoTestCase { assertEquals("?", Units.getDistanceFromKilometers(null)); final boolean savedImperial = Settings.isUseImperialUnits(); try { - Settings.setUseImperialUnits(false); + TestSettings.setUseImperialUnits(false); assertDistance("123 km", 122.782f); assertDistance("123 km", 123.456f); assertDistance("12.3 km", 12.3456f); assertDistance("1.23 km", 1.23456f); assertDistance("123 m", 0.123456f); - Settings.setUseImperialUnits(true); + TestSettings.setUseImperialUnits(true); assertDistance("76.7 mi", 123.456f); assertDistance("7.67 mi", 12.3456f); assertDistance("0.77 mi", 1.23456f); assertDistance("405 ft", 0.123456f); assertDistance("40.5 ft", 0.0123456f); } finally { - Settings.setUseImperialUnits(savedImperial); + TestSettings.setUseImperialUnits(savedImperial); } } @@ -44,7 +45,7 @@ public class UnitsTest extends CGeoTestCase { public void testElevation() { final boolean savedImperial = Settings.isUseImperialUnits(); try { - Settings.setUseImperialUnits(false); + TestSettings.setUseImperialUnits(false); assertElevation("↥ 123 m", 122.782f); assertElevation("↥ 123 m", 123.456f); assertElevation("↥ 12 m", 12.3456f); @@ -57,11 +58,11 @@ public class UnitsTest extends CGeoTestCase { assertElevation("↧ 1 m", -1.23456f); assertElevation("↧ 2 m", -1.6f); assertElevation("↧ 0 m", -0.123456f); - Settings.setUseImperialUnits(true); + TestSettings.setUseImperialUnits(true); assertElevation("↥ 405 ft", 123.456f); assertElevation("↥ 41 ft", 12.3456f); } finally { - Settings.setUseImperialUnits(savedImperial); + TestSettings.setUseImperialUnits(savedImperial); } } @@ -78,18 +79,18 @@ public class UnitsTest extends CGeoTestCase { assertEquals("?", Units.getDistanceFromKilometers(null)); final boolean savedImperial = Settings.isUseImperialUnits(); try { - Settings.setUseImperialUnits(false); + TestSettings.setUseImperialUnits(false); assertSpeed("123 km/h", 122.782f); assertSpeed("123 km/h", 123.456f); assertSpeed("12.3 km/h", 12.3456f); assertSpeed("1.23 km/h", 1.23456f); assertSpeed("123 m/h", 0.123456f); - Settings.setUseImperialUnits(true); + TestSettings.setUseImperialUnits(true); assertSpeed("76.7 mph", 123.456f); assertSpeed("7.67 mph", 12.3456f); assertSpeed("0.77 mph", 1.23456f); } finally { - Settings.setUseImperialUnits(savedImperial); + TestSettings.setUseImperialUnits(savedImperial); } } diff --git a/tests/src/cgeo/geocaching/settings/TestSettings.java b/tests/src/cgeo/geocaching/settings/TestSettings.java new file mode 100644 index 0000000..6585ee4 --- /dev/null +++ b/tests/src/cgeo/geocaching/settings/TestSettings.java @@ -0,0 +1,42 @@ +package cgeo.geocaching.settings; + + +/** + * provide write-access proxy to settings for testing purposes + * + * @author rschuman + * + */ +public class TestSettings { + + /** + * Purely static! + */ + private TestSettings() { + } + + public static void setExcludeDisabledCaches(final boolean exclude) { + Settings.setExcludeDisabledCaches(exclude); + } + + public static void setExcludeMine(final boolean exclude) { + Settings.setExcludeMine(exclude); + } + + public static boolean setLogin(final String username, final String password) { + return Settings.setLogin(username, password); + } + + public static void setStoreOfflineMaps(final boolean offlineMaps) { + Settings.setStoreOfflineMaps(offlineMaps); + } + + public static void setStoreOfflineWpMaps(final boolean offlineWpMaps) { + Settings.setStoreOfflineWpMaps(offlineWpMaps); + } + + public static void setUseImperialUnits(final boolean imperial) { + Settings.setUseImperialUnits(imperial); + } + +} diff --git a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java index dc36e07..864757b 100644 --- a/tests/src/cgeo/geocaching/speech/TextFactoryTest.java +++ b/tests/src/cgeo/geocaching/speech/TextFactoryTest.java @@ -3,6 +3,7 @@ package cgeo.geocaching.speech; import cgeo.geocaching.cgeoapplication; import cgeo.geocaching.geopoint.Geopoint; import cgeo.geocaching.settings.Settings; +import cgeo.geocaching.settings.TestSettings; import android.content.res.Configuration; import android.content.res.Resources; @@ -152,6 +153,6 @@ public class TextFactoryTest extends AndroidTestCase { resources.updateConfiguration(config, resources.getDisplayMetrics()); Locale.setDefault(locale2); - Settings.setUseImperialUnits(!metric); + TestSettings.setUseImperialUnits(!metric); } } |