From ead87519b1cfc338f4dc9315aceb00c93fa74d66 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 2 Jun 2017 13:16:15 -0400
Subject: [PATCH] UI tests: reset state programmatically

---
 .../src/androidTest/assets/test.db            | Bin 49152 -> 0 bytes
 .../isoron/uhabits/BaseUIAutomatorTest.java   |  73 +++++++++++++-----
 .../org/isoron/uhabits/HabitsApplication.java |   4 +-
 3 files changed, 54 insertions(+), 23 deletions(-)
 delete mode 100644 uhabits-android/src/androidTest/assets/test.db

diff --git a/uhabits-android/src/androidTest/assets/test.db b/uhabits-android/src/androidTest/assets/test.db
deleted file mode 100644
index 5319030635db9233852b113123678a8fbee0e49a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 49152
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
M;@}AT7pNWlAK|b(SpWb4

diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUIAutomatorTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUIAutomatorTest.java
index 9ebbf703f..df43bad68 100644
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUIAutomatorTest.java
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUIAutomatorTest.java
@@ -24,10 +24,9 @@ import android.support.test.uiautomator.*;
 
 import com.linkedin.android.testbutler.*;
 
-import org.isoron.androidbase.*;
-import org.isoron.androidbase.utils.*;
+import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.utils.*;
 import org.isoron.uhabits.preferences.*;
-import org.isoron.uhabits.utils.*;
 import org.junit.*;
 
 import java.io.*;
@@ -43,6 +42,20 @@ public class BaseUIAutomatorTest
 
     private HabitsComponent component;
 
+    private HabitList habitList;
+
+    private AndroidPreferences prefs;
+
+    private HabitFixtures fixtures;
+
+    public static void startActivity(Class cls)
+    {
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName(PKG, cls.getCanonicalName()));
+        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        getContext().startActivity(intent);
+    }
+
     @Before
     public void setUp() throws IOException
     {
@@ -50,19 +63,13 @@ public class BaseUIAutomatorTest
         TestButler.verifyAnimationsDisabled(getTargetContext());
         device = getInstance(getInstrumentation());
 
-        component = DaggerHabitsComponent
-            .builder()
-            .appModule(new AppModule(getTargetContext()))
-            .build();
-
-        AndroidPreferences prefs = component.getPreferences();
-        prefs.reset();
-        prefs.setFirstRun(false);
-
-        HabitsApplication.setComponent(component);
-
-        FileUtils.copy(getContext().getAssets().open("test.db"),
-            DatabaseUtils.getDatabaseFile(getTargetContext()));
+        HabitsApplication app =
+            (HabitsApplication) getTargetContext().getApplicationContext();
+        component = app.getComponent();
+        habitList = component.getHabitList();
+        prefs = component.getPreferences();
+        fixtures = new HabitFixtures(component.getModelFactory(), habitList);
+        resetState();
     }
 
     @After
@@ -73,11 +80,35 @@ public class BaseUIAutomatorTest
         TestButler.teardown(getTargetContext());
     }
 
-    public static void startActivity(Class cls)
+    private void resetState()
     {
-        Intent intent = new Intent();
-        intent.setComponent(new ComponentName(PKG, cls.getCanonicalName()));
-        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getContext().startActivity(intent);
+        prefs.reset();
+        prefs.setFirstRun(false);
+        prefs.updateLastHint(100, DateUtils.getStartOfToday());
+        fixtures.purgeHabits(habitList);
+
+        Habit h1 = fixtures.createEmptyHabit();
+        h1.setName("Wake up early");
+        h1.setDescription("Did you wake up early today?");
+        h1.setColor(5);
+        habitList.update(h1);
+
+        Habit h2 = fixtures.createEmptyHabit();
+        h2.setName("Track time");
+        h2.setDescription("Did you track your time?");
+        h2.setColor(5);
+        habitList.update(h2);
+
+        Habit h3 = fixtures.createLongHabit();
+        h3.setName("Meditate");
+        h3.setDescription("Did meditate today?");
+        h3.setColor(10);
+        habitList.update(h3);
+
+        Habit h4 = fixtures.createEmptyHabit();
+        h4.setName("Read books");
+        h4.setDescription("Did you read books today?");
+        h4.setColor(2);
+        habitList.update(h4);
     }
 }
diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
index a380a32eb..68bc0d017 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/HabitsApplication.java
@@ -85,8 +85,8 @@ public class HabitsApplication extends Application
 
         if (isTestMode())
         {
-//            File db = DatabaseUtils.getDatabaseFile(context);
-//            if (db.exists()) db.delete();
+            File db = DatabaseUtils.getDatabaseFile(context);
+            if (db.exists()) db.delete();
         }
 
         try