#1376: tests: split off lb args enum converter tests

tests/unit/lb/test_gossiplb.nompi.cc

@@ -45,7 +45,6 @@
 #include <vt/vrt/collection/balance/lb_common.h>
 #include <vt/vrt/collection/balance/baselb/baselb.h>
 #include <vt/vrt/collection/balance/gossiplb/gossiplb.h>
-#include "vt/vrt/collection/balance/lb_args_enum_converter.h"
 
 #include "test_harness.h"
 
@@ -212,57 +211,4 @@ TEST_F(TestGossipLB, test_gossiplb_ordering_largestobjects) {
   orderUsingOverloadAndVerify(order, over_avg, soln);
 }
 
-///////////////////////////////////////////////////////////////////////////
-
-enum struct DummyEnum : uint8_t {
-  One = 1,
-  Two = 2,
-  Three = 3
-};
-
-}}} // end namespace vt::tests::unit
-
-namespace std {
-
-template <>
-struct hash<::vt::tests::unit::DummyEnum> {
-  size_t operator()(::vt::tests::unit::DummyEnum const& in) const {
-    return std::hash<uint8_t>()(static_cast<uint8_t>(in));
-  }
-};
-
-} // end namespace std
-
-namespace vt { namespace tests { namespace unit {
-
-template <typename E>
-void checkEnum(vrt::collection::lb::LBArgsEnumConverter<E> &conv, E e) {
-  EXPECT_EQ(conv.getEnum(conv.getString(e)), e);
-}
-
-template <typename E>
-void checkString(
-  vrt::collection::lb::LBArgsEnumConverter<E> &conv, const std::string &s
-) {
-  EXPECT_EQ(conv.getString(conv.getEnum(s)).compare(s), 0);
-}
-
-TEST_F(TestGossipLB, test_enum_converter) {
-  vrt::collection::lb::LBArgsEnumConverter<DummyEnum> dummy_(
-    "dummy", "DummyEnum", {
-      {DummyEnum::One,   "One"},
-      {DummyEnum::Two,   "Two"},
-      {DummyEnum::Three, "Three"}
-    }
-  );
-
-  checkEnum(dummy_, DummyEnum::One);
-  checkEnum(dummy_, DummyEnum::Two);
-  checkEnum(dummy_, DummyEnum::Three);
-
-  checkString(dummy_, "One");
-  checkString(dummy_, "Two");
-  checkString(dummy_, "Three");
-}
-
 }}} // end namespace vt::tests::unit

tests/unit/lb/test_lbargs_enum_conv.nompi.cc

@@ -0,0 +1,104 @@
+/*
+//@HEADER
+// *****************************************************************************
+//
+//                       test_lbargs_enum_conv.nompi.cc
+//                           DARMA Toolkit v. 1.0.0
+//                       DARMA/vt => Virtual Transport
+//
+// Copyright 2019 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 "vt/vrt/collection/balance/lb_args_enum_converter.h"
+
+#include "test_harness.h"
+
+namespace vt { namespace tests { namespace unit {
+
+using TestLBArgsEnumConverter = TestHarness;
+
+enum struct DummyEnum : uint8_t {
+  One = 1,
+  Two = 2,
+  Three = 3
+};
+
+}}} // end namespace vt::tests::unit
+
+namespace std {
+
+template <>
+struct hash<::vt::tests::unit::DummyEnum> {
+  size_t operator()(::vt::tests::unit::DummyEnum const& in) const {
+    return std::hash<uint8_t>()(static_cast<uint8_t>(in));
+  }
+};
+
+} // end namespace std
+
+namespace vt { namespace tests { namespace unit {
+
+template <typename E>
+void checkEnum(vrt::collection::balance::LBArgsEnumConverter<E> &conv, E e) {
+  EXPECT_EQ(conv.getEnum(conv.getString(e)), e);
+}
+
+template <typename E>
+void checkString(
+  vrt::collection::balance::LBArgsEnumConverter<E> &conv, const std::string &s
+) {
+  EXPECT_EQ(conv.getString(conv.getEnum(s)).compare(s), 0);
+}
+
+TEST_F(TestLBArgsEnumConverter, test_enum_converter_mapping) {
+  vrt::collection::balance::LBArgsEnumConverter<DummyEnum> dummy_(
+    "dummy", "DummyEnum", {
+      {DummyEnum::One,   "One"},
+      {DummyEnum::Two,   "Two"},
+      {DummyEnum::Three, "Three"}
+    }
+  );
+
+  checkEnum(dummy_, DummyEnum::One);
+  checkEnum(dummy_, DummyEnum::Two);
+  checkEnum(dummy_, DummyEnum::Three);
+
+  checkString(dummy_, "One");
+  checkString(dummy_, "Two");
+  checkString(dummy_, "Three");
+}
+
+}}} // end namespace vt::tests::unit