#3: tests: parameterize on comm type

Author: nlslatt

tests/unit/comm/test_dummy.cc

@@ -0,0 +1,70 @@
+/*
+//@HEADER
+// *****************************************************************************
+//
+//                                 test_dummy.h
+//                 DARMA/vt-lb => Virtual Transport/Load Balancers
+//
+// Copyright 2019-2024 National Technology & Engineering Solutions of Sandia, LLC
+// (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+// Government retains certain rights in this software.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+//
+// * Redistributions of source code must retain the above copyright notice,
+//   this list of conditions and the following disclaimer.
+//
+// * Redistributions in binary form must reproduce the above copyright notice,
+//   this list of conditions and the following disclaimer in the documentation
+//   and/or other materials provided with the distribution.
+//
+// * Neither the name of the copyright holder nor the names of its
+//   contributors may be used to endorse or promote products derived from this
+//   software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+// Questions? Contact [email protected]
+//
+// *****************************************************************************
+//@HEADER
+*/
+
+#include <gtest/gtest.h>
+
+#include "test_parallel_harness.h"
+#include "test_helpers.h"
+
+namespace vt_lb { namespace tests { namespace unit {
+
+struct TestDummyVTOnly : TestParallelHarness<comm::CommVT> {
+};
+
+TEST_F(TestDummyVTOnly, test_dummy) {
+  auto const my_rank = comm.getRank();
+  EXPECT_GE( my_rank, 0 );
+}
+
+template <comm::Communicator CommType>
+struct TestDummyAnyComm : TestParallelHarness<CommType> {
+};
+
+TYPED_TEST_SUITE(TestDummyAnyComm, CommTypesForTesting, CommNameGenerator);
+
+TYPED_TEST(TestDummyAnyComm, test_dummy) {
+  auto const my_rank = this->comm.getRank();
+  EXPECT_GE( my_rank, 0 );
+};
+
+}}} // end namespace vt_lb::tests::unit

tests/unit/test_parallel_harness.h

@@ -50,18 +50,16 @@
 #include "test_config.h"
 #include "test_harness.h"
 
-#include <vt-lb/comm/vt/comm_vt.h>
+#include <vt-lb/comm/comm_traits.h>
 #include <vt-lb/comm/MPI/comm_mpi.h>
+#include <vt-lb/comm/vt/comm_vt.h>
 
 namespace vt_lb { namespace tests { namespace unit {
 
 extern int test_argc;
 extern char** test_argv;
 
-using CommType = vt_lb::comm::CommVT;
-//using CommType = vt_lb::comm::CommMPI;
-
-template <typename TestBase>
+template <typename TestBase, comm::Communicator CommType>
 struct TestParallelHarnessAny : TestHarnessAny<TestBase> {
   virtual void SetUp() override {
     TestHarnessAny<TestBase>::SetUp();
@@ -164,14 +162,24 @@ struct TestParallelHarnessAny : TestHarnessAny<TestBase> {
   std::vector<char*> additional_args_;
 };
 
-using TestParallelHarness = TestParallelHarnessAny<testing::Test>;
+template <comm::Communicator CommType>
+using TestParallelHarness = TestParallelHarnessAny<testing::Test, CommType>;
 
-template <typename ParamT>
+template <typename ParamT, comm::Communicator CommType>
 using TestParallelHarnessParam = TestParallelHarnessAny<
-  testing::TestWithParam<ParamT>
+  testing::TestWithParam<ParamT>, CommType
 >;
 
-using TestParameterHarnessNode = TestParallelHarnessParam<vt::NodeType>;
+struct CommNameGenerator {
+  template <comm::Communicator CommType>
+  static std::string GetName(int) {
+    if constexpr (std::is_same_v<CommType, comm::CommMPI>) return "CommMPI";
+    if constexpr (std::is_same_v<CommType, comm::CommVT>) return "CommVT";
+    return "Unrecognized";
+  }
+};
+
+using CommTypesForTesting = ::testing::Types<comm::CommMPI, comm::CommVT>;
 
 }}} // end namespace vt_lb::tests::unit