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

Fix broken test RecoverySnapshotStorageTest

Browse Source 
This throws an NPE now.

Bug: 75952916
Test: runtest frameworks-services -p \
      com.android.server.locksettings.recoverablekeystore
Change-Id: I094036dbe7e0c149b234a60729aa7fec8db3e2d9
This commit is contained in:
Robert Berry
2018-03-27 12:16:06 +01:00
parent af13eeb110
commit 7cd217b33d
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverySnapshotStorageTest.java
View File

@@ -7,23 +7,19 @@ import android.security.keystore.recovery.KeyChainSnapshot;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import com.android.server.locksettings.recoverablekeystore.TestData;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.security.cert.CertificateException;
import java.util.ArrayList;
@SmallTest
@RunWith(AndroidJUnit4.class)
public class RecoverySnapshotStorageTest {
private static final KeyChainSnapshot MINIMAL_KEYCHAIN_SNAPSHOT = new KeyChainSnapshot.Builder()
.setCounterId(1)
.setSnapshotVersion(1)
.setServerParams(new byte[0])
.setMaxAttempts(10)
.setEncryptedRecoveryKeyBlob(new byte[0])
.setKeyChainProtectionParams(new ArrayList<>())
.setWrappedApplicationKeys(new ArrayList<>())
.build();
private static final KeyChainSnapshot MINIMAL_KEYCHAIN_SNAPSHOT =
createMinimalKeyChainSnapshot();
private final RecoverySnapshotStorage mRecoverySnapshotStorage = new RecoverySnapshotStorage();
@@ -50,4 +46,21 @@ public class RecoverySnapshotStorageTest {
assertNull(mRecoverySnapshotStorage.get(1000));
}
private static KeyChainSnapshot createMinimalKeyChainSnapshot() {
try {
return new KeyChainSnapshot.Builder()
.setCounterId(1)
.setSnapshotVersion(1)
.setServerParams(new byte[0])
.setMaxAttempts(10)
.setEncryptedRecoveryKeyBlob(new byte[0])
.setKeyChainProtectionParams(new ArrayList<>())
.setWrappedApplicationKeys(new ArrayList<>())
.setTrustedHardwareCertPath(TestData.CERT_PATH_1)
.build();
} catch (CertificateException e) {
throw new RuntimeException(e);
}
}
}