2 files changed, 2 insertions, 81 deletions
diff --git a/tests/src/cgeo/geocaching/utils/LogTemplateProviderTest.java b/tests/src/cgeo/geocaching/utils/LogTemplateProviderTest.java
index 5911218..249cbb1 100644
--- a/tests/src/cgeo/geocaching/utils/LogTemplateProviderTest.java
+++ b/tests/src/cgeo/geocaching/utils/LogTemplateProviderTest.java
@@ -10,11 +10,11 @@ public class LogTemplateProviderTest extends TestCase {
 
     public static void testApplyTemplates() {
         final String noTemplates = " no templates ";
-        assertEquals(noTemplates, LogTemplateProvider.applyTemplates(noTemplates, new LogContext(true)));
+        assertEquals(noTemplates, LogTemplateProvider.applyTemplates(noTemplates, new LogContext(null, null, true)));
 
         // This test can occasionally fail if the current year changes right after the next line.
         final String currentYear = Integer.toString(Calendar.YEAR);
-        assertTrue(LogTemplateProvider.applyTemplates("[DATE]", new LogContext(true)).contains(currentYear));
+        assertTrue(LogTemplateProvider.applyTemplates("[DATE]", new LogContext(null, null, true)).contains(currentYear));
     }
 
 }
diff --git a/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java b/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java
deleted file mode 100644
index ee46950..0000000
--- a/tests/src/cgeo/geocaching/utils/MemorySubjectTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package cgeo.geocaching.utils;
-
-import android.test.AndroidTestCase;
-
-public class MemorySubjectTest extends AndroidTestCase {
-
-    private static class Observer implements IObserver<Integer> {
-        private int times = 0;
-        private Integer value;
-
-        @Override
-        public void update(final Integer data) {
-            value = data;
-            times++;
-        }
-    }
-
-    private Observer observer;
-    private MemorySubject<Integer> memorySubject;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        observer = new Observer();
-        memorySubject = new MemorySubject<Integer>();
-    }
-
-    public void testInitial() {
-        assertNull(observer.value);
-        assertEquals(0, observer.times);
-        assertNull(memorySubject.getMemory());
-    }
-
-    public void testMemory() {
-        memorySubject.addObserver(observer);
-        memorySubject.notifyObservers(10);
-        assertEquals(Integer.valueOf(10), observer.value);
-        assertEquals(1, observer.times);
-        assertEquals(Integer.valueOf(10), memorySubject.getMemory());
-        memorySubject.notifyObservers(20);
-        assertEquals(Integer.valueOf(20), observer.value);
-        assertEquals(2, observer.times);
-        assertEquals(Integer.valueOf(20), memorySubject.getMemory());
-    }
-
-    public void testAttach() {
-        memorySubject.notifyObservers(10);
-        assertNull(observer.value);
-        assertEquals(0, observer.times);
-        memorySubject.addObserver(observer);
-        assertEquals(Integer.valueOf(10), observer.value);
-        assertEquals(1, observer.times);
-        memorySubject.notifyObservers(20);
-        assertEquals(Integer.valueOf(20), observer.value);
-        assertEquals(2, observer.times);
-    }
-
-    public void testDetach() {
-        memorySubject.addObserver(observer);
-        memorySubject.notifyObservers(10);
-        assertEquals(Integer.valueOf(10), observer.value);
-        assertEquals(1, observer.times);
-        assertEquals(Integer.valueOf(10), memorySubject.getMemory());
-        memorySubject.deleteObserver(observer);
-        memorySubject.notifyObservers(20);
-        assertEquals(Integer.valueOf(10), observer.value);
-        assertEquals(1, observer.times);
-        assertEquals(Integer.valueOf(20), memorySubject.getMemory());
-    }
-
-    public void testMultiple() {
-        final Observer otherObserver = new Observer();
-        memorySubject.addObserver(otherObserver);
-        testDetach();
-        assertEquals(Integer.valueOf(20), otherObserver.value);
-        assertEquals(2, otherObserver.times);
-    }
-
-}