[T] extracted common testing functionality

Tests/BaseLib/TestConfigTree.cpp

@@ -14,6 +14,7 @@
 #include <sstream>
 
 #include "BaseLib/ConfigTree.h"
+#include "Tests/TestTools.h"
 
 // make useful line numbers appear in the output of gtest
 #define EXPECT_ERR_WARN(cbs, error, warning) do  { \
@@ -73,18 +74,6 @@ private:
     bool _warning = false;
 };
 
-
-boost::property_tree::ptree
-readXml(const char xml[])
-{
-    boost::property_tree::ptree ptree;
-    std::istringstream xml_str(xml);
-    read_xml(xml_str, ptree,
-             boost::property_tree::xml_parser::no_comments |
-             boost::property_tree::xml_parser::trim_whitespace);
-    return ptree;
-}
-
 BaseLib::ConfigTree
 makeConfigTree(boost::property_tree::ptree const& ptree, Callbacks& cbs)
 {

Tests/TestTools.cpp

+/**
+ * \copyright
+ * Copyright (c) 2012-2016, OpenGeoSys Community (http://www.opengeosys.org)
+ *            Distributed under a Modified BSD License.
+ *              See accompanying file LICENSE.txt or
+ *              http://www.opengeosys.org/project/license
+ *
+ */
+
+#include <boost/property_tree/xml_parser.hpp>
+
+#include "TestTools.h"
+
+boost::property_tree::ptree
+readXml(const char xml[])
+{
+    boost::property_tree::ptree ptree;
+    std::istringstream xml_str(xml);
+    boost::property_tree::read_xml(
+        xml_str, ptree,
+        boost::property_tree::xml_parser::no_comments |
+        boost::property_tree::xml_parser::trim_whitespace);
+    return ptree;
+}

Tests/TestTools.h

@@ -13,6 +13,7 @@
  */
 
 #include <gtest/gtest.h>
+#include <boost/property_tree/ptree_fwd.hpp>
 
 #ifndef TESTTOOLS_H_
 #define TESTTOOLS_H_
@@ -25,4 +26,7 @@
     for (std::size_t i=0; i<(unsigned)(N); i++) \
         ASSERT_EQ((E)[i], (A)[i]);
 
+boost::property_tree::ptree
+readXml(const char xml[]);
+
 #endif // TESTTOOLS_H_