diff --git a/.clang-tidy b/.clang-tidy index 9460b95e0..314b69d13 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -14,6 +14,7 @@ Checks: > cert-oop58-cpp, concurrency-*, cppcoreguidelines-*, + google-*, llvm-include-order, llvm-namespace-comment, misc-*, diff --git a/modules/performance/tests/perf_tests.cpp b/modules/performance/tests/perf_tests.cpp index f851a3c1a..5394c4769 100644 --- a/modules/performance/tests/perf_tests.cpp +++ b/modules/performance/tests/perf_tests.cpp @@ -16,7 +16,9 @@ #include "task/include/task.hpp" #include "util/include/util.hpp" -using namespace ppc::task; +using ppc::task::StatusOfTask; +using ppc::task::Task; +using ppc::task::TypeOfTask; namespace ppc::test { @@ -63,7 +65,7 @@ class FakePerfTask : public TestPerfTask { namespace ppc::performance { -TEST(perf_tests, check_perf_pipeline) { +TEST(PerfTests, CheckPerfPipeline) { std::vector in(2000, 1); auto test_task = std::make_shared, uint32_t>>(in); @@ -78,7 +80,7 @@ TEST(perf_tests, check_perf_pipeline) { EXPECT_EQ(test_task->GetOutput(), in.size()); } -TEST(perf_tests, check_perf_pipeline_float) { +TEST(PerfTests, CheckPerfPipelineFloat) { std::vector in(2000, 1); auto test_task = std::make_shared, float>>(in); @@ -93,7 +95,7 @@ TEST(perf_tests, check_perf_pipeline_float) { EXPECT_EQ(test_task->GetOutput(), in.size()); } -TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) { +TEST(PerfTests, CheckPerfPipelineUint8tSlowTest) { std::vector in(128, 1); auto test_task = std::make_shared, uint8_t>>(in); @@ -114,7 +116,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) { ASSERT_ANY_THROW(perf_analyzer.PrintPerfStatistic("check_perf_pipeline_uint8_t_slow_test")); } -TEST(perf_tests, slow_perf_respects_env_override) { +TEST(PerfTests, SlowPerfRespectsEnvOverride) { env::detail::set_scoped_environment_variable scoped("PPC_PERF_MAX_TIME", "12"); std::vector in(128, 1); auto test_task = std::make_shared, uint8_t>>(in); @@ -131,7 +133,7 @@ TEST(perf_tests, slow_perf_respects_env_override) { EXPECT_NO_THROW(perf_analyzer.PrintPerfStatistic("slow_perf_respects_env_override")); } -TEST(perf_tests, check_perf_task_exception) { +TEST(PerfTests, CheckPerfTaskException) { std::vector in(2000, 1); auto test_task = std::make_shared, uint32_t>>(in); @@ -144,7 +146,7 @@ TEST(perf_tests, check_perf_task_exception) { perf_analyzer.TaskRun(perf_attr); } -TEST(perf_tests, check_perf_task_float) { +TEST(PerfTests, CheckPerfTaskFloat) { std::vector in(2000, 1); auto test_task = std::make_shared, float>>(in); @@ -385,7 +387,7 @@ TEST(PerfTest, GetStringParamNameTest) { EXPECT_EQ(GetStringParamName(PerfResults::TypeOfRunning::kNone), "none"); } -TEST(TaskTest, Destructor_InvalidPipelineOrderTerminates_PartialPipeline) { +TEST(TaskTest, DestructorInvalidPipelineOrderTerminatesPartialPipeline) { { struct BadTask : Task { bool ValidationImpl() override { diff --git a/modules/task/tests/task_tests.cpp b/modules/task/tests/task_tests.cpp index cbe5273a8..99ffc9175 100644 --- a/modules/task/tests/task_tests.cpp +++ b/modules/task/tests/task_tests.cpp @@ -19,7 +19,10 @@ #include "task/include/task.hpp" #include "util/include/util.hpp" -using namespace ppc::task; +using ppc::task::StateOfTesting; +using ppc::task::StatusOfTask; +using ppc::task::Task; +using ppc::task::TypeOfTask; class ScopedFile { public: @@ -76,7 +79,7 @@ class FakeSlowTask : public TestTask { } // namespace ppc::test -TEST(task_tests, check_int32_t) { +TEST(TaskTests, CheckInt32t) { std::vector in(20, 1); ppc::test::TestTask, int32_t> test_task(in); ASSERT_EQ(test_task.Validation(), true); @@ -86,7 +89,7 @@ TEST(task_tests, check_int32_t) { ASSERT_EQ(static_cast(test_task.GetOutput()), in.size()); } -TEST(task_tests, check_int32_t_slow) { +TEST(TaskTests, CheckInt32tSlow) { std::vector in(20, 1); ppc::test::FakeSlowTask, int32_t> test_task(in); ASSERT_EQ(test_task.Validation(), true); @@ -95,7 +98,7 @@ TEST(task_tests, check_int32_t_slow) { ASSERT_ANY_THROW(test_task.PostProcessing()); } -TEST(task_tests, slow_task_respects_env_override) { +TEST(TaskTests, SlowTaskRespectsEnvOverride) { env::detail::set_scoped_environment_variable scoped("PPC_TASK_MAX_TIME", "3"); std::vector in(20, 1); ppc::test::FakeSlowTask, int32_t> test_task(in); @@ -105,7 +108,7 @@ TEST(task_tests, slow_task_respects_env_override) { EXPECT_NO_THROW(test_task.PostProcessing()); } -TEST(task_tests, check_validate_func) { +TEST(TaskTests, CheckValidateFunc) { std::vector in; ppc::test::TestTask, int32_t> test_task(in); ASSERT_EQ(test_task.Validation(), false); @@ -114,7 +117,7 @@ TEST(task_tests, check_validate_func) { test_task.PostProcessing(); } -TEST(task_tests, check_double) { +TEST(TaskTests, CheckDouble) { std::vector in(20, 1); ppc::test::TestTask, double> test_task(in); ASSERT_EQ(test_task.Validation(), true); @@ -124,7 +127,7 @@ TEST(task_tests, check_double) { EXPECT_NEAR(test_task.GetOutput(), static_cast(in.size()), 1e-6); } -TEST(task_tests, check_float) { +TEST(TaskTests, CheckFloat) { std::vector in(20, 1); ppc::test::TestTask, float> test_task(in); ASSERT_EQ(test_task.Validation(), true); @@ -134,7 +137,7 @@ TEST(task_tests, check_float) { EXPECT_NEAR(test_task.GetOutput(), in.size(), 1e-3); } -TEST(task_tests, check_wrong_order_disabled_valgrind) { +TEST(TaskTests, CheckWrongOrderDisabledValgrind) { std::vector in(20, 1); ppc::test::TestTask, float> test_task(in); ASSERT_EQ(test_task.Validation(), true); @@ -142,32 +145,32 @@ TEST(task_tests, check_wrong_order_disabled_valgrind) { EXPECT_THROW(test_task.PostProcessing(), std::runtime_error); } -TEST(task_tests, premature_postprocessing_no_steps) { +TEST(TaskTests, PrematurePostprocessingNoSteps) { std::vector in(20, 1); ppc::test::TestTask, float> test_task(in); EXPECT_THROW(test_task.PostProcessing(), std::runtime_error); } -TEST(task_tests, premature_postprocessing_after_preprocessing) { +TEST(TaskTests, PrematurePostprocessingAfterPreprocessing) { std::vector in(20, 1); ppc::test::TestTask, float> test_task(in); EXPECT_THROW(test_task.PreProcessing(), std::runtime_error); EXPECT_THROW(test_task.PostProcessing(), std::runtime_error); } -TEST(TaskTest, GetStringTaskStatus_Disabled) { +TEST(TaskTest, GetStringTaskStatusDisabled) { EXPECT_EQ(GetStringTaskStatus(StatusOfTask::kDisabled), "disabled"); } -TEST(TaskTest, GetStringTaskStatus_Enabled) { +TEST(TaskTest, GetStringTaskStatusEnabled) { EXPECT_EQ(GetStringTaskStatus(StatusOfTask::kEnabled), "enabled"); } -TEST(TaskTest, GetStringTaskType_InvalidFileThrows) { +TEST(TaskTest, GetStringTaskTypeInvalidFileThrows) { EXPECT_THROW({ GetStringTaskType(TypeOfTask::kALL, "non_existing_file.json"); }, std::runtime_error); } -TEST(TaskTest, GetStringTaskType_UnknownType_WithValidFile) { +TEST(TaskTest, GetStringTaskTypeUnknownTypeWithValidFile) { std::string path = "settings_valid.json"; ScopedFile cleaner(path); std::ofstream file(path); @@ -177,7 +180,7 @@ TEST(TaskTest, GetStringTaskType_UnknownType_WithValidFile) { EXPECT_NO_THROW({ GetStringTaskType(TypeOfTask::kUnknown, path); }); } -TEST(TaskTest, GetStringTaskType_ThrowsOnBadJSON) { +TEST(TaskTest, GetStringTaskTypeThrowsOnBadJSON) { std::string path = "bad_settings.json"; ScopedFile cleaner(path); std::ofstream file(path); @@ -186,7 +189,7 @@ TEST(TaskTest, GetStringTaskType_ThrowsOnBadJSON) { EXPECT_THROW({ GetStringTaskType(TypeOfTask::kALL, path); }, std::exception); } -TEST(TaskTest, GetStringTaskType_EachType_WithValidFile) { +TEST(TaskTest, GetStringTaskTypeEachTypeWithValidFile) { std::string path = "settings_valid_all.json"; ScopedFile cleaner(path); std::ofstream file(path); @@ -202,7 +205,7 @@ TEST(TaskTest, GetStringTaskType_EachType_WithValidFile) { EXPECT_NO_THROW(GetStringTaskType(TypeOfTask::kSEQ, path)); } -TEST(TaskTest, GetStringTaskType_ReturnsUnknown_OnDefault) { +TEST(TaskTest, GetStringTaskTypeReturnsUnknownOnDefault) { std::string path = "settings_valid_unknown.json"; ScopedFile cleaner(path); std::ofstream file(path); @@ -213,7 +216,7 @@ TEST(TaskTest, GetStringTaskType_ReturnsUnknown_OnDefault) { EXPECT_EQ(result, "unknown"); } -TEST(TaskTest, GetStringTaskType_ThrowsIfKeyMissing) { +TEST(TaskTest, GetStringTaskTypeThrowsIfKeyMissing) { std::string path = "settings_partial.json"; ScopedFile cleaner(path); std::ofstream file(path); @@ -223,7 +226,7 @@ TEST(TaskTest, GetStringTaskType_ThrowsIfKeyMissing) { EXPECT_ANY_THROW(GetStringTaskType(TypeOfTask::kSTL, path)); } -TEST(TaskTest, TaskDestructor_ThrowsIfStageIncomplete) { +TEST(TaskTest, TaskDestructorThrowsIfStageIncomplete) { { std::vector in(20, 1); struct LocalTask : Task, int32_t> { @@ -249,7 +252,7 @@ TEST(TaskTest, TaskDestructor_ThrowsIfStageIncomplete) { ppc::util::DestructorFailureFlag::Unset(); } -TEST(TaskTest, TaskDestructor_ThrowsIfEmpty) { +TEST(TaskTest, TaskDestructorThrowsIfEmpty) { { std::vector in(20, 1); struct LocalTask : Task, int32_t> { @@ -274,7 +277,7 @@ TEST(TaskTest, TaskDestructor_ThrowsIfEmpty) { ppc::util::DestructorFailureFlag::Unset(); } -TEST(TaskTest, InternalTimeTest_ThrowsIfTimeoutExceeded) { +TEST(TaskTest, InternalTimeTestThrowsIfTimeoutExceeded) { struct SlowTask : Task, int32_t> { explicit SlowTask(const std::vector& in) { this->GetInput() = in; diff --git a/modules/util/tests/util.cpp b/modules/util/tests/util.cpp index d2bd6c96d..6da563a9f 100644 --- a/modules/util/tests/util.cpp +++ b/modules/util/tests/util.cpp @@ -12,12 +12,12 @@ namespace my::nested { struct Type {}; } // namespace my::nested -TEST(util_tests, extracts_correct_namespace) { +TEST(UtilTests, ExtractsCorrectNamespace) { std::string k_ns = ppc::util::GetNamespace(); EXPECT_EQ(k_ns, "my::nested"); } -TEST(util_tests, threads_control_check_openmp_disabled_valgrind) { +TEST(UtilTests, ThreadsControlCheckOpenmpDisabledValgrind) { const auto num_threads_env_var = env::get("PPC_NUM_THREADS"); EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_max_threads()); @@ -34,12 +34,12 @@ TEST(GetNamespaceTest, ReturnsExpectedNamespace) { EXPECT_EQ(k_ns, "test_ns"); } -TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespace_PrimitiveType) { +TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespacePrimitiveType) { std::string k_ns = ppc::util::GetNamespace(); EXPECT_EQ(k_ns, ""); } -TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespace_PlainStruct) { +TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespacePlainStruct) { std::string k_ns = ppc::util::GetNamespace(); EXPECT_EQ(k_ns, ""); } diff --git a/scripts/run_tests.py b/scripts/run_tests.py index 5c36a5468..a6f75a75f 100755 --- a/scripts/run_tests.py +++ b/scripts/run_tests.py @@ -120,7 +120,7 @@ def run_core(self): shlex.split(self.valgrind_cmd) + [str(self.work_dir / "core_func_tests")] + self.__get_gtest_settings(1, "*") - + ["--gtest_filter=*:-*_disabled_valgrind"] + + ["--gtest_filter=*:-*DisabledValgrind"] ) self.__run_exec(