Fix sample bootstrap senfutil.py (Examples/Sniffer/site_scons/senfutil.py)

[senf.git] / senf / Utils / Console / Traits.test.cc

diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc
index a6a1b41..f242f1d 100644 (file)
--- 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>
@@ -33,7 +33,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     char charTest(char value) { return value; }
@@ -52,19 +52,26 @@ namespace {
         static MemberEnum test (MemberEnum value) { return value; }
     };
     SENF_CONSOLE_REGISTER_ENUM_MEMBER( TestClass, MemberEnum, (MemberFoo)(MemberBar) );
+
+    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; }
 }
 
-BOOST_AUTO_UNIT_TEST(charTraits)
+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",&charTest);
-    dir.add("stest",&scharTest);
-    dir.add("utest",&ucharTest);
+    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",
@@ -85,14 +92,16 @@ BOOST_AUTO_UNIT_TEST(charTraits)
     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(
@@ -118,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",
@@ -126,22 +135,25 @@ BOOST_AUTO_UNIT_TEST(boolTraits)
     BOOST_CHECK_EQUAL( ss.str(), "disabled\n" "enabled\n" );
 }
 
-BOOST_AUTO_UNIT_TEST(stringTraits)
+SENF_AUTO_UNIT_TEST(stringTraits)
 {
-    BOOST_CHECK_EQUAL( 
+    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\"" );
 }
 
-BOOST_AUTO_UNIT_TEST(enumSupport)
+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",
@@ -164,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(
@@ -195,17 +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" );
+
+    ss.str("");
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/testKey 1S",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "1s\n" );
+
+    ss.str("");
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/testKey 2",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    BOOST_CHECK_EQUAL( ss.str(), "2\n" );
+
+    ss.str("");
+    SENF_CHECK_NO_THROW(
+        parser.parse("test/testKey ThrEE",
+                     boost::bind<void>( boost::ref(executor), boost::ref(ss), _1 )) );
+    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_
 
 \f