summaryrefslogtreecommitdiff
path: root/maximus/networkclock/src/NetworkClockEvtListTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'maximus/networkclock/src/NetworkClockEvtListTest.cpp')
-rw-r--r--maximus/networkclock/src/NetworkClockEvtListTest.cpp53
1 files changed, 15 insertions, 38 deletions
diff --git a/maximus/networkclock/src/NetworkClockEvtListTest.cpp b/maximus/networkclock/src/NetworkClockEvtListTest.cpp
index 2b64a4d409..950b013000 100644
--- a/maximus/networkclock/src/NetworkClockEvtListTest.cpp
+++ b/maximus/networkclock/src/NetworkClockEvtListTest.cpp
@@ -1,6 +1,12 @@
#include "NetworkClockEvtListTest.h"
+
#include "NetworkClockEvt.h"
+#include "NetworkClockEvtList.h"
+
+#include "networkclock_types.h"
+
+#include "Logger.h"
#include <string>
#include <iostream>
@@ -11,20 +17,18 @@ CPPUNIT_TEST_SUITE_REGISTRATION (NetworkClockEvtListTest);
void NetworkClockEvtListTest::setUp (void)
{
- clog << "NetworkClockEvtListTest::setUp" << endl;
+ logTest();
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList()" << endl;
mpNetworkClockEvtList = new NetworkClockEvtList ();
}
void NetworkClockEvtListTest::tearDown (void)
{
- clog << "NetworkClockEvtListTest::tearDown" << endl;
+ logTest();
if (NULL != mpNetworkClockEvtList)
{
- clog << "\tNetworkClockEvtListTest -> ~NetworkClockEvtList" << endl;
delete (mpNetworkClockEvtList);
mpNetworkClockEvtList = NULL;
}
@@ -33,42 +37,31 @@ void NetworkClockEvtListTest::tearDown (void)
void NetworkClockEvtListTest::insertElementTest (void)
{
- clog << endl;
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << "*** UNITARY TEST OF NetworkClockEvtList::insertElement ***" << endl;
+ logTest();
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvt()" << endl;
NetworkClockEvt evt;
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setId" << endl;
CPPUNIT_ASSERT_MESSAGE ( "setNetworkClockId failed",
evt.setNetworkClockId(123) );
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (1, evt) );
mpNetworkClockEvtList->displayListOfEvts();
-
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << endl;
}
void NetworkClockEvtListTest::removeElementTest (void)
{
- clog << endl;
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << "*** UNITARY TEST OF NetworkClockEvtList::removeElement ***" << endl;
+ logTest();
// Insert Event 1
//
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvt()" << endl;
NetworkClockEvt evt1;
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setId" << endl;
+
CPPUNIT_ASSERT_MESSAGE ( "setNetworkClockId failed",
evt1.setNetworkClockId(1) );
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
+
CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (2, evt1) );
@@ -131,30 +124,22 @@ void NetworkClockEvtListTest::removeElementTest (void)
NetworkClockEvt evt7bis (evt7);
mpNetworkClockEvtList->insertElement (7, evt7bis);
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::removeElement" << endl;
CPPUNIT_ASSERT_MESSAGE ( "removeElement failed",
mpNetworkClockEvtList->removeElement (2, evt1) );
mpNetworkClockEvtList->displayListOfEvts();
-
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << endl;
}
void NetworkClockEvtListTest::getNextElementTest (void)
{
- clog << endl;
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << "*** UNITARY TEST OF NetworkClockEvtList::getNextElement ***" << endl;
+ logTest();
// Insert Event 1
//
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvt()" << endl;
NetworkClockEvt evt1;
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setName" << endl;
evt1.setNetworkClockId(1);
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
+
CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (0, evt1) );
@@ -178,18 +163,10 @@ void NetworkClockEvtListTest::getNextElementTest (void)
mpNetworkClockEvtList->displayListOfEvts();
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvt()" << endl;
Network_Clock_Tick tickValue = 0;
NetworkClockEvt evt (0, NETWORK_CLOCK_TYPE_STATION, 0);
- clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::getNextElement" << endl;
+
CPPUNIT_ASSERT_MESSAGE ( "getNextElement failed",
mpNetworkClockEvtList->getNextElement (tickValue, evt) );
-
- clog << "\tget element is ";
- evt.displayEvt();
- clog << endl;
-
- clog << "-------------------------------------------------------------------------------------" << endl;
- clog << endl;
}