diff --git a/libwvdrmengine/cdm/core/test/test_base.cpp b/libwvdrmengine/cdm/core/test/test_base.cpp index 6ee43e6d..572cef79 100644 --- a/libwvdrmengine/cdm/core/test/test_base.cpp +++ b/libwvdrmengine/cdm/core/test/test_base.cpp @@ -268,6 +268,14 @@ void WvCdmTestBase::InstallTestRootOfTrust() { } } +WvCdmTestBase::WvCdmTestBase() + : config_(default_config_), binary_provisioning_(false) { + const ::testing::TestInfo* const test_info = + ::testing::UnitTest::GetInstance()->current_test_info(); + + LOGD("Running test %s.%s", test_info->test_case_name(), test_info->name()); +} + void WvCdmTestBase::Provision() { CdmProvisioningRequest prov_request; CdmProvisioningRequest binary_prov_request; diff --git a/libwvdrmengine/cdm/core/test/test_base.h b/libwvdrmengine/cdm/core/test/test_base.h index 162869a5..e4c75584 100644 --- a/libwvdrmengine/cdm/core/test/test_base.h +++ b/libwvdrmengine/cdm/core/test/test_base.h @@ -25,10 +25,12 @@ class WvCdmTestBase : public ::testing::Test { // Default number of provisioning try attempts. constexpr static size_t kDefaultMaxProvisioningAttempts = 10; - WvCdmTestBase() : config_(default_config_), binary_provisioning_(false) {} + WvCdmTestBase(); ~WvCdmTestBase() override {} void SetUp() override; - virtual std::string binary_key_id() const { return a2bs_hex(config_.key_id()); } + virtual std::string binary_key_id() const { + return a2bs_hex(config_.key_id()); + } // Returns true if the test program should continue, if false, the caller // should exit. This should be called by main() to allow the user to pass in @@ -77,7 +79,7 @@ class WvCdmTestBase : public ::testing::Test { bool binary_provisioning_; }; -class TestCryptoSession : public CryptoSession { +class TestCryptoSession : public CryptoSession { public: explicit TestCryptoSession(metrics::CryptoMetrics* crypto_metrics); // This intercepts nonce flood errors, which is useful for tests that request @@ -93,7 +95,7 @@ class TestCryptoSession : public CryptoSession { class TestLicenseHolder { public: // cdm_engine must exist and outlive the TestLicenseHolder. - TestLicenseHolder(CdmEngine *cdm_engine); + TestLicenseHolder(CdmEngine* cdm_engine); ~TestLicenseHolder(); // Caller must ensure device already provisioned. void OpenSession(const std::string& key_system);