[Tests] Assigned a namespace to readXML

Tests/BaseLib/TestConfigTree.cpp

@@ -120,7 +120,7 @@ TEST(BaseLibConfigTree, Get)
             "<vector_bad1>x 1 2a</vector_bad1>"
             "<vector_bad2>0 1 2a</vector_bad2>"
             ;
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -256,7 +256,7 @@ TEST(BaseLibConfigTree, IncompleteParse)
             "<pt x=\"0.5\">1</pt>"
             "<pt2 x=\"0.5\" y=\"1.0\" z=\"2.0\" />"
             ;
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -297,7 +297,7 @@ TEST(BaseLibConfigTree, CheckRange)
             "<int>0</int>"
             "<int>1</int>"
             "<int>2</int>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -336,7 +336,7 @@ TEST(BaseLibConfigTree, GetSubtreeList)
             "<val><int>0</int></val>"
             "<val><int>1</int></val>"
             "<val><int>2</int></val>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -368,7 +368,7 @@ TEST(BaseLibConfigTree, GetParamList)
             "<int>2</int>"
             "<int2 a=\"b\">3</int2>"
             "<int3>4<error/></int3>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -419,7 +419,7 @@ TEST(BaseLibConfigTree, GetValueList)
             "<int>0</int>"
             "<int>1</int>"
             "<int>2</int>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -454,7 +454,7 @@ TEST(BaseLibConfigTree, NoConversion)
             "<ign/>"
             "<ign2/><ign2/><ign2/>"
             ;
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -506,7 +506,7 @@ TEST(BaseLibConfigTree, NoConversion)
 TEST(BaseLibConfigTree, BadKeynames)
 {
     const char xml[] = "";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -550,7 +550,7 @@ TEST(BaseLibConfigTree, StringLiterals)
     const char xml[] =
             "<s>test</s>"
             "<t>Test</t>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -576,7 +576,7 @@ TEST(BaseLibConfigTree, MoveConstruct)
             "<s>test</s>"
             "<t>Test</t>"
             "<u>data</u>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {
@@ -620,7 +620,7 @@ TEST(BaseLibConfigTree, MoveAssign)
             "<s>test</s>"
             "<t>Test</t>"
             "<u>data</u>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     Callbacks cbs;
     {

Tests/MaterialLib/TestCapillaryPressureSaturationModel.cpp

@@ -28,7 +28,7 @@ using namespace MaterialLib::PorousMedium;
 std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
     const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("capillary_pressure");

Tests/MaterialLib/TestFluidDensity.cpp

@@ -28,7 +28,7 @@ using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 // Test density models.
 std::unique_ptr<FluidProperty> createTestFluidDensityModel(const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("density");

Tests/MaterialLib/TestFluidProperties.cpp

@@ -30,7 +30,7 @@ using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 
 std::unique_ptr<FluidProperties> createTestFluidProperties(const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("fluid");

Tests/MaterialLib/TestFluidSpecificHeatCapacityModel.cpp

@@ -30,7 +30,7 @@ using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 std::unique_ptr<FluidProperty> createSpecificFluidHeatCapacityModel(
     const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("specific_heat_capacity");

Tests/MaterialLib/TestFluidThermalConductivityModel.cpp

@@ -31,7 +31,7 @@ using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 std::unique_ptr<FluidProperty> createFluidThermalConductivityModel(
     const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("thermal_conductivity");

Tests/MaterialLib/TestFluidViscosity.cpp

@@ -27,7 +27,7 @@ using ArrayType = MaterialLib::Fluid::FluidProperty::ArrayType;
 
 std::unique_ptr<FluidProperty> createTestViscosityModel(const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("viscosity");

Tests/MaterialLib/TestMPL.cpp

@@ -18,12 +18,13 @@
 #include "MaterialLib/MPL/CreateMedium.h"
 #include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h"
 #include "ParameterLib/Parameter.h"
+#include "Tests/TestTools.h"
 
 namespace Tests
 {
 std::unique_ptr<MPL::Medium> createTestMaterial(std::string const& xml)
 {
-    auto const ptree = readXml(xml.c_str());
+    auto const ptree = Tests::readXml(xml.c_str());
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& config = conf.getConfigSubtree("medium");
@@ -41,7 +42,7 @@ std::unique_ptr<MaterialPropertyLib::Property> createTestProperty(
         BaseLib::ConfigTree const& config)>
         createProperty)
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("property");

Tests/MaterialLib/TestPorousMediumStorage.cpp

@@ -24,7 +24,7 @@ using namespace MaterialLib::PorousMedium;
 
 std::unique_ptr<Storage> createTestStorageModel(const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("storage");

Tests/MaterialLib/TestRelativePermeabilityModel.cpp

@@ -28,7 +28,7 @@ using namespace MaterialLib::PorousMedium;
 std::unique_ptr<RelativePermeability> createRelativePermeabilityModel(
     const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("relative_permeability");

Tests/MathLib/TestLinearSolver.cpp

@@ -283,7 +283,7 @@ TEST(MPITest_Math, CheckInterface_PETSc_Linear_Solver_basic)
             "  </parameters>"
             "  <prefix>ptest1</prefix>"
             "</petsc>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     checkLinearSolverInterface<MathLib::PETScMatrix,
                                MathLib::PETScVector,
@@ -317,7 +317,7 @@ TEST(MPITest_Math, CheckInterface_PETSc_Linear_Solver_chebyshev_sor)
             "  </parameters>"
             "  <prefix>ptest2</prefix>"
             "</petsc>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     checkLinearSolverInterface<MathLib::PETScMatrix,
                                MathLib::PETScVector,
@@ -353,7 +353,7 @@ TEST(MPITest_Math, CheckInterface_PETSc_Linear_Solver_gmres_amg)
             "  </parameters>"
             "  <prefix>ptest3</prefix>"
             "</petsc>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
 
     checkLinearSolverInterface<MathLib::PETScMatrix,
                                MathLib::PETScVector,

Tests/MathLib/TestPiecewiseLinearCurve.cpp

@@ -24,7 +24,7 @@
 template <typename CurveType>
 std::unique_ptr<CurveType> createPiecewiseLinearCurve(const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("curve");

Tests/NumLib/TestODEInt.cpp

@@ -41,7 +41,7 @@ createLinearSolver()
         "<petsc><parameters>"
         "-ksp_type bcgs -pc_type sor -ksp_rtol 1e-24 -ksp_max_it 100 -ksp_initial_guess_nonzero false"
         "</parameters></petsc>";
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree config(ptree, "", BaseLib::ConfigTree::onerror,
                                BaseLib::ConfigTree::onwarning);
     return std::make_unique<GlobalLinearSolver>("", &config);

Tests/NumLib/TestTimeSteppingEvolutionaryPIDcontroller.cpp

@@ -25,7 +25,7 @@
 std::unique_ptr<NumLib::TimeStepAlgorithm> createTestTimeStepper(
     const char xml[])
 {
-    auto const ptree = readXml(xml);
+    auto const ptree = Tests::readXml(xml);
     BaseLib::ConfigTree conf(ptree, "", BaseLib::ConfigTree::onerror,
                              BaseLib::ConfigTree::onwarning);
     auto const& sub_config = conf.getConfigSubtree("time_stepping");

Tests/ParameterLib/Parameter.cpp

@@ -35,7 +35,7 @@ std::unique_ptr<Parameter<double>> constructParameterFromString(
              std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const&
         curves = {})
 {
-    auto const xml_ptree = readXml(xml.c_str());
+    auto const xml_ptree = Tests::readXml(xml.c_str());
     BaseLib::ConfigTree config_tree(xml_ptree, "", BaseLib::ConfigTree::onerror,
                                     BaseLib::ConfigTree::onwarning);
     auto parameter_base = createParameter(config_tree, meshes, curves);

Tests/TestTools.cpp

@@ -11,8 +11,9 @@
 
 #include "Tests/TestTools.h"
 
-boost::property_tree::ptree
-readXml(const char xml[])
+namespace Tests
+{
+boost::property_tree::ptree readXml(const char xml[])
 {
     boost::property_tree::ptree ptree;
     std::istringstream xml_str(xml);
@@ -22,3 +23,5 @@ readXml(const char xml[])
         boost::property_tree::xml_parser::trim_whitespace);
     return ptree;
 }
+
+}  // namespace Tests

Tests/TestTools.h

@@ -24,6 +24,7 @@
 #define ASSERT_ARRAY_EQ(E,A,N)\
     for (std::size_t i=0; i<(unsigned)(N); i++) \
         ASSERT_EQ((E)[i], (A)[i]);
-
-boost::property_tree::ptree
-readXml(const char xml[]);
+namespace Tests
+{
+boost::property_tree::ptree readXml(const char xml[]);
+}  // namespace Tests