X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FConnectors.test.cc;h=eae2acd146e7e841850958b482a595a4c2378807;hb=refs%2Fheads%2Fmaster;hp=0e0605376fa72177683d7273747575a54e1735bf;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git diff --git a/senf/PPI/Connectors.test.cc b/senf/PPI/Connectors.test.cc index 0e06053..eae2acd 100644 --- a/senf/PPI/Connectors.test.cc +++ b/senf/PPI/Connectors.test.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // 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 Connectors unit tests */ @@ -35,7 +40,7 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace ppi = senf::ppi; namespace debug = ppi::module::debug; @@ -75,7 +80,7 @@ SENF_AUTO_UNIT_TEST(passiveConnector) target.input.throttle(); BOOST_CHECK( target.input.throttled() ); BOOST_CHECK( target.input.nativeThrottled() ); - + target.input.unthrottle(); BOOST_CHECK( ! target.input.throttled() ); BOOST_CHECK( ! target.input.nativeThrottled() ); @@ -84,9 +89,9 @@ SENF_AUTO_UNIT_TEST(passiveConnector) } namespace { - + bool called = false; - + void handler() { called = true; } } @@ -136,8 +141,7 @@ SENF_AUTO_UNIT_TEST(inputConnector) // peek() is implicitly tested within the Active/PassiveSink implementation BOOST_CHECK_EQUAL ( & target.input.peer(), & source.output ); - - BOOST_CHECK( target.input.begin() == target.input.end() ); + BOOST_CHECK_EQUAL( target.input.queueSize(), 0u ); BOOST_CHECK( target.input.empty() ); } @@ -188,23 +192,23 @@ SENF_AUTO_UNIT_TEST(passiveInput) ppi::init(); BOOST_CHECK_EQUAL( & target.input.peer(), & source.output ); - + target.input.throttle(); senf::Packet p (senf::DataPacket::create()); source.submit(p); - + BOOST_CHECK_EQUAL( target.counter, 0u ); BOOST_CHECK( target.input ); BOOST_CHECK_EQUAL( target.input.queueSize(), 1u ); target.input.unthrottle(); BOOST_CHECK( target.input ); BOOST_CHECK_EQUAL( target.counter, 1u ); - + BOOST_CHECK( target.input() == p ); BOOST_CHECK( ! target.input ); - + source.submit(p); - + BOOST_CHECK_EQUAL( target.counter, 2u ); BOOST_CHECK( target.input.throttled() ); BOOST_CHECK( target.input() == p ); @@ -239,7 +243,7 @@ SENF_AUTO_UNIT_TEST(passiveOutput) source.submit(p); BOOST_CHECK( target.request() == p ); - + // connect() is tested indirectly via ppi::connect } @@ -275,7 +279,7 @@ SENF_AUTO_UNIT_TEST(activeOutput) ppi::connect(source,target); ppi::init(); - + BOOST_CHECK_EQUAL( & source.output.peer(), & target.input ); BOOST_CHECK( source.output ); target.input.throttle(); @@ -301,8 +305,8 @@ namespace { } void request() { - (void) input(); - (void) input.read(); + senf::IGNORE( input() ); + senf::IGNORE( input.read() ); } }; @@ -372,6 +376,8 @@ SENF_AUTO_UNIT_TEST(typedInput) senf::Packet p (senf::DataPacket::create()); source.submit(p); + + BOOST_CHECK( true ); } SENF_AUTO_UNIT_TEST(tyepdOutput) @@ -381,8 +387,10 @@ SENF_AUTO_UNIT_TEST(tyepdOutput) ppi::connect(source,target); ppi::init(); - - (void) target.request(); + + senf::IGNORE( target.request() ); + + BOOST_CHECK( true ); } SENF_AUTO_UNIT_TEST(connectorTest) @@ -390,13 +398,13 @@ SENF_AUTO_UNIT_TEST(connectorTest) { TypedPassiveInput<> input; TypedActiveOutput output; - BOOST_CHECK_THROW( ppi::connect(output, input), + BOOST_CHECK_THROW( ppi::connect(output, input), ppi::connector::IncompatibleConnectorsException ); } { TypedPassiveInput input; TypedActiveOutput<> output; - BOOST_CHECK_THROW( ppi::connect(output, input), + BOOST_CHECK_THROW( ppi::connect(output, input), ppi::connector::IncompatibleConnectorsException ); } { @@ -404,7 +412,7 @@ SENF_AUTO_UNIT_TEST(connectorTest) TypedActiveOutput<> output; SENF_CHECK_NO_THROW( ppi::connect(output, input) ); } - { + { TypedPassiveInput<> input; debug::ActiveSource output; SENF_CHECK_NO_THROW( ppi::connect(output, input) ); @@ -472,13 +480,13 @@ SENF_AUTO_UNIT_TEST(delayedConnect) ppi::connect(source, target); ppi::init(); - + BOOST_CHECK( source.output ); senf::Packet p (senf::DataPacket::create()); source.submit(p); - BOOST_CHECK( target.front() == p ); + BOOST_CHECK( target.front() == p ); BOOST_CHECK_EQUAL( target.size(), 1u ); } @@ -494,7 +502,7 @@ SENF_AUTO_UNIT_TEST(delayedConnect) ppi::connect(source, target); ppi::init(); - + BOOST_CHECK( ! source.output ); target.unthrottle(); BOOST_CHECK( source.output ); @@ -516,10 +524,10 @@ SENF_AUTO_UNIT_TEST(disconnect) source.submit(p); BOOST_CHECK( target.input ); - + target.input.disconnect(); ppi::init(); - + BOOST_CHECK( ! target.input ); } { @@ -538,7 +546,7 @@ SENF_AUTO_UNIT_TEST(disconnect) } } -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_