#1736: Tests: Move test body of test_construct_1 and test_construct_d…

…istributed_1 to separate functions and then use them in corresponding .cc files for both test_construct.cc and test_construct_no_idx.extended.cc
DARMA-tasking · Apr 18, 2022 · ab48080 · ab48080
1 parent d3e4ce0
commit ab48080
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 11 deletions.
diff --git a/tests/unit/collection/test_collection_construct_common.h b/tests/unit/collection/test_collection_construct_common.h
@@ -105,8 +105,8 @@ struct ConstructParams {
 TYPED_TEST_SUITE_P(TestConstruct);
 TYPED_TEST_SUITE_P(TestConstructDist);
 
-TYPED_TEST_P(TestConstruct, test_construct_1) {
-  using ColType   = TypeParam;
+template<typename ColType>
+void test_construct_1() {
   using MsgType   = typename ColType::MsgType;
 
   auto const& this_node = theContext()->getNode();
@@ -121,8 +121,8 @@ TYPED_TEST_P(TestConstruct, test_construct_1) {
   }
 }
 
-TYPED_TEST_P(TestConstructDist, test_construct_distributed_1) {
-  using ColType   = TypeParam;
+template<typename ColType>
+void test_construct_distributed_1() {
   using MsgType   = typename ColType::MsgType;
 
   auto const& col_size = 32;
@@ -134,9 +134,6 @@ TYPED_TEST_P(TestConstructDist, test_construct_distributed_1) {
   >();
 }
 
-REGISTER_TYPED_TEST_SUITE_P(TestConstruct,     test_construct_1);
-REGISTER_TYPED_TEST_SUITE_P(TestConstructDist, test_construct_distributed_1);
-
 }}} // end namespace vt::tests::unit
 
 #endif /*INCLUDED_UNIT_COLLECTION_TEST_COLLECTION_CONSTRUCT_COMMON_H*/
diff --git a/tests/unit/collection/test_construct.cc b/tests/unit/collection/test_construct.cc
@@ -64,6 +64,17 @@ struct ColMsg : CollectionMessage<TestCol> { };
 using CollectionTestTypes = testing::Types<default_::TestCol>;
 using CollectionTestDistTypes = testing::Types<default_::TestCol>;
 
+TYPED_TEST_P(TestConstruct, test_construct_basic_1) {
+  test_construct_1<TypeParam>();
+}
+
+TYPED_TEST_P(TestConstructDist, test_construct_distributed_basic_1) {
+  test_construct_distributed_1<TypeParam>();
+}
+
+REGISTER_TYPED_TEST_SUITE_P(TestConstruct,     test_construct_basic_1);
+REGISTER_TYPED_TEST_SUITE_P(TestConstructDist, test_construct_distributed_basic_1);
+
 INSTANTIATE_TYPED_TEST_SUITE_P(
   test_construct_simple, TestConstruct, CollectionTestTypes, DEFAULT_NAME_GEN
 );

diff --git a/tests/unit/collection/test_construct_no_idx.extended.cc b/tests/unit/collection/test_construct_no_idx.extended.cc
@@ -62,6 +62,17 @@ struct ColMsg : CollectionMessage<TestCol> {};
 
 using CollectionTestTypes = testing::Types<multi_param_no_idx_::TestCol>;
 
+TYPED_TEST_P(TestConstruct, test_construct_no_idx_extended_1) {
+  test_construct_1<TypeParam>();
+}
+
+TYPED_TEST_P(TestConstructDist, test_construct_distributed_no_idx_extended_1) {
+  test_construct_distributed_1<TypeParam>();
+}
+
+REGISTER_TYPED_TEST_SUITE_P(TestConstruct,     test_construct_no_idx_extended_1);
+REGISTER_TYPED_TEST_SUITE_P(TestConstructDist, test_construct_distributed_no_idx_extended_1);
+
 INSTANTIATE_TYPED_TEST_SUITE_P(
   test_construct_no_idx, TestConstruct, CollectionTestTypes, DEFAULT_NAME_GEN
 );

diff --git a/tests/unit/collection/test_send.h b/tests/unit/collection/test_send.h
@@ -140,9 +140,8 @@ struct TestCollectionSendMem : TestParallelHarness {};
 TYPED_TEST_SUITE_P(TestCollectionSend);
 TYPED_TEST_SUITE_P(TestCollectionSendMem);
 
-template<typename TypeParam>
+template<typename ColType>
 void test_collection_send_1() {
-  using ColType = TypeParam;
   using MsgType = typename ColType::MsgType;
   using TestParamType = typename ColType::ParamType;
 
@@ -166,9 +165,8 @@ void test_collection_send_1() {
   }
 }
 
-template<typename TypeParam>
+template<typename ColType>
 void test_collection_send_ptm_1(){
-  using ColType = TypeParam;
   using MsgType = typename ColType::MsgType;
   using TestParamType = typename ColType::ParamType;