PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move tests from tests/app/ to tests/unit/"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-08-10 02:52:37 +00:00
committed by Android (Google) Code Review
parent 9906395fa3 109bb5e59a
commit c4d8c456ed
15 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/unit/Android.mk
View File

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

0
tests/app/src/com/android/settings/CreateShortcutTest.java → tests/unit/src/com/android/settings/CreateShortcutTest.java
View File

1
tests/app/src/com/android/settings/DisplaySettingsTest.java → tests/unit/src/com/android/settings/DisplaySettingsTest.java
View File

@@ -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;

0
tests/app/src/com/android/settings/EncryptionInterstitialTest.java → tests/unit/src/com/android/settings/EncryptionInterstitialTest.java
View File

1
tests/app/src/com/android/settings/ManagedAccessSettingsLowRamTest.java → tests/unit/src/com/android/settings/ManagedAccessSettingsLowRamTest.java
View File

@@ -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;

23
tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java → tests/unit/src/com/android/settings/SettingsPreferenceFragmentTest.java
View File

@@ -1,25 +1,22 @@
package com.android.settings;
import android.content.Intent;
import android.content.Context;
import static com.google.common.truth.Truth.assertThat;
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 static android.support.test.espresso.assertion.ViewAssertions.matches;
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static com.google.common.truth.Truth.assertThat;
import com.android.settings.accessibility.AccessibilitySettings;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
@SmallTest

0
tests/app/src/com/android/settings/applications/PackageUtilTest.java → tests/unit/src/com/android/settings/applications/PackageUtilTest.java
View File

0
tests/app/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java → tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
View File

0
tests/app/src/com/android/settings/bluetooth/DevicePickerActivityTest.java → tests/unit/src/com/android/settings/bluetooth/DevicePickerActivityTest.java
View File

0
tests/app/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java → tests/unit/src/com/android/settings/fingerprint/FingerprintEnrollFinishTest.java
View File

0
tests/app/src/com/android/settings/notification/AppNotificationSettingsTest.java → tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
View File

22
tests/app/src/com/android/settings/search/SearchFragmentEspressoTest.java → tests/unit/src/com/android/settings/search/SearchFragmentEspressoTest.java
View File

@@ -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

2
tests/app/src/com/android/settings/tests/PrivateVolumeSettingsTest.java → tests/unit/src/com/android/settings/tests/PrivateVolumeSettingsTest.java
View File

@@ -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;

0
tests/app/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java → tests/unit/src/com/android/settings/tests/SettingsRestoreAfterCloseTest.java
View File

2
tests/app/src/com/android/settings/users/UserSettingsTest.java → tests/unit/src/com/android/settings/users/UserSettingsTest.java
View File

@@ -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