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

Commit 28795aa8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix two broken tests in PersistentKeyChainSnapshotTest"

parents 92c94332 b2675b44

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/PersistentKeyChainSnapshotTest.java

+4 −8
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ public class PersistentKeyChainSnapshotTest { 
                () -> reader.readProtectionParams());

    }



    @Ignore("Investigate why this is broken. b/73609806")

    @Test

    public void testKeyChainSnapshot() throws Exception {

        PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
@@ -201,7 +200,7 @@ public class PersistentKeyChainSnapshotTest { 
        KeyChainSnapshot snapshot =  new KeyChainSnapshot.Builder()

                .setSnapshotVersion(SNAPSHOT_VERSION)

                .setKeyChainProtectionParams(protectionParamsList)

                .setEncryptedRecoveryKeyBlob(KEY_MATERIAL)

                .setEncryptedRecoveryKeyBlob(RECOVERY_KEY_MATERIAL)

                .setWrappedApplicationKeys(appKeysList)

                .setMaxAttempts(MAX_ATTEMPTS)

                .setCounterId(COUNTER_ID)
@@ -218,13 +217,11 @@ public class PersistentKeyChainSnapshotTest { 


        KeyChainSnapshot copy = reader.readKeyChainSnapshot();

        assertThat(copy.getSnapshotVersion()).isEqualTo(SNAPSHOT_VERSION);

        assertThat(copy.getKeyChainProtectionParams()).hasSize(2);

        assertThat(copy.getKeyChainProtectionParams()).hasSize(1);

        assertThat(copy.getKeyChainProtectionParams().get(0).getUserSecretType()).isEqualTo(1);

        assertThat(copy.getKeyChainProtectionParams().get(1).getUserSecretType()).isEqualTo(2);

        assertThat(copy.getEncryptedRecoveryKeyBlob()).isEqualTo(RECOVERY_KEY_MATERIAL);

        assertThat(copy.getWrappedApplicationKeys()).hasSize(2);

        assertThat(copy.getWrappedApplicationKeys()).hasSize(1);

        assertThat(copy.getWrappedApplicationKeys().get(0).getAlias()).isEqualTo(ALIAS);

        assertThat(copy.getWrappedApplicationKeys().get(1).getAlias()).isEqualTo(ALIAS2);

        assertThat(copy.getMaxAttempts()).isEqualTo(MAX_ATTEMPTS);

        assertThat(copy.getCounterId()).isEqualTo(COUNTER_ID);

        assertThat(copy.getServerParams()).isEqualTo(SERVER_PARAMS);
@@ -237,7 +234,6 @@ public class PersistentKeyChainSnapshotTest { 
        verifyDeserialize(snapshot);

    }



    @Ignore("Investigate why this is broken. b/73609806")

    @Test

    public void testKeyChainSnapshot_withManyKeysAndProtectionParams() throws Exception {

        PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
@@ -272,7 +268,7 @@ public class PersistentKeyChainSnapshotTest { 
        KeyChainSnapshot snapshot =  new KeyChainSnapshot.Builder()

                .setSnapshotVersion(SNAPSHOT_VERSION)

                .setKeyChainProtectionParams(protectionParamsList)

                .setEncryptedRecoveryKeyBlob(KEY_MATERIAL)

                .setEncryptedRecoveryKeyBlob(RECOVERY_KEY_MATERIAL)

                .setWrappedApplicationKeys(appKeysList)

                .setMaxAttempts(MAX_ATTEMPTS)

                .setCounterId(COUNTER_ID)