Merge "Correct ordering of test expectations" am: 297a289a31

Original change: https://googleplex-android-review.googlesource.com/c/platform/vendor/widevine/+/12148128

Change-Id: I3262cc1fa7921da0b83b0c9e84cb2f5764f03e53
This commit is contained in:
Rahul Frias
2020-07-16 23:02:56 +00:00
committed by Automerger Merge Worker

View File

@@ -4846,7 +4846,7 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(kLevelDefault, decryptor_->QueryStatus(kLevelDefault,
wvcdm::QUERY_KEY_PROVISIONING_ID, &value)); wvcdm::QUERY_KEY_PROVISIONING_ID, &value));
EXPECT_LT(0u, value.size()); EXPECT_GT(value.size(), 0u);
EXPECT_LE(value.size(), 64u) << "provisioning id size: " << value.size(); EXPECT_LE(value.size(), 64u) << "provisioning id size: " << value.size();
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
@@ -5011,7 +5011,7 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatusL3) {
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,
decryptor_->QueryStatus(kLevel3, wvcdm::QUERY_KEY_PROVISIONING_ID, decryptor_->QueryStatus(kLevel3, wvcdm::QUERY_KEY_PROVISIONING_ID,
&value)); &value));
EXPECT_LT(0u, value.size()); EXPECT_GT(value.size(), 0u);
EXPECT_LE(value.size(), 64u) << "provisioning id size: " << value.size(); EXPECT_LE(value.size(), 64u) << "provisioning id size: " << value.size();
EXPECT_EQ(wvcdm::NO_ERROR, EXPECT_EQ(wvcdm::NO_ERROR,