* rename configparsertest to paramtreetest

* add move checks to paramtreetest
* test both... ConfigParser and ParameterTree

[[Imported from SVN: r6149]]

dune/common/test/.gitignore

@@ -52,3 +52,8 @@ deprtuplestest
 fassigntest
 iteratorfacadetest2
 static_assert_test
+
+paramtreetest
+tags
+pathtest
+TAGS

dune/common/test/Makefile.am

@@ -5,7 +5,6 @@ TESTPROGS = \
     arraylisttest \
     bigunsignedinttest \
     bitsetvectortest \
-    configparsertest \
     conversiontest \
     deprtuplestest \
     dynvectortest \
@@ -23,6 +22,7 @@ TESTPROGS = \
     mpihelpertest \
     nullptr-test \
     pathtest \
+    paramtreetest \
     polyallocator \
     poolallocatortest \
     shared_ptrtest \
@@ -73,6 +73,8 @@ noinst_HEADERS = dummyiterator.hh
 # define the programs
 pathtest_SOURCES = pathtest.cc
 
+paramtreetest_SOURCES = paramtreetest.cc
+
 smallobject_SOURCES = smallobject.cc
 
 bitsetvectortest_SOURCES = bitsetvectortest.cc
@@ -175,8 +177,6 @@ testfassign_fail6_CPPFLAGS = $(AM_CPPFLAGS) -D_N=2 -D_M=2 -D_VALUES="1, 2, nextR
 
 conversiontest_SOURCES = conversiontest.cc
 
-configparsertest_SOURCES = configparsertest.cc
-
 sourcescheck_NOSOURCES = exprtmpl.cc timing.cc
 
 float_cmp_SOURCES = float_cmp.cc

dune/common/test/configparsertest.cc

-// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-// vi: set et ts=4 sw=2 sts=2:
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <dune/common/configparser.hh>
-#include <dune/common/exceptions.hh>
-#include <dune/common/fvector.hh>
-
-int main ()
-{
-  try {
-    Dune::ConfigParser parameterSet;
-
-    parameterSet["testDouble"] = "3.14";
-    parameterSet["testInt"]    = "42";
-    parameterSet["testString"] = "Hallo Welt!";
-    parameterSet["testVector"] = "2 3 5 7 11";
-
-    double testDouble      = parameterSet.get<double>("testDouble");
-    int testInt            = parameterSet.get<int>("testInt");
-    ++testDouble;
-    ++testInt;
-    std::string testString = parameterSet.get<std::string>("testString");
-    typedef Dune::FieldVector<unsigned, 5> FVector;
-    FVector testFVector    = parameterSet.get<FVector>("testVector");
-    typedef std::vector<unsigned> SVector;
-    SVector testSVector    = parameterSet.get<SVector>("testVector");
-    if(testSVector.size() != 5)
-      DUNE_THROW(Dune::Exception, "Testing std::vector<unsigned>: expected "
-                 "size()==5, got size()==" << testSVector.size());
-    for(unsigned i = 0; i < 5; ++i)
-      if(testFVector[i] != testSVector[i])
-        DUNE_THROW(Dune::Exception,
-                   "testFVector[" << i << "]==" << testFVector[i] << " but "
-                   "testSVector[" << i << "]==" << testSVector[i]);
-  }
-  catch(const Dune::Exception& e) {
-    std::cerr << "Exception thrown: " << e << std::endl;
-    throw;
-  }
-}

dune/common/test/paramtreetest.cc

+// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// vi: set et ts=4 sw=2 sts=2:
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <iostream>
+#include <sstream>
+#include <dune/common/parametertree.hh>
+#include <dune/common/configparser.hh>
+
+template<class P>
+void testparam(const P & p)
+{
+  // try accessing key
+  p.template get<int>("x1");
+  p.template get<double>("x1");
+  p.template get<std::string>("x2");
+  // try accessing subtree
+  p.sub("Foo");
+  p.sub("Foo").template get<std::string>("peng");
+  // try accessing inexistent key
+  try {
+    p.template get<int>("bar");
+    DUNE_THROW(Dune::Exception, "failed to detect missing key");
+  }
+  catch (Dune::RangeError & r) {}
+  // try accessing inexistent subtree
+  try {
+    p.sub("bar");
+    DUNE_THROW(Dune::Exception, "failed to detect missing subtree");
+  }
+  catch (Dune::RangeError & r) {}
+  // try accessing key as subtree
+  try {
+    p.sub("x1");
+    DUNE_THROW(Dune::Exception, "succeeded to access key as subtree");
+  }
+  catch (Dune::RangeError & r) {}
+  // try accessing subtree as key
+  try {
+    p.template get<double>("Foo");
+    DUNE_THROW(Dune::Exception, "succeeded to access subtree as key");
+  }
+  catch (Dune::RangeError & r) {}
+}
+
+template<class P>
+void testmodify(P parameterSet)
+{
+  parameterSet["testDouble"] = "3.14";
+  parameterSet["testInt"]    = "42";
+  parameterSet["testString"] = "Hallo Welt!";
+  parameterSet["testVector"] = "2 3 5 7 11";
+
+  double testDouble      = parameterSet.template get<double>("testDouble");
+  int testInt            = parameterSet.template get<int>("testInt");
+  ++testDouble;
+  ++testInt;
+  std::string testString = parameterSet.template get<std::string>("testString");
+  typedef Dune::FieldVector<unsigned, 5> FVector;
+  FVector testFVector    = parameterSet.template get<FVector>("testVector");
+  typedef std::vector<unsigned> SVector;
+  SVector testSVector    = parameterSet.template get<SVector>("testVector");
+  if(testSVector.size() != 5)
+    DUNE_THROW(Dune::Exception, "Testing std::vector<unsigned>: expected "
+               "size()==5, got size()==" << testSVector.size());
+  for(unsigned i = 0; i < 5; ++i)
+    if(testFVector[i] != testSVector[i])
+      DUNE_THROW(Dune::Exception,
+                 "testFVector[" << i << "]==" << testFVector[i] << " but "
+                 "testSVector[" << i << "]==" << testSVector[i]);
+}
+
+int main()
+{
+  try {
+    // read config
+    std::stringstream s;
+    s << "x1 = 1\n"
+      << "x2 = hallo\n"
+      << "\n"
+      << "[Foo]\n"
+      << "peng = ligapokal\n";
+    Dune::ConfigParser c;
+    c.parseStream(s);
+    // test modifying and reading as configparser
+    testmodify<Dune::ConfigParser>(c);
+    try {
+      c.get<int>("testInt");
+      DUNE_THROW(Dune::Exception, "unexpected shallow copy of ConfigParser");
+    }
+    catch (Dune::RangeError & r) {}
+    // test modifying and reading as parametertree
+    testmodify<Dune::ParameterTree>(c);
+    try {
+      c.get<int>("testInt");
+      DUNE_THROW(Dune::Exception, "unexpected shallow copy of ParameterTree");
+    }
+    catch (Dune::RangeError & r) {}
+    // test as configparser
+    testparam<Dune::ConfigParser>(c);
+    // test as parametertree
+    testparam<Dune::ParameterTree>(c);
+  }
+  catch (Dune::Exception & e)
+  {
+    std::cout << e << std::endl;
+    return 1;
+  }
+  return (0);
+}