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

Merge changes I86c37b6d,I976b29bf

Browse Source 
* changes:
  Frameworks: Disable two recoverablekeystore tests
  Frameworks: Fix JUnit4 test annotations
This commit is contained in:
TreeHugger Robot
2018-02-20 22:08:46 +00:00
committed by Android (Google) Code Review
parent e68ba070bb 5a9f4e5868
commit 41ed367a63
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ import android.security.keystore.recovery.KeyChainProtectionParams;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -148,6 +149,7 @@ public class PersistentKeyChainSnapshotTest {
() -> reader.readKeyEntry());
}
@Test
public void testWriteProtectionParams() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -174,6 +176,8 @@ public class PersistentKeyChainSnapshotTest {
() -> reader.readProtectionParams());
}
@Ignore("Investigate why this is broken. b/73609806")
@Test
public void testKeyChainSnapshot() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -233,6 +237,8 @@ public class PersistentKeyChainSnapshotTest {
verifyDeserialize(snapshot);
}
@Ignore("Investigate why this is broken. b/73609806")
@Test
public void testKeyChainSnapshot_withManyKeysAndProtectionParams() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -316,7 +322,7 @@ public class PersistentKeyChainSnapshotTest {
.isEqualTo(snapshot.getTrustedHardwarePublicKey());
}
@Test
public void testDeserialize_failsForNewerVersion() throws Exception {
byte[] newVersion = new byte[]{(byte) 2, (byte) 0, (byte) 0, (byte) 0};
assertThrows(
@@ -324,6 +330,7 @@ public class PersistentKeyChainSnapshotTest {
() -> PersistentKeyChainSnapshot.deserialize(newVersion));
}
@Test
public void testDeserialize_failsForEmptyData() throws Exception {
byte[] empty = new byte[]{};
assertThrows(

3
services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDbTest.java
View File

@@ -317,6 +317,7 @@ public class RecoverableKeyStoreDbTest {
assertThat(statuses).hasSize(0);
}
@Test
public void testInvalidateKeysWithOldGenerationId_withSingleKey() {
int userId = 12;
int uid = 1009;
@@ -372,6 +373,7 @@ public class RecoverableKeyStoreDbTest {
pubkey);
}
@Test
public void setRecoveryServiceCertPath_replaceOldValue() throws Exception {
int userId = 12;
int uid = 10009;
@@ -453,6 +455,7 @@ public class RecoverableKeyStoreDbTest {
assertThat(agents).contains(uid2);
}
@Test
public void setRecoverySecretTypes_emptyDefaultValue() throws Exception {
int userId = 12;
int uid = 10009;