Merge "Use Idiomatic Generators for DeviceFiles Unit Tests"

This commit is contained in:
John "Juce" Bruce
2015-04-09 21:49:31 +00:00
committed by Android (Google) Code Review

View File

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