diff options
| author | Eran Messeri <eranm@google.com> | 2019-09-19 14:52:06 +0100 |
|---|---|---|
| committer | Eran Messeri <eranm@google.com> | 2019-09-23 10:09:06 +0100 |
| commit | 160ebb16095d80220ffd9e8b7ef29ecefa81b2a7 (patch) | |
| tree | 3fe3c8635f8fd69f5565b3a07bb2b87b85e70594 /tests | |
| parent | 5ce516f29d98c03095daf688a13cec8a04e09292 (diff) | |
| download | KeyChain-160ebb16095d80220ffd9e8b7ef29ecefa81b2a7.tar.gz | |
KeyChain tests: Add TEST_MAPPING
Add a test mapping for running KeyChain tests for any changes to the
KeyChain package.
Note that the Robolectric tests are not added yet because a test suite
cannot be specified for them.
The support service had to be built as an Android app (rather than
Android test) and specified as a dependency for the tests.
Bug: 138375478
Test: atest in packages/apps/KeyChain
Change-Id: Ia5d316f77791176ef63396a468b90491acc7a9eb
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.bp | 4 | ||||
| -rw-r--r-- | tests/src/com/android/keychain/tests/BasicKeyChainServiceTest.java | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index 08e69a9..f7865ff 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -30,4 +30,8 @@ android_test { libs: [ "android.test.base", ], + test_suites: ["general-tests"], + required: [ + "KeyChainTestsSupport", + ], } diff --git a/tests/src/com/android/keychain/tests/BasicKeyChainServiceTest.java b/tests/src/com/android/keychain/tests/BasicKeyChainServiceTest.java index 4144b2d..f336edd 100644 --- a/tests/src/com/android/keychain/tests/BasicKeyChainServiceTest.java +++ b/tests/src/com/android/keychain/tests/BasicKeyChainServiceTest.java @@ -261,7 +261,7 @@ public class BasicKeyChainServiceTest { public void testAttestKeySucceedsOnGeneratedKey() throws RemoteException { generateRsaKey(ALIAS_GENERATED); assertThat(mTestSupportService.attestKey(ALIAS_GENERATED, DUMMY_CHALLENGE, - new int[]{})).isEqualTo(KeyChain.KEY_ATTESTATION_SUCCESS); + null)).isEqualTo(KeyChain.KEY_ATTESTATION_SUCCESS); } @Test |