From: Francis Dupont <fdupont@isc.org>
Date: Tue, 29 Jan 2019 13:39:53 +0000 (+0100)
Subject: [406-update-cb_cmds-with-get-commands] Expend runToElementTest which is built later
X-Git-Tag: 426-cassandra-unit-tests-ends-with-success-even-though-they-fail_base~8
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e42d7ff4063a887adf779bc2c102d8e0020d6da8;p=thirdparty%2Fkea.git

[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 c05c29ce92..cdf149b629 100644
--- 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 6061e1bd41..359fdecbe9 100644
--- 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));
 }
 
 }