-// Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// 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
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
- \brief Module.test unit tests */
+ \brief Module unit tests */
//#include "Module.test.hh"
//#include "Module.test.ih"
#include "Setup.hh"
#include "Module.hh"
-#include <boost/test/auto_unit_test.hpp>
+#include "../Utils/auto_unit_test.hh"
#include <boost/test/test_tools.hpp>
#include <boost/type_traits.hpp>
SENF_PPI_MODULE(TestModule);
public:
- connector::ActiveOutput output;
+ connector::ActiveOutput<> output;
ppi::DebugEvent event;
TestModule() {
noroute(output);
- registerEvent(&TestModule::onEvent, event);
+ registerEvent(event, &TestModule::onEvent);
}
void onEvent() {
output(senf::DataPacket::create());
}
- using ppi::module::Module::eventTime;
+ using ppi::module::Module::time;
};
}
// route and registerEvent are tested in Route.test.cc
TestModule tester;
- debug::PassivePacketSink sink;
+ debug::PassiveSink sink;
ppi::connect(tester, sink);
ppi::init();
tester.event.trigger();
BOOST_CHECK_EQUAL( sink.size(), 1u );
- BOOST_CHECK( senf::ClockService::now() - tester.eventTime() < 1000000000L );
+ BOOST_CHECK( senf::ClockService::now() - tester.time() < senf::ClockService::seconds(1) );
}
///////////////////////////////cc.e////////////////////////////////////////