X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FConsole%2FTraits.test.cc;h=9fcc2642b2fc665cdcae6863a6c54d74b8c8f0cf;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=b8d1d1f313736c66e0bc3599e043305b59bde503;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Utils/Console/Traits.test.cc b/senf/Utils/Console/Traits.test.cc index b8d1d1f..9fcc264 100644 --- a/senf/Utils/Console/Traits.test.cc +++ b/senf/Utils/Console/Traits.test.cc @@ -1,24 +1,29 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2008 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Traits unit tests */ @@ -27,19 +32,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 #include #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 +58,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)) ); - senf::console::FlagCollection collectionTest( - senf::console::FlagCollection flags) { return flags; } + TestEnumKey testKey (TestEnumKey value) { return value; } } -BOOST_AUTO_UNIT_TEST(boolTraits) +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", &boolTest); + 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( 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( 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/utest 10; test/utest 20", + boost::bind( boost::ref(executor), boost::ref(ss), _1 )) ); + BOOST_CHECK_EQUAL( ss.str(), "10\n" "20\n" ); + ss.str(""); +} + +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", fty::Command(&boolTest)); std::stringstream ss; SENF_CHECK_NO_THROW( @@ -90,7 +132,7 @@ BOOST_AUTO_UNIT_TEST(boolTraits) boost::bind( 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 +140,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::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 +181,7 @@ BOOST_AUTO_UNIT_TEST(enumSupport) boost::bind( 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 +212,35 @@ BOOST_AUTO_UNIT_TEST(enumSupport) parser.parse("test/test foo", boost::bind( 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( 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( 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( 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::singleToken ); BOOST_CHECK( senf::console::ArgumentTraits::singleToken ); - BOOST_CHECK( ! senf::console::ArgumentTraits< + BOOST_CHECK( ! senf::console::ArgumentTraits< senf::console::FlagCollection >::singleToken ); } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_