[406-update-cb_cmds-with-get-commands] Expend runToElementTest which is built later

diff --git a/src/lib/database/tests/Makefile.am b/src/lib/database/tests/Makefile.am
index c05c29ce92d897d753b6de8b9bf65462fe778310..cdf149b62937b96cb9f24b6846d5a73c1bf07d6e 100644 (file)
--- a/src/lib/database/tests/Makefile.am
+++ b/src/lib/database/tests/Makefile.am
@@ -30,7 +30,6 @@ 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 6061e1bd41deb7624f291d895a5113f635f52561..359fdecbe940601c938ef4027ae3a8d97590f8dd 100644 (file)
--- a/src/lib/database/tests/backend_selector_unittest.cc
+++ b/src/lib/database/tests/backend_selector_unittest.cc
@@ -7,7 +7,6 @@
 
 #include <config.h>
 #include <database/backend_selector.h>
-#include <testutils/test_to_element.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 
@@ -171,6 +170,7 @@ TEST(BackendSelectorTest, backendTypeToString) {
 }
 
 // Tests toElement from backend selectors.
+// Can't be use runToElementTest because it is defined in a later library...
 TEST(BackendSelectorTest, backendToElement) {
     // Unspecified.
     boost::scoped_ptr<BackendSelector> sel(new BackendSelector());
@@ -184,17 +184,24 @@ TEST(BackendSelectorTest, backendToElement) {
     EXPECT_NO_THROW(sel.reset(new BackendSelector(BackendSelector::Type::MYSQL)));
     ElementPtr expected = Element::createMap();
     expected->set("type", Element::create("mysql"));
-    test::runToElementTest<BackendSelector>(expected, *sel);
+    ConstElementPtr unparsed;
+    ASSERT_NO_THROW(unparsed = sel->toElement());
+    ASSERT_TRUE(unparsed);
+    EXPECT_TRUE(isEquivalent(expected, unparsed));
 
     // Add host.
     expected->set("host", Element::create("myhost"));
     EXPECT_NO_THROW(sel.reset(new BackendSelector(expected)));
-    test::runToElementTest<BackendSelector>(expected, *sel);
+    ASSERT_NO_THROW(unparsed = sel->toElement());
+    ASSERT_TRUE(unparsed);
+    EXPECT_TRUE(isEquivalent(expected, unparsed));
 
     // Add port.
     expected->set("port", Element::create(1234L));
     EXPECT_NO_THROW(sel.reset(new BackendSelector(expected)));
-    test::runToElementTest<BackendSelector>(expected, *sel);
+    ASSERT_NO_THROW(unparsed = sel->toElement());
+    ASSERT_TRUE(unparsed);
+    EXPECT_TRUE(isEquivalent(expected, unparsed));
 }
 
 }