Skip to content

An/fix #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
allnes merged 3 commits into from
Jan 5, 2026
Merged

An/fix #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2d16d2
Update test class names for consistency
allnes Jan 5, 2026
765cf0e
Standardize test class and suite names across multiple files for cons…
allnes Jan 5, 2026
f0207f4
Merge branch 'master' into an/fix
allnes Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions tasks/kutergin_v_reduce/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@

namespace kutergin_v_reduce {

TEST(KuterginReduceValidation, SeqHandlesEmptyVector) {
TEST(KuterginReduce, SeqEmpty) {
InType empty_input{{}, 0};
ReduceSequential task_empty(empty_input);
ASSERT_TRUE(task_empty.Validation());
ASSERT_TRUE(task_empty.Run());
ASSERT_EQ(task_empty.GetOutput(), 0);
}

class ReduceFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
class ReduceTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
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:
Expand Down Expand Up @@ -117,24 +117,24 @@ class ReduceFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, Test

namespace {

TEST_P(ReduceFuncTests, ReduceTest) {
TEST_P(ReduceTests, ReduceTest) {
ExecuteTest(GetParam());
}

const std::array<TestType, 4> 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<ReduceSequential, InType>(kTestCases, PPC_SETTINGS_kutergin_v_reduce),
ppc::util::AddFuncTask<ReduceMPI, InType>(kTestCases, PPC_SETTINGS_kutergin_v_reduce));

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

const auto kTestName = ReduceFuncTests::PrintFuncTestName<ReduceFuncTests>;
const auto kTestName = ReduceTests::PrintFuncTestName<ReduceTests>;

// 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
8 changes: 4 additions & 4 deletions tasks/kutergin_v_trapezoid_method_of_integration/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ TEST(KuterginTrapezoidValidation, MPIFailsOnNegativeSteps) {
task.PostProcessing();
}

class KuterginVRunFuncTestsSEQ
class KuterginTrapezoidTests
: public ppc::util::BaseRunFuncTests<InType, OutType,
TestType> // наследник ppc::util::BaseRunFuncTests<InType, OutType, TestType>
{
Expand Down Expand Up @@ -114,7 +114,7 @@ class KuterginVRunFuncTestsSEQ
namespace // анонимное пространство имен
{

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

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

const auto kTestName = KuterginVRunFuncTestsSEQ::PrintFuncTestName<KuterginVRunFuncTestsSEQ>;
const auto kTestName = KuterginTrapezoidTests::PrintFuncTestName<KuterginTrapezoidTests>;

// "регистрация" набора тестов и параметров в 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
8 changes: 4 additions & 4 deletions tasks/kutuzov_i_elem_vec_average/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace kutuzov_i_elem_vec_average {

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

namespace {

TEST_P(KutuzovIElemVecAverageFuncTests, MatmulFromPic) {
TEST_P(KutuzovAverageTests, AverageTest) {
ExecuteTest(GetParam());
}

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

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

const auto kPerfTestName = KutuzovIElemVecAverageFuncTests::PrintFuncTestName<KutuzovIElemVecAverageFuncTests>;
const auto kPerfTestName = KutuzovAverageTests::PrintFuncTestName<KutuzovAverageTests>;

INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovIElemVecAverageFuncTests, kGtestValues, kPerfTestName);
INSTANTIATE_TEST_SUITE_P(Average, KutuzovAverageTests, kGtestValues, kPerfTestName);

} // namespace

Expand Down
9 changes: 4 additions & 5 deletions tasks/kutuzov_i_simpson_integration/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace kutuzov_i_simpson_integration {

class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
class KutuzovSimpsonTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
public:
static std::string PrintTestParam(const TestType &test_param) {
int n = get<0>(test_param);
Expand Down Expand Up @@ -92,7 +92,7 @@ class KutuzovISimpsonIntegrationMPIFuncTests : public ppc::util::BaseRunFuncTest

namespace {

TEST_P(KutuzovISimpsonIntegrationMPIFuncTests, SimpsonIntegration) {
TEST_P(KutuzovSimpsonTests, SimpsonIntegration) {
ExecuteTest(GetParam());
}

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

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

const auto kPerfTestName =
KutuzovISimpsonIntegrationMPIFuncTests::PrintFuncTestName<KutuzovISimpsonIntegrationMPIFuncTests>;
const auto kPerfTestName = KutuzovSimpsonTests::PrintFuncTestName<KutuzovSimpsonTests>;

INSTANTIATE_TEST_SUITE_P(PicMatrixTests, KutuzovISimpsonIntegrationMPIFuncTests, kGtestValues, kPerfTestName);
INSTANTIATE_TEST_SUITE_P(Simpson, KutuzovSimpsonTests, kGtestValues, kPerfTestName);

} // namespace

Expand Down
8 changes: 4 additions & 4 deletions tasks/kutuzov_i_simpson_integration/tests/performance/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

namespace kutuzov_i_simpson_integration {

class KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
class KutuzovSimpsonPerf : public ppc::util::BaseRunPerfTests<InType, OutType> {
InType input_data_;

void SetUp() override {
Expand Down Expand Up @@ -56,7 +56,7 @@ class KutuzovISimpsonIntegrationPerfTests : public ppc::util::BaseRunPerfTests<I
}
};

TEST_P(KutuzovISimpsonIntegrationPerfTests, RunPerfModes) {
TEST_P(KutuzovSimpsonPerf, RunPerfModes) {
ExecuteTest(GetParam());
}

Expand All @@ -66,8 +66,8 @@ const auto kAllPerfTasks =

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

const auto kPerfTestName = KutuzovISimpsonIntegrationPerfTests::CustomPerfTestName;
const auto kPerfTestName = KutuzovSimpsonPerf::CustomPerfTestName;

INSTANTIATE_TEST_SUITE_P(RunModeTests, KutuzovISimpsonIntegrationPerfTests, kGtestValues, kPerfTestName);
INSTANTIATE_TEST_SUITE_P(RunMode, KutuzovSimpsonPerf, kGtestValues, kPerfTestName);

} // namespace kutuzov_i_simpson_integration
8 changes: 4 additions & 4 deletions tasks/kutuzov_i_torus_grid/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

namespace kutuzov_i_torus_grid {

class KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
class KutuzovTorusTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
public:
static std::string PrintTestParam(const TestType &test_param) {
std::string test_name = test_param;
Expand Down Expand Up @@ -175,7 +175,7 @@ class KutuzovITorusGridMPIFuncTests : public ppc::util::BaseRunFuncTests<InType,

namespace {

TEST_P(KutuzovITorusGridMPIFuncTests, ThorusGrid) {
TEST_P(KutuzovTorusTests, ThorusGrid) {
ExecuteTest(GetParam());
}

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

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

const auto kPerfTestName = KutuzovITorusGridMPIFuncTests::PrintFuncTestName<KutuzovITorusGridMPIFuncTests>;
const auto kPerfTestName = KutuzovTorusTests::PrintFuncTestName<KutuzovTorusTests>;

INSTANTIATE_TEST_SUITE_P(ThorusGridTests, KutuzovITorusGridMPIFuncTests, kGtestValues, kPerfTestName);
INSTANTIATE_TEST_SUITE_P(TorusGrid, KutuzovTorusTests, kGtestValues, kPerfTestName);

} // namespace

Expand Down
8 changes: 4 additions & 4 deletions tasks/kutuzov_i_torus_grid/tests/performance/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
namespace kutuzov_i_torus_grid {
const int kLongStringSize = 10'000'000;

class KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests<InType, OutType> {
class KutuzovTorusPerf : public ppc::util::BaseRunPerfTests<InType, OutType> {
void SetUp() override {
message_ = std::string(kLongStringSize, 'a');
int process_count = -1;
Expand Down Expand Up @@ -61,7 +61,7 @@ class KutuzovITorusGridPerfTests : public ppc::util::BaseRunPerfTests<InType, Ou
std::string message_;
};

TEST_P(KutuzovITorusGridPerfTests, RunPerfModes) {
TEST_P(KutuzovTorusPerf, RunPerfModes) {
ExecuteTest(GetParam());
}

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

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

const auto kPerfTestName = KutuzovITorusGridPerfTests::CustomPerfTestName;
const auto kPerfTestName = KutuzovTorusPerf::CustomPerfTestName;

INSTANTIATE_TEST_SUITE_P(RunTests, KutuzovITorusGridPerfTests, kGtestValues, kPerfTestName);
INSTANTIATE_TEST_SUITE_P(RunMode, KutuzovTorusPerf, kGtestValues, kPerfTestName);

} // namespace kutuzov_i_torus_grid
8 changes: 4 additions & 4 deletions tasks/nikitina_v_max_elem_matr/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace nikitina_v_max_elem_matr {

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

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

namespace {

TEST_P(NikitinaVMaxElemMatrFuncTests, FindMaxElement) {
TEST_P(NikitinaMaxElemTests, FindMaxElement) {
ExecuteTest(GetParam());
}

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

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

INSTANTIATE_TEST_SUITE_P(NikitinaV_MaxElementMatr_Func, NikitinaVMaxElemMatrFuncTests, kGtestValues,
NikitinaVMaxElemMatrFuncTests::PrintTestParam);
INSTANTIATE_TEST_SUITE_P(NikitinaMaxElem, NikitinaMaxElemTests, kGtestValues,
NikitinaMaxElemTests::PrintTestParam);

} // namespace

Expand Down
6 changes: 3 additions & 3 deletions tasks/nikitina_v_trans_all_one_distrib/tests/functional/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

namespace nikitina_v_trans_all_one_distrib {

class NikitinaVRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
class NikitinaAllReduceTests : public ppc::util::BaseRunFuncTests<InType, OutType, TestType> {
public:
static std::string PrintTestParam(
const testing::TestParamInfo<ppc::util::FuncTestParam<InType, OutType, TestType>> &param_info) {
Expand Down Expand Up @@ -55,7 +55,7 @@ class NikitinaVRunFuncTests : public ppc::util::BaseRunFuncTests<InType, OutType
InType input_data_;
};

TEST_P(NikitinaVRunFuncTests, AllReduceSum) {
TEST_P(NikitinaAllReduceTests, AllReduceSum) {
ExecuteTest(GetParam());
}

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

// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables, modernize-type-traits, misc-use-anonymous-namespace)
INSTANTIATE_TEST_SUITE_P(AllReduceTests, NikitinaVRunFuncTests, kGtestValues, NikitinaVRunFuncTests::PrintTestParam);
INSTANTIATE_TEST_SUITE_P(AllReduce, NikitinaAllReduceTests, kGtestValues, NikitinaAllReduceTests::PrintTestParam);
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables, modernize-type-traits, misc-use-anonymous-namespace)

void RunCheck(const std::shared_ptr<BaseTask> &task, ppc::task::TypeOfTask type) {
Expand Down
Loading