summaryrefslogtreecommitdiff
path: root/maximus/networkclock
diff options
context:
space:
mode:
authorschodet2007-07-26 16:35:57 +0000
committerschodet2007-07-26 16:35:57 +0000
commit75398fb6d98a9c80b6a2517ddeb251b74a8caf87 (patch)
treeb17b8ce12973f0d3160ea6e8bfae0ee745c3a543 /maximus/networkclock
parent2236ca8d524dec3a7da4884945fc2dc0cc91976c (diff)
Removed Message construction in CPPUNIT_ASSERT_MESSAGE.
git-svn-id: svn+ssh://pessac/svn/cesar/trunk@549 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'maximus/networkclock')
-rw-r--r--maximus/networkclock/src/NetworkClockEvtListTest.cpp14
-rw-r--r--maximus/networkclock/src/NetworkClockProcessorTest.cpp20
2 files changed, 17 insertions, 17 deletions
diff --git a/maximus/networkclock/src/NetworkClockEvtListTest.cpp b/maximus/networkclock/src/NetworkClockEvtListTest.cpp
index 48854d13e8..2b64a4d409 100644
--- a/maximus/networkclock/src/NetworkClockEvtListTest.cpp
+++ b/maximus/networkclock/src/NetworkClockEvtListTest.cpp
@@ -41,11 +41,11 @@ void NetworkClockEvtListTest::insertElementTest (void)
NetworkClockEvt evt;
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setId" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setNetworkClockId failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setNetworkClockId failed",
evt.setNetworkClockId(123) );
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertElement failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (1, evt) );
mpNetworkClockEvtList->displayListOfEvts();
@@ -66,10 +66,10 @@ void NetworkClockEvtListTest::removeElementTest (void)
clog << "\tNetworkClockEvtListTest -> NetworkClockEvt()" << endl;
NetworkClockEvt evt1;
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setId" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setNetworkClockId failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setNetworkClockId failed",
evt1.setNetworkClockId(1) );
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertElement failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (2, evt1) );
// Insert Event 2
@@ -132,7 +132,7 @@ void NetworkClockEvtListTest::removeElementTest (void)
mpNetworkClockEvtList->insertElement (7, evt7bis);
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::removeElement" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("removeElement failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "removeElement failed",
mpNetworkClockEvtList->removeElement (2, evt1) );
mpNetworkClockEvtList->displayListOfEvts();
@@ -155,7 +155,7 @@ void NetworkClockEvtListTest::getNextElementTest (void)
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::setName" << endl;
evt1.setNetworkClockId(1);
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::insertElement" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertElement failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertElement failed",
mpNetworkClockEvtList->insertElement (0, evt1) );
// Insert Event 2
@@ -182,7 +182,7 @@ void NetworkClockEvtListTest::getNextElementTest (void)
Network_Clock_Tick tickValue = 0;
NetworkClockEvt evt (0, NETWORK_CLOCK_TYPE_STATION, 0);
clog << "\tNetworkClockEvtListTest -> NetworkClockEvtList::getNextElement" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("getNextElement failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "getNextElement failed",
mpNetworkClockEvtList->getNextElement (tickValue, evt) );
clog << "\tget element is ";
diff --git a/maximus/networkclock/src/NetworkClockProcessorTest.cpp b/maximus/networkclock/src/NetworkClockProcessorTest.cpp
index b7bc95c993..cdd8fe41ec 100644
--- a/maximus/networkclock/src/NetworkClockProcessorTest.cpp
+++ b/maximus/networkclock/src/NetworkClockProcessorTest.cpp
@@ -124,15 +124,15 @@ void NetworkClockProcessorTest::removeEvtTest (void)
NetworkClockEvt evt (789, NETWORK_CLOCK_TYPE_NONE, 1011);
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::removeEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("removeEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "removeEvt failed",
!mpNetworkClockProcessor->removeEvt(555, evt) );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::insertEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertEvt failed",
mpNetworkClockProcessor->insertEvt(555, evt) );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::removeEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("removeEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "removeEvt failed",
mpNetworkClockProcessor->removeEvt(555, evt) );
}
catch ( Error &e )
@@ -167,26 +167,26 @@ void NetworkClockProcessorTest::processNextEvtTest (void)
NetworkClockEvt evt (stationId, NETWORK_CLOCK_TYPE_STATION, 0);
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::insertEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertEvt failed",
mpNetworkClockProcessor->insertEvt(0, evt) );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::processNextEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("processNextEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "processNextEvt failed",
mpNetworkClockProcessor->processNextEvt() );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::insertEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertEvt failed",
mpNetworkClockProcessor->insertEvt(1, evt) );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::processNextEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("processNextEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "processNextEvt failed",
mpNetworkClockProcessor->processNextEvt() );
clog << "\tNetworkClockProcessorTest -> NetworkClockEvt(...)" << endl;
NetworkClockEvt evtToProcess (stationId, NETWORK_CLOCK_TYPE_STATION, 0);
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::insertEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("insertEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "insertEvt failed",
mpNetworkClockProcessor->insertEvt(4, evtToProcess) );
mpNetworkClockProcessor->getNetworkClockEvtList()->displayListOfEvts();
@@ -194,7 +194,7 @@ void NetworkClockProcessorTest::processNextEvtTest (void)
for (unsigned int i=0; i<10; i++)
{
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::processNextEvt" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("processNextEvt failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "processNextEvt failed",
mpNetworkClockProcessor->processNextEvt() );
}
}
@@ -232,7 +232,7 @@ void NetworkClockProcessorTest::processEvtStationTest (void)
clog << "\tNetworkClockProcessorTest -> SystemManager::updateStationStatus" << endl;
mpSystemManager->updateStationStatus ( stationId, MAXIMUS_STATION_STATUS_IDLE );
clog << "\tNetworkClockProcessorTest -> NetworkClockProcessor::processEvtStation" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("processEvtStation failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "processEvtStation failed",
mpNetworkClockProcessor->processEvtStation(evt) );
}
catch ( Error &e )