widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Migrate tests to googletest 1.10+ API"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-16 00:20:40 +00:00
committed by Android (Google) Code Review
parent 6f6ce6a04b 895d391121
commit 9d84d5deba
11 changed files with 93 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
libwvdrmengine/cdm/core/test/device_files_unittest.cpp
View File

@@ -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<size_t>(0, kNumberOfHlsAttributes));
INSTANTIATE_TEST_SUITE_P(HlsAttributes, DeviceFilesHlsAttributesTest,
::testing::Range<size_t>(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.

52
libwvdrmengine/cdm/core/test/duration_use_case_test.cpp
View File

@@ -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

14
libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp
View File

@@ -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),

8
libwvdrmengine/cdm/core/test/license_keys_unittest.cpp
View File

@@ -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

2
libwvdrmengine/cdm/core/test/license_unittest.cpp
View File

@@ -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),

6
libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp
View File

@@ -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:

4
libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp
View File

@@ -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);

8
libwvdrmengine/cdm/util/test/base64_test.cpp
View File

@@ -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 {};

4
libwvdrmengine/cdm/util/test/cdm_random_unittest.cpp
View File

@@ -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();