4 files changed, 67 insertions, 19 deletions

diff --git a/tests/src/cgeo/geocaching/utils/DateUtilsTest.java b/tests/src/cgeo/geocaching/utils/CalendarUtilsTest.java
index d0a2b4a..c074903 100644
--- a/tests/src/cgeo/geocaching/utils/DateUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/CalendarUtilsTest.java
@@ -5,17 +5,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 import cgeo.geocaching.Geocache;
 import cgeo.geocaching.enumerations.CacheType;
 
-import java.util.Calendar;
-
 import junit.framework.TestCase;
 
-public class DateUtilsTest extends TestCase {
+import java.util.Calendar;
+
+public class CalendarUtilsTest extends TestCase {
 
     public static void testDaysSince() {
         final Calendar start = Calendar.getInstance();
         for (int hour = 0; hour < 24; hour++) {
             start.set(Calendar.HOUR_OF_DAY, hour);
-            assertThat(DateUtils.daysSince(start.getTimeInMillis())).isEqualTo(0);
+            assertThat(CalendarUtils.daysSince(start.getTimeInMillis())).isEqualTo(0);
         }
     }
 
@@ -32,12 +32,22 @@ public class DateUtilsTest extends TestCase {
         assertPastEvent(start, true);
     }
 
-    private static void assertPastEvent(final Calendar start, boolean expectedPast) {
+    private static void assertPastEvent(final Calendar start, final boolean expectedPast) {
         final Geocache cache = new Geocache();
         cache.setType(CacheType.EVENT);
 
         cache.setHidden(start.getTime());
-        assertThat(DateUtils.isPastEvent(cache)).isEqualTo(expectedPast);
+        assertThat(CalendarUtils.isPastEvent(cache)).isEqualTo(expectedPast);
     }
 
+    public static void testIsFuture() {
+        final Calendar date = Calendar.getInstance();
+        assertThat(CalendarUtils.isFuture(date)).isFalse();
+
+        date.add(Calendar.DAY_OF_MONTH, 1);
+        assertThat(CalendarUtils.isFuture(date)).isFalse();
+
+        date.add(Calendar.DAY_OF_MONTH, 1);
+        assertThat(CalendarUtils.isFuture(date)).isTrue();
+    }
 }
diff --git a/tests/src/cgeo/geocaching/utils/FileUtilsTest.java b/tests/src/cgeo/geocaching/utils/FileUtilsTest.java
new file mode 100644
index 0000000..65638e1
--- /dev/null
+++ b/tests/src/cgeo/geocaching/utils/FileUtilsTest.java
@@ -0,0 +1,49 @@
+package cgeo.geocaching.utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import cgeo.geocaching.files.LocalStorage;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+import java.io.IOException;
+
+public class FileUtilsTest extends TestCase {
+
+    final File testDir = LocalStorage.getStorageDir("automated-tests");
+    final File baseFile = new File(testDir, "prefix.ext");
+    final File alternative1 = new File(testDir, "prefix_1.ext");
+    final File alternative2 = new File(testDir, "prefix_2.ext");
+
+    public void testGetUniqueNamedFile() throws IOException {
+        FileUtils.deleteDirectory(testDir);
+        testDir.mkdirs();
+        try {
+            assertThat(FileUtils.getUniqueNamedFile(baseFile)).isEqualTo(baseFile);
+            baseFile.createNewFile();
+            assertThat(FileUtils.getUniqueNamedFile(baseFile)).isEqualTo(alternative1);
+            alternative1.createNewFile();
+            assertThat(FileUtils.getUniqueNamedFile(baseFile)).isEqualTo(alternative2);
+            assertThat(FileUtils.getUniqueNamedFile(baseFile)).isEqualTo(alternative2);
+        } finally {
+            FileUtils.deleteDirectory(testDir);
+        }
+    }
+
+    public static void testFileUrl() {
+        assertThat(FileUtils.isFileUrl("file:///tmp/foo/bar")).isTrue();
+        assertThat(FileUtils.isFileUrl("http://www.google.com")).isFalse();
+        assertThat(FileUtils.fileToUrl(new File("/tmp/foo/bar"))).isEqualTo("file:///tmp/foo/bar");
+        assertThat(FileUtils.urlToFile("file:///tmp/foo/bar").getPath()).isEqualTo("/tmp/foo/bar");
+    }
+
+    public void testCreateRemoveDirectories() {
+        FileUtils.deleteDirectory(testDir);
+        assertThat(testDir.exists()).isFalse();
+        FileUtils.mkdirs(testDir);
+        assertThat(testDir.exists()).isTrue();
+        FileUtils.deleteDirectory(testDir);
+        assertThat(testDir.exists()).isFalse();
+    }
+}
diff --git a/tests/src/cgeo/geocaching/utils/ProcessUtilsTest.java b/tests/src/cgeo/geocaching/utils/ProcessUtilsTest.java
index 2c6ed18..b442c8a 100644
--- a/tests/src/cgeo/geocaching/utils/ProcessUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/ProcessUtilsTest.java
@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 public class ProcessUtilsTest extends TestCase {
 
     public static void testIsInstalled() {
-        assertThat(ProcessUtils.isInstalled("com.android.launcher")).isTrue();
+        assertThat(ProcessUtils.isInstalled("com.android.settings")).isTrue();
     }
 
     public static void testIsInstalledNotLaunchable() {
@@ -16,7 +16,7 @@ public class ProcessUtilsTest extends TestCase {
     }
 
     public static void testIsLaunchable() {
-        assertThat(ProcessUtils.isInstalled("com.android.settings")).isTrue();
+        assertThat(ProcessUtils.isLaunchable("com.android.settings")).isTrue();
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/utils/RxUtilsTest.java b/tests/src/cgeo/geocaching/utils/RxUtilsTest.java
index 2487184..cc8589b 100644
--- a/tests/src/cgeo/geocaching/utils/RxUtilsTest.java
+++ b/tests/src/cgeo/geocaching/utils/RxUtilsTest.java
@@ -4,7 +4,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import rx.Observable;
 import rx.Subscription;
-import rx.functions.Func1;
 import rx.subjects.PublishSubject;
 import rx.subjects.ReplaySubject;
 
@@ -21,16 +20,6 @@ public class RxUtilsTest extends AndroidTestCase {
         range.onCompleted();
     }
 
-    public static void testTakeUntil() {
-        final Observable<Integer> observable = range.lift(RxUtils.operatorTakeUntil(new Func1<Integer, Boolean>() {
-            @Override
-            public Boolean call(final Integer value) {
-                return value > 6;
-            }
-        }));
-        assertThat(observable.toList().toBlocking().single().toArray()).isEqualTo(new int[]{1, 2, 3, 4, 5, 6, 7});
-    }
-
     public static void testRememberLast() {
         final PublishSubject<String> rawObservable = PublishSubject.create();
         final Observable<String> observable = RxUtils.rememberLast(rawObservable, "initial");