Test disabling timing reports
Change-Id: I5b904bbf9e039b2a15f8328b156fcc7bdd1d71ca
diff --git a/aos/events/simulated_event_loop_test.cc b/aos/events/simulated_event_loop_test.cc
index 0fb757b..7b7c861 100644
--- a/aos/events/simulated_event_loop_test.cc
+++ b/aos/events/simulated_event_loop_test.cc
@@ -64,31 +64,18 @@
std::unique_ptr<SimulatedEventLoopFactory> event_loop_factory_;
};
-INSTANTIATE_TEST_CASE_P(SimulatedEventLoopCopyTest, AbstractEventLoopTest,
- ::testing::Values(std::make_tuple(
- []() {
- return new SimulatedEventLoopTestFactory();
- },
- ReadMethod::COPY)));
+auto CommonParameters() {
+ return ::testing::Combine(
+ ::testing::Values([]() { return new SimulatedEventLoopTestFactory(); }),
+ ::testing::Values(ReadMethod::COPY, ReadMethod::PIN),
+ ::testing::Values(DoTimingReports::kYes, DoTimingReports::kNo));
+}
-INSTANTIATE_TEST_CASE_P(
- SimulatedEventLoopCopyDeathTest, AbstractEventLoopDeathTest,
- ::testing::Values(
- std::make_tuple([]() { return new SimulatedEventLoopTestFactory(); },
- ReadMethod::COPY)));
+INSTANTIATE_TEST_CASE_P(SimulatedEventLoopCommonTest, AbstractEventLoopTest,
+ CommonParameters());
-INSTANTIATE_TEST_CASE_P(SimulatedEventLoopPinTest, AbstractEventLoopTest,
- ::testing::Values(std::make_tuple(
- []() {
- return new SimulatedEventLoopTestFactory();
- },
- ReadMethod::PIN)));
-
-INSTANTIATE_TEST_CASE_P(
- SimulatedEventLoopPinDeathTest, AbstractEventLoopDeathTest,
- ::testing::Values(
- std::make_tuple([]() { return new SimulatedEventLoopTestFactory(); },
- ReadMethod::PIN)));
+INSTANTIATE_TEST_CASE_P(SimulatedEventLoopCommonDeathTest,
+ AbstractEventLoopDeathTest, CommonParameters());
// Test that creating an event and running the scheduler runs the event.
TEST(EventSchedulerTest, ScheduleEvent) {