refactoring: remove unused code

3 files changed, 28 insertions, 22 deletions

diff --git a/tests/src/cgeo/geocaching/settings/TestSettings.java b/tests/src/cgeo/geocaching/settings/TestSettings.java
index 6c31dcc..d63200b 100644
--- a/tests/src/cgeo/geocaching/settings/TestSettings.java
+++ b/tests/src/cgeo/geocaching/settings/TestSettings.java
@@ -1,24 +1,27 @@
 package cgeo.geocaching.settings;
 
+import cgeo.geocaching.R;
+
 
 /**
  * provide write-access proxy to settings for testing purposes
  *
  */
-public class TestSettings {
+public final class TestSettings extends Settings {
 
     /**
      * Purely static!
      */
     private TestSettings() {
+        throw new InstantiationError();
     }
 
     public static void setExcludeDisabledCaches(final boolean exclude) {
-        Settings.setExcludeDisabledCaches(exclude);
+        putBoolean(R.string.pref_excludedisabled, exclude);
     }
 
     public static void setExcludeMine(final boolean exclude) {
-        Settings.setExcludeMine(exclude);
+        putBoolean(R.string.pref_excludemine, exclude);
     }
 
     public static boolean setLogin(final String username, final String password) {
@@ -26,15 +29,23 @@ public class TestSettings {
     }
 
     public static void setStoreOfflineMaps(final boolean offlineMaps) {
-        Settings.setStoreOfflineMaps(offlineMaps);
+        putBoolean(R.string.pref_offlinemaps, offlineMaps);
     }
 
     public static void setStoreOfflineWpMaps(final boolean offlineWpMaps) {
-        Settings.setStoreOfflineWpMaps(offlineWpMaps);
+        putBoolean(R.string.pref_offlinewpmaps, offlineWpMaps);
     }
 
     public static void setUseImperialUnits(final boolean imperial) {
-        Settings.setUseImperialUnits(imperial);
+        putBoolean(R.string.pref_units, imperial);
+    }
+
+    public static void setCacheTwitterMessage(final String template) {
+        putString(R.string.pref_twitter_cache_message, template);
+    }
+
+    public static void setTrackableTwitterMessage(final String template) {
+        putString(R.string.pref_twitter_trackable_message, template);
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/twitter/TwitterTest.java b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
index 7ce0f09..f8a4f85 100644
--- a/tests/src/cgeo/geocaching/twitter/TwitterTest.java
+++ b/tests/src/cgeo/geocaching/twitter/TwitterTest.java
@@ -3,6 +3,7 @@ package cgeo.geocaching.twitter;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.Trackable;
 import cgeo.geocaching.settings.Settings;
+import cgeo.geocaching.settings.TestSettings;
 
 import junit.framework.TestCase;
 
@@ -11,39 +12,39 @@ public class TwitterTest extends TestCase {
     public static void testTrackableMessage() {
         final String oldMessage = Settings.getTrackableTwitterMessage();
         try {
-            Settings.setTrackableTwitterMessage("I touched [NAME] ([URL]).");
-        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));
+            TestSettings.setTrackableTwitterMessage("I touched [NAME] ([URL]).");
+            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));
         } finally {
-            Settings.setTrackableTwitterMessage(oldMessage);
+            TestSettings.setTrackableTwitterMessage(oldMessage);
         }
     }
 
     public static void testCacheMessage() {
         final String oldMessage = Settings.getCacheTwitterMessage();
         try {
-            Settings.setCacheTwitterMessage("I found [NAME] ([URL]).");
+            TestSettings.setCacheTwitterMessage("I found [NAME] ([URL]).");
             Geocache cache = new Geocache();
             cache.setGeocode("GC1234");
             cache.setName("TwitterTest");
             assertEquals("I found TwitterTest (http://coord.info/GC1234). #cgeo #geocaching", Twitter.getStatusMessage(cache));
         } finally {
-            Settings.setCacheTwitterMessage(oldMessage);
+            TestSettings.setCacheTwitterMessage(oldMessage);
         }
     }
 
     public static void testAvoidDuplicateTags() {
         final String oldMessage = Settings.getCacheTwitterMessage();
         try {
-            Settings.setCacheTwitterMessage("[NAME] #cgeo");
+            TestSettings.setCacheTwitterMessage("[NAME] #cgeo");
             Geocache cache = new Geocache();
             cache.setGeocode("GC1234");
             cache.setName("TwitterTest");
             assertEquals("TwitterTest #cgeo #geocaching", Twitter.getStatusMessage(cache));
         } finally {
-            Settings.setCacheTwitterMessage(oldMessage);
+            TestSettings.setCacheTwitterMessage(oldMessage);
         }
     }
 }
diff --git a/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
index 9264d29..9a74167 100644
--- a/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/CryptUtilsTest.java
@@ -24,12 +24,6 @@ public class CryptUtilsTest extends TestCase {
         assertEquals("ƖƖlƖƖƖƖ", CryptUtils.rot13("ƖƖyƖƖƖƖ"));
     }
 
-    public static void testSha1() {
-        assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", CryptUtils.sha1(""));
-        // expected value taken from debugger. should assure every developer uses UTF-8
-        assertEquals("cf2f343f59cea81afc0a5a566cb138ba349c548f", CryptUtils.sha1("äöü"));
-    }
-
     public static void testMd5() {
         assertEquals("d41d8cd98f00b204e9800998ecf8427e", CryptUtils.md5(""));
         // expected value taken from debugger. should assure every developer uses UTF-8