| commit | 9beaab013f9cdd2a2ac094f08d76d7e5b065d123 | [log] [tgz] |
|---|---|---|
| author | Lei Yu <jackqdyulei@google.com> | Fri Jun 15 17:34:02 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 15 17:34:02 2018 +0000 |
| tree | 915b757f2c918de7695a8b5f8b28cff83d90bd40 | |
| parent | 606ff9b7e44c5d74eabae796ce777c2030ebed3f [diff] | |
| parent | 74deb8d6ae9a304ff212c0e0a03bc5ea4ea55b89 [diff] |
Merge "Disable two test files"
diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index 24d46dd..e247485 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
@@ -23,6 +23,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -33,6 +34,7 @@ import java.util.Collections; @RunWith(SettingsRobolectricTestRunner.class) +@Ignore public class MockLocationAppPreferenceControllerTest { @Mock
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index c6f885c..a377c16 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java
@@ -39,6 +39,7 @@ import com.android.settings.fuelgauge.batterytip.AppInfo; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; @@ -51,6 +52,7 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) +@Ignore public class RestrictAppPreferenceControllerTest { private static final int ALLOWED_UID = 111; private static final String ALLOWED_PACKAGE_NAME = "com.android.allowed.package";