diff options
Diffstat (limited to 'src/hooks/dhcp/pgsql_cb/tests')
| -rw-r--r-- | src/hooks/dhcp/pgsql_cb/tests/Makefile.am | 5 | ||||
| -rw-r--r-- | src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_mgr_unittest.cc | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am index 288980c6fa..146885d2b6 100644 --- a/src/hooks/dhcp/pgsql_cb/tests/Makefile.am +++ b/src/hooks/dhcp/pgsql_cb/tests/Makefile.am @@ -24,15 +24,10 @@ if HAVE_GTEST TESTS += pgsql_cb_unittests pgsql_cb_unittests_SOURCES = pgsql_cb_impl_unittest.cc - -# disabled for now, to be added in #95 pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp4_unittest.cc pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp4_mgr_unittest.cc - -# disabled for now, to be added in #96 pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_unittest.cc pgsql_cb_unittests_SOURCES += pgsql_cb_dhcp6_mgr_unittest.cc - pgsql_cb_unittests_SOURCES += run_unittests.cc pgsql_cb_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) $(LOG4CPLUS_INCLUDES) diff --git a/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_mgr_unittest.cc b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_mgr_unittest.cc index ca4a97b070..cb2b699b1e 100644 --- a/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_mgr_unittest.cc +++ b/src/hooks/dhcp/pgsql_cb/tests/pgsql_cb_dhcp6_mgr_unittest.cc @@ -60,15 +60,15 @@ TEST_F(PgSqlConfigBackendDHCPv6MgrTest, factoryRegistration) { ASSERT_NO_THROW(mgr.addBackend(validPgSQLConnectionString())); // Create a PgSQL backend selector for convenience. - BackendSelector mysql(BackendSelector::Type::POSTGRESQL); + BackendSelector pgsql(BackendSelector::Type::POSTGRESQL); // Should be able to create a global parameter. StampedValuePtr server_tag = StampedValue::create("server-tag", "whale"); - ASSERT_NO_THROW(mgr.getPool()->createUpdateGlobalParameter6(mysql, ServerSelector::ALL(), + ASSERT_NO_THROW(mgr.getPool()->createUpdateGlobalParameter6(pgsql, ServerSelector::ALL(), server_tag)); // Verify parameter can be fetched. server_tag.reset(); - ASSERT_NO_THROW(server_tag = mgr.getPool()->getGlobalParameter6(mysql, ServerSelector::ALL(), + ASSERT_NO_THROW(server_tag = mgr.getPool()->getGlobalParameter6(pgsql, ServerSelector::ALL(), "server-tag")); ASSERT_TRUE(server_tag); EXPECT_EQ("server-tag", server_tag->getName()); @@ -81,7 +81,7 @@ TEST_F(PgSqlConfigBackendDHCPv6MgrTest, factoryRegistration) { ASSERT_THROW(mgr.addBackend(validPgSQLConnectionString()), InvalidType); // Attempting to read the global parameter should fail. - ASSERT_THROW(mgr.getPool()->getGlobalParameter6(mysql, ServerSelector::ALL(), "server-tag"), + ASSERT_THROW(mgr.getPool()->getGlobalParameter6(pgsql, ServerSelector::ALL(), "server-tag"), NoSuchDatabase); } |