Added tests for ConfigTree

BaseLib/ConfigTree.h

@@ -353,8 +353,6 @@ public:
      * The return value is suitable to be used with range-base for-loops.
      *
      * \pre \c param must not have been read before from this ConfigTree.
-     *
-     * \todo write tests
      */
     Range<ParameterIterator>
     getConfParamList(std::string const& param) const;
@@ -382,8 +380,6 @@ public:
      * \return the requested attribute
      *
      * \pre \c param must not have been read before from this ConfigTree.
-     *
-     * \todo write tests
      */
     template<typename T> boost::optional<T>
     getConfAttributeOptional(std::string const& attr) const;

Tests/BaseLib/TestConfigTree.cpp

@@ -129,7 +129,8 @@ TEST(BaseLibConfigTree, Get)
             "  <ignored2/>"
             "</sub>"
             "<x>Y</x>"
-            "<z attr=\"0.5\">32.0</z>";
+            "<z attr=\"0.5\" optattr=\"false\">32.0</z>"
+            ;
     auto const ptree = readXml(xml);
 
     Callbacks cbs;
@@ -220,12 +221,19 @@ TEST(BaseLibConfigTree, Get)
             EXPECT_ERR_WARN(cbs, false, false);
             EXPECT_EQ(0.5, z.getConfAttribute<double>("attr"));
             EXPECT_ERR_WARN(cbs, false, false);
-            RUN_SAFE(z.getConfAttribute<double>("attr")); // getting attr twice
+            RUN_SAFE(z.getConfAttribute<double>("attr")); // getting attribute twice
             EXPECT_ERR_WARN(cbs, true, false);
             RUN_SAFE(z.getConfAttribute<double>("not_an_attr")); // nonexistent attribute
             EXPECT_ERR_WARN(cbs, true, false);
             EXPECT_EQ(32.0, z.getValue<double>());
             EXPECT_ERR_WARN(cbs, false, false);
+            auto const opt = z.getConfAttributeOptional<bool>("optattr");
+            EXPECT_TRUE(!!opt); EXPECT_FALSE(*opt);
+            EXPECT_ERR_WARN(cbs, false, false);
+            //RUN_SAFE(z.getConfAttributeOptional<bool>("optattr")); // getting attribute twice
+            //EXPECT_ERR_WARN(cbs, true, false);
+            EXPECT_FALSE(z.getConfAttributeOptional<bool>("also_not_an_attr")); // nonexisting attribute
+            EXPECT_ERR_WARN(cbs, false, false);
         }
         EXPECT_ERR_WARN(cbs, false, false);
     } // ConfigTree destroyed here
@@ -328,6 +336,13 @@ TEST(BaseLibConfigTree, GetSubtreeList)
     {
         auto const conf = makeConfigTree(ptree, cbs);
 
+        for (auto p : conf.getConfSubtreeList("nonexistent_list"))
+        {
+            (void) p;
+            FAIL() << "Expected empty list";
+        }
+        EXPECT_ERR_WARN(cbs, false, false);
+
         int i = 0;
         for (auto ct : conf.getConfSubtreeList("val"))
         {
@@ -339,6 +354,58 @@ TEST(BaseLibConfigTree, GetSubtreeList)
     EXPECT_ERR_WARN(cbs, false, false);
 }
 
+TEST(BaseLibConfigTree, GetParamList)
+{
+    const char xml[] =
+            "<int>0</int>"
+            "<int>1</int>"
+            "<int>2</int>"
+            "<int2 a=\"b\">3</int2>"
+            "<int3>4<error/></int3>";
+    auto const ptree = readXml(xml);
+
+    Callbacks cbs;
+    {
+        auto const conf = makeConfigTree(ptree, cbs);
+
+        for (auto p : conf.getConfParamList("nonexistent_list"))
+        {
+            (void) p;
+            FAIL() << "Expected empty list";
+        }
+        EXPECT_ERR_WARN(cbs, false, false);
+
+        int i = 0;
+        for (auto p : conf.getConfParamList("int"))
+        {
+            EXPECT_EQ(i, p.getValue<int>());
+            EXPECT_ERR_WARN(cbs, false, false);
+            ++i;
+        }
+
+        for (auto p : conf.getConfParamList("int2"))
+        {
+            EXPECT_EQ(i, p.getValue<int>());
+            EXPECT_ERR_WARN(cbs, false, false);
+            ++i;
+        }
+        EXPECT_ERR_WARN(cbs, false, true); // attribute "a" not read
+
+        {
+            auto range = conf.getConfParamList("int3");
+            EXPECT_ERR_WARN(cbs, false, false);
+
+            RUN_SAFE(*range.begin());
+            // Error because of child tag, raises exception, thus
+            // a temporary ConfigTree gets destroyed producing a warning.
+            EXPECT_ERR_WARN(cbs, true, true);
+        } // range destroyed here
+        EXPECT_ERR_WARN(cbs, false, false);
+
+    } // ConfigTree destroyed here
+    EXPECT_ERR_WARN(cbs, false, false);
+}
+
 
 TEST(BaseLibConfigTree, GetValueList)
 {
@@ -352,6 +419,13 @@ TEST(BaseLibConfigTree, GetValueList)
     {
         auto const conf = makeConfigTree(ptree, cbs);
 
+        for (auto p : conf.getConfParamList<int>("nonexistent_list"))
+        {
+            (void) p;
+            FAIL() << "Expected empty list";
+        }
+        EXPECT_ERR_WARN(cbs, false, false);
+
         int n = 0;
         for (auto i : conf.getConfParamList<int>("int"))
         {