Move tests from tests/app/ to tests/unit/

- first round: move tests that currently pass

Bug: 62103184
Test: make SettingsUnitTests
Change-Id: Ief3adf88e5090621e5ec3957a71d1b56b4be186a

tests/unit/Android.mk

@@ -14,6 +14,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
     mockito-target-minus-junit4 \
     truth-prebuilt \
     ub-uiautomator \
+    espresso-intents-nodep \
 
 
 # Include all test java files.

tests/unit/src/com/android/settings/DisplaySettingsTest.java

@@ -27,6 +27,7 @@ import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
 import android.support.test.uiautomator.UiDevice;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java

@@ -30,6 +30,7 @@ import android.provider.Settings;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java

@@ -1,25 +1,22 @@
 package com.android.settings;
 
-import android.content.Intent;
+import static com.google.common.truth.Truth.assertThat;
-import android.content.Context;
 
 import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import com.android.settings.accessibility.AccessibilitySettings;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceGroupAdapter;
 
-import static android.support.test.espresso.Espresso.onView;
+import com.android.settings.accessibility.AccessibilitySettings;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
+
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import org.junit.Before;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import org.junit.Test;
-import static com.google.common.truth.Truth.assertThat;
+import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest

tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java

@@ -17,24 +17,26 @@
 
 package com.android.settings.search;
 
+import static android.support.test.espresso.Espresso.onView;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
+import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
+import static android.support.test.espresso.matcher.ViewMatchers.withId;
+
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.core.AllOf.allOf;
+
 import android.support.test.filters.SmallTest;
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.widget.SearchView;
+
+import com.android.settings.R;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.hasFocus;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.core.AllOf.allOf;
-
-import com.android.settings.R;
-
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest

tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java

@@ -20,8 +20,6 @@ import android.content.Intent;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 import android.support.test.runner.AndroidJUnit4;
-import com.android.settings.Settings;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 

tests/unit/src/com/android/settings/users/UserSettingsTest.java

@@ -24,8 +24,6 @@ import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.UiScrollable;
 import android.test.InstrumentationTestCase;
 
-import com.android.settings.R;
-
 import org.junit.Test;
 
 @SmallTest