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

Merge "Ignore MemtagPreferenceControllerTest and the development test" into main

Browse Source
This commit is contained in:
Fan Wu
2023-11-28 08:43:48 +00:00
committed by Android (Google) Code Review
parent 011b606740 c3ba104206
commit 8579dec1be
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/development/DevelopmentMemtagPreferenceControllerTest.java
View File

@@ -38,6 +38,7 @@ import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor; import com.android.settingslib.testutils.shadow.ShadowInteractionJankMonitor;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -46,13 +47,14 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowSystemProperties; import org.robolectric.shadows.ShadowSystemProperties;
@Ignore("b/313564061")
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config( @Config(
shadows = { shadows = {
ZygoteShadow.class, ZygoteShadow.class,
ShadowDeviceConfig.class, ShadowDeviceConfig.class,
ShadowInteractionJankMonitor.class, ShadowInteractionJankMonitor.class,
ShadowRestrictedLockUtilsInternal.class ShadowRestrictedLockUtilsInternal.class
}) })
public class DevelopmentMemtagPreferenceControllerTest { public class DevelopmentMemtagPreferenceControllerTest {
private final String mMemtagSupportedProperty = "ro.arm64.memtag.bootctl_supported"; private final String mMemtagSupportedProperty = "ro.arm64.memtag.bootctl_supported";

3
tests/robotests/src/com/android/settings/security/MemtagPreferenceControllerTest.java
View File

@@ -43,6 +43,7 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowSystemProperties; import org.robolectric.shadows.ShadowSystemProperties;
@Ignore("b/313564061")
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config( @Config(
shadows = { shadows = {
@@ -134,7 +135,6 @@ public class MemtagPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void setChecked_isChecked_doesNotShowDialog() { public void setChecked_isChecked_doesNotShowDialog() {
ZygoteShadow.setSupportsMemoryTagging(false); ZygoteShadow.setSupportsMemoryTagging(false);
mController.setChecked(false); mController.setChecked(false);
@@ -142,7 +142,6 @@ public class MemtagPreferenceControllerTest {
} }
@Test @Test
@Ignore
public void setChecked_isUnchecked_doesNotShowDialog() { public void setChecked_isUnchecked_doesNotShowDialog() {
ZygoteShadow.setSupportsMemoryTagging(true); ZygoteShadow.setSupportsMemoryTagging(true);
mController.setChecked(true); mController.setChecked(true);