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

Migrate packages/apps/Settings to androidx.test

Browse Source 
See go/jetpack-test-android-migration

Test: make checkbuild
Change-Id: If67b124188fd4e303154eb11263d03abfb3718c6
This commit is contained in:
Brett Chabot
2018-12-13 19:06:32 -08:00
parent 8920ec68f9
commit 031dcf5019
91 changed files with 500 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
View File

@@ -22,9 +22,10 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.provider.Settings;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.settings.Settings.NightDisplaySettingsActivity;

11
tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -31,9 +32,11 @@ import android.content.om.OverlayInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.support.test.InstrumentationRegistry;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import androidx.preference.ListPreference;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
@@ -42,8 +45,6 @@ import org.mockito.ArgumentCaptor;
import java.util.ArrayList;
import androidx.preference.ListPreference;
@SmallTest
@RunWith(AndroidJUnit4.class)
public class ThemePreferenceControllerTest {