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

Frameworks: Fix JUnit4 test annotations

Browse Source 
Fix missing annotations in recoverablekeystore.

Found by errorprone.

Bug: 73513670
Test: atest PersistentKeyChainSnapshotTest
Test: atest RecoverableKeyStoreDbTest
Test: m javac-check RUN_ERROR_PRONE=true
Change-Id: I976b29bf2c7f47d1a9c615b1f8102b593842724b
This commit is contained in:
Andreas Gampe
2018-02-19 10:47:28 -08:00
parent 2588dbce34
commit bd666411cc
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,7 @@ public class PersistentKeyChainSnapshotTest {
() -> reader.readKeyEntry());
}
@Test
public void testWriteProtectionParams() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -174,6 +175,7 @@ public class PersistentKeyChainSnapshotTest {
() -> reader.readProtectionParams());
}
@Test
public void testKeyChainSnapshot() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -233,6 +235,7 @@ public class PersistentKeyChainSnapshotTest {
verifyDeserialize(snapshot);
}
@Test
public void testKeyChainSnapshot_withManyKeysAndProtectionParams() throws Exception {
PersistentKeyChainSnapshot writer = new PersistentKeyChainSnapshot();
writer.initWriter();
@@ -316,7 +319,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 +327,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;