From 5e35336e77fb199cab456e6246c320fe611b5566 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Mon, 4 Feb 2019 19:04:31 +0100 Subject: [PATCH] [406-update-cb_cmds-with-get-commands] Moved testutils and use runToElementTest --- src/lib/Makefile.am | 4 ++-- src/lib/database/tests/Makefile.am | 1 + .../database/tests/backend_selector_unittest.cc | 16 ++++------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 211aafe810..9cecf356c3 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,5 +1,5 @@ # The following build order must be maintained. -SUBDIRS = exceptions util log cryptolink dns asiolink cc database +SUBDIRS = exceptions util log cryptolink dns asiolink cc testutils database if HAVE_MYSQL SUBDIRS += mysql @@ -13,7 +13,7 @@ if HAVE_CQL SUBDIRS += cql endif -SUBDIRS += config_backend testutils hooks dhcp config stats +SUBDIRS += config_backend hooks dhcp config stats if HAVE_SYSREPO SUBDIRS += yang diff --git a/src/lib/database/tests/Makefile.am b/src/lib/database/tests/Makefile.am index cdf149b629..c05c29ce92 100644 --- a/src/lib/database/tests/Makefile.am +++ b/src/lib/database/tests/Makefile.am @@ -30,6 +30,7 @@ libdatabase_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES) libdatabase_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS) libdatabase_unittests_LDADD = $(top_builddir)/src/lib/database/libkea-database.la +libdatabase_unittests_LDADD += $(top_builddir)/src/lib/testutils/libkea-testutils.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/cc/libkea-cc.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/asiolink/libkea-asiolink.la libdatabase_unittests_LDADD += $(top_builddir)/src/lib/log/libkea-log.la diff --git a/src/lib/database/tests/backend_selector_unittest.cc b/src/lib/database/tests/backend_selector_unittest.cc index 54383aeac2..6061e1bd41 100644 --- a/src/lib/database/tests/backend_selector_unittest.cc +++ b/src/lib/database/tests/backend_selector_unittest.cc @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -170,8 +171,6 @@ TEST(BackendSelectorTest, backendTypeToString) { } // Tests toElement from backend selectors. -// Can't use runToElementTest because it is defined in a library built -// at a later stage. TEST(BackendSelectorTest, backendToElement) { // Unspecified. boost::scoped_ptr sel(new BackendSelector()); @@ -185,24 +184,17 @@ TEST(BackendSelectorTest, backendToElement) { EXPECT_NO_THROW(sel.reset(new BackendSelector(BackendSelector::Type::MYSQL))); ElementPtr expected = Element::createMap(); expected->set("type", Element::create("mysql")); - ConstElementPtr unparsed; - ASSERT_NO_THROW(unparsed = sel->toElement()); - ASSERT_TRUE(unparsed); - EXPECT_TRUE(isEquivalent(expected, unparsed)); + test::runToElementTest(expected, *sel); // Add host. expected->set("host", Element::create("myhost")); EXPECT_NO_THROW(sel.reset(new BackendSelector(expected))); - ASSERT_NO_THROW(unparsed = sel->toElement()); - ASSERT_TRUE(unparsed); - EXPECT_TRUE(isEquivalent(expected, unparsed)); + test::runToElementTest(expected, *sel); // Add port. expected->set("port", Element::create(1234L)); EXPECT_NO_THROW(sel.reset(new BackendSelector(expected))); - ASSERT_NO_THROW(unparsed = sel->toElement()); - ASSERT_TRUE(unparsed); - EXPECT_TRUE(isEquivalent(expected, unparsed)); + test::runToElementTest(expected, *sel); } } -- GitLab