X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FProgramOptions.test.cc;h=65cae20cba72e33ae95037a42346a16c2e93b79d;hb=6aae6e526573187ece558842e928578e5aa4cc4c;hp=d063473258424edca1e89e908d4789851f8602f5;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Console/ProgramOptions.test.cc b/senf/Utils/Console/ProgramOptions.test.cc
index d063473..65cae20 100644
--- a/senf/Utils/Console/ProgramOptions.test.cc
+++ b/senf/Utils/Console/ProgramOptions.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 <g0dil@berlios.de>
@@ -27,9 +27,7 @@
 //#include "ProgramOptions.test.ih"
 
 // Custom includes
-#include "ProgramOptions.hh"
-#include "ScopedDirectory.hh"
-#include "ParsedCommand.hh"
+#include "Console.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
@@ -48,14 +46,16 @@ namespace {
     { val2 = true; }
 }
 
-BOOST_AUTO_UNIT_TEST(programOptions)
+SENF_AUTO_UNIT_TEST(programOptions)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::ScopedDirectory<> root;
     senf::console::root().add("root", root);
 
-    root.mkdir("dir1").add("fun1", &fun1);
-    root.add("fun2", &fun2);
-    root.mkdir("name-with-dashes").add("fun-2", &fun2);
+    root.add("dir1", fty::Directory()).add("fun1", fty::Command(&fun1));
+    root.add("fun2", fty::Command(&fun2));
+    root.add("name-with-dashes", fty::Directory()).add("fun-2", fty::Command(&fun2));
 
     {
         char const * argv[] = { "", "--dir1-fun1=foo","--fun2" };
@@ -89,7 +89,7 @@ BOOST_AUTO_UNIT_TEST(programOptions)
         BOOST_CHECK_EQUAL( val1, "" );
         BOOST_CHECK_EQUAL( val2, true );
     }
-    
+
     {
         char const * argv[] = { "", "-ab" };
         senf::console::ProgramOptions opts(sizeof(argv)/sizeof(argv[0]), argv, root);