OEMCrypto v14 Unit tests and reference code
Merge from Widevine repo of http://go/wvgerrit/41661 bug: 64001862 OEMCrypto V14 for Android P test: Unit tests pass Change-Id: I3314a881357c12ef63d7b257d83f6f0d07e4725a
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
#include "log.h"
|
||||
#include "oec_session_util.h"
|
||||
#include "../../oemcrypto/mock/src/oemcrypto_key_mock.h"
|
||||
#include "oemcrypto_session_tests_helper.h"
|
||||
#include "properties.h"
|
||||
#include "string_conversions.h"
|
||||
#include "url_request.h"
|
||||
@@ -34,7 +35,8 @@ std::string g_provisioning_service_certificate;
|
||||
|
||||
namespace wvcdm {
|
||||
|
||||
class WvGenericOperationsTest : public testing::Test {
|
||||
class WvGenericOperationsTest : public testing::Test,
|
||||
public wvoec::SessionUtil {
|
||||
public:
|
||||
WvGenericOperationsTest() : crypto_session_(NULL) {}
|
||||
|
||||
@@ -49,10 +51,8 @@ class WvGenericOperationsTest : public testing::Test {
|
||||
g_license_service_certificate.assign(config.license_service_certificate());
|
||||
g_provisioning_server.assign(config.provisioning_server());
|
||||
|
||||
// TODO(fredgc or gmorgan): This should be updated for provisioning 3.0
|
||||
// Load test keybox. This keybox will be used by any CryptoSession
|
||||
// created by the CDM under test.
|
||||
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_LoadTestKeybox());
|
||||
// Ensure that OEMCrypto has a test keybox if needed.
|
||||
EnsureTestKeys();
|
||||
|
||||
// Perform CdmEngine setup
|
||||
cdm_engine_.reset(new CdmEngine(&file_system_));
|
||||
|
||||
Reference in New Issue
Block a user