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

diff --git a/senf/Utils/Console/Utility.test.cc b/senf/Utils/Console/Utility.test.cc
index f5ff939..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,21 +27,18 @@
 //#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 {
 
+    char charTest(char value) { return value; }
+
     enum TestEnum { Foo=1, Bar=2, FooBar=4 };
     SENF_CONSOLE_REGISTER_ENUM( TestEnum, (Foo)(Bar)(FooBar) );
 
@@ -50,16 +47,39 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(flagCollection)
+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",&collectionTest);
-    
+    dir.add("test",
+            fty::Command<senf::console::CharAsString<char> (senf::console::CharAsString<char>)>(
+                &charTest));
+
+    ss.str("");
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/test \"\\x01\"",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "\x01\n" );
+}
+
+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",fty::Command(&collectionTest));
+
     ss.str("");
     SENF_CHECK_NO_THROW(
         parser.parse("test/test foo",
@@ -79,7 +99,7 @@ BOOST_AUTO_UNIT_TEST(flagCollection)
     BOOST_CHECK_EQUAL( ss.str(), "()\n" );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_