diff options
Diffstat (limited to 'keystore/tests/src')
| -rw-r--r-- | keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java (renamed from keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java) | 4 | ||||
| -rw-r--r-- | keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java (renamed from keystore/tests/src/android/security/AndroidKeyStoreTest.java) | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java b/keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java index 9c2f358..cad4e54 100644 --- a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java +++ b/keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package android.security; +package android.security.keystore; +import android.security.Credentials; +import android.security.KeyPairGeneratorSpec; import android.test.AndroidTestCase; import java.io.ByteArrayInputStream; diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java index 4b2b9b5..2d4e4a0 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package android.security; +package android.security.keystore; import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; import com.android.org.conscrypt.NativeConstants; import com.android.org.conscrypt.OpenSSLEngine; +import android.security.Credentials; +import android.security.KeyStore; +import android.security.KeyStoreParameter; import android.test.AndroidTestCase; import java.io.ByteArrayInputStream; @@ -1319,9 +1322,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } public void testKeyStore_GetType_Encrypted_Success() throws Exception { - assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); + assertEquals(AndroidKeyStoreSpi.NAME, mKeyStore.getType()); setupPassword(); - assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); + assertEquals(AndroidKeyStoreSpi.NAME, mKeyStore.getType()); } public void testKeyStore_IsCertificateEntry_CA_Encrypted_Success() throws Exception { |