From 2e4ffdab22027b3ae50d06dbd35572359ad7d641 Mon Sep 17 00:00:00 2001 From: Vicente Mataix Ferrandiz Date: Fri, 15 Dec 2023 15:39:35 +0100 Subject: [PATCH] [Core][MPI] Fix suite in C++ tests in MPI (`KRATOS_TEST_CASE_IN_SUITE` -> `KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE`) --- .../sources/test_data_communicator.cpp | 122 +++++++++--------- .../utilities/test_pointer_communicator.cpp | 12 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/kratos/mpi/tests/cpp_tests/sources/test_data_communicator.cpp b/kratos/mpi/tests/cpp_tests/sources/test_data_communicator.cpp index 052045dc02a0..76079e6d90f7 100644 --- a/kratos/mpi/tests/cpp_tests/sources/test_data_communicator.cpp +++ b/kratos/mpi/tests/cpp_tests/sources/test_data_communicator.cpp @@ -23,7 +23,7 @@ namespace Kratos::Testing { -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorRankAndSize, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorRankAndSize, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -31,7 +31,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorRankAndSize, KratosCoreFastSuite) KRATOS_EXPECT_EQ(serial_communicator.Size(), 1); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorInquiryChecks, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorInquiryChecks, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -40,7 +40,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorInquiryChecks, KratosCoreFastSuite) KRATOS_EXPECT_EQ(serial_communicator.IsDistributed(), false); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorFromKratosComponents, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorFromKratosComponents, KratosCoreFastSuite) { KRATOS_EXPECT_EQ(KratosComponents::Has("Serial"), true); const DataCommunicator& r_serial = KratosComponents::Get("Serial"); @@ -49,7 +49,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorFromKratosComponents, KratosCoreFastSu // Sum //////////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -65,7 +65,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumInt, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -81,7 +81,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumDouble, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -103,7 +103,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSumIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -144,7 +144,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSumDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -187,7 +187,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumDoubleVector, KratosCoreFastSuite) // Min //////////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -203,7 +203,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinInt, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -219,7 +219,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinDouble, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -241,7 +241,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMinIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -282,7 +282,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMinDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -325,7 +325,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinDoubleVector, KratosCoreFastSuite) // Max //////////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -341,7 +341,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxInt, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -357,7 +357,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxDouble, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -379,7 +379,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMaxIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -420,7 +420,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMaxDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -463,7 +463,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxDoubleVector, KratosCoreFastSuite) // SumAll ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumAllInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -472,7 +472,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumAllDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -481,7 +481,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllDouble, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorSumAllArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -496,7 +496,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorSumAllArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumAllIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSumAllIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -527,7 +527,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumAllIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumAllDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSumAllDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -560,7 +560,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSumAllDoubleVector, KratosCoreFastSuit // MinAll ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinAllInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -569,7 +569,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinAllDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -578,7 +578,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllDouble, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinAllArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -593,7 +593,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinAllArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinAllIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMinAllIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -624,7 +624,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinAllIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinAllDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMinAllDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -657,7 +657,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMinAllDoubleVector, KratosCoreFastSuit // MaxAll ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -666,7 +666,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -675,7 +675,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllDouble, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllArray1d, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllArray1d, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -690,7 +690,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxAllArray1d, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -713,7 +713,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllIntVector, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -738,7 +738,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorMaxAllDoubleVector, KratosCoreFastSuit // MinLocAll ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -748,7 +748,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result.second, 0); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -760,7 +760,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMinLocAllDouble, KratosCoreFastSuite) // MaxLocAll ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -770,7 +770,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result.second, 0); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -782,7 +782,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorMaxLocAllDouble, KratosCoreFastSuite) // ScanSum //////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorScanSumInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorScanSumInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -791,7 +791,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorScanSumInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorScanSumDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommuniactorScanSumDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -800,7 +800,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommuniactorScanSumDouble, KratosCoreFastSuite) KRATOS_EXPECT_EQ(result, local); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScanSumIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScanSumIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -831,7 +831,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScanSumIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScanSumDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScanSumDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -864,7 +864,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScanSumDoubleVector, KratosCoreFastSui // SendRecv /////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -918,7 +918,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvInt, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -972,7 +972,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvDouble, KratosCoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvString, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvString, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -1023,7 +1023,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorSendRecvString, KratosCoreFastSuite) // Broadcast ////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -1035,7 +1035,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastInt, KratosCoreFastSuite) KRATOS_EXPECT_EQ(send, 1 + world_rank); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -1047,7 +1047,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDouble, KratosCoreFastSuite) KRATOS_EXPECT_EQ(send, 1.0 + world_rank); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -1060,7 +1060,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastIntVector, KratosCoreFastSuit KRATOS_EXPECT_EQ(send[1], 1 + world_rank); } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; const DataCommunicator& r_world = Testing::GetDefaultDataCommunicator(); @@ -1075,7 +1075,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorBroadcastDoubleVector, KratosCoreFastS // Scatter //////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScatterIntVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScatterIntVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1126,7 +1126,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScatterIntVector, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScatterDoubleVector, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScatterDoubleVector, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1179,7 +1179,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScatterDoubleVector, KratosCoreFastSui // Scatterv /////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScattervInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScattervInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1245,7 +1245,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScattervInt, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScattervDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorScattervDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1313,7 +1313,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorScattervDouble, KratosCoreFastSuite) // Gather ///////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGatherInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorGatherInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1364,7 +1364,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGatherInt, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGatherDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorGatherDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1417,7 +1417,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGatherDouble, KratosCoreFastSuite) // Gatherv //////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGathervInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorGathervInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1483,7 +1483,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGathervInt, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGathervDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorGathervDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1551,7 +1551,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorGathervDouble, KratosCoreFastSuite) // AllGather ////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1583,7 +1583,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherInt, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1617,7 +1617,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGatherDouble, KratosCoreFastSuite) // AllGatherv //////////////////////////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervInt, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervInt, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1664,7 +1664,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervInt, KratosCoreFastSuite) #endif } -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervDouble, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervDouble, KratosCoreFastSuite) { DataCommunicator serial_communicator; @@ -1713,7 +1713,7 @@ KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorAllGathervDouble, KratosCoreFastSuite) // Error broadcasting methods ///////////////////////////////////////////////// -KRATOS_TEST_CASE_IN_SUITE(DataCommunicatorErrorBroadcasting, KratosCoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(DataCommunicatorErrorBroadcasting, KratosCoreFastSuite) { DataCommunicator serial_communicator; diff --git a/kratos/mpi/tests/cpp_tests/utilities/test_pointer_communicator.cpp b/kratos/mpi/tests/cpp_tests/utilities/test_pointer_communicator.cpp index 23d8e0254add..09a51d11dd46 100644 --- a/kratos/mpi/tests/cpp_tests/utilities/test_pointer_communicator.cpp +++ b/kratos/mpi/tests/cpp_tests/utilities/test_pointer_communicator.cpp @@ -29,7 +29,7 @@ namespace Kratos::Testing { -KRATOS_TEST_CASE_IN_SUITE(PointerCommunicator, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerCommunicator, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model; @@ -85,7 +85,7 @@ KRATOS_TEST_CASE_IN_SUITE(PointerCommunicator, KratosMPICoreFastSuite) } } -KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorLocalRetrieveGlobalPointers, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerCommunicatorLocalRetrieveGlobalPointers, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model; @@ -144,7 +144,7 @@ KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorLocalRetrieveGlobalPointers, Kratos } } -KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorGlobalRetrieveGlobalPointers, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerCommunicatorGlobalRetrieveGlobalPointers, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model; @@ -207,7 +207,7 @@ KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorGlobalRetrieveGlobalPointers, Krato } } -KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorIndexConsistence, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerCommunicatorIndexConsistence, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model; @@ -256,7 +256,7 @@ KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorIndexConsistence, KratosMPICoreFast } } -KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorConstructByFunctor, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerCommunicatorConstructByFunctor, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model; @@ -311,7 +311,7 @@ KRATOS_TEST_CASE_IN_SUITE(PointerCommunicatorConstructByFunctor, KratosMPICoreFa } -KRATOS_TEST_CASE_IN_SUITE(PointerMapCommunicatorAssembly, KratosMPICoreFastSuite) +KRATOS_DISTRIBUTED_TEST_CASE_IN_SUITE(PointerMapCommunicatorAssembly, KratosMPICoreFastSuite) { DataCommunicator& r_default_comm = ParallelEnvironment::GetDefaultDataCommunicator(); Model current_model;