@@ -63,7 +63,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
63
63
};
64
64
perf_analyzer.PipelineRun (perf_attr);
65
65
66
- ASSERT_ANY_THROW_NOLINT (perf_analyzer.PrintPerfStatistic (" check_perf_pipeline_uint8_t_slow_test" ));
66
+ ASSERT_ANY_THROW (perf_analyzer.PrintPerfStatistic (" check_perf_pipeline_uint8_t_slow_test" ));
67
67
}
68
68
69
69
TEST (perf_tests, check_perf_task_exception) {
@@ -73,7 +73,7 @@ TEST(perf_tests, check_perf_task_exception) {
73
73
74
74
ppc::core::Perf<std::vector<uint32_t >, uint32_t > perf_analyzer (test_task);
75
75
76
- ASSERT_ANY_THROW_NOLINT (perf_analyzer.PrintPerfStatistic (" check_perf_task_exception" ));
76
+ ASSERT_ANY_THROW (perf_analyzer.PrintPerfStatistic (" check_perf_task_exception" ));
77
77
78
78
ppc::core::PerfAttr perf_attr;
79
79
perf_analyzer.TaskRun (perf_attr);
@@ -109,12 +109,13 @@ TEST_P(GetStringParamNameParamTest, ReturnsExpectedString) {
109
109
EXPECT_EQ (ppc::core::GetStringParamName (param.input ), param.expected_output );
110
110
}
111
111
112
- INSTANTIATE_TEST_SUITE_P_WITH_NAME (
113
- ParamTests, GetStringParamNameParamTest,
114
- ::testing::Values (ParamTestCase{ppc::core::PerfResults::kTaskRun , " task_run" },
115
- ParamTestCase{ppc::core::PerfResults::kPipeline , " pipeline" },
116
- ParamTestCase{ppc::core::PerfResults::TypeOfRunning::kNone , " none" }),
117
- [](const ::testing::TestParamInfo<ParamTestCase>& info) { return info.param .expected_output ; });
112
+ INSTANTIATE_TEST_SUITE_P (ParamTests, GetStringParamNameParamTest,
113
+ ::testing::Values (ParamTestCase{ppc::core::PerfResults::kTaskRun , " task_run" },
114
+ ParamTestCase{ppc::core::PerfResults::kPipeline , " pipeline" },
115
+ ParamTestCase{ppc::core::PerfResults::TypeOfRunning::kNone , " none" }),
116
+ [](const ::testing::TestParamInfo<ParamTestCase>& info) {
117
+ return info.param .expected_output ;
118
+ });
118
119
119
120
struct TaskTypeTestCase {
120
121
ppc::core::TypeOfTask type;
@@ -151,22 +152,22 @@ TEST_P(GetStringTaskTypeTest, ReturnsExpectedString) {
151
152
EXPECT_EQ (GetStringTaskType (param.type , temp_path), param.expected ) << " Failed on: " << param.label ;
152
153
}
153
154
154
- INSTANTIATE_TEST_SUITE_P_NOLINT (AllTypeCases, GetStringTaskTypeTest,
155
- ::testing::Values (TaskTypeTestCase{ppc::core::TypeOfTask::kALL , " all_ALL" , " kALL" },
156
- TaskTypeTestCase{ppc::core::TypeOfTask::kSTL , " stl_STL" , " kSTL" },
157
- TaskTypeTestCase{ppc::core::TypeOfTask::kOMP , " omp_OMP" , " kOMP" },
158
- TaskTypeTestCase{ppc::core::TypeOfTask::kMPI , " mpi_MPI" , " kMPI" },
159
- TaskTypeTestCase{ppc::core::TypeOfTask::kTBB , " tbb_TBB" , " kTBB" },
160
- TaskTypeTestCase{ppc::core::TypeOfTask::kSEQ , " seq_SEQ" , " kSEQ" }));
155
+ INSTANTIATE_TEST_SUITE_P (AllTypeCases, GetStringTaskTypeTest,
156
+ ::testing::Values (TaskTypeTestCase{ppc::core::TypeOfTask::kALL , " all_ALL" , " kALL" },
157
+ TaskTypeTestCase{ppc::core::TypeOfTask::kSTL , " stl_STL" , " kSTL" },
158
+ TaskTypeTestCase{ppc::core::TypeOfTask::kOMP , " omp_OMP" , " kOMP" },
159
+ TaskTypeTestCase{ppc::core::TypeOfTask::kMPI , " mpi_MPI" , " kMPI" },
160
+ TaskTypeTestCase{ppc::core::TypeOfTask::kTBB , " tbb_TBB" , " kTBB" },
161
+ TaskTypeTestCase{ppc::core::TypeOfTask::kSEQ , " seq_SEQ" , " kSEQ" }));
161
162
162
- TEST_NOLINT (GetStringTaskTypeStandaloneTest, ThrowsIfFileMissing) {
163
+ TEST (GetStringTaskTypeStandaloneTest, ThrowsIfFileMissing) {
163
164
std::string missing_path = " non_existent_settings.json" ;
164
- EXPECT_THROW_NOLINT (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , missing_path), std::runtime_error);
165
+ EXPECT_THROW (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , missing_path), std::runtime_error);
165
166
}
166
167
167
- TEST_NOLINT (GetStringTaskTypeStandaloneTest, ExceptionMessageContainsPath) {
168
+ TEST (GetStringTaskTypeStandaloneTest, ExceptionMessageContainsPath) {
168
169
const std::string missing_path = " non_existent_settings.json" ;
169
- EXPECT_THROW_NOLINT (
170
+ EXPECT_THROW (
170
171
try { GetStringTaskType (ppc::core::TypeOfTask::kSEQ , missing_path); } catch (const std::runtime_error& e) {
171
172
EXPECT_NE (std::string (e.what ()).find (missing_path), std::string::npos);
172
173
throw ;
@@ -184,23 +185,22 @@ TEST(GetStringTaskTypeStandaloneTest, ReturnsUnknownForInvalidEnum) {
184
185
std::filesystem::remove (path);
185
186
}
186
187
187
- TEST_NOLINT (GetStringTaskTypeEdgeCases, ThrowsIfFileCannotBeOpened) {
188
- EXPECT_THROW_NOLINT (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , " definitely_missing_file.json" ),
189
- std::runtime_error);
188
+ TEST (GetStringTaskTypeEdgeCases, ThrowsIfFileCannotBeOpened) {
189
+ EXPECT_THROW (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , " definitely_missing_file.json" ), std::runtime_error);
190
190
}
191
191
192
- TEST_NOLINT (GetStringTaskTypeEdgeCases, ThrowsIfJsonIsMalformed) {
192
+ TEST (GetStringTaskTypeEdgeCases, ThrowsIfJsonIsMalformed) {
193
193
std::string path = (std::filesystem::temp_directory_path () / " bad_json.json" ).string ();
194
194
std::ofstream (path) << " { this is not valid json " ;
195
- EXPECT_THROW_NOLINT (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , path), NlohmannJsonParseError);
195
+ EXPECT_THROW (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , path), NlohmannJsonParseError);
196
196
std::filesystem::remove (path);
197
197
}
198
198
199
- TEST_NOLINT (GetStringTaskTypeEdgeCases, ThrowsIfJsonValueIsNull) {
199
+ TEST (GetStringTaskTypeEdgeCases, ThrowsIfJsonValueIsNull) {
200
200
std::string path = (std::filesystem::temp_directory_path () / " null_value.json" ).string ();
201
201
std::ofstream (path) << R"( {"tasks": { "seq": null }})" ;
202
202
203
- EXPECT_THROW_NOLINT (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , path), NlohmannJsonTypeError);
203
+ EXPECT_THROW (GetStringTaskType (ppc::core::TypeOfTask::kSEQ , path), NlohmannJsonTypeError);
204
204
205
205
std::filesystem::remove (path);
206
206
}
@@ -237,9 +237,9 @@ TEST(TaskTest, GetDynamicTypeReturnsCorrectEnum) {
237
237
EXPECT_EQ (task.GetDynamicTypeOfTask (), ppc::core::TypeOfTask::kOMP );
238
238
}
239
239
240
- TEST_NOLINT (TaskTest, DestructorTerminatesIfWrongOrder) {
240
+ TEST (TaskTest, DestructorTerminatesIfWrongOrder) {
241
241
testing::FLAGS_gtest_death_test_style = " threadsafe" ;
242
- ASSERT_DEATH_IF_SUPPORTED_NOLINT (
242
+ ASSERT_DEATH_IF_SUPPORTED (
243
243
{
244
244
DummyTask task;
245
245
task.Run ();
@@ -262,7 +262,7 @@ using TestTypes = ::testing::Types<my::nested::Type, my::Another, int>;
262
262
263
263
TYPED_TEST_SUITE (GetNamespaceTest, TestTypes);
264
264
265
- TYPED_TEST_NOLINT (GetNamespaceTest, ExtractsNamespaceCorrectly) {
265
+ TYPED_TEST (GetNamespaceTest, ExtractsNamespaceCorrectly) {
266
266
constexpr std::string_view kNs = ppc::util::GetNamespace<TypeParam>();
267
267
268
268
if constexpr (std::is_same_v<TypeParam, my::nested::Type>) {
0 commit comments