Skip to content

Commit 373b71f

Browse files
allnesallnes
authored
An/fix (#314)
<!-- 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 c8020af commit 373b71f

9 files changed

Lines changed: 39 additions & 40 deletions

File tree

  • tasks
    • kutergin_v_reduce/tests/functional
    • kutergin_v_trapezoid_method_of_integration/tests/functional
    • kutuzov_i_elem_vec_average/tests/functional
    • kutuzov_i_simpson_integration/tests
    • kutuzov_i_torus_grid/tests
    • nikitina_v_max_elem_matr/tests/functional
    • nikitina_v_trans_all_one_distrib/tests/functional

‎tasks/kutergin_v_reduce/tests/functional/main.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717

1818
namespace kutergin_v_reduce {
1919

20-
TEST(KuterginReduceValidation, SeqHandlesEmptyVector) {
20+
TEST(KuterginReduce, SeqEmpty) {
2121
InType empty_input{{}, 0};
2222
ReduceSequential task_empty(empty_input);
2323
ASSERT_TRUE(task_empty.Validation());
2424
ASSERT_TRUE(task_empty.Run());
2525
ASSERT_EQ(task_empty.GetOutput(), 0);
2626
}
2727

28-
class ReduceFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
28+
class ReduceTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2929
public:
3030
static std::string PrintTestParam(const TestType &test_param) // вывод имен тестов
3131
{
32-
return "vec_size_" + std::to_string(std::get<0>(test_param)) + "_root_" + std::to_string(std::get<1>(test_param));
32+
return "sz_" + std::to_string(std::get<0>(test_param)) + "_r_" + std::to_string(std::get<1>(test_param));
3333
}
3434

3535
protected:
@@ -117,24 +117,24 @@ class ReduceFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, Test
117117

118118
namespace {
119119

120-
TEST_P(ReduceFuncTests, ReduceTest) {
120+
TEST_P(ReduceTests, ReduceTest) {
121121
ExecuteTest(GetParam());
122122
}
123123

124124
const std::array<TestType, 4> kTestCases = {
125-
std::make_tuple(10, 0, "size_10_root_0"), std::make_tuple(20, 1, "size_20_root_1"),
126-
std::make_tuple(1, 3, "size_1_root_3"), std::make_tuple(100, 2, "size_100_root_2")};
125+
std::make_tuple(10, 0, "sz_10_r_0"), std::make_tuple(20, 1, "sz_20_r_1"),
126+
std::make_tuple(1, 3, "sz_1_r_3"), std::make_tuple(100, 2, "sz_100_r_2")};
127127

128128
const auto kTestTasksList =
129129
std::tuple_cat(ppc::util::AddFuncTask<ReduceSequential, InType>(kTestCases, PPC_SETTINGS_kutergin_v_reduce),
130130
ppc::util::AddFuncTask<ReduceMPI, InType>(kTestCases, PPC_SETTINGS_kutergin_v_reduce));
131131

132132
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
133133

134-
const auto kTestName = ReduceFuncTests::PrintFuncTestName<ReduceFuncTests>;
134+
const auto kTestName = ReduceTests::PrintFuncTestName<ReduceTests>;
135135

136136
// NOLINTNEXTLINE(modernize-type-traits, cppcoreguidelines-avoid-non-const-global-variables)
137-
INSTANTIATE_TEST_SUITE_P(Reduce, ReduceFuncTests, kGtestValues, kTestName);
137+
INSTANTIATE_TEST_SUITE_P(Reduce, ReduceTests, kGtestValues, kTestName);
138138
} // namespace
139139

140140
} // namespace kutergin_v_reduce

‎tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ TEST(KuterginTrapezoidValidation, MPIFailsOnNegativeSteps) {
6767
task.PostProcessing();
6868
}
6969

70-
class KuterginVRunFuncTestsSEQ
70+
class KuterginTrapezoidTests
7171
: public ppc::util::BaseRunFuncTests<InType, OutType,
7272
TestType> // наследник ppc::util::BaseRunFuncTests<InType, OutType, TestType>
7373
{
@@ -114,7 +114,7 @@ class KuterginVRunFuncTestsSEQ
114114
namespace // анонимное пространство имен
115115
{
116116

117-
TEST_P(KuterginVRunFuncTestsSEQ, TrapezoidTest) // параметризованный тест
117+
TEST_P(KuterginTrapezoidTests, TrapezoidTest) // параметризованный тест
118118
{
119119
ExecuteTest(GetParam());
120120
}
@@ -145,11 +145,11 @@ const auto kTestTasksList =
145145

146146
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
147147

148-
const auto kTestName = KuterginVRunFuncTestsSEQ::PrintFuncTestName<KuterginVRunFuncTestsSEQ>;
148+
const auto kTestName = KuterginTrapezoidTests::PrintFuncTestName<KuterginTrapezoidTests>;
149149

150150
// "регистрация" набора тестов и параметров в GTest
151151
// NOLINTNEXTLINE(modernize-type-traits, cppcoreguidelines-avoid-non-const-global-variables)
152-
INSTANTIATE_TEST_SUITE_P(TrapezoidIntegrationSEQ, KuterginVRunFuncTestsSEQ, kGtestValues, kTestName);
152+
INSTANTIATE_TEST_SUITE_P(TrapezoidSeq, KuterginTrapezoidTests, kGtestValues, kTestName);
153153
} // namespace
154154

155155
} // namespace kutergin_v_trapezoid_seq

‎tasks/kutuzov_i_elem_vec_average/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_elem_vec_average {
1818

19-
class KutuzovIElemVecAverageFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
19+
class KutuzovAverageTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2020
public:
2121
static std::string PrintTestParam(const TestType &test_param) {
2222
return std::to_string(test_param);
@@ -54,7 +54,7 @@ class KutuzovIElemVecAverageFuncTests : public ppc::util::BaseRunFuncTests<InTyp
5454

5555
namespace {
5656

57-
TEST_P(KutuzovIElemVecAverageFuncTests, MatmulFromPic) {
57+
TEST_P(KutuzovAverageTests, AverageTest) {
5858
ExecuteTest(GetParam());
5959
}
6060

@@ -66,9 +66,9 @@ const auto kTestTasksList = std::tuple_cat(
6666

6767
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
6868

69-
const auto kPerfTestName = KutuzovIElemVecAverageFuncTests::PrintFuncTestName<KutuzovIElemVecAverageFuncTests>;
69+
const auto kPerfTestName = KutuzovAverageTests::PrintFuncTestName<KutuzovAverageTests>;
7070

71-
INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovIElemVecAverageFuncTests, kGtestValues, kPerfTestName);
71+
INSTANTIATE_TEST_SUITE_P(Average, KutuzovAverageTests, kGtestValues, kPerfTestName);
7272

7373
} // namespace
7474

‎tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp‎

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

1818
namespace kutuzov_i_simpson_integration {
1919

20-
class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
20+
class KutuzovSimpsonTests : 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 KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTest
9292

9393
namespace {
9494

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

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

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

128-
const auto kPerfTestName =
129-
KutuzovISimpsonIntegrationMPIFuncTests::PrintFuncTestName<KutuzovISimpsonIntegrationMPIFuncTests>;
128+
const auto kPerfTestName = KutuzovSimpsonTests::PrintFuncTestName<KutuzovSimpsonTests>;
130129

131-
INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovISimpsonIntegrationMPIFuncTests, kGtestValues, kPerfTestName);
130+
INSTANTIATE_TEST_SUITE_P(Simpson, KutuzovSimpsonTests, kGtestValues, kPerfTestName);
132131

133132
} // namespace
134133

‎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 KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
13+
class KutuzovSimpsonPerf : public ppc::util::BaseRunPerfTests<InType, OutType> {
1414
InType input_data_;
1515

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

59-
TEST_P(KutuzovISimpsonIntegrationPerfTests, RunPerfModes) {
59+
TEST_P(KutuzovSimpsonPerf, 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 = KutuzovISimpsonIntegrationPerfTests::CustomPerfTestName;
69+
const auto kPerfTestName = KutuzovSimpsonPerf::CustomPerfTestName;
7070

71-
INSTANTIATE_TEST_SUITE_P(RunModeTests, KutuzovISimpsonIntegrationPerfTests, kGtestValues, kPerfTestName);
71+
INSTANTIATE_TEST_SUITE_P(RunMode, KutuzovSimpsonPerf, 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 KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
19+
class KutuzovTorusTests : 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 KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests<InType,
175175

176176
namespace {
177177

178-
TEST_P(KutuzovITorusGridMPIFuncTests, ThorusGrid) {
178+
TEST_P(KutuzovTorusTests, 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 = KutuzovITorusGridMPIFuncTests::PrintFuncTestName<KutuzovITorusGridMPIFuncTests>;
191+
const auto kPerfTestName = KutuzovTorusTests::PrintFuncTestName<KutuzovTorusTests>;
192192

193-
INSTANTIATE_TEST_SUITE_P(ThorusGridTests, KutuzovITorusGridMPIFuncTests, kGtestValues, kPerfTestName);
193+
INSTANTIATE_TEST_SUITE_P(TorusGrid, KutuzovTorusTests, 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 KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
16+
class KutuzovTorusPerf : 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 KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests<InType, Ou
6161
std::string message_;
6262
};
6363

64-
TEST_P(KutuzovITorusGridPerfTests, RunPerfModes) {
64+
TEST_P(KutuzovTorusPerf, 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 = KutuzovITorusGridPerfTests::CustomPerfTestName;
73+
const auto kPerfTestName = KutuzovTorusPerf::CustomPerfTestName;
7474

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

7777
} // namespace kutuzov_i_torus_grid

‎tasks/nikitina_v_max_elem_matr/tests/functional/main.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace nikitina_v_max_elem_matr {
1818

1919
using TestType = std::tuple<int, int, int>;
2020

21-
class NikitinaVMaxElemMatrFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
21+
class NikitinaMaxElemTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2222
public:
2323
static std::string PrintTestParam(const testing::TestParamInfo<ParamType> &info) {
2424
auto task_name = std::get<static_cast<std::size_t>(ppc::util::GTestParamIndex::kNameTest)>(info.param);
@@ -102,7 +102,7 @@ class NikitinaVMaxElemMatrFuncTests : public ppc::util::BaseRunFuncTests<InType,
102102

103103
namespace {
104104

105-
TEST_P(NikitinaVMaxElemMatrFuncTests, FindMaxElement) {
105+
TEST_P(NikitinaMaxElemTests, FindMaxElement) {
106106
ExecuteTest(GetParam());
107107
}
108108

@@ -116,8 +116,8 @@ const auto kTestTasksList = std::tuple_cat(
116116

117117
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
118118

119-
INSTANTIATE_TEST_SUITE_P(NikitinaV_MaxElementMatr_Func, NikitinaVMaxElemMatrFuncTests, kGtestValues,
120-
NikitinaVMaxElemMatrFuncTests::PrintTestParam);
119+
INSTANTIATE_TEST_SUITE_P(NikitinaMaxElem, NikitinaMaxElemTests, kGtestValues,
120+
NikitinaMaxElemTests::PrintTestParam);
121121

122122
} // namespace
123123

‎tasks/nikitina_v_trans_all_one_distrib/tests/functional/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
namespace nikitina_v_trans_all_one_distrib {
2020

21-
class NikitinaVRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
21+
class NikitinaAllReduceTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
2222
public:
2323
static std::string PrintTestParam(
2424
const testing::TestParamInfo<ppc::util::FuncTestParam<InType, OutType, TestType>> &param_info) {
@@ -55,7 +55,7 @@ class NikitinaVRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType
5555
InType input_data_;
5656
};
5757

58-
TEST_P(NikitinaVRunFuncTests, AllReduceSum) {
58+
TEST_P(NikitinaAllReduceTests, AllReduceSum) {
5959
ExecuteTest(GetParam());
6060
}
6161

@@ -70,7 +70,7 @@ const auto kTestTasksList = std::tuple_cat(
7070
const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList);
7171

7272
// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables, modernize-type-traits, misc-use-anonymous-namespace)
73-
INSTANTIATE_TEST_SUITE_P(AllReduceTests, NikitinaVRunFuncTests, kGtestValues, NikitinaVRunFuncTests::PrintTestParam);
73+
INSTANTIATE_TEST_SUITE_P(AllReduce, NikitinaAllReduceTests, kGtestValues, NikitinaAllReduceTests::PrintTestParam);
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) {

0 commit comments

Comments
 (0)