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

Commit 8579dec1 authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Ignore MemtagPreferenceControllerTest and the development test" into main

parents 011b6067 c3ba1042

tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java

+6 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import com.android.settingslib.RestrictedSwitchPreference; 
import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -46,6 +47,7 @@ import org.robolectric.RuntimeEnvironment; 
import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowSystemProperties;



@Ignore("b/313564061")

@RunWith(RobolectricTestRunner.class)

@Config(

        shadows = {

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

+1 −2
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowSystemProperties;



@Ignore("b/313564061")

@RunWith(RobolectricTestRunner.class)

@Config(

        shadows = {
@@ -134,7 +135,6 @@ public class MemtagPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void setChecked_isChecked_doesNotShowDialog() {

        ZygoteShadow.setSupportsMemoryTagging(false);

        mController.setChecked(false);
@@ -142,7 +142,6 @@ public class MemtagPreferenceControllerTest { 
    }



    @Test

    @Ignore

    public void setChecked_isUnchecked_doesNotShowDialog() {

        ZygoteShadow.setSupportsMemoryTagging(true);

        mController.setChecked(true);