X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FConfigFile.test.cc;fp=senf%2FUtils%2FConsole%2FConfigFile.test.cc;h=aa24e016d225f0c49a344744f944ed8d49fa1394;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=692fad62a71462604c281529e9bec5cb31dff1fa;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Utils/Console/ConfigFile.test.cc b/senf/Utils/Console/ConfigFile.test.cc index 692fad6..aa24e01 100644 --- a/senf/Utils/Console/ConfigFile.test.cc +++ b/senf/Utils/Console/ConfigFile.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -41,7 +41,7 @@ namespace { int var1 (0); bool var2 (false); - + void fun1(int v) { var1 = v; } void fun2() { var2 = true; } @@ -50,7 +50,7 @@ namespace { public: TempFile(std::string const & name) : name_ (name), file_ (name_.c_str()) {} ~TempFile() { file_.close(); boost::filesystem::remove(name_); } - + template TempFile & operator<<(T const & v) { file_ << v; return *this; } enum Closer { close }; void operator<<(Closer) { file_.close(); } std::string const & name() { return name_; } @@ -59,7 +59,7 @@ namespace { std::string name_; std::ofstream file_; }; - + } #define SENF_CHECK_THROW_SYSTEMEXCEPTION( expr, errorNumber, msg) \ @@ -71,16 +71,16 @@ namespace { BOOST_CHECK( ex.anyOf( errorNumber)); \ BOOST_CHECK( ex.message().find(msg) != std::string::npos); \ } \ - + SENF_AUTO_UNIT_TEST(configFile) { namespace fty = senf::console::factory; TempFile cfgf ("test.cfg"); - cfgf << "dir1/fun1 10;\n" + cfgf << "dir1/fun1 10;\n" << TempFile::close; - + senf::console::ScopedDirectory<> dir1; senf::console::root().add("dir1", dir1); dir1.add("fun1",fty::Command(&fun1)); @@ -125,11 +125,11 @@ SENF_AUTO_UNIT_TEST(configFileRestrict) cfgf << "dir1/fun1 10;\n" << "dir2/fun2;\n" << TempFile::close; - + senf::console::ScopedDirectory<> dir1; senf::console::root().add("dir1", dir1); dir1.add("fun1",fty::Command(&fun1)); - + { var1 = 0; var2 = false; @@ -161,14 +161,14 @@ SENF_AUTO_UNIT_TEST(configFileSkipGroup) cfgf << "dir1/fun1 10;\n" << "dir2 { dir3 { fun2; } fun1 5; }" << TempFile::close; - + senf::console::ScopedDirectory<> dir1; senf::console::root().add("dir1", dir1); dir1.add("fun1",fty::Command(&fun1)); - + senf::console::ScopedDirectory<> dir2; senf::console::root().add("dir2", dir2); - + dir2.add("dir3",fty::Directory()).add("fun2", fty::Command(&fun2)); dir2.add("fun1", fty::Command(&fun1)); @@ -204,14 +204,14 @@ SENF_AUTO_UNIT_TEST(configRestrictAndLink) cfgf << "dir1/fun1 10;\n" << "link1 { dir3 { fun2; } fun1 5; }" << TempFile::close; - + senf::console::ScopedDirectory<> dir1; senf::console::root().add("dir1", dir1); dir1.add("fun1",fty::Command(&fun1)); - + senf::console::ScopedDirectory<> dir2; dir1.add("dir2", dir2); - + dir2.add("dir3",fty::Directory()).add("fun2", fty::Command(&fun2)); dir2.add("fun1", fty::Command(&fun1));