Ignore lock type in ChooseLockGeneric in non-FBE

We need to show the encryption opt-in in non-FBE cases. Test: atest RunSettingsRoboTests Bug: 115847373 Change-Id: I3a92b265c9c8ecf5d4af009943b5b9483e25a738
2018-10-04 19:49:08 -07:00
parent c08dcbd700
commit 446637e583
8 changed files with 116 additions and 93 deletions
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -30,15 +30,13 @@ import android.widget.Button;
 import com.android.settings.R;
 import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroductionTest
-        .ShadowStorageManagerWrapper;
 import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment;
 import com.android.settings.password.SetupSkipDialog;
-import com.android.settings.password.StorageManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.ShadowFingerprintManager;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;

 import org.junit.After;
@@ -51,8 +49,6 @@ import org.robolectric.Robolectric;
 import org.robolectric.Shadows;
 import org.robolectric.android.controller.ActivityController;
 import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowActivity.IntentForResult;
 import org.robolectric.shadows.ShadowKeyguardManager;
@@ -61,7 +57,7 @@ import org.robolectric.shadows.ShadowKeyguardManager;
@Config(shadows = {
    ShadowFingerprintManager.class,
    ShadowLockPatternUtils.class,
-    ShadowStorageManagerWrapper.class,
+    ShadowStorageManager.class,
    ShadowUserManager.class
 })
 public class SetupFingerprintEnrollIntroductionTest {
@@ -89,7 +85,7 @@ public class SetupFingerprintEnrollIntroductionTest {

    @After
    public void tearDown() {
-        ShadowStorageManagerWrapper.reset();
+        ShadowStorageManager.reset();
        ShadowFingerprintManager.reset();
    }

@@ -209,7 +205,7 @@ public class SetupFingerprintEnrollIntroductionTest {

    @Test
    public void testLockPattern() {
-        ShadowStorageManagerWrapper.sIsFileEncrypted = false;
+        ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);

        mController.create().postCreate(null).resume();

@@ -228,19 +224,4 @@ public class SetupFingerprintEnrollIntroductionTest {
    private ShadowKeyguardManager getShadowKeyguardManager() {
        return Shadows.shadowOf(application.getSystemService(KeyguardManager.class));
    }
-
-    @Implements(StorageManagerWrapper.class)
-    public static class ShadowStorageManagerWrapper {
-
-        private static boolean sIsFileEncrypted = true;
-
-        public static void reset() {
-            sIsFileEncrypted = true;
-        }
-
-        @Implementation
-        public static boolean isFileEncryptedNativeOrEmulated() {
-            return sIsFileEncrypted;
-        }
-    }
 }
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -16,122 +16,170 @@

 package com.android.settings.password;

-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;

 import android.app.Activity;
-import android.content.Context;
+import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
-import android.os.Bundle;
 import android.provider.Settings.Global;

-import androidx.fragment.app.FragmentActivity;
-import androidx.fragment.app.FragmentManager;
+import androidx.annotation.Nullable;

+import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.search.SearchFeatureProvider;
 import com.android.settings.testutils.SettingsRobolectricTestRunner;
 import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settings.testutils.shadow.SettingsShadowResources.SettingsShadowTheme;
+import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
+import com.android.settings.testutils.shadow.ShadowUserManager;
+import com.android.settings.testutils.shadow.ShadowUtils;

 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Robolectric;
 import org.robolectric.annotation.Config;

@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowTheme.class,
+                ShadowLockPatternUtils.class,
+                ShadowStorageManager.class,
+                ShadowUserManager.class,
+                ShadowUtils.class
+        })
 public class ChooseLockGenericTest {

-    private Context mContext;
    private ChooseLockGenericFragment mFragment;
-    private FragmentActivity mActivity;
+    private ChooseLockGeneric mActivity;

    @Before
    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mFragment = spy(new ChooseLockGenericFragment());
-        mActivity = mock(FragmentActivity.class);
-        when(mFragment.getActivity()).thenReturn(mActivity);
-        when(mFragment.getFragmentManager()).thenReturn(mock(FragmentManager.class));
-        doNothing().when(mFragment).startActivity(any(Intent.class));
+        Global.putInt(
+                application.getContentResolver(),
+                Global.DEVICE_PROVISIONED, 1);
+        mFragment = new ChooseLockGenericFragment();
    }

    @After
    public void tearDown() {
-        Global.putInt(RuntimeEnvironment.application.getContentResolver(),
+        Global.putInt(
+                application.getContentResolver(),
                Global.DEVICE_PROVISIONED, 1);
+        ShadowStorageManager.reset();
    }

    @Test
-    @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class)
    public void onCreate_deviceNotProvisioned_shouldFinishActivity() {
-        Global.putInt(mContext.getContentResolver(), Global.DEVICE_PROVISIONED, 0);
-        when(mActivity.getContentResolver()).thenReturn(mContext.getContentResolver());
-        when(mActivity.getTheme()).thenReturn(mContext.getTheme());
-        when(mFragment.getArguments()).thenReturn(Bundle.EMPTY);
+        Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 0);

-        mFragment.onCreate(Bundle.EMPTY);
-        verify(mActivity).finish();
+        initActivity(null);
+        assertThat(mActivity.isFinishing()).isTrue();
    }

    @Test
    public void onActivityResult_nullIntentData_shouldNotCrash() {
-        doNothing().when(mFragment).updatePreferencesOrFinish(anyBoolean());
-
+        initActivity(null);
        mFragment.onActivityResult(
                ChooseLockGenericFragment.CONFIRM_EXISTING_REQUEST, Activity.RESULT_OK,
                null /* data */);
        // no crash
    }

+    @Test
+    public void updatePreferencesOrFinish_passwordTypeSetPin_shouldStartChooseLockPassword() {
+        Intent intent = new Intent().putExtra(
+                LockPatternUtils.PASSWORD_TYPE_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+        initActivity(intent);
+
+        mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+        assertThat(shadowOf(mActivity).getNextStartedActivity()).isNotNull();
+    }
+
+    @Test
+    public void updatePreferencesOrFinish_passwordTypeSetPinNotFbe_shouldNotStartChooseLock() {
+        ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
+        Intent intent = new Intent().putExtra(
+                LockPatternUtils.PASSWORD_TYPE_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+        initActivity(intent);
+
+        mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+        assertThat(shadowOf(mActivity).getNextStartedActivity()).isNull();
+    }
+
    @Test
    public void onActivityResult_requestcode0_shouldNotFinish() {
+        initActivity(null);
+
        mFragment.onActivityResult(
                SearchFeatureProvider.REQUEST_CODE, Activity.RESULT_OK, null /* data */);

-        verify(mFragment, never()).finish();
+        assertThat(mActivity.isFinishing()).isFalse();
    }

    @Test
    public void onActivityResult_requestcode101_shouldFinish() {
+        initActivity(null);
+
        mFragment.onActivityResult(
                ChooseLockGenericFragment.ENABLE_ENCRYPTION_REQUEST, Activity.RESULT_OK,
                null /* data */);

-        verify(mFragment).finish();
+        assertThat(mActivity.isFinishing()).isTrue();
    }

    @Test
    public void onActivityResult_requestcode102_shouldFinish() {
+        initActivity(null);
+
        mFragment.onActivityResult(
                ChooseLockGenericFragment.CHOOSE_LOCK_REQUEST, Activity.RESULT_OK, null /* data */);

-        verify(mFragment).finish();
+        assertThat(mActivity.isFinishing()).isTrue();
    }

    @Test
    public void onActivityResult_requestcode103_shouldFinish() {
+        initActivity(null);
+
        mFragment.onActivityResult(
                ChooseLockGenericFragment.CHOOSE_LOCK_BEFORE_FINGERPRINT_REQUEST,
                BiometricEnrollBase.RESULT_FINISHED, null /* data */);

-        verify(mFragment).finish();
+        assertThat(mActivity.isFinishing()).isTrue();
    }

    @Test
    public void onActivityResult_requestcode104_shouldFinish() {
+        initActivity(null);
+
        mFragment.onActivityResult(
                ChooseLockGenericFragment.SKIP_FINGERPRINT_REQUEST, Activity.RESULT_OK,
                null /* data */);

-        verify(mFragment).finish();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    private void initActivity(@Nullable Intent intent) {
+        if (intent == null) {
+            intent = new Intent();
+        }
+        intent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
+        mActivity = Robolectric.buildActivity(ChooseLockGeneric.InternalActivity.class, intent)
+                .setup().get();
+        mActivity.getSupportFragmentManager().beginTransaction().add(mFragment, null).commitNow();
    }
 }
--- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java
@@ -96,7 +96,9 @@ public class SettingsRobolectricTestRunner extends RobolectricTestRunner {
            paths.add(new ResourcePath(null,
                Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.cardview_cardview-nodeps/android_common/aar/res")), null));
            paths.add(new ResourcePath(null,
-                Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null));
+                    Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.slice_slice-view-nodeps/android_common/aar/res")), null));
+            paths.add(new ResourcePath(null,
+                    Fs.fromURL(new URL("file:out/soong/.intermediates/prebuilts/sdk/current/androidx/androidx.preference_preference-nodeps/android_common/aar/res")), null));
        } catch (MalformedURLException e) {
            throw new RuntimeException("SettingsRobolectricTestRunner failure", e);
        }
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -209,6 +209,10 @@ public class SettingsShadowResources extends ShadowResources {
                            node.setNodeValue("@style/FingerprintLayoutTheme");
                        } else if (attributeValue.startsWith("@*android:string")) {
                            node.setNodeValue("PLACEHOLDER");
+                        } else if (attributeValue.startsWith("@*android:dimen")) {
+                            node.setNodeValue("321dp");
+                        } else if (attributeValue.startsWith("@*android:drawable")) {
+                            node.setNodeValue("");
                        }
                    }
                }
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowStorageManager.java
@@ -30,6 +30,7 @@ public class ShadowStorageManager {

    private static boolean sIsUnmountCalled;
    private static boolean sIsForgetCalled;
+    private static boolean sIsFileEncryptedNativeOrEmulated = true;

    public static boolean isUnmountCalled() {
        return sIsUnmountCalled;
@@ -43,7 +44,7 @@ public class ShadowStorageManager {
    public static void reset() {
        sIsUnmountCalled = false;
        sIsForgetCalled = false;
-
+        sIsFileEncryptedNativeOrEmulated = true;
    }

    @Implementation
@@ -71,6 +72,15 @@ public class ShadowStorageManager {
        sIsForgetCalled = true;
    }

+    @Implementation
+    protected static boolean isFileEncryptedNativeOrEmulated() {
+        return sIsFileEncryptedNativeOrEmulated;
+    }
+
+    public static void setIsFileEncryptedNativeOrEmulated(boolean encrypted) {
+        sIsFileEncryptedNativeOrEmulated = encrypted;
+    }
+
    private VolumeInfo createVolumeInfo(String volumeId) {
        final DiskInfo disk = new DiskInfo("fakeid", 0);
        return new VolumeInfo(volumeId, 0, disk, "guid");