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

Use GTEST_SKIP for session tests

Browse Source 
Bug: 251240681
Merged from https://widevine-internal-review.googlesource.com/180010

Change-Id: I39e5c0365a5e0c2ddf62e6f68426f6baa3ddd1a1
This commit is contained in:
Vicky Min
2023-07-27 18:38:18 +00:00
committed by Robert Shih
parent 678b3332db
commit afbbad9aa5
4 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp
View File

@@ -12,6 +12,7 @@
#include "cdm_usage_table.h" #include "cdm_usage_table.h"
#include "crypto_key.h" #include "crypto_key.h"
#include "crypto_wrapped_key.h" #include "crypto_wrapped_key.h"
#include "oec_device_features.h"
#include "properties.h" #include "properties.h"
#include "service_certificate.h" #include "service_certificate.h"
#include "string_conversions.h" #include "string_conversions.h"
@@ -215,6 +216,10 @@ class CdmSessionTest : public WvCdmTestBase {
protected: protected:
void SetUp() override { void SetUp() override {
WvCdmTestBase::SetUp(); WvCdmTestBase::SetUp();
if (wvoec::global_features.derive_key_method ==
wvoec::DeviceFeatures::NO_METHOD) {
GTEST_SKIP() << "Test for devices that can derive session keys only.";
}
metrics_ = std::make_shared<metrics::SessionMetrics>(); metrics_ = std::make_shared<metrics::SessionMetrics>();
cdm_session_.reset(new CdmSession(nullptr, metrics_)); cdm_session_.reset(new CdmSession(nullptr, metrics_));
// Inject testing mocks. // Inject testing mocks.

1
libwvdrmengine/oemcrypto/test/oec_device_features.cpp
View File

@@ -149,7 +149,6 @@ std::string DeviceFeatures::RestrictFilter(const std::string& initial_filter) {
std::string filter = initial_filter; std::string filter = initial_filter;
// clang-format off // clang-format off
if (!generic_crypto) FilterOut(&filter, "*GenericCrypto*"); if (!generic_crypto) FilterOut(&filter, "*GenericCrypto*");
if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*");
if (!supports_rsa_3072) FilterOut(&filter, "*RSAKey3072*"); if (!supports_rsa_3072) FilterOut(&filter, "*RSAKey3072*");
if (api_version < 17) FilterOut(&filter, "*API17*"); if (api_version < 17) FilterOut(&filter, "*API17*");
if (api_version < 18) FilterOut(&filter, "*API18*"); if (api_version < 18) FilterOut(&filter, "*API18*");

4
libwvdrmengine/oemcrypto/test/oemcrypto_decrypt_test.h
View File

@@ -98,6 +98,10 @@ class OEMCryptoSessionTestsDecryptTests
protected: protected:
void SetUp() override { void SetUp() override {
OEMCryptoLicenseTestAPI16::SetUp(); OEMCryptoLicenseTestAPI16::SetUp();
if (wvoec::global_features.derive_key_method ==
wvoec::DeviceFeatures::NO_METHOD) {
GTEST_SKIP() << "Test for devices that can derive session keys only.";
}
pattern_ = ::testing::get<0>(GetParam()); pattern_ = ::testing::get<0>(GetParam());
cipher_mode_ = ::testing::get<1>(GetParam()); cipher_mode_ = ::testing::get<1>(GetParam());
decrypt_inplace_ = ::testing::get<2>(GetParam()).decrypt_inplace; decrypt_inplace_ = ::testing::get<2>(GetParam()).decrypt_inplace;

4
libwvdrmengine/oemcrypto/test/oemcrypto_license_test.h
View File

@@ -39,6 +39,10 @@ class OEMCryptoSessionTests : public OEMCryptoClientTest {
void SetUp() override { void SetUp() override {
OEMCryptoClientTest::SetUp(); OEMCryptoClientTest::SetUp();
if (wvoec::global_features.derive_key_method ==
wvoec::DeviceFeatures::NO_METHOD) {
GTEST_SKIP() << "Test for devices that can derive session keys only.";
}
EnsureTestROT(); EnsureTestROT();
if (global_features.usage_table) { if (global_features.usage_table) {
CreateUsageTableHeader(); CreateUsageTableHeader();