Skip to content

GitLab

T
tangled
Commit f5e75463 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot
Browse files
Options

test: Replace _TEST_CASE_ with _TEST_SUITE_ in /chromeos. 

Googletest is (at last) converging with industry-standard terminology
[1]. We previously called test suites "test cases", which was rather
confusing for folks coming from any other testing framework.

Chrome now has a googletest version that supports _TEST_SUITE_ macros
instead of _TEST_CASE_, so this CL cleans up some of the outdated usage.

[1] https://github.com/google/googletest/blob/master/googletest/docs/primer.md#beware-of-the-nomenclature

TBR=hychao,bartfab

Bug: 925652
Change-Id: I71a4345703ca76c05540fc8062ca0d24c7d204c2
Reviewed-on: https://chromium-review.googlesource.com/c/1471375Reviewed-by: default avatarVictor Costan <pwnall@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Auto-Submit: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632006}
parent 200e1df8
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 96 deletions
chromeos/audio/audio_devices_pref_handler_impl_unittest.cc
View file @ f5e75463
...@@ -205,8 +205,8 @@ class AudioDevicesPrefHandlerTest : public testing::TestWithParam<bool> { ...@@ -205,8 +205,8 @@ class AudioDevicesPrefHandlerTest : public testing::TestWithParam<bool> {
DISALLOW_COPY_AND_ASSIGN(AudioDevicesPrefHandlerTest); DISALLOW_COPY_AND_ASSIGN(AudioDevicesPrefHandlerTest);
}; };
INSTANTIATE_TEST_CASE_P(Input, AudioDevicesPrefHandlerTest, Values(true)); INSTANTIATE_TEST_SUITE_P(Input, AudioDevicesPrefHandlerTest, Values(true));
INSTANTIATE_TEST_CASE_P(Output, AudioDevicesPrefHandlerTest, Values(false)); INSTANTIATE_TEST_SUITE_P(Output, AudioDevicesPrefHandlerTest, Values(false));
TEST_P(AudioDevicesPrefHandlerTest, TestDefaultValuesV1) { TEST_P(AudioDevicesPrefHandlerTest, TestDefaultValuesV1) {
AudioDevice device = GetDeviceWithVersion(1); AudioDevice device = GetDeviceWithVersion(1);
......
chromeos/audio/cras_audio_handler_unittest.cc
View file @ f5e75463
...@@ -491,8 +491,8 @@ class HDMIRediscoverWaiter { ...@@ -491,8 +491,8 @@ class HDMIRediscoverWaiter {
DISALLOW_COPY_AND_ASSIGN(HDMIRediscoverWaiter); DISALLOW_COPY_AND_ASSIGN(HDMIRediscoverWaiter);
}; };
INSTANTIATE_TEST_CASE_P(StableIdV1, CrasAudioHandlerTest, testing::Values(1)); INSTANTIATE_TEST_SUITE_P(StableIdV1, CrasAudioHandlerTest, testing::Values(1));
INSTANTIATE_TEST_CASE_P(StableIdV2, CrasAudioHandlerTest, testing::Values(2)); INSTANTIATE_TEST_SUITE_P(StableIdV2, CrasAudioHandlerTest, testing::Values(2));
TEST_P(CrasAudioHandlerTest, InitializeWithOnlyDefaultAudioDevices) { TEST_P(CrasAudioHandlerTest, InitializeWithOnlyDefaultAudioDevices) {
AudioNodeList audio_nodes = AudioNodeList audio_nodes =
......
chromeos/policy/weekly_time/time_utils_unittest.cc
View file @ f5e75463
...@@ -188,7 +188,7 @@ TEST_P(GetIntervalForCurrentTimeTest, Test) { ...@@ -188,7 +188,7 @@ TEST_P(GetIntervalForCurrentTimeTest, Test) {
EXPECT_EQ(result, expected_result()); EXPECT_EQ(result, expected_result());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SameTimezoneNone, SameTimezoneNone,
GetIntervalForCurrentTimeTest, GetIntervalForCurrentTimeTest,
testing::Values(std::make_tuple( testing::Values(std::make_tuple(
...@@ -201,7 +201,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -201,7 +201,7 @@ INSTANTIATE_TEST_CASE_P(
WeeklyTime(kSunday, 16 * kMillisecondsInHour, 0))}, WeeklyTime(kSunday, 16 * kMillisecondsInHour, 0))},
base::nullopt))); base::nullopt)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
SameTimezoneResult, SameTimezoneResult,
GetIntervalForCurrentTimeTest, GetIntervalForCurrentTimeTest,
testing::Values( testing::Values(
...@@ -228,7 +228,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -228,7 +228,7 @@ INSTANTIATE_TEST_CASE_P(
WeeklyTime(kSunday, 5 * kMillisecondsInHour, 0), WeeklyTime(kSunday, 5 * kMillisecondsInHour, 0),
WeeklyTime(kWednesday, 16 * kMillisecondsInHour, 0))))); WeeklyTime(kWednesday, 16 * kMillisecondsInHour, 0)))));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DifferentTimezoneNone, DifferentTimezoneNone,
GetIntervalForCurrentTimeTest, GetIntervalForCurrentTimeTest,
testing::Values(std::make_tuple( testing::Values(std::make_tuple(
...@@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(
5 * kMillisecondsInHour))}, 5 * kMillisecondsInHour))},
base::nullopt))); base::nullopt)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DifferentTimezoneResult, DifferentTimezoneResult,
GetIntervalForCurrentTimeTest, GetIntervalForCurrentTimeTest,
testing::Values(std::make_tuple( testing::Values(std::make_tuple(
......
chromeos/policy/weekly_time/weekly_time_interval_unittest.cc
View file @ f5e75463
...@@ -146,25 +146,25 @@ TEST_P(SingleWeeklyTimeIntervalTest, ExtractFromProto_Valid) { ...@@ -146,25 +146,25 @@ TEST_P(SingleWeeklyTimeIntervalTest, ExtractFromProto_Valid) {
EXPECT_EQ(result->start().timezone_offset(), 0); EXPECT_EQ(result->start().timezone_offset(), 0);
} }
INSTANTIATE_TEST_CASE_P(OneMinuteInterval, INSTANTIATE_TEST_SUITE_P(OneMinuteInterval,
SingleWeeklyTimeIntervalTest, SingleWeeklyTimeIntervalTest,
testing::Values(std::make_tuple(kWednesday, testing::Values(std::make_tuple(kWednesday,
kMinutesInHour, kMinutesInHour,
kWednesday, kWednesday,
kMinutesInHour + 1))); kMinutesInHour + 1)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheLongestInterval, TheLongestInterval,
SingleWeeklyTimeIntervalTest, SingleWeeklyTimeIntervalTest,
testing::Values( testing::Values(
std::make_tuple(kMonday, 0, kSunday, 24 * kMinutesInHour - 1))); std::make_tuple(kMonday, 0, kSunday, 24 * kMinutesInHour - 1)));
INSTANTIATE_TEST_CASE_P(RandomInterval, INSTANTIATE_TEST_SUITE_P(RandomInterval,
SingleWeeklyTimeIntervalTest, SingleWeeklyTimeIntervalTest,
testing::Values(std::make_tuple(kTuesday, testing::Values(std::make_tuple(kTuesday,
10 * kMinutesInHour, 10 * kMinutesInHour,
kFriday, kFriday,
14 * kMinutesInHour + 14 * kMinutesInHour +
15))); 15)));
class WeeklyTimeIntervalAndWeeklyTimeTest class WeeklyTimeIntervalAndWeeklyTimeTest
: public testing::TestWithParam< : public testing::TestWithParam<
...@@ -190,24 +190,25 @@ TEST_P(WeeklyTimeIntervalAndWeeklyTimeTest, Contains) { ...@@ -190,24 +190,25 @@ TEST_P(WeeklyTimeIntervalAndWeeklyTimeTest, Contains) {
EXPECT_EQ(interval.Contains(weekly_time), expected_contains()); EXPECT_EQ(interval.Contains(weekly_time), expected_contains());
} }
INSTANTIATE_TEST_CASE_P(TheLongestInterval, INSTANTIATE_TEST_SUITE_P(
WeeklyTimeIntervalAndWeeklyTimeTest, TheLongestInterval,
testing::Values(std::make_tuple(kMonday, WeeklyTimeIntervalAndWeeklyTimeTest,
0, testing::Values(std::make_tuple(kMonday,
kSunday, 0,
24 * kMinutesInHour - 1, kSunday,
kWednesday, 24 * kMinutesInHour - 1,
10 * kMinutesInHour, kWednesday,
true), 10 * kMinutesInHour,
std::make_tuple(kSunday, true),
24 * kMinutesInHour - 1, std::make_tuple(kSunday,
kMonday, 24 * kMinutesInHour - 1,
0, kMonday,
kWednesday, 0,
10 * kMinutesInHour, kWednesday,
false))); 10 * kMinutesInHour,
false)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheShortestInterval, TheShortestInterval,
WeeklyTimeIntervalAndWeeklyTimeTest, WeeklyTimeIntervalAndWeeklyTimeTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -220,7 +221,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -220,7 +221,7 @@ INSTANTIATE_TEST_CASE_P(
std::make_tuple(kMonday, 0, kMonday, 1, kMonday, 1, false), std::make_tuple(kMonday, 0, kMonday, 1, kMonday, 1, false),
std::make_tuple(kMonday, 0, kMonday, 1, kMonday, 0, true))); std::make_tuple(kMonday, 0, kMonday, 1, kMonday, 0, true)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CheckStartInterval, CheckStartInterval,
WeeklyTimeIntervalAndWeeklyTimeTest, WeeklyTimeIntervalAndWeeklyTimeTest,
testing::Values(std::make_tuple(kTuesday, testing::Values(std::make_tuple(kTuesday,
...@@ -231,7 +232,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -231,7 +232,7 @@ INSTANTIATE_TEST_CASE_P(
10 * kMinutesInHour + 30, 10 * kMinutesInHour + 30,
true))); true)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
CheckEndInterval, CheckEndInterval,
WeeklyTimeIntervalAndWeeklyTimeTest, WeeklyTimeIntervalAndWeeklyTimeTest,
testing::Values(std::make_tuple(kTuesday, testing::Values(std::make_tuple(kTuesday,
...@@ -242,22 +243,22 @@ INSTANTIATE_TEST_CASE_P( ...@@ -242,22 +243,22 @@ INSTANTIATE_TEST_CASE_P(
14 * kMinutesInHour + 45, 14 * kMinutesInHour + 45,
false))); false)));
INSTANTIATE_TEST_CASE_P(RandomInterval, INSTANTIATE_TEST_SUITE_P(RandomInterval,
WeeklyTimeIntervalAndWeeklyTimeTest, WeeklyTimeIntervalAndWeeklyTimeTest,
testing::Values(std::make_tuple(kFriday, testing::Values(std::make_tuple(kFriday,
17 * kMinutesInHour + 17 * kMinutesInHour +
60, 60,
kMonday, kMonday,
9 * kMinutesInHour, 9 * kMinutesInHour,
kSunday, kSunday,
14 * kMinutesInHour, 14 * kMinutesInHour,
true), true),
std::make_tuple(kMonday, std::make_tuple(kMonday,
9 * kMinutesInHour, 9 * kMinutesInHour,
kFriday, kFriday,
17 * kMinutesInHour, 17 * kMinutesInHour,
kSunday, kSunday,
14 * kMinutesInHour, 14 * kMinutesInHour,
false))); false)));
} // namespace policy } // namespace policy
chromeos/policy/weekly_time/weekly_time_unittest.cc
View file @ f5e75463
...@@ -117,17 +117,17 @@ TEST_P(SingleWeeklyTimeTest, ExtractFromProto_Valid) { ...@@ -117,17 +117,17 @@ TEST_P(SingleWeeklyTimeTest, ExtractFromProto_Valid) {
EXPECT_EQ(result->timezone_offset(), timezone_offset()); EXPECT_EQ(result->timezone_offset(), timezone_offset());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheSmallestCase, TheSmallestCase,
SingleWeeklyTimeTest, SingleWeeklyTimeTest,
testing::Values(std::make_tuple(kMonday, 0, base::nullopt))); testing::Values(std::make_tuple(kMonday, 0, base::nullopt)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheBiggestCase, TheBiggestCase,
SingleWeeklyTimeTest, SingleWeeklyTimeTest,
testing::Values(std::make_tuple(kSunday, 24 * kMinutesInHour - 1, 0))); testing::Values(std::make_tuple(kSunday, 24 * kMinutesInHour - 1, 0)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
RandomCase, RandomCase,
SingleWeeklyTimeTest, SingleWeeklyTimeTest,
testing::Values(std::make_tuple(kWednesday, 15 * kMinutesInHour + 30, 10))); testing::Values(std::make_tuple(kWednesday, 15 * kMinutesInHour + 30, 10)));
...@@ -151,23 +151,24 @@ TEST_P(TwoWeeklyTimesAndDurationTest, GetDuration) { ...@@ -151,23 +151,24 @@ TEST_P(TwoWeeklyTimesAndDurationTest, GetDuration) {
EXPECT_EQ(weekly_time1.GetDurationTo(weekly_time2), expected_duration()); EXPECT_EQ(weekly_time1.GetDurationTo(weekly_time2), expected_duration());
} }
INSTANTIATE_TEST_CASE_P(ZeroDuration, INSTANTIATE_TEST_SUITE_P(ZeroDuration,
TwoWeeklyTimesAndDurationTest, TwoWeeklyTimesAndDurationTest,
testing::Values(std::make_tuple(kWednesday, testing::Values(std::make_tuple(kWednesday,
kMinutesInHour, kMinutesInHour,
kWednesday, kWednesday,
kMinutesInHour, kMinutesInHour,
base::TimeDelta()))); base::TimeDelta())));
INSTANTIATE_TEST_CASE_P(TheLongestDuration, INSTANTIATE_TEST_SUITE_P(TheLongestDuration,
TwoWeeklyTimesAndDurationTest, TwoWeeklyTimesAndDurationTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
0, 0,
kSunday, kSunday,
24 * kMinutesInHour - 1, 24 * kMinutesInHour -
kWeek - kMinute))); 1,
kWeek - kMinute)));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
DifferentDurations, DifferentDurations,
TwoWeeklyTimesAndDurationTest, TwoWeeklyTimesAndDurationTest,
testing::Values( testing::Values(
...@@ -207,7 +208,7 @@ TEST_P(TwoWeeklyTimesAndDurationInDifferentTimezonesTest, ConvertToTimezone) { ...@@ -207,7 +208,7 @@ TEST_P(TwoWeeklyTimesAndDurationInDifferentTimezonesTest, ConvertToTimezone) {
EXPECT_EQ(weekly_time1.GetDurationTo(weekly_time2), expected_duration()); EXPECT_EQ(weekly_time1.GetDurationTo(weekly_time2), expected_duration());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DifferentTimezones, DifferentTimezones,
TwoWeeklyTimesAndDurationInDifferentTimezonesTest, TwoWeeklyTimesAndDurationInDifferentTimezonesTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -218,7 +219,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -218,7 +219,7 @@ INSTANTIATE_TEST_CASE_P(
5 * kMillisecondsInHour, 5 * kMillisecondsInHour,
kWeek - base::TimeDelta::FromHours(4)))); kWeek - base::TimeDelta::FromHours(4))));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TimezoneMakesDurationWrapAround, TimezoneMakesDurationWrapAround,
TwoWeeklyTimesAndDurationInDifferentTimezonesTest, TwoWeeklyTimesAndDurationInDifferentTimezonesTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -229,7 +230,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -229,7 +230,7 @@ INSTANTIATE_TEST_CASE_P(
4 * kMillisecondsInHour, 4 * kMillisecondsInHour,
base::TimeDelta::FromHours(1)))); base::TimeDelta::FromHours(1))));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TwoAgnosticTimezones, TwoAgnosticTimezones,
TwoWeeklyTimesAndDurationInDifferentTimezonesTest, TwoWeeklyTimesAndDurationInDifferentTimezonesTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -262,7 +263,7 @@ TEST_P(TwoWeeklyTimesAndOffsetTest, AddMilliseconds) { ...@@ -262,7 +263,7 @@ TEST_P(TwoWeeklyTimesAndOffsetTest, AddMilliseconds) {
weekly_time.timezone_offset()); weekly_time.timezone_offset());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ZeroOffset, ZeroOffset,
TwoWeeklyTimesAndOffsetTest, TwoWeeklyTimesAndOffsetTest,
testing::Values(std::make_tuple(kTuesday, testing::Values(std::make_tuple(kTuesday,
...@@ -271,7 +272,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -271,7 +272,7 @@ INSTANTIATE_TEST_CASE_P(
kTuesday, kTuesday,
15 * kMinutesInHour + 30))); 15 * kMinutesInHour + 30)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheSmallestOffset, TheSmallestOffset,
TwoWeeklyTimesAndOffsetTest, TwoWeeklyTimesAndOffsetTest,
testing::Values(std::make_tuple(kWednesday, testing::Values(std::make_tuple(kWednesday,
...@@ -285,7 +286,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -285,7 +286,7 @@ INSTANTIATE_TEST_CASE_P(
kSunday, kSunday,
20 * kMinutesInHour + 30))); 20 * kMinutesInHour + 30)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
TheBiggestOffset, TheBiggestOffset,
TwoWeeklyTimesAndOffsetTest, TwoWeeklyTimesAndOffsetTest,
testing::Values(std::make_tuple(kTuesday, testing::Values(std::make_tuple(kTuesday,
...@@ -299,7 +300,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -299,7 +300,7 @@ INSTANTIATE_TEST_CASE_P(
kMonday, kMonday,
10 * kMinutesInHour + 30))); 10 * kMinutesInHour + 30)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
DifferentOffsets, DifferentOffsets,
TwoWeeklyTimesAndOffsetTest, TwoWeeklyTimesAndOffsetTest,
testing::Values(std::make_tuple(kWednesday, testing::Values(std::make_tuple(kWednesday,
...@@ -338,7 +339,7 @@ TEST_P(WeeklyTimeTimezoneConversionTest, ConvertToTimezone) { ...@@ -338,7 +339,7 @@ TEST_P(WeeklyTimeTimezoneConversionTest, ConvertToTimezone) {
EXPECT_EQ(result.timezone_offset().value(), result_offset()); EXPECT_EQ(result.timezone_offset().value(), result_offset());
} }
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ConversionToABiggerTimezone, ConversionToABiggerTimezone,
WeeklyTimeTimezoneConversionTest, WeeklyTimeTimezoneConversionTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -348,16 +349,17 @@ INSTANTIATE_TEST_CASE_P( ...@@ -348,16 +349,17 @@ INSTANTIATE_TEST_CASE_P(
15 * kMinutesInHour, 15 * kMinutesInHour,
7 * kMillisecondsInHour))); 7 * kMillisecondsInHour)));
INSTANTIATE_TEST_CASE_P(ConversionToASmallerTimezone, INSTANTIATE_TEST_SUITE_P(
WeeklyTimeTimezoneConversionTest, ConversionToASmallerTimezone,
testing::Values(std::make_tuple(kMonday, WeeklyTimeTimezoneConversionTest,
10 * kMinutesInHour, testing::Values(std::make_tuple(kMonday,
4 * kMillisecondsInHour, 10 * kMinutesInHour,
kMonday, 4 * kMillisecondsInHour,
6 * kMinutesInHour, kMonday,
0))); 6 * kMinutesInHour,
0)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ConversionToTheSameTimezone, ConversionToTheSameTimezone,
WeeklyTimeTimezoneConversionTest, WeeklyTimeTimezoneConversionTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
...@@ -367,7 +369,7 @@ INSTANTIATE_TEST_CASE_P( ...@@ -367,7 +369,7 @@ INSTANTIATE_TEST_CASE_P(
10 * kMinutesInHour, 10 * kMinutesInHour,
4 * kMillisecondsInHour))); 4 * kMillisecondsInHour)));
INSTANTIATE_TEST_CASE_P( INSTANTIATE_TEST_SUITE_P(
ConversionToANegativeTimezone, ConversionToANegativeTimezone,
WeeklyTimeTimezoneConversionTest, WeeklyTimeTimezoneConversionTest,
testing::Values(std::make_tuple(kMonday, testing::Values(std::make_tuple(kMonday,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment