diff options
| author | Kenny Root <kroot@google.com> | 2013-02-14 10:18:38 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-02-14 12:06:51 -0800 |
| commit | b9594ce9ebb3f5f303a280f04312ae5754ce3560 (patch) | |
| tree | c2d5554829d9dfce6c387a7a41a2218d5bd5f276 /keystore/tests/src | |
| parent | 37edbbc62fa031c75ce5a1298fdd07d981907e89 (diff) | |
| download | frameworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.zip frameworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.tar.gz frameworks_base-b9594ce9ebb3f5f303a280f04312ae5754ce3560.tar.bz2 | |
KeyStore: stop using state()
Change-Id: I721974fd95f8d1ab06a3fd1bbb4c9b4d9d1d7752
Diffstat (limited to 'keystore/tests/src')
| -rw-r--r-- | keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java | 5 | ||||
| -rw-r--r-- | keystore/tests/src/android/security/AndroidKeyStoreTest.java | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java b/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java index d108caa..cd031b4 100644 --- a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java +++ b/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java @@ -62,11 +62,10 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase { assertTrue(mAndroidKeyStore.reset()); - assertEquals(android.security.KeyStore.State.UNINITIALIZED, mAndroidKeyStore.state()); + assertFalse(mAndroidKeyStore.isUnlocked()); assertTrue(mAndroidKeyStore.password("1111")); - - assertEquals(android.security.KeyStore.State.UNLOCKED, mAndroidKeyStore.state()); + assertTrue(mAndroidKeyStore.isUnlocked()); assertEquals(0, mAndroidKeyStore.saw("").length); diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/AndroidKeyStoreTest.java index c376f3d..8928e06 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/AndroidKeyStoreTest.java @@ -467,12 +467,10 @@ public class AndroidKeyStoreTest extends AndroidTestCase { mAndroidKeyStore = android.security.KeyStore.getInstance(); assertTrue(mAndroidKeyStore.reset()); - - assertEquals(android.security.KeyStore.State.UNINITIALIZED, mAndroidKeyStore.state()); + assertFalse(mAndroidKeyStore.isUnlocked()); assertTrue(mAndroidKeyStore.password("1111")); - - assertEquals(android.security.KeyStore.State.UNLOCKED, mAndroidKeyStore.state()); + assertTrue(mAndroidKeyStore.isUnlocked()); assertEquals(0, mAndroidKeyStore.saw("").length); |