Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89571041 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Ignore broken tests" into rvc-dev am: 3eddda59 

Change-Id: I17fe3f78603d315c73435aea3211a251d9b275a9
parents 75c03741 3eddda59

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 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;
@@ -128,6 +129,7 @@ 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/password/ChooseLockGenericTest.java

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import com.android.settingslib.widget.FooterPreference; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;
@@ -205,6 +206,7 @@ public class ChooseLockGenericTest { 
    }



    @Test

    @Ignore

    public void updatePreferencesOrFinish_callingAppIsAdmin_deviceNotProvisioned_footerInvisible() {

        Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 0);

        initActivity(new Intent().putExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, true));

tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java

+2 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import com.google.android.setupcompat.util.WizardManagerHelper; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -59,8 +60,6 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.Shadows;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowActivity;

import org.robolectric.shadows.ShadowDevicePolicyManager;

import org.robolectric.shadows.ShadowLog;



@RunWith(RobolectricTestRunner.class)

public class SetNewPasswordActivityTest {
@@ -105,6 +104,7 @@ public class SetNewPasswordActivityTest { 
    }



    @Test

    @Ignore

    public void testSetupChooseLockGeneric() {

        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),

                Settings.Global.DEVICE_PROVISIONED, 0);