X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.test.cc;h=59f848a04fc5ac0e2b0ebf2fa89e390e50ac40fb;hb=9bf675b08d624cfac113a1a90dcfbd9503872b1d;hp=85b9f35437ca13021646cbf2fbba7c25c7e5a1e6;hpb=a30f975608bae2dcee151af15dc7f40602627615;p=senf.git

diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc
index 85b9f35..59f848a 100644
--- a/senf/Utils/Console/Traits.test.cc
+++ b/senf/Utils/Console/Traits.test.cc
@@ -27,12 +27,7 @@
 //#include "Traits.test.ih"
 
 // Custom includes
-#include "Traits.hh"
-#include "Utility.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>
@@ -59,7 +54,7 @@ namespace {
     SENF_CONSOLE_REGISTER_ENUM_MEMBER( TestClass, MemberEnum, (MemberFoo)(MemberBar) );
 }
 
-BOOST_AUTO_UNIT_TEST(charTraits)
+SENF_AUTO_UNIT_TEST(charTraits)
 {
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -90,7 +85,7 @@ BOOST_AUTO_UNIT_TEST(charTraits)
     ss.str("");
 }
 
-BOOST_AUTO_UNIT_TEST(boolTraits)
+SENF_AUTO_UNIT_TEST(boolTraits)
 {
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -131,7 +126,14 @@ 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)
 {
     senf::console::Executor executor;
     senf::console::CommandParser parser;
@@ -195,7 +197,7 @@ BOOST_AUTO_UNIT_TEST(enumSupport)
     BOOST_CHECK_EQUAL( ss.str(), "Foo\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 );