[406-update-cb_cmds-with-get-commands] Moved testutils and use runToElementTest

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 211aafe810839806ae6bb763bd5a28e144643e1f..9cecf356c390c6bc47e02c6077b8e91598b6b960 100644 (file)
--- 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 cdf149b62937b96cb9f24b6846d5a73c1bf07d6e..c05c29ce92d897d753b6de8b9bf65462fe778310 100644 (file)
--- 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 54383aeac213148978ca04cf794622204464cb5e..6061e1bd41deb7624f291d895a5113f635f52561 100644 (file)
--- a/src/lib/database/tests/backend_selector_unittest.cc
+++ b/src/lib/database/tests/backend_selector_unittest.cc
@@ -7,6 +7,7 @@
 
 #include <config.h>
 #include <database/backend_selector.h>
+#include <testutils/test_to_element.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 
@@ -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<BackendSelector> 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<BackendSelector>(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<BackendSelector>(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<BackendSelector>(expected, *sel);
 }
 
 }