Skip to content

Commit eff867a

Browse files
committed
Standardize and refactor test macros:
- Replace `DEATH_TEST` with `TEST_NOLINT` and introduce consistent `NOLINT` test macro variants (`ASSERT_DEATH_IF_SUPPORTED_NOLINT`, `TYPED_TEST_NOLINT`, etc.). - Update affected test cases in `task_tests.cpp`, `perf_tests.cpp`, and `util.hpp`. - Enhance `GetNamespaceTest` consistency with variable naming improvements. - Include missing `util.hpp` in performance tests and clean up redundant includes.
1 parent b4d452c commit eff867a

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

modules/core/performance/tests/perf_tests.cpp

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include "core/performance/include/performance.hpp"
99
#include "core/performance/tests/test_task.hpp"
10+
#include "core/util/include/util.hpp"
1011

1112
TEST(perf_tests, check_perf_pipeline) {
1213
std::vector<uint32_t> in(2000, 1);
@@ -99,7 +100,7 @@ TEST_P(GetStringParamNameParamTest, ReturnsExpectedString) {
99100
EXPECT_EQ(ppc::core::GetStringParamName(param.input), param.expected_output);
100101
}
101102

102-
INSTANTIATE_TEST_SUITE_P(ParamTests, GetStringParamNameParamTest,
103+
INSTANTIATE_TEST_SUITE_P_NOLINT(ParamTests, GetStringParamNameParamTest,
103104
::testing::Values(ParamTestCase{ppc::core::PerfResults::kTaskRun, "task_run"},
104105
ParamTestCase{ppc::core::PerfResults::kPipeline, "pipeline"},
105106
ParamTestCase{static_cast<ppc::core::PerfResults::TypeOfRunning>(999),
@@ -144,7 +145,7 @@ INSTANTIATE_TEST_SUITE_P_NOLINT(AllTypeCases, GetStringTaskTypeTest,
144145
TaskTypeTestCase{ppc::core::TypeOfTask::kTBB, "tbb_TBB", "kTBB"},
145146
TaskTypeTestCase{ppc::core::TypeOfTask::kSEQ, "seq_SEQ", "kSEQ"}));
146147

147-
DEATH_TEST(GetStringTaskTypeStandaloneTest, ThrowsIfFileMissing) {
148+
TEST_NOLINT(GetStringTaskTypeStandaloneTest, ThrowsIfFileMissing) {
148149
std::string missing_path = "non_existent_settings.json";
149150
EXPECT_THROW_NOLINT(GetStringTaskType(ppc::core::TypeOfTask::kSEQ, missing_path), std::runtime_error);
150151
}
@@ -159,12 +160,12 @@ TEST(GetStringTaskTypeStandaloneTest, ReturnsUnknownForInvalidEnum) {
159160
std::filesystem::remove(path);
160161
}
161162

162-
TEST(GetStringTaskTypeEdgeCases, ThrowsIfFileCannotBeOpened) {
163+
TEST_NOLINT(GetStringTaskTypeEdgeCases, ThrowsIfFileCannotBeOpened) {
163164
EXPECT_THROW_NOLINT(GetStringTaskType(ppc::core::TypeOfTask::kSEQ, "definitely_missing_file.json"),
164165
std::runtime_error);
165166
}
166167

167-
TEST(GetStringTaskTypeEdgeCases, ThrowsIfJsonIsMalformed) {
168+
TEST_NOLINT(GetStringTaskTypeEdgeCases, ThrowsIfJsonIsMalformed) {
168169
std::string path = std::filesystem::temp_directory_path() / "bad_json.json";
169170
std::ofstream(path) << "{ this is not valid json ";
170171
EXPECT_THROW_NOLINT(GetStringTaskType(ppc::core::TypeOfTask::kSEQ, path), nlohmann::json::parse_error);
@@ -175,7 +176,7 @@ TEST(GetStringTaskTypeEdgeCases, ThrowsIfJsonValueIsNull) {
175176
std::string path = std::filesystem::temp_directory_path() / "null_value.json";
176177
std::ofstream(path) << R"({"tasks": { "seq": null }})";
177178

178-
EXPECT_THROW(GetStringTaskType(ppc::core::TypeOfTask::kSEQ, path), nlohmann::json::type_error);
179+
EXPECT_THROW_NOLINT(GetStringTaskType(ppc::core::TypeOfTask::kSEQ, path), nlohmann::json::type_error);
179180

180181
std::filesystem::remove(path);
181182
}
@@ -224,9 +225,9 @@ TEST(TaskTest, GetDynamicTypeReturnsCorrectEnum) {
224225
EXPECT_EQ(task.GetDynamicTypeOfTask(), ppc::core::TypeOfTask::kOMP);
225226
}
226227

227-
DEATH_TEST(TaskTest, DestructorTerminatesIfWrongOrder) {
228+
TEST_NOLINT(TaskTest, DestructorTerminatesIfWrongOrder) {
228229
testing::FLAGS_gtest_death_test_style = "threadsafe";
229-
ASSERT_DEATH_IF_SUPPORTED(
230+
ASSERT_DEATH_IF_SUPPORTED_NOLINT(
230231
{
231232
DummyTask task;
232233
task.Run();
@@ -249,17 +250,17 @@ using TestTypes = ::testing::Types<my::nested::Type, my::Another, int, std::vect
249250

250251
TYPED_TEST_SUITE(GetNamespaceTest, TestTypes);
251252

252-
TYPED_TEST(GetNamespaceTest, ExtractsNamespaceCorrectly) {
253-
constexpr std::string_view ns = ppc::util::GetNamespace<TypeParam>();
253+
TYPED_TEST_NOLINT(GetNamespaceTest, ExtractsNamespaceCorrectly) {
254+
constexpr std::string_view kNs = ppc::util::GetNamespace<TypeParam>();
254255

255256
if constexpr (std::is_same_v<TypeParam, my::nested::Type>) {
256-
EXPECT_EQ(ns, "my::nested");
257+
EXPECT_EQ(kNs, "my::nested");
257258
} else if constexpr (std::is_same_v<TypeParam, my::Another>) {
258-
EXPECT_EQ(ns, "my");
259+
EXPECT_EQ(kNs, "my");
259260
} else if constexpr (std::is_same_v<TypeParam, int>) {
260-
EXPECT_EQ(ns, "");
261+
EXPECT_EQ(kNs, "");
261262
} else if constexpr (std::is_same_v<TypeParam, std::vector<int>>) {
262-
EXPECT_EQ(ns, "std");
263+
EXPECT_EQ(kNs, "std");
263264
} else {
264265
FAIL() << "Unhandled type in test";
265266
}

modules/core/performance/tests/test_task.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
#include <chrono>
44
#include <thread>
5-
#include <vector>
65

76
#include "core/task/include/task.hpp"
87

modules/core/task/tests/task_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ TEST(task_tests, check_float) {
128128
EXPECT_NEAR(test_task.GetOutput(), in.size(), 1e-3);
129129
}
130130

131-
DEATH_TEST(task_tests, check_wrong_order_disabled_valgrind) {
131+
TEST_NOLINT(task_tests, check_wrong_order_disabled_valgrind) {
132132
auto destroy_function = [] {
133133
// Create data
134134
std::vector<float> in(20, 1);
@@ -143,7 +143,7 @@ DEATH_TEST(task_tests, check_wrong_order_disabled_valgrind) {
143143
EXPECT_DEATH_IF_SUPPORTED(destroy_function(), ".*ORDER OF FUNCTIONS IS NOT RIGHT.*");
144144
}
145145

146-
DEATH_TEST(task_tests, check_empty_order_disabled_valgrind) {
146+
TEST_NOLINT(task_tests, check_empty_order_disabled_valgrind) {
147147
auto destroy_function = [] {
148148
// Create data
149149
std::vector<float> in(20, 1);

modules/core/util/include/util.hpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@
3030
/* NOLINTEND */
3131

3232
/* NOLINTBEGIN */
33-
#define DEATH_TEST(...) TEST(__VA_ARGS__)
33+
#define TEST_NOLINT(...) TEST(__VA_ARGS__)
34+
/* NOLINTEND */
35+
36+
/* NOLINTBEGIN */
37+
#define ASSERT_DEATH_IF_SUPPORTED_NOLINT(...) ASSERT_DEATH_IF_SUPPORTED(__VA_ARGS__)
38+
/* NOLINTEND */
39+
40+
/* NOLINTBEGIN */
41+
#define TYPED_TEST_NOLINT(...) TYPED_TEST(__VA_ARGS__)
3442
/* NOLINTEND */
3543

3644
namespace ppc::util {

0 commit comments

Comments
 (0)