commit b47247dad9d7fd3e5be84a895f8f0bc1f1cfa683
author Junxiao Shi <git@mail1.yoursunny.com> Tue Jan 24 15:09:16 2017 +0000
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jan 25 14:17:45 2017 -0500
tree 66dd9672000c1713d122a3ccb9d818d567a8bf36
parent 8a84773fdbb0b0b91a972ee85394438b4793d384

face: ProtocolFactory registry

refs #3904

Change-Id: Ic7c8b3d6138b7c27d4189a2e15cc646055ad1294

tests/daemon/face/face-system.t.cpp

diff --git a/tests/daemon/face/face-system.t.cpp b/tests/daemon/face/face-system.t.cpp
index de1b6b1..bae735b 100644
--- a/tests/daemon/face/face-system.t.cpp
+++ b/tests/daemon/face/face-system.t.cpp
@@ -82,10 +82,10 @@
 
 BOOST_AUTO_TEST_CASE(Normal)
 {
-  auto f1 = make_shared<DummyProtocolFactory>();
-  auto f2 = make_shared<DummyProtocolFactory>();
-  faceSystem.m_factories["f1"] = f1;
-  faceSystem.m_factories["f2"] = f2;
+  faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
+  faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>();
+  auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
+  auto f2 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f2"));
 
   const std::string CONFIG = R"CONFIG(
     face_system
@@ -101,7 +101,7 @@
     }
   )CONFIG";
 
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, true));
+  parseConfig(CONFIG, true);
   BOOST_REQUIRE_EQUAL(f1->processConfigHistory.size(), 1);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().isDryRun, true);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().configSection->get<std::string>("key"), "v1");
@@ -109,7 +109,7 @@
   BOOST_CHECK_EQUAL(f2->processConfigHistory.back().isDryRun, true);
   BOOST_CHECK_EQUAL(f2->processConfigHistory.back().configSection->get<std::string>("key"), "v2");
 
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, false));
+  parseConfig(CONFIG, false);
   BOOST_REQUIRE_EQUAL(f1->processConfigHistory.size(), 2);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().isDryRun, false);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().configSection->get<std::string>("key"), "v1");
@@ -120,10 +120,10 @@
 
 BOOST_AUTO_TEST_CASE(OmittedSection)
 {
-  auto f1 = make_shared<DummyProtocolFactory>();
-  auto f2 = make_shared<DummyProtocolFactory>();
-  faceSystem.m_factories["f1"] = f1;
-  faceSystem.m_factories["f2"] = f2;
+  faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
+  faceSystem.m_factories["f2"] = make_unique<DummyProtocolFactory>();
+  auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
+  auto f2 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f2"));
 
   const std::string CONFIG = R"CONFIG(
     face_system
@@ -134,14 +134,14 @@
     }
   )CONFIG";
 
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, true));
+  parseConfig(CONFIG, true);
   BOOST_REQUIRE_EQUAL(f1->processConfigHistory.size(), 1);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().isDryRun, true);
   BOOST_REQUIRE_EQUAL(f2->processConfigHistory.size(), 1);
   BOOST_CHECK_EQUAL(f2->processConfigHistory.back().isDryRun, true);
   BOOST_CHECK(!f2->processConfigHistory.back().configSection);
 
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, false));
+  parseConfig(CONFIG, false);
   BOOST_REQUIRE_EQUAL(f1->processConfigHistory.size(), 2);
   BOOST_CHECK_EQUAL(f1->processConfigHistory.back().isDryRun, false);
   BOOST_REQUIRE_EQUAL(f2->processConfigHistory.size(), 2);
@@ -166,8 +166,8 @@
 
 BOOST_AUTO_TEST_CASE(ChangeProvidedSchemes)
 {
-  auto f1 = make_shared<DummyProtocolFactory>();
-  faceSystem.m_factories["f1"] = f1;
+  faceSystem.m_factories["f1"] = make_unique<DummyProtocolFactory>();
+  auto f1 = static_cast<DummyProtocolFactory*>(faceSystem.getFactoryById("f1"));
 
   const std::string CONFIG = R"CONFIG(
     face_system
@@ -180,18 +180,18 @@
 
   f1->newProvidedSchemes.insert("s1");
   f1->newProvidedSchemes.insert("s2");
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, false));
+  parseConfig(CONFIG, false);
   BOOST_CHECK(faceSystem.getFactoryByScheme("f1") == nullptr);
-  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s1"), f1.get());
-  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s2"), f1.get());
+  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s1"), f1);
+  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s2"), f1);
 
   f1->newProvidedSchemes.erase("s2");
   f1->newProvidedSchemes.insert("s3");
-  BOOST_CHECK_NO_THROW(parseConfig(CONFIG, false));
+  parseConfig(CONFIG, false);
   BOOST_CHECK(faceSystem.getFactoryByScheme("f1") == nullptr);
-  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s1"), f1.get());
+  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s1"), f1);
   BOOST_CHECK(faceSystem.getFactoryByScheme("s2") == nullptr);
-  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s3"), f1.get());
+  BOOST_CHECK_EQUAL(faceSystem.getFactoryByScheme("s3"), f1);
 }
 
 BOOST_AUTO_TEST_SUITE_END() // ProcessConfig