diff options
| author | Robert Shih <robertshih@google.com> | 2019-03-12 20:46:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-12 20:46:45 +0000 |
| commit | c13e0f6db26157bcd02759c200bb1ecbcdb95173 (patch) | |
| tree | 9e99c55e8ce136e5075a030ae83178b0eba3c874 /drm | |
| parent | cc35ef0529e04b131e97f96bcefe93215548ad7f (diff) | |
| parent | 90af5f189891076b5224f14060f4e61c36eae723 (diff) | |
| download | android_hardware_interfaces-c13e0f6db26157bcd02759c200bb1ecbcdb95173.tar.gz android_hardware_interfaces-c13e0f6db26157bcd02759c200bb1ecbcdb95173.tar.bz2 android_hardware_interfaces-c13e0f6db26157bcd02759c200bb1ecbcdb95173.zip | |
Merge "DrmHalTest.OfflineLicenseStateTest: search keySetId"
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.2/vts/functional/drm_hal_test.cpp | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/drm/1.2/vts/functional/drm_hal_test.cpp b/drm/1.2/vts/functional/drm_hal_test.cpp index f37adaf31..252ebb95f 100644 --- a/drm/1.2/vts/functional/drm_hal_test.cpp +++ b/drm/1.2/vts/functional/drm_hal_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#define LOG_TAG "drm_hal_clearkey_test@1.2" +#define LOG_TAG "drm_hal_test@1.2" #include <gtest/gtest.h> #include <hidl/HidlSupport.h> @@ -180,19 +180,36 @@ void checkKeySetIdState(Status status, OfflineLicenseState state) { } /** - * Test clearkey plugin offline key support + * Test drm plugin offline key support */ TEST_P(DrmHalTest, OfflineLicenseTest) { auto sessionId = openSession(); hidl_vec<uint8_t> keySetId = loadKeys(sessionId, KeyType::OFFLINE); - auto res = drmPlugin->getOfflineLicenseKeySetIds(checkKeySetIds<Status::OK, 1u>); + auto res = drmPlugin->getOfflineLicenseKeySetIds( + [&](Status status, const hidl_vec<KeySetId>& keySetIds) { + bool found = false; + EXPECT_EQ(Status::OK, status); + for (KeySetId keySetId2: keySetIds) { + if (keySetId == keySetId2) { + found = true; + break; + } + } + EXPECT_TRUE(found) << "keySetId not found"; + }); EXPECT_OK(res); Status err = drmPlugin->removeOfflineLicense(keySetId); EXPECT_EQ(Status::OK, err); - res = drmPlugin->getOfflineLicenseKeySetIds(checkKeySetIds<Status::OK, 0u>); + res = drmPlugin->getOfflineLicenseKeySetIds( + [&](Status status, const hidl_vec<KeySetId>& keySetIds) { + EXPECT_EQ(Status::OK, status); + for (KeySetId keySetId2: keySetIds) { + EXPECT_NE(keySetId, keySetId2); + } + }); EXPECT_OK(res); err = drmPlugin->removeOfflineLicense(keySetId); @@ -202,7 +219,7 @@ TEST_P(DrmHalTest, OfflineLicenseTest) { } /** - * Test clearkey plugin offline key state + * Test drm plugin offline key state */ TEST_P(DrmHalTest, OfflineLicenseStateTest) { auto sessionId = openSession(); |