From 616d9ab46c2604cf502da8741d18d28645293c4c Mon Sep 17 00:00:00 2001
From: Alinson Xavier <isoron@gmail.com>
Date: Fri, 3 Jan 2020 12:59:59 -0600
Subject: [PATCH] Put SavedState tests together

---
 .../uhabits/integration/SavedStateTest.java   | 51 -------------------
 ...ateRegressionTest.kt => SavedStateTest.kt} | 21 +++++++-
 2 files changed, 19 insertions(+), 53 deletions(-)
 delete mode 100644 android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
 rename android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/{SavedStateRegressionTest.kt => SavedStateTest.kt} (70%)

diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
deleted file mode 100644
index 391e4e37b..000000000
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/integration/SavedStateTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2017 Á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.integration;
-
-import android.support.test.filters.*;
-import android.support.test.runner.*;
-
-import org.isoron.uhabits.*;
-import org.isoron.uhabits.activities.about.*;
-import org.isoron.uhabits.activities.habits.list.*;
-import org.junit.*;
-import org.junit.runner.*;
-
-import static java.lang.Thread.*;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class SavedStateTest extends BaseUserInterfaceTest
-{
-    /**
-     * Make sure that the main activity can be recreated by using
-     * BundleSavedState after being destroyed. See bug:
-     * https://github.com/iSoron/uhabits/issues/287
-     */
-    @Test
-    public void testBundleSavedState() throws Exception
-    {
-        startActivity(ListHabitsActivity.class);
-        device.waitForIdle();
-        startActivity(AboutActivity.class);
-        sleep(1000);
-        device.pressBack();
-    }
-}
diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateRegressionTest.kt b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
similarity index 70%
rename from android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateRegressionTest.kt
rename to android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
index 59d28790d..1418c56c7 100644
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateRegressionTest.kt
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/regression/SavedStateTest.kt
@@ -29,13 +29,16 @@ import org.isoron.uhabits.acceptance.steps.EditHabitSteps.*
 import org.isoron.uhabits.acceptance.steps.ListHabitsSteps.*
 import org.isoron.uhabits.acceptance.steps.ListHabitsSteps.MenuItem.*
 import org.isoron.uhabits.acceptance.steps.WidgetSteps.clickText
+import org.isoron.uhabits.activities.about.*
+import org.isoron.uhabits.activities.habits.list.*
+import java.lang.Thread.*
 
 @LargeTest
-class SavedStateRegressionTest : BaseUserInterfaceTest() {
+class SavedStateTest : BaseUserInterfaceTest() {
 
     @Test
     @Throws(Exception::class)
-    fun shouldNotCrashWhenRotatingWeekdayPickedDialog() {
+    fun shouldNotCrashWhenRotatingWeekdayPickerDialog() {
         // https://github.com/iSoron/uhabits/issues/534
         launchApp()
         clickMenu(ADD)
@@ -45,4 +48,18 @@ class SavedStateRegressionTest : BaseUserInterfaceTest() {
         rotateDevice()
         clickText("Monday")
     }
+
+    /**
+     * Make sure that the main activity can be recreated by using
+     * BundleSavedState after being destroyed. See bug:
+     * https://github.com/iSoron/uhabits/issues/287
+     */
+    @Test
+    @Throws(Exception::class)
+    fun testBundleSavedState() {
+        launchApp()
+        startActivity(AboutActivity::class.java)
+        sleep(1000)
+        device.pressBack()
+    }
 }