Skip to content

Commit 1ce281e

Browse files
committed
Refactor test macros and update test cases:
- Replace `INSTANTIATE_TEST_SUITE_P_NOLINT` with `INSTANTIATE_TEST_SUITE_P_WITH_NAME` across functional and performance test cases. - Add new `INSTANTIATE_TEST_SUITE_P_WITH_NAME` macro in `util.hpp` for improved consistency and clarity.
1 parent d6beb7a commit 1ce281e

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

modules/core/util/include/util.hpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,15 @@ using NlohmannJsonTypeError = nlohmann::json::type_error;
2020
#pragma warning(pop)
2121
#endif
2222

23-
#define ASSERT_ANY_THROW_NOLINT(...) ASSERT_ANY_THROW(__VA_ARGS__) // NOLINT
24-
#define EXPECT_THROW_NOLINT(...) EXPECT_THROW(__VA_ARGS__) // NOLINT
25-
#define INSTANTIATE_TEST_SUITE_P_NOLINT(...) INSTANTIATE_TEST_SUITE_P(__VA_ARGS__) // NOLINT
26-
#define TEST_NOLINT(...) TEST(__VA_ARGS__) // NOLINT
27-
#define ASSERT_DEATH_IF_SUPPORTED_NOLINT(...) ASSERT_DEATH_IF_SUPPORTED(__VA_ARGS__) // NOLINT
28-
#define TYPED_TEST_NOLINT(...) TYPED_TEST(__VA_ARGS__) // NOLINT
23+
#define ASSERT_ANY_THROW_NOLINT(stmt) ASSERT_ANY_THROW(stmt) // NOLINT
24+
#define EXPECT_THROW_NOLINT(stmt, error) EXPECT_THROW(stmt, error) // NOLINT
25+
#define INSTANTIATE_TEST_SUITE_P_NOLINT(name, test_case_name, generator) \
26+
INSTANTIATE_TEST_SUITE_P(name, test_case_name, generator) // NOLINT
27+
#define INSTANTIATE_TEST_SUITE_P_WITH_NAME(name, test_case_name, generator, name_generator) \
28+
INSTANTIATE_TEST_SUITE_P(name, test_case_name, generator, name_generator) // NOLINT
29+
#define TEST_NOLINT(test_suite_name, test_name) TEST(test_suite_name, test_name) // NOLINT
30+
#define ASSERT_DEATH_IF_SUPPORTED_NOLINT(stmt, name) ASSERT_DEATH_IF_SUPPORTED(stmt, name) // NOLINT
31+
#define TYPED_TEST_NOLINT(test_suite_name, test_name) TYPED_TEST(test_suite_name, test_name) // NOLINT
2932

3033
namespace ppc::util {
3134

tasks/example_processes/tests/functional/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
7272

7373
const auto kPerfTestName = NesterovARunFuncTestsProcesses::PrintFuncTestName<NesterovARunFuncTestsProcesses>;
7474

75-
INSTANTIATE_TEST_SUITE_P_NOLINT(PicMatrixTests, NesterovARunFuncTestsProcesses, kGtestValues, kPerfTestName);
75+
INSTANTIATE_TEST_SUITE_P_WITH_NAME(PicMatrixTests, NesterovARunFuncTestsProcesses, kGtestValues, kPerfTestName);
7676

7777
} // namespace
7878

tasks/example_processes/tests/performance/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks);
2828

2929
const auto kPerfTestName = ExampleRunPerfTestProcesses::CustomPerfTestName;
3030

31-
INSTANTIATE_TEST_SUITE_P_NOLINT(RunModeTests, ExampleRunPerfTestProcesses, kGtestValues, kPerfTestName);
31+
INSTANTIATE_TEST_SUITE_P_WITH_NAME(RunModeTests, ExampleRunPerfTestProcesses, kGtestValues, kPerfTestName);
3232

3333
} // namespace nesterov_a_test_task_processes

tasks/example_threads/tests/functional/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
7878

7979
const auto kPerfTestName = NesterovARunFuncTestsThreads::PrintFuncTestName<NesterovARunFuncTestsThreads>;
8080

81-
INSTANTIATE_TEST_SUITE_P_NOLINT(PicMatrixTests, NesterovARunFuncTestsThreads, kGtestValues, kPerfTestName);
81+
INSTANTIATE_TEST_SUITE_P_WITH_NAME(PicMatrixTests, NesterovARunFuncTestsThreads, kGtestValues, kPerfTestName);
8282

8383
} // namespace
8484

tasks/example_threads/tests/performance/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks);
3232

3333
const auto kPerfTestName = ExampleRunPerfTestThreads::CustomPerfTestName;
3434

35-
INSTANTIATE_TEST_SUITE_P_NOLINT(RunModeTests, ExampleRunPerfTestThreads, kGtestValues, kPerfTestName);
35+
INSTANTIATE_TEST_SUITE_P_WITH_NAME(RunModeTests, ExampleRunPerfTestThreads, kGtestValues, kPerfTestName);
3636

3737
} // namespace nesterov_a_test_task_threads

0 commit comments

Comments
 (0)