diff --git a/tasks/kutergin_v_reduce/tests/functional/main.cpp b/tasks/kutergin_v_reduce/tests/functional/main.cpp index 17cee8e6aa..1cb83186fe 100644 --- a/tasks/kutergin_v_reduce/tests/functional/main.cpp +++ b/tasks/kutergin_v_reduce/tests/functional/main.cpp @@ -17,7 +17,7 @@ namespace kutergin_v_reduce { -TEST(KuterginReduceValidation, SeqHandlesEmptyVector) { +TEST(KuterginReduce, SeqEmpty) { InType empty_input{{}, 0}; ReduceSequential task_empty(empty_input); ASSERT_TRUE(task_empty.Validation()); @@ -25,11 +25,11 @@ TEST(KuterginReduceValidation, SeqHandlesEmptyVector) { ASSERT_EQ(task_empty.GetOutput(), 0); } -class ReduceFuncTests : public ppc::util::BaseRunFuncTests { +class ReduceTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const TestType &test_param) // вывод имен тестов { - return "vec_size_" + std::to_string(std::get<0>(test_param)) + "_root_" + std::to_string(std::get<1>(test_param)); + return "sz_" + std::to_string(std::get<0>(test_param)) + "_r_" + std::to_string(std::get<1>(test_param)); } protected: @@ -117,13 +117,13 @@ class ReduceFuncTests : public ppc::util::BaseRunFuncTests kTestCases = { - std::make_tuple(10, 0, "size_10_root_0"), std::make_tuple(20, 1, "size_20_root_1"), - std::make_tuple(1, 3, "size_1_root_3"), std::make_tuple(100, 2, "size_100_root_2")}; + std::make_tuple(10, 0, "sz_10_r_0"), std::make_tuple(20, 1, "sz_20_r_1"), + std::make_tuple(1, 3, "sz_1_r_3"), std::make_tuple(100, 2, "sz_100_r_2")}; const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask(kTestCases, PPC_SETTINGS_kutergin_v_reduce), @@ -131,10 +131,10 @@ const auto kTestTasksList = const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList); -const auto kTestName = ReduceFuncTests::PrintFuncTestName; +const auto kTestName = ReduceTests::PrintFuncTestName; // NOLINTNEXTLINE(modernize-type-traits, cppcoreguidelines-avoid-non-const-global-variables) -INSTANTIATE_TEST_SUITE_P(Reduce, ReduceFuncTests, kGtestValues, kTestName); +INSTANTIATE_TEST_SUITE_P(Reduce, ReduceTests, kGtestValues, kTestName); } // namespace } // namespace kutergin_v_reduce diff --git a/tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp b/tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp index 1b11ff9913..9e3f0c0f5a 100644 --- a/tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp +++ b/tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp @@ -67,7 +67,7 @@ TEST(KuterginTrapezoidValidation, MPIFailsOnNegativeSteps) { task.PostProcessing(); } -class KuterginVRunFuncTestsSEQ +class KuterginTrapezoidTests : public ppc::util::BaseRunFuncTests // наследник ppc::util::BaseRunFuncTests { @@ -114,7 +114,7 @@ class KuterginVRunFuncTestsSEQ namespace // анонимное пространство имен { -TEST_P(KuterginVRunFuncTestsSEQ, TrapezoidTest) // параметризованный тест +TEST_P(KuterginTrapezoidTests, TrapezoidTest) // параметризованный тест { ExecuteTest(GetParam()); } @@ -145,11 +145,11 @@ const auto kTestTasksList = const auto kGtestValues = ppc::util::ExpandToValues(kTestTasksList); -const auto kTestName = KuterginVRunFuncTestsSEQ::PrintFuncTestName; +const auto kTestName = KuterginTrapezoidTests::PrintFuncTestName; // "регистрация" набора тестов и параметров в GTest // NOLINTNEXTLINE(modernize-type-traits, cppcoreguidelines-avoid-non-const-global-variables) -INSTANTIATE_TEST_SUITE_P(TrapezoidIntegrationSEQ, KuterginVRunFuncTestsSEQ, kGtestValues, kTestName); +INSTANTIATE_TEST_SUITE_P(TrapezoidSeq, KuterginTrapezoidTests, kGtestValues, kTestName); } // namespace } // namespace kutergin_v_trapezoid_seq diff --git a/tasks/kutuzov_i_elem_vec_average/tests/functional/main.cpp b/tasks/kutuzov_i_elem_vec_average/tests/functional/main.cpp index 2767309543..725a61489e 100644 --- a/tasks/kutuzov_i_elem_vec_average/tests/functional/main.cpp +++ b/tasks/kutuzov_i_elem_vec_average/tests/functional/main.cpp @@ -16,7 +16,7 @@ namespace kutuzov_i_elem_vec_average { -class KutuzovIElemVecAverageFuncTests : public ppc::util::BaseRunFuncTests { +class KutuzovAverageTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const TestType &test_param) { return std::to_string(test_param); @@ -54,7 +54,7 @@ class KutuzovIElemVecAverageFuncTests : public ppc::util::BaseRunFuncTests; +const auto kPerfTestName = KutuzovAverageTests::PrintFuncTestName; -INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovIElemVecAverageFuncTests, kGtestValues, kPerfTestName); +INSTANTIATE_TEST_SUITE_P(Average, KutuzovAverageTests, kGtestValues, kPerfTestName); } // namespace diff --git a/tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp b/tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp index 15f04576d8..572088cfa3 100644 --- a/tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp +++ b/tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp @@ -17,7 +17,7 @@ namespace kutuzov_i_simpson_integration { -class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTests { +class KutuzovSimpsonTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const TestType &test_param) { int n = get<0>(test_param); @@ -92,7 +92,7 @@ class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTest namespace { -TEST_P(KutuzovISimpsonIntegrationMPIFuncTests, SimpsonIntegration) { +TEST_P(KutuzovSimpsonTests, SimpsonIntegration) { ExecuteTest(GetParam()); } @@ -125,10 +125,9 @@ const auto kTestTasksList = std::tuple_cat(ppc::util::AddFuncTask; +const auto kPerfTestName = KutuzovSimpsonTests::PrintFuncTestName; -INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovISimpsonIntegrationMPIFuncTests, kGtestValues, kPerfTestName); +INSTANTIATE_TEST_SUITE_P(Simpson, KutuzovSimpsonTests, kGtestValues, kPerfTestName); } // namespace diff --git a/tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp b/tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp index dd9b18a769..765cb661f1 100644 --- a/tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp +++ b/tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp @@ -10,7 +10,7 @@ namespace kutuzov_i_simpson_integration { -class KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests { +class KutuzovSimpsonPerf : public ppc::util::BaseRunPerfTests { InType input_data_; void SetUp() override { @@ -56,7 +56,7 @@ class KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests { +class KutuzovTorusTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const TestType &test_param) { std::string test_name = test_param; @@ -175,7 +175,7 @@ class KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests; +const auto kPerfTestName = KutuzovTorusTests::PrintFuncTestName; -INSTANTIATE_TEST_SUITE_P(ThorusGridTests, KutuzovITorusGridMPIFuncTests, kGtestValues, kPerfTestName); +INSTANTIATE_TEST_SUITE_P(TorusGrid, KutuzovTorusTests, kGtestValues, kPerfTestName); } // namespace diff --git a/tasks/kutuzov_i_torus_grid/tests/performance/main.cpp b/tasks/kutuzov_i_torus_grid/tests/performance/main.cpp index 374d3c42ad..16b75e5509 100644 --- a/tasks/kutuzov_i_torus_grid/tests/performance/main.cpp +++ b/tasks/kutuzov_i_torus_grid/tests/performance/main.cpp @@ -13,7 +13,7 @@ namespace kutuzov_i_torus_grid { const int kLongStringSize = 10'000'000; -class KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests { +class KutuzovTorusPerf : public ppc::util::BaseRunPerfTests { void SetUp() override { message_ = std::string(kLongStringSize, 'a'); int process_count = -1; @@ -61,7 +61,7 @@ class KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests; -class NikitinaVMaxElemMatrFuncTests : public ppc::util::BaseRunFuncTests { +class NikitinaMaxElemTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam(const testing::TestParamInfo &info) { auto task_name = std::get(ppc::util::GTestParamIndex::kNameTest)>(info.param); @@ -102,7 +102,7 @@ class NikitinaVMaxElemMatrFuncTests : public ppc::util::BaseRunFuncTests { +class NikitinaAllReduceTests : public ppc::util::BaseRunFuncTests { public: static std::string PrintTestParam( const testing::TestParamInfo> ¶m_info) { @@ -55,7 +55,7 @@ class NikitinaVRunFuncTests : public ppc::util::BaseRunFuncTests &task, ppc::task::TypeOfTask type) {