widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated usage test to expect v16 duration values. am: f2bf164914

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

Change-Id: I042b75f71136642c883a97bb9883696291ce9a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Dale
2023-05-08 19:00:06 +00:00
committed by Automerger Merge Worker
parent c5887c74cf f2bf164914
commit 766904974b
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libwvdrmengine/cdm/test/cdm_extended_duration_test.cpp
View File

@@ -1316,7 +1316,11 @@ TEST_P(WvCdmStreamingNoPstTest, UsageTest) {
if (initial_license_duration_remaining == kUnlimitedDurationValue) {
EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
} else {
} else if (license_duration_remaining != kUnlimitedDurationValue) {
// Possible that the initial license duration was limited due to
// the finit rental duration; however, if the license has a soft
// rental duration, it will be considered unlimited after playback
// has begun.
EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
expected_seconds_since_license_received, kClockTolerance)
<< "initial_license_duration_remaining = "
@@ -1343,9 +1347,7 @@ INSTANTIATE_TEST_CASE_P(Cdm, WvCdmStreamingNoPstTest,
class WvCdmStreamingPstTest : public WvCdmExtendedDurationTest,
public ::testing::WithParamInterface<size_t> {};
// TODO(b275651559): Re-enable test once the issue with "license remaining
// duration" is addressed.
TEST_P(WvCdmStreamingPstTest, DISABLED_UsageTest) {
TEST_P(WvCdmStreamingPstTest, UsageTest) {
Unprovision();
Provision();
@@ -1400,7 +1402,11 @@ TEST_P(WvCdmStreamingPstTest, DISABLED_UsageTest) {
if (initial_license_duration_remaining == kUnlimitedDurationValue) {
EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
} else {
} else if (license_duration_remaining != kUnlimitedDurationValue) {
// Possible that the initial license duration was limited due to
// the finit rental duration; however, if the license has a soft
// rental duration, it will be considered unlimited after playback
// has begun.
EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
expected_seconds_since_license_received, kClockTolerance)
<< "initial_license_duration_remaining = "
@@ -1427,9 +1433,7 @@ class WvCdmStreamingUsageReportTest
: public WvCdmExtendedDurationTest,
public ::testing::WithParamInterface<size_t> {};
// TODO(b275651559): Re-enable test once the issue with "license remaining
// duration" is addressed.
TEST_P(WvCdmStreamingUsageReportTest, DISABLED_UsageTest) {
TEST_P(WvCdmStreamingUsageReportTest, UsageTest) {
Unprovision();
Provision();
@@ -1488,7 +1492,11 @@ TEST_P(WvCdmStreamingUsageReportTest, DISABLED_UsageTest) {
// change over time.
if (initial_license_duration_remaining == kUnlimitedDurationValue) {
EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
} else {
} else if (license_duration_remaining != kUnlimitedDurationValue) {
// Possible that the initial license duration was limited due to
// the finit rental duration; however, if the license has a soft
// rental duration, it will be considered unlimited after playback
// has begun.
EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
expected_seconds_since_license_received, kClockTolerance)
<< "initial_license_duration_remaining = "
@@ -1660,7 +1668,11 @@ TEST_P(WvCdmOfflineUsageReportTest, UsageTest) {
if (initial_license_duration_remaining == kUnlimitedDurationValue) {
EXPECT_EQ(license_duration_remaining, kUnlimitedDurationValue);
} else {
} else if (license_duration_remaining != kUnlimitedDurationValue) {
// Possible that the initial license duration was limited due to
// the finit rental duration; however, if the license has a soft
// rental duration, it will be considered unlimited after playback
// has begun.
EXPECT_NEAR(initial_license_duration_remaining - license_duration_remaining,
expected_seconds_since_license_received, kClockTolerance)
<< "initial_license_duration_remaining = "