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

Commit 1002473f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ignore broken tests"

parents d1f8c277 297fcb40

tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.settingslib.drawer.CategoryKey; 
import com.android.settingslib.drawer.Tile;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -41,6 +42,7 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RobolectricTestRunner;



@RunWith(RobolectricTestRunner.class)

@Ignore

public class ProfileSelectDialogTest {



    private static final UserHandle NORMAL_USER = UserHandle.of(1111);

tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.settings.testutils.FakeFeatureFactory; 
import com.android.settings.testutils.shadow.ShadowUtils;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;
@@ -61,6 +62,7 @@ public class SearchFeatureProviderImplTest { 
    }



    @Test

    @Ignore

    @Config(shadows = ShadowUtils.class)

    public void initSearchToolbar_hasResolvedInfo_shouldStartCorrectIntent() {

        final Intent searchIntent = new Intent(Settings.ACTION_APP_SEARCH_SETTINGS)

tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import com.android.settings.R; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;
@@ -91,6 +92,7 @@ public class ScreenPinningPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void getPreferenceKey_byDefault_returnsDefaultValue() {

        assertThat(mController.getPreferenceKey()).isEqualTo("screen_pinning_settings");

    }

tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.core.BasePreferenceController;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -139,6 +140,7 @@ public class SimLockPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void getPreferenceKey_byDefault_returnsDefaultValue() {

        assertThat(mController.getPreferenceKey()).isEqualTo("sim_lock_settings");

    }

tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.settings.security.trustagent.TrustAgentManager.TrustAgentComp 
import com.android.settings.testutils.FakeFeatureFactory;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;
@@ -119,6 +120,7 @@ public class ManageTrustAgentsPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void getPreferenceKey_byDefault_returnsDefaultValue() {

        assertThat(mController.getPreferenceKey()).isEqualTo("manage_trust_agents");

    }