52bd76e0e2
[ Merge of http://go/wvgerrit/168397 ] When CdmResponseType (enum) was transformed to CdmResponseType (struct), the test printers where not updated to print the result of failed comparisons. In addition, several logs statements were updated haphazardly, leaving inconsistencies and potential compiler-specific behavior. This CL replaces CdmResponseType std::string operator with a ToString() method. This is to make it consistent with Google's C++ style guide on conversion operators vs methods. The string conversion function is now defined in wv_cdm_types.cpp instead of inline in the header file. The PrintTo function has been implemented along with the other CDM test printers in test_printers.cpp. Bug: 273989359 Test: run_x86_64_tests Test: MediaDrmParameterizedTests on redfin Test: Forrest drm_compliance Change-Id: Ibfaa17029046b75b1c8c278f7bd7e04a24379848
28 lines
1.0 KiB
C++
28 lines
1.0 KiB
C++
// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
|
|
// source code may only be used and distributed under the Widevine License
|
|
// Agreement.
|
|
// This file adds some print methods so that when unit tests fail, the
|
|
// will print the name of an enumeration instead of the numeric value.
|
|
|
|
#ifndef CDM_TEST_PRINTERS_H_
|
|
#define CDM_TEST_PRINTERS_H_
|
|
|
|
#include <iostream>
|
|
|
|
#include "OEMCryptoCENC.h"
|
|
#include "okp_info.h"
|
|
#include "wv_cdm_types.h"
|
|
|
|
namespace wvcdm {
|
|
void PrintTo(CdmResponseEnum value, ::std::ostream* os);
|
|
void PrintTo(const CdmResponseType& value, ::std::ostream* os);
|
|
void PrintTo(const enum CdmLicenseType& value, ::std::ostream* os);
|
|
void PrintTo(const enum CdmSecurityLevel& value, ::std::ostream* os);
|
|
void PrintTo(const enum CdmCertificateType& value, ::std::ostream* os);
|
|
void PrintTo(const enum OEMCryptoResult& value, ::std::ostream* os);
|
|
namespace okp {
|
|
void PrintTo(const SystemState& state, std::ostream* os);
|
|
} // namespace okp
|
|
} // namespace wvcdm
|
|
#endif // CDM_TEST_PRINTERS_H_
|