X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.test.cc;h=f242f1d3514e71d162f64c0b3fb402f13ba2056c;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=1e77cf73bc20f91d163f2dd573b86706228c56c2;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc
index 1e77cf7..f242f1d 100644
--- a/senf/Utils/Console/Traits.test.cc
+++ b/senf/Utils/Console/Traits.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,19 +27,21 @@
 //#include "Traits.test.ih"
 
 // Custom includes
-#include "Traits.hh"
-#include "ParsedCommand.hh"
-#include "Executor.hh"
-#include "Parse.hh"
-#include "ScopedDirectory.hh"
+#include "Console.hh"
 
-#include "../../Utils/auto_unit_test.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; }
+    signed char scharTest(signed char value) { return value; }
+    unsigned char ucharTest(unsigned char value) { return value; }
+
+    bool boolTest(bool value) { return value; }
+
     enum TestEnum { Foo=1, Bar=2, FooBar=4 };
     SENF_CONSOLE_REGISTER_ENUM( TestEnum, (Foo)(Bar)(FooBar) );
 
@@ -51,20 +53,55 @@ namespace {
     };
     SENF_CONSOLE_REGISTER_ENUM_MEMBER( TestClass, MemberEnum, (MemberFoo)(MemberBar) );
 
-    bool boolTest(bool value) { return value; }
+    enum TestEnumKey { ONE, TWO, THREE };
+    SENF_CONSOLE_REGISTER_ENUM( TestEnumKey, (key("1s",ONE))(key("2",TWO))(key("three",THREE)) );
+
+    TestEnumKey testKey (TestEnumKey value) { return value; }
+}
+
+SENF_AUTO_UNIT_TEST(charTraits)
+{
+    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(&charTest));
+    dir.add("stest",fty::Command(&scharTest));
+    dir.add("utest",fty::Command(&ucharTest));
+
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/test 10; test/test 20",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "10\n" "20\n" );
+    ss.str("");
+
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/stest 10; test/stest -20",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "10\n" "-20\n" );
+    ss.str("");
 
-    senf::console::FlagCollection<TestEnum> collectionTest(
-        senf::console::FlagCollection<TestEnum> flags) { return flags; }
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/utest 10; test/utest 20",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "10\n" "20\n" );
+    ss.str("");
 }
 
-BOOST_AUTO_UNIT_TEST(boolTraits)
+SENF_AUTO_UNIT_TEST(boolTraits)
 {
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
-    dir.add("test", &boolTest);
+    dir.add("test", fty::Command(&boolTest));
 
     std::stringstream ss;
     SENF_CHECK_NO_THROW(
@@ -90,7 +127,7 @@ BOOST_AUTO_UNIT_TEST(boolTraits)
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
     BOOST_CHECK_EQUAL( ss.str(), "true\n" "true\n" );
 
-    dir.add("test2", &boolTest).formatter( senf::console::formatEnabledDisabled );
+    dir.add("test2", fty::Command(&boolTest).formatter( senf::console::formatEnabledDisabled ));
     ss.str("");
     SENF_CHECK_NO_THROW(
         parser.parse("test/test2 0; test/test2 -1",
@@ -98,15 +135,25 @@ BOOST_AUTO_UNIT_TEST(boolTraits)
     BOOST_CHECK_EQUAL( ss.str(), "disabled\n" "enabled\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(enumSupport)
+SENF_AUTO_UNIT_TEST(stringTraits)
 {
+    BOOST_CHECK_EQUAL(
+        senf::console::ArgumentTraits<std::string>::str("Test\nOf\nA \"String\"\x01\x7f\xa0\xff"),
+        "\"Test\\x0aOf\\x0aA \\\"String\\\"\\x01\\x7f\\xa0\\xff\"" );
+}
+
+SENF_AUTO_UNIT_TEST(enumSupport)
+{
+    namespace fty = senf::console::factory;
+
     senf::console::Executor executor;
     senf::console::CommandParser parser;
     senf::console::ScopedDirectory<> dir;
     senf::console::root().add("test", dir);
 
-    dir.add("test",&test);
-    
+    dir.add("test",fty::Command(&test));
+    dir.add("testKey",fty::Command(&testKey));
+
     std::stringstream ss;
     SENF_CHECK_NO_THROW(
         parser.parse("test/test Foo",
@@ -129,7 +176,7 @@ BOOST_AUTO_UNIT_TEST(enumSupport)
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )),
         senf::console::SyntaxErrorException );
 
-    dir.add("member", &TestClass::test);
+    dir.add("member", fty::Command(&TestClass::test));
 
     ss.str("");
     SENF_CHECK_NO_THROW(
@@ -160,46 +207,35 @@ BOOST_AUTO_UNIT_TEST(enumSupport)
         parser.parse("test/test foo",
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
     BOOST_CHECK_EQUAL( ss.str(), "Foo\n" );
-}
-
-BOOST_AUTO_UNIT_TEST(flagCollection)
-{
-    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);
-    
     ss.str("");
     SENF_CHECK_NO_THROW(
-        parser.parse("test/test foo",
+        parser.parse("test/testKey 1S",
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
-    BOOST_CHECK_EQUAL( ss.str(), "Foo\n" );
+    BOOST_CHECK_EQUAL( ss.str(), "1s\n" );
 
     ss.str("");
     SENF_CHECK_NO_THROW(
-        parser.parse("test/test (foo bar)",
+        parser.parse("test/testKey 2",
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
-    BOOST_CHECK_EQUAL( ss.str(), "(Foo Bar)\n" );
+    BOOST_CHECK_EQUAL( ss.str(), "2\n" );
 
     ss.str("");
     SENF_CHECK_NO_THROW(
-        parser.parse("test/test ()",
+        parser.parse("test/testKey ThrEE",
                      boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
-    BOOST_CHECK_EQUAL( ss.str(), "()\n" );
+    BOOST_CHECK_EQUAL( ss.str(), "three\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(singleToken)
+SENF_AUTO_UNIT_TEST(singleToken)
 {
     BOOST_CHECK( senf::console::ArgumentTraits<std::string>::singleToken );
     BOOST_CHECK( senf::console::ArgumentTraits<int>::singleToken );
-    BOOST_CHECK( ! senf::console::ArgumentTraits< 
+    BOOST_CHECK( ! senf::console::ArgumentTraits<
                        senf::console::FlagCollection<TestEnum> >::singleToken );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_