Upgrade MOCK_METHOD to googletest 1.10
(This is a merge of http://go/wvgerrit/139989.) Googletest added a new, more powerful MOCK_METHOD() macro in 1.10. This patch updates all our usage of the old MOCK_METHOD family to the new macro. Full details can be found at https://github.com/google/googletest/blob/release-1.10.0/googlemock/docs/cook_book.md#creating-mock-classes but in brief, the new MOCK_METHOD() replaces the entire old MOCK_METHOD family and has the following advantages: 1) No need to count parameters or update the macro name when changing parameters. 2) No need for a different macro for const methods. 3) The ability to specify override, noexcept, and other function qualifiers. 4) The macro order is now the same as C++ method definition order: Return Type -> Name -> Arguments -> Qualifiers In addition to upgrading all our usage sites to the new macro, the addition of the override qualifier to our MOCK_METHODs helped uncover several cases where we were using MOCK_METHOD to override methods that didn't exist. This is a great example of why the override qualifier is so useful. These places have been updated, by removing the invalid and unused mock method. Bug: 207693687 Test: build_and_run_all_unit_tests Change-Id: Iaad4a22c7f72bb48b1356fe01a41eb0a2f555244
This commit is contained in:
John "Juce" Bruce
committed by
John Bruce
John Bruce
parent
e5822def1d
commit
5606e7dae3
@@ -138,146 +138,146 @@ const char kSerializedMetricsHex[] =
|
||||
|
||||
class MockCDM : public WvContentDecryptionModule {
|
||||
public:
|
||||
MOCK_METHOD5(OpenSession, CdmResponseType(const CdmKeySystem&,
|
||||
MOCK_METHOD(CdmResponseType, OpenSession, (const CdmKeySystem&,
|
||||
CdmClientPropertySet*,
|
||||
const CdmIdentifier&,
|
||||
WvCdmEventListener*,
|
||||
CdmSessionId*));
|
||||
CdmSessionId*), (override));
|
||||
|
||||
MOCK_METHOD1(CloseSession, CdmResponseType(const CdmSessionId&));
|
||||
MOCK_METHOD(CdmResponseType, CloseSession, (const CdmSessionId&), (override));
|
||||
|
||||
MOCK_METHOD9(GenerateKeyRequest,
|
||||
CdmResponseType(const CdmSessionId&, const CdmKeySetId&,
|
||||
MOCK_METHOD(CdmResponseType, GenerateKeyRequest,
|
||||
(const CdmSessionId&, const CdmKeySetId&,
|
||||
const std::string&, const CdmInitData&,
|
||||
const CdmLicenseType, CdmAppParameterMap&,
|
||||
CdmClientPropertySet*, const CdmIdentifier&,
|
||||
CdmKeyRequest*));
|
||||
CdmKeyRequest*), (override));
|
||||
|
||||
MOCK_METHOD3(AddKey, CdmResponseType(const CdmSessionId&,
|
||||
MOCK_METHOD(CdmResponseType, AddKey, (const CdmSessionId&,
|
||||
const CdmKeyResponse&,
|
||||
CdmKeySetId*));
|
||||
CdmKeySetId*), (override));
|
||||
|
||||
MOCK_METHOD1(RemoveKeys, CdmResponseType(const CdmSessionId&));
|
||||
MOCK_METHOD(CdmResponseType, RemoveKeys, (const CdmSessionId&), (override));
|
||||
|
||||
MOCK_METHOD2(RestoreKey, CdmResponseType(const CdmSessionId&,
|
||||
const CdmKeySetId&));
|
||||
MOCK_METHOD(CdmResponseType, RestoreKey, (const CdmSessionId&,
|
||||
const CdmKeySetId&), (override));
|
||||
|
||||
MOCK_METHOD3(QueryStatus, CdmResponseType(wvcdm::SecurityLevel,
|
||||
MOCK_METHOD(CdmResponseType, QueryStatus, (wvcdm::SecurityLevel,
|
||||
const std::string&,
|
||||
std::string*));
|
||||
std::string*), (override));
|
||||
|
||||
MOCK_METHOD2(QuerySessionStatus, CdmResponseType(const CdmSessionId&,
|
||||
CdmQueryMap*));
|
||||
MOCK_METHOD(CdmResponseType, QuerySessionStatus, (const CdmSessionId&,
|
||||
CdmQueryMap*), (override));
|
||||
|
||||
MOCK_METHOD2(QueryKeyStatus, CdmResponseType(const CdmSessionId&,
|
||||
CdmQueryMap*));
|
||||
MOCK_METHOD(CdmResponseType, QueryKeyStatus, (const CdmSessionId&,
|
||||
CdmQueryMap*), (override));
|
||||
|
||||
MOCK_METHOD2(QueryOemCryptoSessionId, CdmResponseType(const CdmSessionId&,
|
||||
CdmQueryMap*));
|
||||
MOCK_METHOD(CdmResponseType, QueryOemCryptoSessionId, (const CdmSessionId&,
|
||||
CdmQueryMap*), (override));
|
||||
|
||||
MOCK_METHOD7(GetProvisioningRequest, CdmResponseType(CdmCertificateType,
|
||||
MOCK_METHOD(CdmResponseType, GetProvisioningRequest, (CdmCertificateType,
|
||||
const std::string&,
|
||||
const CdmIdentifier&,
|
||||
const std::string&,
|
||||
wvcdm::SecurityLevel,
|
||||
CdmProvisioningRequest*,
|
||||
std::string*));
|
||||
std::string*), (override));
|
||||
|
||||
MOCK_METHOD5(HandleProvisioningResponse,
|
||||
CdmResponseType(const CdmIdentifier&, CdmProvisioningResponse&,
|
||||
wvcdm::SecurityLevel, std::string*, std::string*));
|
||||
MOCK_METHOD(CdmResponseType, HandleProvisioningResponse,
|
||||
(const CdmIdentifier&, CdmProvisioningResponse&,
|
||||
wvcdm::SecurityLevel, std::string*, std::string*), (override));
|
||||
|
||||
MOCK_METHOD2(Unprovision, CdmResponseType(CdmSecurityLevel,
|
||||
const CdmIdentifier&));
|
||||
MOCK_METHOD(CdmResponseType, Unprovision, (CdmSecurityLevel,
|
||||
const CdmIdentifier&), (override));
|
||||
|
||||
MOCK_METHOD4(IsProvisioned, bool(CdmSecurityLevel, const std::string&,
|
||||
const std::string&, bool));
|
||||
MOCK_METHOD(bool, IsProvisioned, (CdmSecurityLevel, const std::string&,
|
||||
const std::string&, bool), (override));
|
||||
|
||||
MOCK_METHOD3(GetUsageInfo, CdmResponseType(const std::string&,
|
||||
MOCK_METHOD(CdmResponseType, GetUsageInfo, (const std::string&,
|
||||
const CdmIdentifier&,
|
||||
CdmUsageInfo*));
|
||||
CdmUsageInfo*), (override));
|
||||
|
||||
MOCK_METHOD4(GetUsageInfo, CdmResponseType(const std::string&,
|
||||
MOCK_METHOD(CdmResponseType, GetUsageInfo, (const std::string&,
|
||||
const CdmSecureStopId&,
|
||||
const CdmIdentifier&,
|
||||
CdmUsageInfo*));
|
||||
CdmUsageInfo*), (override));
|
||||
|
||||
MOCK_METHOD2(RemoveAllUsageInfo, CdmResponseType(const std::string&,
|
||||
const CdmIdentifier&));
|
||||
MOCK_METHOD(CdmResponseType, RemoveAllUsageInfo, (const std::string&,
|
||||
const CdmIdentifier&), (override));
|
||||
|
||||
MOCK_METHOD2(ReleaseUsageInfo,
|
||||
CdmResponseType(const CdmUsageInfoReleaseMessage&, const CdmIdentifier&));
|
||||
MOCK_METHOD(CdmResponseType, ReleaseUsageInfo,
|
||||
(const CdmUsageInfoReleaseMessage&, const CdmIdentifier&), (override));
|
||||
|
||||
MOCK_METHOD1(IsValidServiceCertificate, bool(const std::string&));
|
||||
MOCK_METHOD(bool, IsValidServiceCertificate, (const std::string&), (override));
|
||||
|
||||
MOCK_METHOD2(GetMetrics, CdmResponseType(const CdmIdentifier&,
|
||||
drm_metrics::WvCdmMetrics*));
|
||||
MOCK_METHOD(CdmResponseType, GetMetrics, (const CdmIdentifier&,
|
||||
drm_metrics::WvCdmMetrics*), (override));
|
||||
|
||||
MOCK_METHOD2(GetDecryptHashError,
|
||||
CdmResponseType(const CdmSessionId&, std::string*));
|
||||
MOCK_METHOD(CdmResponseType, GetDecryptHashError,
|
||||
(const CdmSessionId&, std::string*), (override));
|
||||
|
||||
MOCK_METHOD3(ListStoredLicenses,
|
||||
CdmResponseType(CdmSecurityLevel,
|
||||
MOCK_METHOD(CdmResponseType, ListStoredLicenses,
|
||||
(CdmSecurityLevel,
|
||||
const CdmIdentifier&,
|
||||
std::vector<std::string>*));
|
||||
std::vector<std::string>*), (override));
|
||||
|
||||
MOCK_METHOD4(GetOfflineLicenseState,
|
||||
CdmResponseType(const std::string&,
|
||||
MOCK_METHOD(CdmResponseType, GetOfflineLicenseState,
|
||||
(const std::string&,
|
||||
CdmSecurityLevel,
|
||||
const CdmIdentifier&,
|
||||
CdmOfflineLicenseState*));
|
||||
CdmOfflineLicenseState*), (override));
|
||||
|
||||
MOCK_METHOD3(RemoveOfflineLicense,
|
||||
CdmResponseType(const std::string&,
|
||||
MOCK_METHOD(CdmResponseType, RemoveOfflineLicense,
|
||||
(const std::string&,
|
||||
CdmSecurityLevel,
|
||||
const CdmIdentifier&));
|
||||
const CdmIdentifier&), (override));
|
||||
};
|
||||
|
||||
class MockCrypto : public WVGenericCryptoInterface {
|
||||
public:
|
||||
MOCK_METHOD3(selectKey, OEMCryptoResult(const OEMCrypto_SESSION,
|
||||
const uint8_t*, size_t));
|
||||
MOCK_METHOD(OEMCryptoResult, selectKey, (const OEMCrypto_SESSION,
|
||||
const uint8_t*, size_t), (override));
|
||||
|
||||
MOCK_METHOD6(encrypt, OEMCryptoResult(OEMCrypto_SESSION, const uint8_t*,
|
||||
MOCK_METHOD(OEMCryptoResult, encrypt, (OEMCrypto_SESSION, const uint8_t*,
|
||||
size_t, const uint8_t*,
|
||||
OEMCrypto_Algorithm, uint8_t*));
|
||||
OEMCrypto_Algorithm, uint8_t*), (override));
|
||||
|
||||
MOCK_METHOD6(decrypt, OEMCryptoResult(OEMCrypto_SESSION, const uint8_t*,
|
||||
MOCK_METHOD(OEMCryptoResult, decrypt, (OEMCrypto_SESSION, const uint8_t*,
|
||||
size_t, const uint8_t*,
|
||||
OEMCrypto_Algorithm, uint8_t*));
|
||||
OEMCrypto_Algorithm, uint8_t*), (override));
|
||||
|
||||
MOCK_METHOD6(sign, OEMCryptoResult(OEMCrypto_SESSION, const uint8_t*, size_t,
|
||||
OEMCrypto_Algorithm, uint8_t*, size_t*));
|
||||
MOCK_METHOD(OEMCryptoResult, sign, (OEMCrypto_SESSION, const uint8_t*, size_t,
|
||||
OEMCrypto_Algorithm, uint8_t*, size_t*), (override));
|
||||
|
||||
MOCK_METHOD6(verify, OEMCryptoResult(OEMCrypto_SESSION, const uint8_t*,
|
||||
MOCK_METHOD(OEMCryptoResult, verify, (OEMCrypto_SESSION, const uint8_t*,
|
||||
size_t, OEMCrypto_Algorithm,
|
||||
const uint8_t*, size_t));
|
||||
const uint8_t*, size_t), (override));
|
||||
|
||||
MOCK_METHOD3(loadDeviceRSAKey, OEMCryptoResult(OEMCrypto_SESSION,
|
||||
const uint8_t*, size_t));
|
||||
MOCK_METHOD(OEMCryptoResult, loadDeviceRSAKey, (OEMCrypto_SESSION,
|
||||
const uint8_t*, size_t), (override));
|
||||
|
||||
MOCK_METHOD6(generateRSASignature, OEMCryptoResult(OEMCrypto_SESSION,
|
||||
MOCK_METHOD(OEMCryptoResult, generateRSASignature, (OEMCrypto_SESSION,
|
||||
const uint8_t*, size_t,
|
||||
uint8_t*, size_t*,
|
||||
RSA_Padding_Scheme));
|
||||
RSA_Padding_Scheme), (override));
|
||||
};
|
||||
|
||||
class MockDrmPluginListener : public IDrmPluginListener_V1_2 {
|
||||
public:
|
||||
MOCK_METHOD3(sendEvent, Return<void>(EventType, const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<uint8_t>&));
|
||||
MOCK_METHOD(Return<void>, sendEvent, (EventType, const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<uint8_t>&), (override));
|
||||
|
||||
MOCK_METHOD2(sendExpirationUpdate,
|
||||
Return<void>(const hidl_vec<uint8_t>&, int64_t));
|
||||
MOCK_METHOD(Return<void>, sendExpirationUpdate,
|
||||
(const hidl_vec<uint8_t>&, int64_t), (override));
|
||||
|
||||
MOCK_METHOD3(sendKeysChange, Return<void>(const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<KeyStatus>&, bool));
|
||||
MOCK_METHOD(Return<void>, sendKeysChange, (const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<KeyStatus>&, bool), (override));
|
||||
|
||||
MOCK_METHOD1(sendSessionLostState,
|
||||
Return<void>(const hidl_vec<uint8_t>&));
|
||||
MOCK_METHOD(Return<void>, sendSessionLostState,
|
||||
(const hidl_vec<uint8_t>&), (override));
|
||||
|
||||
MOCK_METHOD3(sendKeysChange_1_2, Return<void>(const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<KeyStatus_V1_2>&, bool));
|
||||
MOCK_METHOD(Return<void>, sendKeysChange_1_2, (const hidl_vec<uint8_t>&,
|
||||
const hidl_vec<KeyStatus_V1_2>&, bool), (override));
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user