// $Id$
//
// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
#include "Module.hh"
#include "Setup.hh"
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
#define prefix_
namespace {
class RouteTester : public module::Module
{
+ SENF_PPI_MODULE(RouteTester);
+
public:
connector::ActiveInput activeIn;
connector::PassiveInput passiveIn;
passiveIn.onRequest(&RouteTester::inputRequest);
passiveOut.onRequest(&RouteTester::outputRequest);
- registerEvent(&RouteTester::onEvent, event);
+ registerEvent(event, &RouteTester::onEvent);
activeIn.onThrottle(&RouteTester::throttleRequest);
activeIn.onUnthrottle(&RouteTester::unthrottleRequest);
BOOST_AUTO_UNIT_TEST(route)
{
- debug::PassivePacketSource passiveSource;
- debug::ActivePacketSource activeSource;
- debug::PassivePacketSink passiveSink;
- debug::ActivePacketSink activeSink;
+ debug::PassiveSource passiveSource;
+ debug::ActiveSource activeSource;
+ debug::PassiveSink passiveSink;
+ debug::ActiveSink activeSink;
RouteTester tester;
- ppi::connect(passiveSource.output, tester.activeIn);
- ppi::connect(activeSource.output, tester.passiveIn);
- ppi::connect(tester.activeOut, passiveSink.input);
- ppi::connect(tester.passiveOut, activeSink.input);
+ ppi::connect(passiveSource, tester.activeIn);
+ ppi::connect(activeSource, tester.passiveIn);
+ ppi::connect(tester.activeOut, passiveSink);
+ ppi::connect(tester.passiveOut, activeSink);
ppi::init();
BOOST_CHECK( ! tester.activeOut );
BOOST_CHECK_EQUAL( tester.throttles, 1 );
BOOST_CHECK( tester.passiveIn.throttled() );
- BOOST_CHECK( ! activeSource.output );
+ BOOST_CHECK( ! activeSource );
BOOST_CHECK( ! tester.event.enabled() );
passiveSink.input.unthrottle();
- BOOST_CHECK( activeSource.output );
+ BOOST_CHECK( activeSource );
BOOST_CHECK( tester.event.enabled() );
-
// Now throttle the passive source by exhausting the queue
BOOST_CHECK( p1 == activeSink.request() );
BOOST_CHECK( ! tester.activeIn );
BOOST_CHECK_EQUAL( tester.throttles, 1 );
BOOST_CHECK( tester.passiveOut.throttled() );
- BOOST_CHECK( ! activeSink.input );
+ BOOST_CHECK( ! activeSink );
BOOST_CHECK( ! tester.event.enabled() );
passiveSource.submit(p1);
- BOOST_CHECK( activeSink.input );
+ BOOST_CHECK( activeSink );
+ BOOST_CHECK( tester.event.enabled() );
+
+ // Check correct combination of multiple throttling events
+
+ activeSink.request();
+ BOOST_CHECK( ! tester.event.enabled() );
+ passiveSink.input.throttle();
+ BOOST_CHECK( ! tester.event.enabled() );
+ passiveSource.submit(p1);
+ BOOST_CHECK( ! tester.event.enabled() );
+ passiveSink.input.unthrottle();
BOOST_CHECK( tester.event.enabled() );
tester.rt->autoThrottling(false);
BOOST_CHECK( p1 == activeSink.request() );
BOOST_CHECK( passiveSource.output.throttled() );
- BOOST_CHECK( activeSink.input );
+ BOOST_CHECK( activeSink );
}
///////////////////////////////cc.e////////////////////////////////////////