X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FUtility.test.cc;h=194c7a88d521b63238c682e43ee0aaecaa9658d3;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=2ec5ab70b4c7aa4cf64d9cd5464acd4585b93b9c;hpb=ea5f02fb88dfab3932368bbafdc863b8ad585cc1;p=senf.git

diff --git a/senf/Utils/Console/Utility.test.cc b/senf/Utils/Console/Utility.test.cc
index 2ec5ab7..194c7a8 100644
--- a/senf/Utils/Console/Utility.test.cc
+++ b/senf/Utils/Console/Utility.test.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -27,18 +27,13 @@
 //#include "Utility.test.ih"
 
 // Custom includes
-#include "Utility.hh"
-#include "Traits.hh"
-#include "ParsedCommand.hh"
-#include "Executor.hh"
-#include "Parse.hh"
-#include "ScopedDirectory.hh"
+#include "Console.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
@@ -52,16 +47,19 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(charAsString)
+SENF_AUTO_UNIT_TEST(charAsString)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
     std::stringstream ss;
 
-    dir.add("test", boost::function<
-            senf::console::CharAsString<char> (senf::console::CharAsString<char>)>(&charTest));
+    dir.add("test",
+            fty::Command<senf::console::CharAsString<char> (senf::console::CharAsString<char>)>(
+                &charTest));
 
     ss.str("");
     SENF_CHECK_NO_THROW(
@@ -70,16 +68,18 @@ BOOST_AUTO_UNIT_TEST(charAsString)
     BOOST_CHECK_EQUAL( ss.str(), "\x01\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(flagCollection)
+SENF_AUTO_UNIT_TEST(flagCollection)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
     std::stringstream ss;
 
-    dir.add("test",&collectionTest);
-    
+    dir.add("test",fty::Command(&collectionTest));
+
     ss.str("");
     SENF_CHECK_NO_THROW(
         parser.parse("test/test foo",
@@ -99,7 +99,7 @@ BOOST_AUTO_UNIT_TEST(flagCollection)
     BOOST_CHECK_EQUAL( ss.str(), "()\n" );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_