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

Merge "Revert "Ignore a lot of failed test cases on Settings"" into rvc-dev am: 3c4b5d2a2e am: 195adf8adf am: d941a0bc5b am: f38c5c6b6e

Browse Source 
Change-Id: I61faae9ced543989acca6ea34297668bf10e67db
This commit is contained in:
TreeHugger Robot
2020-04-22 21:55:34 +00:00
committed by Automerger Merge Worker
parent 1d36f345a6 f38c5c6b6e
commit 843e500256
13 changed files with 9 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java
View File

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

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

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

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

@@ -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 */);