Skip to content

Commit c8020af

Browse files
authored
Update test class names for consistency (#313)
<!-- Solution for PR template choice: https://stackoverflow.com/a/75030350/24543008 --> Please go to the `Preview` tab and select the appropriate template: * [Submit Student task (English)](?expand=1&template=task_submission_en.md) * [Submit Student task (Russian)](?expand=1&template=task_submission_ru.md)
1 parent 178735f commit c8020af

5 files changed

Lines changed: 18 additions & 17 deletions

File tree

tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
namespace kutuzov_i_simpson_integration {
1919

20-
class KutuzovIRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
20+
class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2121
public:
2222
static std::string PrintTestParam(const TestType &test_param) {
2323
int n = get<0>(test_param);
@@ -92,7 +92,7 @@ class KutuzovIRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType,
9292

9393
namespace {
9494

95-
TEST_P(KutuzovIRunFuncTests, SimpsonIntegration) {
95+
TEST_P(KutuzovISimpsonIntegrationMPIFuncTests, SimpsonIntegration) {
9696
ExecuteTest(GetParam());
9797
}
9898

@@ -125,9 +125,10 @@ const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask<KutuzovISimpso
125125

126126
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
127127

128-
const auto kPerfTestName = KutuzovIRunFuncTests::PrintFuncTestName<KutuzovIRunFuncTests>;
128+
const auto kPerfTestName =
129+
KutuzovISimpsonIntegrationMPIFuncTests::PrintFuncTestName<KutuzovISimpsonIntegrationMPIFuncTests>;
129130

130-
INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovIRunFuncTests, kGtestValues, kPerfTestName);
131+
INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovISimpsonIntegrationMPIFuncTests, kGtestValues, kPerfTestName);
131132

132133
} // namespace
133134

tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace kutuzov_i_simpson_integration {
1212

13-
class KutuzovIRunPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
13+
class KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
1414
InType input_data_;
1515

1616
void SetUp() override {
@@ -56,7 +56,7 @@ class KutuzovIRunPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType>
5656
}
5757
};
5858

59-
TEST_P(KutuzovIRunPerfTests, RunPerfModes) {
59+
TEST_P(KutuzovISimpsonIntegrationPerfTests, RunPerfModes) {
6060
ExecuteTest(GetParam());
6161
}
6262

@@ -66,8 +66,8 @@ const auto kAllPerfTasks =
6666

6767
const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks);
6868

69-
const auto kPerfTestName = KutuzovIRunPerfTests::CustomPerfTestName;
69+
const auto kPerfTestName = KutuzovISimpsonIntegrationPerfTests::CustomPerfTestName;
7070

71-
INSTANTIATE_TEST_SUITE_P(RunModeTests, KutuzovIRunPerfTests, kGtestValues, kPerfTestName);
71+
INSTANTIATE_TEST_SUITE_P(RunModeTests, KutuzovISimpsonIntegrationPerfTests, kGtestValues, kPerfTestName);
7272

7373
} // namespace kutuzov_i_simpson_integration

tasks/kutuzov_i_torus_grid/tests/functional/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
namespace kutuzov_i_torus_grid {
1818

19-
class KutuzovIRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
19+
class KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2020
public:
2121
static std::string PrintTestParam(const TestType &test_param) {
2222
std::string test_name = test_param;
@@ -175,7 +175,7 @@ class KutuzovIRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType,
175175

176176
namespace {
177177

178-
TEST_P(KutuzovIRunFuncTests, ThorusGrid) {
178+
TEST_P(KutuzovITorusGridMPIFuncTests, ThorusGrid) {
179179
ExecuteTest(GetParam());
180180
}
181181

@@ -188,9 +188,9 @@ const auto kTestTasksList = std::tuple_cat(
188188

189189
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
190190

191-
const auto kPerfTestName = KutuzovIRunFuncTests::PrintFuncTestName<KutuzovIRunFuncTests>;
191+
const auto kPerfTestName = KutuzovITorusGridMPIFuncTests::PrintFuncTestName<KutuzovITorusGridMPIFuncTests>;
192192

193-
INSTANTIATE_TEST_SUITE_P(ThorusGridTests, KutuzovIRunFuncTests, kGtestValues, kPerfTestName);
193+
INSTANTIATE_TEST_SUITE_P(ThorusGridTests, KutuzovITorusGridMPIFuncTests, kGtestValues, kPerfTestName);
194194

195195
} // namespace
196196

tasks/kutuzov_i_torus_grid/tests/performance/main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
namespace kutuzov_i_torus_grid {
1414
const int kLongStringSize = 10'000'000;
1515

16-
class KutuzovIRunPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
16+
class KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
1717
void SetUp() override {
1818
message_ = std::string(kLongStringSize, 'a');
1919
int process_count = -1;
@@ -61,7 +61,7 @@ class KutuzovIRunPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType>
6161
std::string message_;
6262
};
6363

64-
TEST_P(KutuzovIRunPerfTests, RunPerfModes) {
64+
TEST_P(KutuzovITorusGridPerfTests, RunPerfModes) {
6565
ExecuteTest(GetParam());
6666
}
6767

@@ -70,8 +70,8 @@ const auto kAllPerfTasks = ppc::util::MakeAllPerfTasks<InType, KutuzovIThorusGri
7070

7171
const auto kGtestValues = ppc::util::TupleToGTestValues(kAllPerfTasks);
7272

73-
const auto kPerfTestName = KutuzovIRunPerfTests::CustomPerfTestName;
73+
const auto kPerfTestName = KutuzovITorusGridPerfTests::CustomPerfTestName;
7474

75-
INSTANTIATE_TEST_SUITE_P(RunTests, KutuzovIRunPerfTests, kGtestValues, kPerfTestName);
75+
INSTANTIATE_TEST_SUITE_P(RunTests, KutuzovITorusGridPerfTests, kGtestValues, kPerfTestName);
7676

7777
} // namespace kutuzov_i_torus_grid

tasks/nikitina_v_trans_all_one_distrib/tests/functional/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ INSTANTIATE_TEST_SUITE_P(AllReduceTests, NikitinaVRunFuncTests, kGtestValues, Ni
7474
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables, modernize-type-traits, misc-use-anonymous-namespace)
7575

7676
void RunCheck(const std::shared_ptr<BaseTask> &task, ppc::task::TypeOfTask type) {
77-
ASSERT_EQ(task->GetStaticTypeOfTask(), type);
77+
ASSERT_EQ(task->GetDynamicTypeOfTask(), type);
7878
ASSERT_TRUE(task->Validation());
7979
task->PreProcessing();
8080
task->Run();

0 commit comments

Comments
 (0)