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

Commit 46d1fa4b authored by Chaohui Wang's avatar Chaohui Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix SetupSkipDialogTest" into tm-dev am: 9512dfd7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17312727

Change-Id: If75b43150ced9d15d36e24fd3bb3c0b92338fa48
parents 04f52626 9512dfd7

tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java

+52 −68
Original line number Original line Diff line number Diff line
@@ -18,24 +18,24 @@ package com.android.settings.password; 




import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth.assertThat;





import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;

import androidx.fragment.app.FragmentActivity;

import androidx.test.core.app.ApplicationProvider;





import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;

import com.android.settings.testutils.shadow.ShadowUtils;

import com.android.settings.testutils.shadow.ShadowUtils;





import org.junit.Before;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.ShadowAlertDialog;

import org.robolectric.shadows.ShadowApplication;





@RunWith(RobolectricTestRunner.class)

@RunWith(RobolectricTestRunner.class)

@Config(shadows = {ShadowUtils.class, ShadowAlertDialogCompat.class})

@Config(shadows = {ShadowUtils.class, ShadowAlertDialog.class})

@Ignore

public class SetupSkipDialogTest {

public class SetupSkipDialogTest {





    private FragmentActivity mActivity;

    private FragmentActivity mActivity;
@@ -45,19 +45,25 @@ public class SetupSkipDialogTest { 
        mActivity = Robolectric.setupActivity(FragmentActivity.class);

        mActivity = Robolectric.setupActivity(FragmentActivity.class);

    }

    }





    private ShadowAlertDialog getShadowAlertDialog() {

        ShadowApplication shadowApplication = Shadow.extract(

                ApplicationProvider.getApplicationContext());

        ShadowAlertDialog shadowAlertDialog = shadowApplication.getLatestAlertDialog();

        assertThat(shadowAlertDialog).isNotNull();

        return shadowAlertDialog;

    }



    @Test

    @Test

    public void frpMessages_areShownCorrectly_whenNotSupported() {

    public void frpMessages_areShownCorrectly_whenNotSupported() {

        SetupSkipDialog setupSkipDialog =

        SetupSkipDialog setupSkipDialog =

                SetupSkipDialog.newInstance(false, false, false, false, false, false);

                SetupSkipDialog.newInstance(false, false, false, false, false, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

                mActivity.getString(R.string.lock_screen_intro_skip_title));

        assertThat(mActivity.getString(R.string.lock_screen_intro_skip_title)).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                shadowAlertDialog.getTitle());

                mActivity.getString(R.string.lock_screen_intro_skip_dialog_text));

        assertThat(mActivity.getString(R.string.lock_screen_intro_skip_dialog_text)).isEqualTo(

                shadowAlertDialog.getMessage());

    }

    }





    @Test

    @Test
@@ -66,29 +72,24 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, false, false, false, false, false);

                SetupSkipDialog.newInstance(true, false, false, false, false, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

                mActivity.getString(R.string.lock_screen_intro_skip_title));

        assertThat(mActivity.getString(R.string.lock_screen_intro_skip_title)).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                shadowAlertDialog.getTitle());

                mActivity.getString(R.string.lock_screen_intro_skip_dialog_text_frp));

        assertThat(mActivity.getString(R.string.lock_screen_intro_skip_dialog_text_frp)).isEqualTo(

                shadowAlertDialog.getMessage());

    }

    }





    @Test

    @Test

    @Ignore

    public void dialogMessage_whenSkipPinSetupForFace_shouldShownCorrectly() {

    public void dialogMessage_whenSkipPinSetupForFace_shouldShownCorrectly() {

        SetupSkipDialog setupSkipDialog =

        SetupSkipDialog setupSkipDialog =

                SetupSkipDialog.newInstance(true, false, false, false, true, false);

                SetupSkipDialog.newInstance(true, false, false, false, true, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

                mActivity.getString(R.string.lock_screen_pin_skip_face_title));

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_title));

                mActivity.getString(R.string.lock_screen_pin_skip_face_message));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_message));

    }

    }





    @Test

    @Test
@@ -97,12 +98,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, false, true, false, true, false);

                SetupSkipDialog.newInstance(true, false, true, false, true, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_face_title));

                mActivity.getString(R.string.lock_screen_password_skip_face_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_face_message));

                mActivity.getString(R.string.lock_screen_password_skip_face_message));

    }

    }
@@ -112,12 +111,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, true, false, false, true, false);

                SetupSkipDialog.newInstance(true, true, false, false, true, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_face_title));

                mActivity.getString(R.string.lock_screen_pattern_skip_face_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_face_message));

                mActivity.getString(R.string.lock_screen_pattern_skip_face_message));

    }

    }
@@ -127,12 +124,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, false, false, true, false, false);

                SetupSkipDialog.newInstance(true, false, false, true, false, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_title));

                mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_message));

                mActivity.getString(R.string.lock_screen_pin_skip_fingerprint_message));

    }

    }
@@ -142,12 +137,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, false, true, true, false, false);

                SetupSkipDialog.newInstance(true, false, true, true, false, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_fingerprint_title));

                mActivity.getString(R.string.lock_screen_password_skip_fingerprint_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_fingerprint_message));

                mActivity.getString(R.string.lock_screen_password_skip_fingerprint_message));

    }

    }
@@ -157,28 +150,23 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, true, false, true, false, false);

                SetupSkipDialog.newInstance(true, true, false, true, false, false);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_title));

                mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_message));

                mActivity.getString(R.string.lock_screen_pattern_skip_fingerprint_message));

    }

    }







    @Test

    @Test

    public void dialogMessage_whenSkipPinSetupForBiometrics_shouldShownCorrectly() {

    public void dialogMessage_whenSkipPinSetupForBiometrics_shouldShownCorrectly() {

        SetupSkipDialog setupSkipDialog =

        SetupSkipDialog setupSkipDialog =

                SetupSkipDialog.newInstance(true, false, false, false, false, true);

                SetupSkipDialog.newInstance(true, false, false, false, false, true);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_title));

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_message));

                mActivity.getString(R.string.lock_screen_pin_skip_biometrics_message));

    }

    }
@@ -188,12 +176,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, false, true, false, false, true);

                SetupSkipDialog.newInstance(true, false, true, false, false, true);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_biometrics_title));

                mActivity.getString(R.string.lock_screen_password_skip_biometrics_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_password_skip_biometrics_message));

                mActivity.getString(R.string.lock_screen_password_skip_biometrics_message));

    }

    }
@@ -203,12 +189,10 @@ public class SetupSkipDialogTest { 
                SetupSkipDialog.newInstance(true, true, false, false, false, true);

                SetupSkipDialog.newInstance(true, true, false, false, false, true);

        setupSkipDialog.show(mActivity.getSupportFragmentManager());

        setupSkipDialog.show(mActivity.getSupportFragmentManager());





        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();

        ShadowAlertDialog shadowAlertDialog = getShadowAlertDialog();

        assertThat(alertDialog).isNotNull();

        assertThat(shadowAlertDialog.getTitle().toString()).isEqualTo(

        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);

        assertThat(shadowAlertDialog.getTitle()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_title));

                mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_title));

        assertThat(shadowAlertDialog.getMessage()).isEqualTo(

        assertThat(shadowAlertDialog.getMessage().toString()).isEqualTo(

                mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_message));

                mActivity.getString(R.string.lock_screen_pattern_skip_biometrics_message));

    }

    }

}
 
}