From 895d391121750fc1eda3db913cca45503ced9bfd Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Mon, 11 Oct 2021 17:05:48 -0700 Subject: [PATCH] Migrate tests to googletest 1.10+ API (This is a cherry-pick of http://go/wvgerrit/135227 and http://go/wvgerrit/135246 from the Widevine repo.) Googletest has deprecated the TEST_CASE nomenclature in favor of the International Software Testing Qualifications Board-compliant term TEST_SUITE. See https://google.github.io/googletest/primer.html#beware-of-the-nomenclature for more info. Bug: 156766290 Test: build_and_run_all_unit_tests.sh Change-Id: Ib94d534d17677601c4c160eb6b8d4e4e07df85c9 --- .../cdm/core/test/device_files_unittest.cpp | 39 +++++++------- .../cdm/core/test/duration_use_case_test.cpp | 52 +++++++++---------- .../test/initialization_data_unittest.cpp | 14 ++--- .../cdm/core/test/license_keys_unittest.cpp | 8 +-- .../cdm/core/test/license_unittest.cpp | 2 +- .../cdm/core/test/policy_engine_unittest.cpp | 6 +-- .../core/test/usage_table_header_unittest.cpp | 4 +- libwvdrmengine/cdm/util/test/base64_test.cpp | 8 +-- .../cdm/util/test/cdm_random_unittest.cpp | 4 +- .../oemcrypto/odk/test/odk_timer_test.cpp | 4 +- .../oemcrypto/test/oemcrypto_test.cpp | 44 ++++++++-------- 11 files changed, 93 insertions(+), 92 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp index 2f735aa7..0eba423b 100644 --- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp @@ -3944,8 +3944,8 @@ TEST_P(StoreCertificateTest, DefaultAndLegacy) { EXPECT_TRUE(device_files.StoreCertificate(certificate, private_key)); } -INSTANTIATE_TEST_CASE_P(CertificateTest, StoreCertificateTest, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(CertificateTest, StoreCertificateTest, + ::testing::Values(false, true)); TEST_F(DeviceFilesTest, RetrieveCertificateInvalidParams) { std::string certificate, serial_number; @@ -4184,8 +4184,8 @@ TEST_P(RetrieveLegacyCertificateTest, ErrorScenarios) { } } -INSTANTIATE_TEST_CASE_P(CertificateTest, RetrieveLegacyCertificateTest, - ::testing::Range(kZero, kNumberOfLegacyCertificates)); +INSTANTIATE_TEST_SUITE_P(CertificateTest, RetrieveLegacyCertificateTest, + ::testing::Range(kZero, kNumberOfLegacyCertificates)); TEST_F(DeviceFilesTest, RetrieveDefaultCertificate) { MockFileSystem file_system; @@ -4317,8 +4317,8 @@ TEST_P(RetrieveDefaultCertificateTest, ErrorScenarios) { } } -INSTANTIATE_TEST_CASE_P(CertificateTest, RetrieveDefaultCertificateTest, - ::testing::Range(kZero, kNumberOfDefaultCertificates)); +INSTANTIATE_TEST_SUITE_P(CertificateTest, RetrieveDefaultCertificateTest, + ::testing::Range(kZero, kNumberOfDefaultCertificates)); TEST_F(DeviceFilesTest, RetrieveCertificateWithoutKeyType) { // Stored files without an explicit key type should default to RSA. @@ -4500,8 +4500,8 @@ TEST_P(DeviceFilesSecurityLevelTest, SecurityLevel) { EXPECT_TRUE(device_files.StoreCertificate(certificate, private_key)); } -INSTANTIATE_TEST_CASE_P(SecurityLevel, DeviceFilesSecurityLevelTest, - ::testing::Values(kSecurityLevelL1, kSecurityLevelL3)); +INSTANTIATE_TEST_SUITE_P(SecurityLevel, DeviceFilesSecurityLevelTest, + ::testing::Values(kSecurityLevelL1, kSecurityLevelL3)); TEST_P(DeviceFilesStoreTest, StoreLicense) { MockFileSystem file_system; @@ -4562,7 +4562,7 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) { EXPECT_EQ(DeviceFiles::kNoError, sub_error_code); } -INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(StoreLicense, DeviceFilesStoreTest, ::testing::Bool()); TEST_F(DeviceFilesTest, StoreLicenses) { MockFileSystem file_system; @@ -5044,8 +5044,9 @@ TEST_P(DeviceFilesDeleteMultipleUsageInfoTest, DeleteAllButOne) { kUsageInfoFileName, to_remove)); } -INSTANTIATE_TEST_CASE_P(DeviceFilesTest, DeviceFilesDeleteMultipleUsageInfoTest, - ::testing::Range(0, 3)); +INSTANTIATE_TEST_SUITE_P(DeviceFilesTest, + DeviceFilesDeleteMultipleUsageInfoTest, + ::testing::Range(0, 3)); // Delete all provider sessions from a usage info file. It is expected // that the usage info file will be deleted (not written back to with @@ -5299,8 +5300,8 @@ TEST_P(DeviceFilesUsageInfoListTest, UsageInfoList) { ::testing::UnorderedElementsAreArray(expected_usage_file_list)); } -INSTANTIATE_TEST_CASE_P(UsageInfo, DeviceFilesUsageInfoListTest, - ::testing::Range(0, 7)); +INSTANTIATE_TEST_SUITE_P(UsageInfo, DeviceFilesUsageInfoListTest, + ::testing::Range(0, 7)); TEST_P(DeviceFilesUsageInfoTest, Store) { MockFileSystem file_system; @@ -5662,8 +5663,8 @@ TEST_P(DeviceFilesUsageInfoTest, UpdateUsageInfo) { if (index >= 0) EXPECT_TRUE(write_called); } -INSTANTIATE_TEST_CASE_P(UsageInfo, DeviceFilesUsageInfoTest, - ::testing::Range(-1, 9)); +INSTANTIATE_TEST_SUITE_P(UsageInfo, DeviceFilesUsageInfoTest, + ::testing::Range(-1, 9)); TEST_P(DeviceFilesHlsAttributesTest, Read) { MockFileSystem file_system; @@ -5735,8 +5736,8 @@ TEST_P(DeviceFilesHlsAttributesTest, Delete) { ASSERT_TRUE(device_files.DeleteHlsAttributes(param->key_set_id)); } -INSTANTIATE_TEST_CASE_P(HlsAttributes, DeviceFilesHlsAttributesTest, - ::testing::Range(0, kNumberOfHlsAttributes)); +INSTANTIATE_TEST_SUITE_P(HlsAttributes, DeviceFilesHlsAttributesTest, + ::testing::Range(0, kNumberOfHlsAttributes)); TEST_P(DeviceFilesUsageTableTest, Store) { MockFileSystem file_system; @@ -5816,8 +5817,8 @@ TEST_P(DeviceFilesUsageTableTest, Read) { EXPECT_FALSE(lru_upgrade); } -INSTANTIATE_TEST_CASE_P(UsageInfo, DeviceFilesUsageTableTest, - ::testing::Range(0, 6)); +INSTANTIATE_TEST_SUITE_P(UsageInfo, DeviceFilesUsageTableTest, + ::testing::Range(0, 6)); TEST_F(DeviceFilesUsageTableTest, ReadWithoutLruData) { // Setup file. diff --git a/libwvdrmengine/cdm/core/test/duration_use_case_test.cpp b/libwvdrmengine/cdm/core/test/duration_use_case_test.cpp index 68d87241..4c991ee1 100644 --- a/libwvdrmengine/cdm/core/test/duration_use_case_test.cpp +++ b/libwvdrmengine/cdm/core/test/duration_use_case_test.cpp @@ -1004,18 +1004,18 @@ TEST_P(CdmUseCase_SevenSoftTwoSoft, Case9) { ForbidPlayback(EndOfRentalWindow() + kFudge); } -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_Streaming, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_StreamingQuickStart, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_SevenHardTwoHard, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_SevenHardTwoSoft, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_SevenSoftTwoHard, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_SevenSoftTwoSoft, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_Streaming, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_StreamingQuickStart, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_SevenHardTwoHard, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_SevenHardTwoSoft, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_SevenSoftTwoHard, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_SevenSoftTwoSoft, + ::testing::Values(false, true)); class RenewalTest : public CdmDurationTest { protected: @@ -1673,8 +1673,8 @@ TEST_P(CdmUseCase_UnlimitedStreaming, Case3) { start_of_playback_ + 3 * kPlayDuration); } -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_UnlimitedStreaming, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_UnlimitedStreaming, + ::testing::Values(false, true)); /*****************************************************************************/ // Some content providers set the license duration instead of the rental @@ -1812,17 +1812,17 @@ TEST_P(CdmUseCase_LicenseDurationWithRenewal, WithRenewal) { /***********************************************************************/ // All duration tests are parameterized by can_persist = true or false. -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_LicenseWithRenewal, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_LicenseWithRenewalPlayback, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_LimitedDurationLicense, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_InfiniteRenewal, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_LicenseDuration, - ::testing::Values(false, true)); -INSTANTIATE_TEST_CASE_P(Both, CdmUseCase_LicenseDurationWithRenewal, - ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_LicenseWithRenewal, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_LicenseWithRenewalPlayback, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_LimitedDurationLicense, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_InfiniteRenewal, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_LicenseDuration, + ::testing::Values(false, true)); +INSTANTIATE_TEST_SUITE_P(Both, CdmUseCase_LicenseDurationWithRenewal, + ::testing::Values(false, true)); } // namespace wvcdm diff --git a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp index 692de725..508787fb 100644 --- a/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp @@ -508,7 +508,7 @@ TEST_P(InitializationDataTest, Parse) { EXPECT_FALSE(init_data.IsEmpty()); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ParsePssh, InitializationDataTest, ::testing::Values(kWidevinePssh, kWidevinePsshFirst, kWidevinePsshAfterV0Pssh, kWidevinePsshAfterNonZeroFlags, @@ -554,7 +554,7 @@ TEST_P(HlsKeyFormatVersionsExtractionTest, ExtractKeyFormatVersions) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsKeyFormatVersionsExtractionTest, ::testing::Values(VectorOfStrings(kHlsTestKeyFormatVersion1).Generate(), VectorOfStrings(kHlsTestKeyFormatVersion21).Generate(), @@ -584,7 +584,7 @@ TEST_P(HlsAttributeExtractionTest, ExtractAttribute) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsAttributeExtractionTest, ::testing::Values( HlsAttributeVariant(kHlsAttributeList, HLS_METHOD_ATTRIBUTE, @@ -651,7 +651,7 @@ TEST_P(HlsHexAttributeExtractionTest, ExtractHexAttribute) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsHexAttributeExtractionTest, ::testing::Values( HlsAttributeVariant(kHlsAttributeList, HLS_IV_ATTRIBUTE, kHlsIvHexValue, @@ -682,7 +682,7 @@ TEST_P(HlsQuotedAttributeExtractionTest, ExtractQuotedAttribute) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsQuotedAttributeExtractionTest, ::testing::Values( HlsAttributeVariant( @@ -750,7 +750,7 @@ TEST_P(HlsConstructionTest, InitData) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsConstructionTest, ::testing::Values( HlsInitDataVariant(kHlsMethodAes128, "", kHlsTestContentId, @@ -840,7 +840,7 @@ TEST_P(HlsParseTest, Parse) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( HlsTest, HlsParseTest, ::testing::Values( HlsAttributeVariant(kHlsAttributeList, "", "", true), diff --git a/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp b/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp index 486e2f7b..3d339fa1 100644 --- a/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/license_keys_unittest.cpp @@ -1440,9 +1440,9 @@ TEST_P(LicenseKeysSecurityLevelConstraintsTest, KeyStatusChange) { ExpectKeyStatusesEqual(key_status_map, kKeyStatusExpired); } -INSTANTIATE_TEST_CASE_P(KeyStatusChange, - LicenseKeysSecurityLevelConstraintsTest, - ::testing::Range(&key_security_level_test_vectors[0], - &key_security_level_test_vectors[5])); +INSTANTIATE_TEST_SUITE_P(KeyStatusChange, + LicenseKeysSecurityLevelConstraintsTest, + ::testing::Range(&key_security_level_test_vectors[0], + &key_security_level_test_vectors[5])); } // namespace wvcdm diff --git a/libwvdrmengine/cdm/core/test/license_unittest.cpp b/libwvdrmengine/cdm/core/test/license_unittest.cpp index 199feba6..9c78fb54 100644 --- a/libwvdrmengine/cdm/core/test/license_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/license_unittest.cpp @@ -603,7 +603,7 @@ TEST_P(CdmLicenseEntitledKeyTest, LoadsEntitledKeys) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( EntitledKeyTests, CdmLicenseEntitledKeyTest, Values(EntitledKeyVariant("UnpaddedKey", kFakeUnpaddedKey, true), EntitledKeyVariant("PaddedKey", kFakePaddedKey, true), diff --git a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp index 58599ce9..08276b5a 100644 --- a/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp @@ -1725,9 +1725,9 @@ TEST_P(PolicyEngineKeySecurityLevelTest, CanUseKeyForSecurityLevel) { policy_engine_->CanUseKeyForSecurityLevel(kKeyId)); } -INSTANTIATE_TEST_CASE_P(PolicyEngine, PolicyEngineKeySecurityLevelTest, - ::testing::Range(&key_security_test_vectors[0], - &key_security_test_vectors[5])); +INSTANTIATE_TEST_SUITE_P(PolicyEngine, PolicyEngineKeySecurityLevelTest, + ::testing::Range(&key_security_test_vectors[0], + &key_security_test_vectors[5])); class PolicyEngineKeyAllowedUsageTest : public PolicyEngineTest { protected: diff --git a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp index 36fd2ea9..aef278fd 100644 --- a/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp @@ -996,8 +996,8 @@ TEST_P(UsageTableHeaderInitializationTest, EXPECT_TRUE(usage_table_header_->Init(GetParam(), crypto_session_)); } -INSTANTIATE_TEST_CASE_P(Cdm, UsageTableHeaderInitializationTest, - ::testing::Values(kSecurityLevelL1, kSecurityLevelL3)); +INSTANTIATE_TEST_SUITE_P(Cdm, UsageTableHeaderInitializationTest, + ::testing::Values(kSecurityLevelL1, kSecurityLevelL3)); TEST_F(UsageTableHeaderTest, AddEntry_CreateUsageEntryFailed_UnknownError) { Init(kSecurityLevelL1, kUsageTableHeader, kUsageEntryInfoVector); diff --git a/libwvdrmengine/cdm/util/test/base64_test.cpp b/libwvdrmengine/cdm/util/test/base64_test.cpp index 684fa447..647afbe8 100644 --- a/libwvdrmengine/cdm/util/test/base64_test.cpp +++ b/libwvdrmengine/cdm/util/test/base64_test.cpp @@ -169,11 +169,11 @@ TEST_P(Base64ErrorDecodeTest, EncoderErrors) { EXPECT_TRUE(safe_result.empty()); } -INSTANTIATE_TEST_CASE_P(ExecutesBase64Test, Base64EncodeDecodeTest, - ::testing::ValuesIn(kBase64TestVectors)); +INSTANTIATE_TEST_SUITE_P(ExecutesBase64Test, Base64EncodeDecodeTest, + ::testing::ValuesIn(kBase64TestVectors)); -INSTANTIATE_TEST_CASE_P(ExecutesBase64Test, Base64ErrorDecodeTest, - ::testing::ValuesIn(kBase64ErrorVectors)); +INSTANTIATE_TEST_SUITE_P(ExecutesBase64Test, Base64ErrorDecodeTest, + ::testing::ValuesIn(kBase64ErrorVectors)); class HtoNLL64Test : public ::testing::Test {}; diff --git a/libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp b/libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp index 097a6984..54c6e2a6 100644 --- a/libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp +++ b/libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp @@ -173,8 +173,8 @@ TEST_P(CdmRandomGeneratorTest, ThreadSafety) { } } -INSTANTIATE_TEST_CASE_P(VariousSeeds, CdmRandomGeneratorTest, - testing::ValuesIn(kSeeds)); +INSTANTIATE_TEST_SUITE_P(VariousSeeds, CdmRandomGeneratorTest, + testing::ValuesIn(kSeeds)); TEST(CdmRandomTest, AllMethods) { CdmRandom::Rand(); diff --git a/libwvdrmengine/oemcrypto/odk/test/odk_timer_test.cpp b/libwvdrmengine/oemcrypto/odk/test/odk_timer_test.cpp index 9bb0b547..8fdaa440 100644 --- a/libwvdrmengine/oemcrypto/odk/test/odk_timer_test.cpp +++ b/libwvdrmengine/oemcrypto/odk/test/odk_timer_test.cpp @@ -1133,8 +1133,8 @@ TEST_P(ODKUseCase_LicenseWithRenewal, NullPointerTest) { timer_value_pointer); } -INSTANTIATE_TEST_CASE_P(RestrictRenewal, ODKUseCase_LicenseWithRenewal, - ::testing::Values(0, 1)); +INSTANTIATE_TEST_SUITE_P(RestrictRenewal, ODKUseCase_LicenseWithRenewal, + ::testing::Values(0, 1)); // Limited Duration License. (See above for notes on Use Case tests). The user // has 15 minutes to begin watching the movie. If a renewal is not received, diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp index d9f5a4f4..ccadeb52 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp @@ -2331,8 +2331,8 @@ TEST_P(OEMCryptoLicenseTestRangeAPI, LoadKeys) { // Range of API versions to test. This should start several versions old, and // go to the current API + 2. We use +2 because we want to test at least 1 // future API, and the ::testing::Range is not inclusive. -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoLicenseTestRangeAPI, - Range(10, kCurrentAPI + 2)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoLicenseTestRangeAPI, + Range(10, kCurrentAPI + 2)); TEST_P(OEMCryptoLicenseTest, LoadKeysBadSignatureAPI16) { ASSERT_NO_FATAL_FAILURE(session_.GenerateNonce()); @@ -3407,8 +3407,8 @@ TEST_P(OEMCryptoSessionTestDecryptWithHDCP, DecryptAPI09) { // Test parameterized by HDCP version. DecryptWithHDCP(static_cast(GetParam())); } -INSTANTIATE_TEST_CASE_P(TestHDCP, OEMCryptoSessionTestDecryptWithHDCP, - Range(1, 6)); +INSTANTIATE_TEST_SUITE_P(TestHDCP, OEMCryptoSessionTestDecryptWithHDCP, + Range(1, 6)); /// @} @@ -3567,12 +3567,12 @@ TEST_P(OEMCryptoRefreshTest, RefreshWithNoSelectKey) { ASSERT_NO_FATAL_FAILURE(session_.TestDecryptCTR(false)); } -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoRefreshTest, - Range(kCurrentAPI - 1, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoRefreshTest, + Range(kCurrentAPI - 1, kCurrentAPI + 1)); // These tests only work when the license has a core message. -INSTANTIATE_TEST_CASE_P(TestAPI16, OEMCryptoRefreshTestAPI16, - Range(kCoreMessagesAPI, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAPI16, OEMCryptoRefreshTestAPI16, + Range(kCoreMessagesAPI, kCurrentAPI + 1)); // If the license does not allow a hash, then we should not compute one. TEST_P(OEMCryptoLicenseTest, HashForbiddenAPI15) { @@ -4369,13 +4369,13 @@ constexpr OEMCrypto_CENCEncryptPatternDesc MakePattern(size_t encrypt, return {encrypt, skip}; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CTRTests, OEMCryptoSessionTestsDecryptTests, Combine(Values(MakePattern(0, 0)), Values(OEMCrypto_CipherMode_CTR), ::testing::ValuesIn(global_features.GetOutputTypes()))); // Decrypt in place for CBC tests was only required in v13. -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( CBCTestsAPI14, OEMCryptoSessionTestsDecryptTests, Combine( Values(MakePattern(3, 7), MakePattern(9, 1), @@ -4419,8 +4419,8 @@ TEST_P(OEMCryptoLicenseTest, KeyDuration) { ASSERT_NO_FATAL_FAILURE(session_.TestSelectExpired(0)); } -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoLicenseTest, - Range(kCurrentAPI - 1, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoLicenseTest, + Range(kCurrentAPI - 1, kCurrentAPI + 1)); // // Certificate Root of Trust Tests @@ -7325,11 +7325,11 @@ TEST_P(OEMCryptoGenericCryptoKeyIdLengthTest, UniformLongKeyId) { TestWithKey(2); } -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoGenericCryptoTest, - Range(kCurrentAPI - 1, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoGenericCryptoTest, + Range(kCurrentAPI - 1, kCurrentAPI + 1)); -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoGenericCryptoKeyIdLengthTest, - Range(kCurrentAPI - 1, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoGenericCryptoKeyIdLengthTest, + Range(kCurrentAPI - 1, kCurrentAPI + 1)); /// @} @@ -9075,16 +9075,16 @@ TEST_P(OEMCryptoUsageTableTest, PSTLargeBuffer) { ASSERT_NO_FATAL_FAILURE(s.close()); } -INSTANTIATE_TEST_CASE_P(TestAll, OEMCryptoUsageTableTest, - Range(kCurrentAPI - 1, kCurrentAPI + 1)); +INSTANTIATE_TEST_SUITE_P(TestAll, OEMCryptoUsageTableTest, + Range(kCurrentAPI - 1, kCurrentAPI + 1)); // These tests only work when the license has a core message. -INSTANTIATE_TEST_CASE_P(TestAPI16, OEMCryptoUsageTableDefragTest, - Values(kCurrentAPI)); +INSTANTIATE_TEST_SUITE_P(TestAPI16, OEMCryptoUsageTableDefragTest, + Values(kCurrentAPI)); // These tests only work when the license has a core message. -INSTANTIATE_TEST_CASE_P(TestAPI16, OEMCryptoUsageTableTestWallClock, - Values(kCurrentAPI)); +INSTANTIATE_TEST_SUITE_P(TestAPI16, OEMCryptoUsageTableTestWallClock, + Values(kCurrentAPI)); /// @} } // namespace wvoec