From e0727b8af6a76fb939dbb386a2c22a01ef44a12e Mon Sep 17 00:00:00 2001 From: "John \"Juce\" Bruce" Date: Tue, 7 Apr 2015 16:33:27 -0700 Subject: [PATCH] Use Idiomatic Generators for DeviceFiles Unit Tests (This is a merge of http://go/wvgerrit/13971) gTest provides generators for ranges of numbers and booleans so that we don't have to roll our own. Change-Id: Id7d9310c5d5c1314f680200da4457c0e529ac107 --- libwvdrmengine/cdm/core/test/device_files_unittest.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp index c8ea7f9b..60e5bb42 100644 --- a/libwvdrmengine/cdm/core/test/device_files_unittest.cpp +++ b/libwvdrmengine/cdm/core/test/device_files_unittest.cpp @@ -1356,7 +1356,7 @@ TEST_P(DeviceFilesStoreTest, StoreCertificate) { } INSTANTIATE_TEST_CASE_P(StoreCertificate, DeviceFilesStoreTest, - ::testing::Values(true, false)); + ::testing::Bool()); TEST_F(DeviceFilesTest, ReadCertificate) { MockFile file; @@ -1470,8 +1470,7 @@ TEST_P(DeviceFilesStoreTest, StoreLicense) { license_test_data[license_num].last_playback_time)); } -INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest, - ::testing::Values(true, false)); +INSTANTIATE_TEST_CASE_P(StoreLicense, DeviceFilesStoreTest, ::testing::Bool()); TEST_F(DeviceFilesTest, StoreLicenses) { MockFile file; @@ -1985,6 +1984,6 @@ TEST_P(DeviceFilesUsageInfoTest, DeleteAll) { } INSTANTIATE_TEST_CASE_P(UsageInfo, DeviceFilesUsageInfoTest, - ::testing::Values(-1, 0, 1, 2, 3)); + ::testing::Range(-1, 4)); } // namespace wvcdm