Move two methods into the tests

Those two methods were only used in the tests. They can be rewritten
more concisely while testing the same thing.

1 files changed, 5 insertions, 4 deletions

diff --git a/tests/src/cgeo/geocaching/SettingsTest.java b/tests/src/cgeo/geocaching/SettingsTest.java
index c31e635..27395ec 100644
--- a/tests/src/cgeo/geocaching/SettingsTest.java
+++ b/tests/src/cgeo/geocaching/SettingsTest.java
@@ -1,7 +1,6 @@
 package cgeo.geocaching;
 
-import cgeo.geocaching.Settings;
-import cgeo.geocaching.cgeo;
+import org.mapsforge.android.maps.MapDatabase;
 
 import android.test.ActivityInstrumentationTestCase2;
 
@@ -21,7 +20,9 @@ public class SettingsTest extends ActivityInstrumentationTestCase2<cgeo> {
      * this should work fine without an exception (once there was an exception because of the empty map file string)
      */
     public static void testSettingsException() {
-        // asserts A OR NOT A, because we don't know what the settings are on any device or emulator
-        assertTrue(Settings.isValidMapFile() || !Settings.isValidMapFile());
+        final String mapFile = Settings.getMapFile();
+        assertNotNull(mapFile);
+        // We just want to ensure that it does not throw any exception but we do not know anything about the result
+        MapDatabase.isValidMapFile(mapFile);
     }
 }