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

Commit 559d83a3 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Fixed test case failures" into main

parents 94a8a910 86d3d54d

tests/unit/src/com/android/settings/biometrics/face/FaceStatusUtilsTest.java

+9 −2
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.core.app.ApplicationProvider;
@@ -55,6 +59,9 @@ public class FaceStatusUtilsTest { 
    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private static final ComponentName COMPONENT_NAME =

            new ComponentName("package", "class");

    private static final int USER_ID = UserHandle.myUserId();
@@ -173,7 +180,7 @@ public class FaceStatusUtilsTest { 
    }



    @Test

    @DisableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    @RequiresFlagsDisabled(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    public void getSummary_whenNotEnrolled_flagOff_returnsSummaryNone() {

        when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
@@ -184,7 +191,7 @@ public class FaceStatusUtilsTest { 
    }



    @Test

    @EnableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    public void getSummary_whenNotEnrolled_flagOn_returnsSummaryNone() {

        when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);

tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintStatusUtilsTest.java

+9 −2
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ import android.os.UserHandle; 
import android.os.UserManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.core.app.ApplicationProvider;
@@ -59,6 +63,9 @@ public class FingerprintStatusUtilsTest { 
    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();



    private static final ComponentName COMPONENT_NAME =

            new ComponentName("package", "class");

    private static final int USER_ID = UserHandle.myUserId();
@@ -180,7 +187,7 @@ public class FingerprintStatusUtilsTest { 
    }



    @Test

    @DisableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    @RequiresFlagsDisabled(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    public void getSummary_whenNotEnrolled_flagOff_returnsSummaryNone() {

        when(mFingerprintManager.hasEnrolledTemplates(anyInt())).thenReturn(false);
@@ -191,7 +198,7 @@ public class FingerprintStatusUtilsTest { 
    }



    @Test

    @EnableFlags(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    @RequiresFlagsEnabled(com.android.settings.flags.Flags.FLAG_BIOMETRICS_ONBOARDING_EDUCATION)

    public void getSummary_whenNotEnrolled_flagOn_returnsSummaryNone() {

        when(mFingerprintManager.hasEnrolledTemplates(anyInt())).thenReturn(false);