Move tests to androidTest

uhabits-android/build.gradle

@@ -86,8 +86,8 @@ dependencies {
     androidTestImplementation 'com.android.support.test:rules:0.5'
     androidTestImplementation 'com.android.support.test:runner:0.5'
     androidTestImplementation "com.google.dexmaker:dexmaker:1.2"
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.2.0'
-    androidTestImplementation 'org.mockito:mockito-core:1.10.19'
+    androidTestImplementation 'org.mockito:mockito-core:2.8.9'
     androidTestImplementation 'com.google.guava:guava:20.0'
     androidTestCompileOnly 'com.google.auto.factory:auto-factory:1.0-beta3'
     androidTestAnnotationProcessor 'com.google.dagger:dagger-compiler:2.11-rc2'

uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java

@@ -154,4 +154,11 @@ public class BaseAndroidTest extends TestCase
             fail();
         }
     }
+
+    public long timestamp(int year, int month, int day)
+    {
+        GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
+        cal.set(year, month, day);
+        return cal.getTimeInMillis();
+    }
 }

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -33,9 +33,8 @@ import org.junit.*;
 
 import static org.mockito.Mockito.*;
 
-public class ListHabitsControllerTest extends BaseUnitTest
+public class ListHabitsControllerTest extends BaseAndroidTest
 {
-
     private ListHabitsController controller;
 
     private ImportDataTaskFactory importTaskFactory;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsMenuTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -30,10 +30,9 @@ import org.isoron.uhabits.preferences.*;
 import org.junit.*;
 import org.mockito.*;
 
-import static junit.framework.Assert.*;
 import static org.mockito.Mockito.*;
 
-public class ListHabitsMenuTest extends BaseUnitTest
+public class ListHabitsMenuTest extends BaseAndroidTest
 {
     private BaseActivity activity;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreenTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -37,13 +37,10 @@ import org.junit.runner.*;
 import org.junit.runners.*;
 
 import static org.isoron.uhabits.activities.habits.list.ListHabitsScreen.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.eq;
 
 @RunWith(JUnit4.class)
-public class ListHabitsScreenTest extends BaseUnitTest
+public class ListHabitsScreenTest extends BaseAndroidTest
 {
     private BaseActivity activity;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/CheckmarkButtonControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -27,7 +27,7 @@ import org.junit.*;
 
 import static org.mockito.Mockito.*;
 
-public class CheckmarkButtonControllerTest extends BaseUnitTest
+public class CheckmarkButtonControllerTest extends BaseAndroidTest
 {
     private CheckmarkButtonController controller;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -27,7 +27,7 @@ import org.junit.*;
 
 import static org.mockito.Mockito.*;
 
-public class HabitCardControllerTest extends BaseUnitTest
+public class HabitCardControllerTest extends BaseAndroidTest
 {
 
     private Habit habit;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/controllers/HabitCardListControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -29,7 +29,7 @@ import java.util.*;
 
 import static org.mockito.Mockito.*;
 
-public class HabitCardListControllerTest extends BaseUnitTest
+public class HabitCardListControllerTest extends BaseAndroidTest
 {
 
     private LinkedList<Habit> habits;

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/model/HabitCardListCacheTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -28,12 +28,11 @@ import org.junit.*;
 
 import java.util.*;
 
-import static junit.framework.Assert.*;
 import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.core.IsEqual.*;
 import static org.mockito.Mockito.*;
 
-public class HabitCardListCacheTest extends BaseUnitTest
+public class HabitCardListCacheTest extends BaseAndroidTest
 {
     private HabitCardListCache cache;
 
@@ -45,11 +44,12 @@ public class HabitCardListCacheTest extends BaseUnitTest
     public void setUp()
     {
         super.setUp();
+        habitList.removeAll();
 
         for (int i = 0; i < 10; i++)
         {
-            if (i == 3) habitList.add(fixtures.createLongHabit());
+            if (i == 3) fixtures.createLongHabit();
-            else habitList.add(fixtures.createShortHabit());
+            else fixtures.createShortHabit();
         }
 
         SingleThreadTaskRunner taskRunner = new SingleThreadTaskRunner();
@@ -68,7 +68,6 @@ public class HabitCardListCacheTest extends BaseUnitTest
     public void tearDown()
     {
         cache.onDetached();
-        super.tearDown();
     }
 
     @Test

uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/ShowHabitsMenuTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -30,7 +30,7 @@ import org.junit.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
-public class ShowHabitsMenuTest extends BaseUnitTest
+public class ShowHabitsMenuTest extends BaseAndroidTest
 {
     private ShowHabitActivity activity;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/commands/CommandParserTest.java

@@ -21,6 +21,7 @@ package org.isoron.uhabits.commands;
 
 import android.support.annotation.*;
 
+import org.hamcrest.*;
 import org.isoron.uhabits.*;
 import org.isoron.uhabits.models.*;
 import org.json.*;
@@ -28,11 +29,9 @@ import org.junit.*;
 
 import java.util.*;
 
-import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.Matchers.*;
 
-
+public class CommandParserTest extends BaseAndroidTest
-public class CommandParserTest extends BaseUnitTest
 {
     @NonNull
     private CommandParser parser;
@@ -59,8 +58,8 @@ public class CommandParserTest extends BaseUnitTest
         original = new ArchiveHabitsCommand(habitList, selected);
         decoded = (ArchiveHabitsCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.selected, equalTo(original.selected));
+        MatcherAssert.assertThat(decoded.selected, equalTo(original.selected));
     }
 
     @Test
@@ -70,9 +69,9 @@ public class CommandParserTest extends BaseUnitTest
         original = new ChangeHabitColorCommand(habitList, selected, 20);
         decoded = (ChangeHabitColorCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.newColor, equalTo(original.newColor));
+        MatcherAssert.assertThat(decoded.newColor, equalTo(original.newColor));
-        assertThat(decoded.selected, equalTo(original.selected));
+        MatcherAssert.assertThat(decoded.selected, equalTo(original.selected));
     }
 
     @Test
@@ -87,9 +86,10 @@ public class CommandParserTest extends BaseUnitTest
 
         decoded = (CreateHabitCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.savedId, equalTo(original.savedId));
+        MatcherAssert.assertThat(decoded.savedId, equalTo(original.savedId));
-        assertThat(decoded.model.getData(), equalTo(model.getData()));
+        MatcherAssert.assertThat(decoded.model.getData(), equalTo(model
+            .getData()));
     }
 
     @Test
@@ -99,10 +99,11 @@ public class CommandParserTest extends BaseUnitTest
         original = new CreateRepetitionCommand(habit, 1000, 5);
         decoded = (CreateRepetitionCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.timestamp, equalTo(original.timestamp));
+        MatcherAssert.assertThat(decoded.timestamp, equalTo(original
-        assertThat(decoded.value, equalTo(original.value));
+            .timestamp));
-        assertThat(decoded.habit, equalTo(original.habit));
+        MatcherAssert.assertThat(decoded.value, equalTo(original.value));
+        MatcherAssert.assertThat(decoded.habit, equalTo(original.habit));
     }
 
     @Test
@@ -112,8 +113,8 @@ public class CommandParserTest extends BaseUnitTest
         original = new DeleteHabitsCommand(habitList, selected);
         decoded = (DeleteHabitsCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.selected, equalTo(original.selected));
+        MatcherAssert.assertThat(decoded.selected, equalTo(original.selected));
     }
 
     @Test
@@ -129,9 +130,10 @@ public class CommandParserTest extends BaseUnitTest
 
         decoded = (EditHabitCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.savedId, equalTo(original.savedId));
+        MatcherAssert.assertThat(decoded.savedId, equalTo(original.savedId));
-        assertThat(decoded.modified.getData(), equalTo(modified.getData()));
+        MatcherAssert.assertThat(decoded.modified.getData(), equalTo(modified
+            .getData()));
     }
 
     @Test
@@ -141,9 +143,10 @@ public class CommandParserTest extends BaseUnitTest
         original = new ToggleRepetitionCommand(habit, 1000);
         decoded = (ToggleRepetitionCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.timestamp, equalTo(original.timestamp));
+        MatcherAssert.assertThat(decoded.timestamp, equalTo(original
-        assertThat(decoded.habit, equalTo(original.habit));
+            .timestamp));
+        MatcherAssert.assertThat(decoded.habit, equalTo(original.habit));
     }
 
     @Test
@@ -153,7 +156,7 @@ public class CommandParserTest extends BaseUnitTest
         original = new UnarchiveHabitsCommand(habitList, selected);
         decoded = (UnarchiveHabitsCommand) parser.parse(original.toJson());
 
-        assertThat(decoded.getId(), equalTo(original.getId()));
+        MatcherAssert.assertThat(decoded.getId(), equalTo(original.getId()));
-        assertThat(decoded.selected, equalTo(original.selected));
+        MatcherAssert.assertThat(decoded.selected, equalTo(original.selected));
     }
 }

uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/ReminderControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -28,7 +28,7 @@ import org.junit.*;
 
 import static org.mockito.Mockito.*;
 
-public class ReminderControllerTest extends BaseUnitTest
+public class ReminderControllerTest extends BaseAndroidTest
 {
 
     private ReminderController controller;

uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/WidgetControllerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -31,7 +31,7 @@ import static org.hamcrest.core.IsEqual.*;
 import static org.isoron.uhabits.models.Checkmark.*;
 import static org.mockito.Mockito.*;
 
-public class WidgetControllerTest extends BaseUnitTest
+public class WidgetControllerTest extends BaseAndroidTest
 {
     private WidgetController controller;
 

uhabits-android/src/androidTest/java/org/isoron/uhabits/utils/ReminderSchedulerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
+ * Copyright (C) 2017 Álinson Santos Xavier <isoron@gmail.com>
  *
  * This file is part of Loop Habit Tracker.
  *
@@ -31,8 +31,7 @@ import java.util.*;
 
 import static org.mockito.Mockito.*;
 
-@SuppressWarnings("JavaDoc")
+public class ReminderSchedulerTest extends BaseAndroidTest
-public class ReminderSchedulerTest extends BaseUnitTest
 {
     private Habit habit;
 

uhabits-android/src/test/java/org/isoron/uhabits/BaseUnitTest.java

@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits;
-
-import org.isoron.uhabits.models.*;
-import org.isoron.uhabits.models.memory.*;
-import org.isoron.uhabits.utils.*;
-import org.junit.*;
-
-import java.util.*;
-
-public class BaseUnitTest
-{
-    protected HabitList habitList;
-
-    protected HabitFixtures fixtures;
-
-    protected MemoryModelFactory modelFactory;
-
-    @Before
-    public void setUp()
-    {
-        // 8:00am, January 25th, 2015 (UTC)
-        long fixed_local_time = 1422172800000L;
-        DateUtils.setFixedLocalTime(fixed_local_time);
-
-        modelFactory = new MemoryModelFactory();
-        habitList = modelFactory.buildHabitList();
-        fixtures = new HabitFixtures(modelFactory);
-    }
-
-    @After
-    public void tearDown()
-    {
-        DateUtils.setFixedLocalTime(null);
-    }
-
-    public long timestamp(int year, int month, int day)
-    {
-        GregorianCalendar cal = DateUtils.getStartOfTodayCalendar();
-        cal.set(year, month, day);
-        return cal.getTimeInMillis();
-    }
-}