Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix two broken tests in PersistentKeyChainSnapshotTest"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-21 03:10:05 +00:00
committed by Android (Google) Code Review
parent 92c943325c b2675b4402
commit 28795aa82b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)