Skip to content

Commit eb1d18e

Browse files
aobolenskaobolensk
authored
Enable 'google-*' scope in clang-tidy (#621)
1 parent 1fa251d commit eb1d18e

File tree

5 files changed

+40
-34
lines changed

5 files changed

+40
-34
lines changed

‎.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Checks: >
1414
cert-oop58-cpp,
1515
concurrency-*,
1616
cppcoreguidelines-*,
17+
google-*,
1718
llvm-include-order,
1819
llvm-namespace-comment,
1920
misc-*,

‎modules/performance/tests/perf_tests.cpp

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
#include "task/include/task.hpp"
1717
#include "util/include/util.hpp"
1818

19-
using namespace ppc::task;
19+
using ppc::task::StatusOfTask;
20+
using ppc::task::Task;
21+
using ppc::task::TypeOfTask;
2022

2123
namespace ppc::test {
2224

@@ -63,7 +65,7 @@ class FakePerfTask : public TestPerfTask<InType, OutType> {
6365

6466
namespace ppc::performance {
6567

66-
TEST(perf_tests, check_perf_pipeline) {
68+
TEST(PerfTests, CheckPerfPipeline) {
6769
std::vector<uint32_t> in(2000, 1);
6870

6971
auto test_task = std::make_shared<ppc::test::TestPerfTask<std::vector<uint32_t>, uint32_t>>(in);
@@ -78,7 +80,7 @@ TEST(perf_tests, check_perf_pipeline) {
7880
EXPECT_EQ(test_task->GetOutput(), in.size());
7981
}
8082

81-
TEST(perf_tests, check_perf_pipeline_float) {
83+
TEST(PerfTests, CheckPerfPipelineFloat) {
8284
std::vector<float> in(2000, 1);
8385

8486
auto test_task = std::make_shared<ppc::test::TestPerfTask<std::vector<float>, float>>(in);
@@ -93,7 +95,7 @@ TEST(perf_tests, check_perf_pipeline_float) {
9395
EXPECT_EQ(test_task->GetOutput(), in.size());
9496
}
9597

96-
TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
98+
TEST(PerfTests, CheckPerfPipelineUint8tSlowTest) {
9799
std::vector<uint8_t> in(128, 1);
98100

99101
auto test_task = std::make_shared<ppc::test::FakePerfTask<std::vector<uint8_t>, uint8_t>>(in);
@@ -114,7 +116,7 @@ TEST(perf_tests, check_perf_pipeline_uint8_t_slow_test) {
114116
ASSERT_ANY_THROW(perf_analyzer.PrintPerfStatistic("check_perf_pipeline_uint8_t_slow_test"));
115117
}
116118

117-
TEST(perf_tests, slow_perf_respects_env_override) {
119+
TEST(PerfTests, SlowPerfRespectsEnvOverride) {
118120
env::detail::set_scoped_environment_variable scoped("PPC_PERF_MAX_TIME", "12");
119121
std::vector<uint8_t> in(128, 1);
120122
auto test_task = std::make_shared<ppc::test::FakePerfTask<std::vector<uint8_t>, uint8_t>>(in);
@@ -131,7 +133,7 @@ TEST(perf_tests, slow_perf_respects_env_override) {
131133
EXPECT_NO_THROW(perf_analyzer.PrintPerfStatistic("slow_perf_respects_env_override"));
132134
}
133135

134-
TEST(perf_tests, check_perf_task_exception) {
136+
TEST(PerfTests, CheckPerfTaskException) {
135137
std::vector<uint32_t> in(2000, 1);
136138

137139
auto test_task = std::make_shared<ppc::test::TestPerfTask<std::vector<uint32_t>, uint32_t>>(in);
@@ -144,7 +146,7 @@ TEST(perf_tests, check_perf_task_exception) {
144146
perf_analyzer.TaskRun(perf_attr);
145147
}
146148

147-
TEST(perf_tests, check_perf_task_float) {
149+
TEST(PerfTests, CheckPerfTaskFloat) {
148150
std::vector<float> in(2000, 1);
149151

150152
auto test_task = std::make_shared<ppc::test::TestPerfTask<std::vector<float>, float>>(in);
@@ -385,7 +387,7 @@ TEST(PerfTest, GetStringParamNameTest) {
385387
EXPECT_EQ(GetStringParamName(PerfResults::TypeOfRunning::kNone), "none");
386388
}
387389

388-
TEST(TaskTest, Destructor_InvalidPipelineOrderTerminates_PartialPipeline) {
390+
TEST(TaskTest, DestructorInvalidPipelineOrderTerminatesPartialPipeline) {
389391
{
390392
struct BadTask : Task<int, int> {
391393
bool ValidationImpl() override {

‎modules/task/tests/task_tests.cpp

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
#include "task/include/task.hpp"
2020
#include "util/include/util.hpp"
2121

22-
using namespace ppc::task;
22+
using ppc::task::StateOfTesting;
23+
using ppc::task::StatusOfTask;
24+
using ppc::task::Task;
25+
using ppc::task::TypeOfTask;
2326

2427
class ScopedFile {
2528
public:
@@ -76,7 +79,7 @@ class FakeSlowTask : public TestTask<InType, OutType> {
7679

7780
} // namespace ppc::test
7881

79-
TEST(task_tests, check_int32_t) {
82+
TEST(TaskTests, CheckInt32t) {
8083
std::vector<int32_t> in(20, 1);
8184
ppc::test::TestTask<std::vector<int32_t>, int32_t> test_task(in);
8285
ASSERT_EQ(test_task.Validation(), true);
@@ -86,7 +89,7 @@ TEST(task_tests, check_int32_t) {
8689
ASSERT_EQ(static_cast<size_t>(test_task.GetOutput()), in.size());
8790
}
8891

89-
TEST(task_tests, check_int32_t_slow) {
92+
TEST(TaskTests, CheckInt32tSlow) {
9093
std::vector<int32_t> in(20, 1);
9194
ppc::test::FakeSlowTask<std::vector<int32_t>, int32_t> test_task(in);
9295
ASSERT_EQ(test_task.Validation(), true);
@@ -95,7 +98,7 @@ TEST(task_tests, check_int32_t_slow) {
9598
ASSERT_ANY_THROW(test_task.PostProcessing());
9699
}
97100

98-
TEST(task_tests, slow_task_respects_env_override) {
101+
TEST(TaskTests, SlowTaskRespectsEnvOverride) {
99102
env::detail::set_scoped_environment_variable scoped("PPC_TASK_MAX_TIME", "3");
100103
std::vector<int32_t> in(20, 1);
101104
ppc::test::FakeSlowTask<std::vector<int32_t>, int32_t> test_task(in);
@@ -105,7 +108,7 @@ TEST(task_tests, slow_task_respects_env_override) {
105108
EXPECT_NO_THROW(test_task.PostProcessing());
106109
}
107110

108-
TEST(task_tests, check_validate_func) {
111+
TEST(TaskTests, CheckValidateFunc) {
109112
std::vector<int32_t> in;
110113
ppc::test::TestTask<std::vector<int32_t>, int32_t> test_task(in);
111114
ASSERT_EQ(test_task.Validation(), false);
@@ -114,7 +117,7 @@ TEST(task_tests, check_validate_func) {
114117
test_task.PostProcessing();
115118
}
116119

117-
TEST(task_tests, check_double) {
120+
TEST(TaskTests, CheckDouble) {
118121
std::vector<double> in(20, 1);
119122
ppc::test::TestTask<std::vector<double>, double> test_task(in);
120123
ASSERT_EQ(test_task.Validation(), true);
@@ -124,7 +127,7 @@ TEST(task_tests, check_double) {
124127
EXPECT_NEAR(test_task.GetOutput(), static_cast<double>(in.size()), 1e-6);
125128
}
126129

127-
TEST(task_tests, check_float) {
130+
TEST(TaskTests, CheckFloat) {
128131
std::vector<float> in(20, 1);
129132
ppc::test::TestTask<std::vector<float>, float> test_task(in);
130133
ASSERT_EQ(test_task.Validation(), true);
@@ -134,40 +137,40 @@ TEST(task_tests, check_float) {
134137
EXPECT_NEAR(test_task.GetOutput(), in.size(), 1e-3);
135138
}
136139

137-
TEST(task_tests, check_wrong_order_disabled_valgrind) {
140+
TEST(TaskTests, CheckWrongOrderDisabledValgrind) {
138141
std::vector<float> in(20, 1);
139142
ppc::test::TestTask<std::vector<float>, float> test_task(in);
140143
ASSERT_EQ(test_task.Validation(), true);
141144
test_task.PreProcessing();
142145
EXPECT_THROW(test_task.PostProcessing(), std::runtime_error);
143146
}
144147

145-
TEST(task_tests, premature_postprocessing_no_steps) {
148+
TEST(TaskTests, PrematurePostprocessingNoSteps) {
146149
std::vector<float> in(20, 1);
147150
ppc::test::TestTask<std::vector<float>, float> test_task(in);
148151
EXPECT_THROW(test_task.PostProcessing(), std::runtime_error);
149152
}
150153

151-
TEST(task_tests, premature_postprocessing_after_preprocessing) {
154+
TEST(TaskTests, PrematurePostprocessingAfterPreprocessing) {
152155
std::vector<float> in(20, 1);
153156
ppc::test::TestTask<std::vector<float>, float> test_task(in);
154157
EXPECT_THROW(test_task.PreProcessing(), std::runtime_error);
155158
EXPECT_THROW(test_task.PostProcessing(), std::runtime_error);
156159
}
157160

158-
TEST(TaskTest, GetStringTaskStatus_Disabled) {
161+
TEST(TaskTest, GetStringTaskStatusDisabled) {
159162
EXPECT_EQ(GetStringTaskStatus(StatusOfTask::kDisabled), "disabled");
160163
}
161164

162-
TEST(TaskTest, GetStringTaskStatus_Enabled) {
165+
TEST(TaskTest, GetStringTaskStatusEnabled) {
163166
EXPECT_EQ(GetStringTaskStatus(StatusOfTask::kEnabled), "enabled");
164167
}
165168

166-
TEST(TaskTest, GetStringTaskType_InvalidFileThrows) {
169+
TEST(TaskTest, GetStringTaskTypeInvalidFileThrows) {
167170
EXPECT_THROW({ GetStringTaskType(TypeOfTask::kALL, "non_existing_file.json"); }, std::runtime_error);
168171
}
169172

170-
TEST(TaskTest, GetStringTaskType_UnknownType_WithValidFile) {
173+
TEST(TaskTest, GetStringTaskTypeUnknownTypeWithValidFile) {
171174
std::string path = "settings_valid.json";
172175
ScopedFile cleaner(path);
173176
std::ofstream file(path);
@@ -177,7 +180,7 @@ TEST(TaskTest, GetStringTaskType_UnknownType_WithValidFile) {
177180
EXPECT_NO_THROW({ GetStringTaskType(TypeOfTask::kUnknown, path); });
178181
}
179182

180-
TEST(TaskTest, GetStringTaskType_ThrowsOnBadJSON) {
183+
TEST(TaskTest, GetStringTaskTypeThrowsOnBadJSON) {
181184
std::string path = "bad_settings.json";
182185
ScopedFile cleaner(path);
183186
std::ofstream file(path);
@@ -186,7 +189,7 @@ TEST(TaskTest, GetStringTaskType_ThrowsOnBadJSON) {
186189
EXPECT_THROW({ GetStringTaskType(TypeOfTask::kALL, path); }, std::exception);
187190
}
188191

189-
TEST(TaskTest, GetStringTaskType_EachType_WithValidFile) {
192+
TEST(TaskTest, GetStringTaskTypeEachTypeWithValidFile) {
190193
std::string path = "settings_valid_all.json";
191194
ScopedFile cleaner(path);
192195
std::ofstream file(path);
@@ -202,7 +205,7 @@ TEST(TaskTest, GetStringTaskType_EachType_WithValidFile) {
202205
EXPECT_NO_THROW(GetStringTaskType(TypeOfTask::kSEQ, path));
203206
}
204207

205-
TEST(TaskTest, GetStringTaskType_ReturnsUnknown_OnDefault) {
208+
TEST(TaskTest, GetStringTaskTypeReturnsUnknownOnDefault) {
206209
std::string path = "settings_valid_unknown.json";
207210
ScopedFile cleaner(path);
208211
std::ofstream file(path);
@@ -213,7 +216,7 @@ TEST(TaskTest, GetStringTaskType_ReturnsUnknown_OnDefault) {
213216
EXPECT_EQ(result, "unknown");
214217
}
215218

216-
TEST(TaskTest, GetStringTaskType_ThrowsIfKeyMissing) {
219+
TEST(TaskTest, GetStringTaskTypeThrowsIfKeyMissing) {
217220
std::string path = "settings_partial.json";
218221
ScopedFile cleaner(path);
219222
std::ofstream file(path);
@@ -223,7 +226,7 @@ TEST(TaskTest, GetStringTaskType_ThrowsIfKeyMissing) {
223226
EXPECT_ANY_THROW(GetStringTaskType(TypeOfTask::kSTL, path));
224227
}
225228

226-
TEST(TaskTest, TaskDestructor_ThrowsIfStageIncomplete) {
229+
TEST(TaskTest, TaskDestructorThrowsIfStageIncomplete) {
227230
{
228231
std::vector<int32_t> in(20, 1);
229232
struct LocalTask : Task<std::vector<int32_t>, int32_t> {
@@ -249,7 +252,7 @@ TEST(TaskTest, TaskDestructor_ThrowsIfStageIncomplete) {
249252
ppc::util::DestructorFailureFlag::Unset();
250253
}
251254

252-
TEST(TaskTest, TaskDestructor_ThrowsIfEmpty) {
255+
TEST(TaskTest, TaskDestructorThrowsIfEmpty) {
253256
{
254257
std::vector<int32_t> in(20, 1);
255258
struct LocalTask : Task<std::vector<int32_t>, int32_t> {
@@ -274,7 +277,7 @@ TEST(TaskTest, TaskDestructor_ThrowsIfEmpty) {
274277
ppc::util::DestructorFailureFlag::Unset();
275278
}
276279

277-
TEST(TaskTest, InternalTimeTest_ThrowsIfTimeoutExceeded) {
280+
TEST(TaskTest, InternalTimeTestThrowsIfTimeoutExceeded) {
278281
struct SlowTask : Task<std::vector<int32_t>, int32_t> {
279282
explicit SlowTask(const std::vector<int32_t>& in) {
280283
this->GetInput() = in;

‎modules/util/tests/util.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ namespace my::nested {
1212
struct Type {};
1313
} // namespace my::nested
1414

15-
TEST(util_tests, extracts_correct_namespace) {
15+
TEST(UtilTests, ExtractsCorrectNamespace) {
1616
std::string k_ns = ppc::util::GetNamespace<my::nested::Type>();
1717
EXPECT_EQ(k_ns, "my::nested");
1818
}
1919

20-
TEST(util_tests, threads_control_check_openmp_disabled_valgrind) {
20+
TEST(UtilTests, ThreadsControlCheckOpenmpDisabledValgrind) {
2121
const auto num_threads_env_var = env::get<int>("PPC_NUM_THREADS");
2222

2323
EXPECT_EQ(ppc::util::GetNumThreads(), omp_get_max_threads());
@@ -34,12 +34,12 @@ TEST(GetNamespaceTest, ReturnsExpectedNamespace) {
3434
EXPECT_EQ(k_ns, "test_ns");
3535
}
3636

37-
TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespace_PrimitiveType) {
37+
TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespacePrimitiveType) {
3838
std::string k_ns = ppc::util::GetNamespace<int>();
3939
EXPECT_EQ(k_ns, "");
4040
}
4141

42-
TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespace_PlainStruct) {
42+
TEST(GetNamespaceTest, ReturnsEmptyIfNoNamespacePlainStruct) {
4343
std::string k_ns = ppc::util::GetNamespace<PlainType>();
4444
EXPECT_EQ(k_ns, "");
4545
}

‎scripts/run_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def run_core(self):
120120
shlex.split(self.valgrind_cmd)
121121
+ [str(self.work_dir / "core_func_tests")]
122122
+ self.__get_gtest_settings(1, "*")
123-
+ ["--gtest_filter=*:-*_disabled_valgrind"]
123+
+ ["--gtest_filter=*:-*DisabledValgrind"]
124124
)
125125

126126
self.__run_exec(

0 commit comments

Comments
 (0)