Updated expected resource rating for integration tests.

[ Merge of http://go/wvgerrit/93603 ]

When the new "very high" resource rating tier was introduced, the
Android integration test was not updated to accept this value.  The
integration test has now been updated to use "min" and "max" instead
of fixed levels.  This will make future updates easier.

Bug: 140831533
Test: Android integration test (on master)
Change-Id: Ib92bf0afbfbfd81b46c90243651396dfcb74b91f
This commit is contained in:
Alex Dale
2020-02-12 18:06:28 -08:00
parent 2068fa4a2b
commit c9f586f81a

View File

@@ -4906,11 +4906,11 @@ TEST_F(WvCdmRequestLicenseTest, QueryStatus) {
EXPECT_TRUE(ss.eof());
if (api_version >= OEM_CRYPTO_API_VERSION_SUPPORTS_RESOURCE_RATING_TIER) {
EXPECT_LE(RESOURCE_RATING_TIER_LOW, resource_rating_tier);
EXPECT_GE(RESOURCE_RATING_TIER_HIGH, resource_rating_tier);
EXPECT_LE(RESOURCE_RATING_TIER_MIN, resource_rating_tier);
EXPECT_GE(RESOURCE_RATING_TIER_MAX, resource_rating_tier);
} else {
EXPECT_TRUE(resource_rating_tier < RESOURCE_RATING_TIER_LOW ||
resource_rating_tier > RESOURCE_RATING_TIER_HIGH)
EXPECT_TRUE(resource_rating_tier < RESOURCE_RATING_TIER_MIN ||
resource_rating_tier > RESOURCE_RATING_TIER_MAX)
<< "resource rating tier: " << resource_rating_tier;
}