X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.test.cc;h=00e3d1111641b4df91ad2c1b6d1cfaaa749b918b;hb=649d1287af25496ff538bc97ea03a17cd03c4200;hp=cc5697f4c02a233cf0445ade70aafe6f68dd7a5f;hpb=f13780e9e4da7df981d6f6542fbdc714beb34765;p=senf.git

diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc
index cc5697f..00e3d11 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>
@@ -52,6 +52,11 @@ 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; }
 }
 
 SENF_AUTO_UNIT_TEST(charTraits)
@@ -132,7 +137,7 @@ SENF_AUTO_UNIT_TEST(boolTraits)
 
 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\"" );
 }
@@ -147,7 +152,8 @@ SENF_AUTO_UNIT_TEST(enumSupport)
     senf::console::root().add("test", dir);
 
     dir.add("test",fty::Command(&test));
-    
+    dir.add("testKey",fty::Command(&testKey));
+
     std::stringstream ss;
     SENF_CHECK_NO_THROW(
         parser.parse("test/test Foo",
@@ -201,13 +207,31 @@ SENF_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" );
 }
 
 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 );
 }