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

Merge "Enabling private space unit tests in presubmit" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-03-25 21:21:48 +00:00
committed by Android (Google) Code Review
parent 6263205fa8 31a793dfcf
commit 31e2dcbbb8
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
TEST_MAPPING
View File

@@ -14,6 +14,9 @@
}, },
{ {
"include-filter": "com.android.settings.password" "include-filter": "com.android.settings.password"
},
{
"include-filter": "com.android.settings.privatespace"
}, },
{ {
"include-filter": "com.android.settings.safetycenter" "include-filter": "com.android.settings.safetycenter"

3
tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java
View File

@@ -35,6 +35,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
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;
@@ -71,6 +72,7 @@ public class FaceFingerprintUnlockControllerTest {
} }
/** Tests that the controller is always available. */ /** Tests that the controller is always available. */
@Ignore("b/323652985")
@Test @Test
public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() { public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() {
mSetFlagsRule.enableFlags( mSetFlagsRule.enableFlags(
@@ -131,6 +133,7 @@ public class FaceFingerprintUnlockControllerTest {
} }
/** Tests that preference is enabled and summary is not same as device lock. */ /** Tests that preference is enabled and summary is not same as device lock. */
@Ignore("b/323652985")
@Test @Test
public void getSummary_whenSeparateProfileLock() { public void getSummary_whenSeparateProfileLock() {
doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt()); doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());

4
tests/unit/src/com/android/settings/privatespace/UseOneLockControllerTest.java
View File

@@ -40,6 +40,7 @@ import com.android.settings.privatespace.onelock.UseOneLockController;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
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;
@@ -82,6 +83,7 @@ public class UseOneLockControllerTest {
/** Tests that summary in controller is Pattern. */ /** Tests that summary in controller is Pattern. */
@Ignore("b/323652985")
@Test @Test
public void getSummary_whenProfileLockPattern() { public void getSummary_whenProfileLockPattern() {
doReturn(true) doReturn(true)
@@ -96,6 +98,7 @@ public class UseOneLockControllerTest {
} }
/** Tests that summary in controller is PIN. */ /** Tests that summary in controller is PIN. */
@Ignore("b/323652985")
@Test @Test
public void getSummary_whenProfileLockPin() { public void getSummary_whenProfileLockPin() {
doReturn(true) doReturn(true)
@@ -109,6 +112,7 @@ public class UseOneLockControllerTest {
} }
/** Tests that summary in controller is Password. */ /** Tests that summary in controller is Password. */
@Ignore("b/323652985")
@Test @Test
public void getSummary_whenProfileLockPassword() { public void getSummary_whenProfileLockPassword() {
doReturn(true) doReturn(true)