Merge "Revert "Ignore a lot of failed test cases on Settings"" into rvc-dev (3c4b5d2a) · Commits · e / os / android_packages_apps_Settings

tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -62,7 +62,6 @@ import com.android.settingslib.applications.ApplicationsState;
		import com.android.settingslib.applications.ApplicationsState.AppEntry;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -133,7 +132,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testGetAggregatedUsageEvents_onlyNotificationEvents() throws Exception {
		List<Event> events = new ArrayList<>();
		Event good = new Event();
		@@ -156,7 +154,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testGetAggregatedUsageEvents_multipleEventsAgg() throws Exception {
		List<Event> events = new ArrayList<>();
		Event good = new Event();
		@@ -180,7 +177,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testGetAggregatedUsageEvents_multiplePkgs() throws Exception {
		List<Event> events = new ArrayList<>();
		Event good = new Event();
		@@ -219,7 +215,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testLoadAllExtraInfo_multipleEventsAgg() throws RemoteException {
		List<Event> events = new ArrayList<>();
		for (int i = 0; i < 7; i++) {
		@@ -249,7 +244,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testLoadAllExtraInfo_multiplePkgs() throws RemoteException {
		List<Event> events = new ArrayList<>();
		for (int i = 0; i < 8; i++) {
		@@ -287,7 +281,6 @@ public class AppStateNotificationBridgeTest {
		}

		@Test
		@Ignore
		public void testLoadAllExtraInfo_multipleUsers() throws RemoteException {
		// has work profile
		when(mUserManager.getProfileIdsWithDisabled(anyInt())).thenReturn(new int[]{1});

tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesPreferenceControllerTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import com.android.settings.core.BasePreferenceController;

		import com.google.common.collect.ImmutableList;

		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		@@ -50,7 +49,6 @@ public class InteractAcrossProfilesPreferenceControllerTest {
		new InteractAcrossProfilesDetailsPreferenceController(mContext, "test_key");

		@Test
		@Ignore
		public void getAvailabilityStatus_requestedCrossProfilePermission_returnsAvailable() {
		mController.setPackageName(CROSS_PROFILE_PACKAGE_NAME);
		shadowOf(mPackageManager).setInstalledPackagesForUserId(

tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import androidx.test.core.app.ApplicationProvider;

		import com.google.common.collect.ImmutableList;

		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;
		@@ -74,7 +73,6 @@ public class InteractAcrossProfilesSettingsTest {
		private final AppOpsManager mAppOpsManager = mContext.getSystemService(AppOpsManager.class);

		@Test
		@Ignore
		public void collectConfigurableApps_fromPersonal_returnsCombinedPackages() {
		shadowOf(mUserManager).addUser(
		PERSONAL_PROFILE_ID, "personal-profile"/* name /, 0/ flags */);
		@@ -100,7 +98,6 @@ public class InteractAcrossProfilesSettingsTest {
		}

		@Test
		@Ignore
		public void collectConfigurableApps_fromWork_returnsCombinedPackages() {
		shadowOf(mUserManager).addUser(
		PERSONAL_PROFILE_ID, "personal-profile"/* name /, 0/ flags */);
		@@ -142,7 +139,6 @@ public class InteractAcrossProfilesSettingsTest {
		}

		@Test
		@Ignore
		public void getNumberOfEnabledApps_returnsNumberOfEnabledApps() {
		shadowOf(mUserManager).addUser(
		PERSONAL_PROFILE_ID, "personal-profile"/* name /, 0/ flags */);

tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -22,14 +22,13 @@ import android.os.Parcel;
		import android.text.format.DateUtils;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.robolectric.RobolectricTestRunner;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.List;
		import org.robolectric.RobolectricTestRunner;

		@RunWith(RobolectricTestRunner.class)
		public class AppInfoTest {
		@@ -56,7 +55,6 @@ public class AppInfoTest {
		}

		@Test
		@Ignore
		public void testParcel() {
		Parcel parcel = Parcel.obtain();
		mAppInfo.writeToParcel(parcel, mAppInfo.describeContents());

tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import com.android.settings.fuelgauge.batterytip.AppInfo;
		import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -66,7 +65,6 @@ public class HighUsageTipTest {
		}

		@Test
		@Ignore
		public void testParcelable() {

		Parcel parcel = Parcel.obtain();