summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maximus/functioncall/src/FunctionCallManagerTest.cpp14
-rw-r--r--maximus/functioncall/src/FunctionSciMsgTest.cpp30
-rw-r--r--maximus/functioncall/src/IFunctionCallTest.cpp10
-rw-r--r--maximus/networkclock/src/NetworkClockEvtListTest.cpp14
-rw-r--r--maximus/networkclock/src/NetworkClockProcessorTest.cpp20
-rw-r--r--maximus/phy/src/PhyProcessorTest.cpp8
-rw-r--r--maximus/sci/src/SciServerTest.cpp26
-rw-r--r--maximus/system/src/SystemManagerTest.cpp6
-rw-r--r--maximus/system/src/SystemSciMsgTest.cpp6
9 files changed, 67 insertions, 67 deletions
diff --git a/maximus/functioncall/src/FunctionCallManagerTest.cpp b/maximus/functioncall/src/FunctionCallManagerTest.cpp
index 2a2e8c6b13..d23bc20e2b 100644
--- a/maximus/functioncall/src/FunctionCallManagerTest.cpp
+++ b/maximus/functioncall/src/FunctionCallManagerTest.cpp
@@ -63,10 +63,10 @@ void FunctionCallManagerTest::registerCallbackTest (void)
if (NULL != mpFunctionCallManager)
{
clog << "\tFunctionCallManagerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (1, &userFunction1) );
clog << "\tFunctionCallManagerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (2, &userFunction2) );
}
@@ -87,23 +87,23 @@ void FunctionCallManagerTest::receiveMsgTest (void)
FunctionSciMsg functionSciMsg(mpFunctionCallManager);
clog << "\tFunctionCallManagerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (functionSciMsg.getSpecializedSciMsgHeader()->msg_id, &userFunction1) );
clog << "\tFunctionCallManagerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (2, &userFunction2) );
clog << "\tFunctionCallManagerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (3, &userFunction3) );
clog << "\tFunctionCallManagerTest -> FunctionSciMsg::setFunctionName" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setFunctionName failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setFunctionName failed",
functionSciMsg.setFunctionName ("userFunction1") );
clog << "\tFunctionCallManagerTest -> FunctionCallManager::receiveMsg" << endl;
try
{
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "receiveMsg failed",
mpFunctionCallManager->receiveMsg (functionSciMsg) );
}
catch (Error &e)
diff --git a/maximus/functioncall/src/FunctionSciMsgTest.cpp b/maximus/functioncall/src/FunctionSciMsgTest.cpp
index 17658d02c5..e847bf56a5 100644
--- a/maximus/functioncall/src/FunctionSciMsgTest.cpp
+++ b/maximus/functioncall/src/FunctionSciMsgTest.cpp
@@ -62,20 +62,20 @@ void FunctionSciMsgTest::addParameterTest (void)
//
FunctionCallParameter parameter1 ("parameter1", 3, (unsigned char *)"123");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter1) );
// Add parameter 2
//
FunctionCallParameter parameter2 ("parameter2", 10, (unsigned char *)"0123456789");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter2) );
// Add parameter 3
//
FunctionCallParameter parameter3 = parameter2;
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter3) );
}
else
@@ -100,36 +100,36 @@ void FunctionSciMsgTest::bindParameterTest (void)
//
FunctionCallParameter parameter1 ("parameter1", 3, (unsigned char *)"123");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter1) );
// Add parameter 2
//
FunctionCallParameter parameter2 ("parameter2", 10, (unsigned char *)"0123456789");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter2) );
// Add parameter 3
//
FunctionCallParameter parameter3 = parameter2;
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter3) );
const string name = "parameter1";
unsigned long dataLength = 0;
unsigned char * pData = NULL;
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::bindParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("bindParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "bindParameter failed",
mpFunctionSciMsg->bindParameter(name, dataLength, pData) );
// Check results
//
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("bindParameterTest failed: wrong data length"), (3 == dataLength) );
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("bindParameterTest failed: data pointer is NULL"), (NULL != pData) );
+ CPPUNIT_ASSERT_MESSAGE ( "bindParameterTest failed: wrong data length", 3 == dataLength) ;
+ CPPUNIT_ASSERT_MESSAGE ( "bindParameterTest failed: data pointer is NULL", NULL != pData) ;
pData[dataLength] = '\0';
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("bindParameterTest failed: wrong data"), (!strcmp("123", (char*)pData)) );
+ CPPUNIT_ASSERT_MESSAGE ( "bindParameterTest failed: wrong data", !strcmp("123", (char*)pData)) ;
// Free memory allocated into 'FunctionSciMsg::bindParameter'
//
@@ -161,27 +161,27 @@ void FunctionSciMsgTest::fillSpecializedSciMsgToSendTest (void)
//
FunctionCallParameter parameter1 ("parameter1", 3, (unsigned char *)"123");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter1) );
// Add parameter 2
//
FunctionCallParameter parameter2 ("parameter2", 10, (unsigned char *)"0123456789");
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter2) );
// Add parameter 3
//
FunctionCallParameter parameter3 = parameter2;
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
mpFunctionSciMsg->addParameter(parameter3) );
clog << "\tFunctionSciMsgTest -> FunctionSciMsg::setFunctionCallName" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setFunctionName failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setFunctionName failed",
mpFunctionSciMsg->setFunctionName ("function_to_call") );
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("fillSpecializedSciMsgToSend failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "fillSpecializedSciMsgToSend failed",
mpFunctionSciMsg->fillSpecializedSciMsgToSend() );
}
else
diff --git a/maximus/functioncall/src/IFunctionCallTest.cpp b/maximus/functioncall/src/IFunctionCallTest.cpp
index 29301d77d0..e7f48bdef1 100644
--- a/maximus/functioncall/src/IFunctionCallTest.cpp
+++ b/maximus/functioncall/src/IFunctionCallTest.cpp
@@ -39,19 +39,19 @@ void IFunctionCallTest::userTest (void)
clog << "IFunctionCallTest -> FunctionCallManager::createMsg" << endl;
FunctionSciMsg * functionSciMsg = functionCallManager.createMsg();
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("createMsg failed"), (NULL != functionSciMsg) );
+ CPPUNIT_ASSERT_MESSAGE ( "createMsg failed", (NULL != functionSciMsg) );
clog << "IFunctionCallTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
functionCallManager.registerCallback(functionSciMsg->getSpecializedSciMsgId(), &userFunction) );
clog << "IFunctionCallTest -> FunctionCallManager::setFunctionName" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setFunctionName failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setFunctionName failed",
functionSciMsg->setFunctionName("function_to_call") );
FunctionCallParameter parameter ("parameter", 25, (unsigned char *)"1234567890123456789012345");
clog << "IFunctionCallTest -> FunctionSciMsg::addParameter" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("addParameter failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "addParameter failed",
functionSciMsg->addParameter (parameter) );
clog << "IFunctionCallTest -> SystemManager(SciServer*)" << endl;
@@ -64,7 +64,7 @@ void IFunctionCallTest::userTest (void)
clog << "\tIFunctionCallTest -> SystemManager::updateStationStatus" << endl;
systemManager.updateStationStatus ( stationId, MAXIMUS_STATION_STATUS_IDLE );
clog << "IFunctionCallTest -> FunctionCallManager::sendMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("sendMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "sendMsg failed",
functionCallManager.sendMsg(functionSciMsg) );
}
catch ( Error &e )
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 )
diff --git a/maximus/phy/src/PhyProcessorTest.cpp b/maximus/phy/src/PhyProcessorTest.cpp
index 4d8448d05d..09477bb822 100644
--- a/maximus/phy/src/PhyProcessorTest.cpp
+++ b/maximus/phy/src/PhyProcessorTest.cpp
@@ -50,17 +50,17 @@ void PhyProcessorTest::userTest (void)
if (NULL != mpPhyProcessor)
{
PhySciMsg * pPhySciMsg = mpPhyProcessor->createMsg();
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("Phy SCI message pointer is NULL"), pPhySciMsg != NULL );
+ CPPUNIT_ASSERT_MESSAGE ( "Phy SCI message pointer is NULL", pPhySciMsg != NULL );
SystemManager * pSystemManager = new SystemManager(mpSciServer);
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("System manager pointer is NULL"), pSystemManager != NULL );
+ CPPUNIT_ASSERT_MESSAGE ( "System manager pointer is NULL", pSystemManager != NULL );
Sci_Msg_Station_Id stationId = pSystemManager->createStation();
pPhySciMsg->setSciMsgStationId(stationId);
Sci_Msg_Station_Id destinationStationId = pSystemManager->createStation();
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("Phy SCI message has not been sent"), mpPhyProcessor->sendMsg(pPhySciMsg) );
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("Wrong destination station"), destinationStationId == pPhySciMsg->getSciMsgStationId() );
+ CPPUNIT_ASSERT_MESSAGE ( "Phy SCI message has not been sent", mpPhyProcessor->sendMsg(pPhySciMsg) );
+ CPPUNIT_ASSERT_MESSAGE ( "Wrong destination station", destinationStationId == pPhySciMsg->getSciMsgStationId() );
// delete
if (NULL != pPhySciMsg)
diff --git a/maximus/sci/src/SciServerTest.cpp b/maximus/sci/src/SciServerTest.cpp
index 1a592deae7..f384af20b8 100644
--- a/maximus/sci/src/SciServerTest.cpp
+++ b/maximus/sci/src/SciServerTest.cpp
@@ -182,12 +182,12 @@ void SciServerTest::registerClockSciMsgTest (void)
// Test a network clock SCI message registration
//
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerSpecializedSciMsg failed",
mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_NETWORK_CLOCK, new ClockSciMsg(mpNetworkClockProcessor)) );
// Check results
//
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("KO"),
+ CPPUNIT_ASSERT_MESSAGE ( "KO",
(*((mpSciServer->getSpecializedSciMsgArray())+(unsigned int)SCI_MSG_TYPE_NETWORK_CLOCK)) != NULL );
}
@@ -199,7 +199,7 @@ void SciServerTest::registerFunctionSciMsgTest (void)
if (NULL != mpFunctionCallManager)
{
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerSpecializedSciMsg failed",
mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_FUNCTION_CALL, new FunctionSciMsg(mpFunctionCallManager)) );
}
else
@@ -209,7 +209,7 @@ void SciServerTest::registerFunctionSciMsgTest (void)
// Check results
//
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("KO"),
+ CPPUNIT_ASSERT_MESSAGE ( "KO",
(*((mpSciServer->getSpecializedSciMsgArray())+(unsigned int)SCI_MSG_TYPE_FUNCTION_CALL)) != NULL );
}
@@ -219,12 +219,12 @@ void SciServerTest::registerPhySciMsgTest (void)
// Test a PHY SCI message registration
//
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerSpecializedSciMsg failed",
mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_PHY, new PhySciMsg(mpPhyProcessor)) );
// Check results
//
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("KO"),
+ CPPUNIT_ASSERT_MESSAGE ( "KO",
(*((mpSciServer->getSpecializedSciMsgArray())+(unsigned int)SCI_MSG_TYPE_PHY)) != NULL );
}
@@ -234,12 +234,12 @@ void SciServerTest::registerSystemSciMsgTest (void)
// Test a system SCI message registration
//
clog << "\tSciServerTest -> SciServer::registerSpecializedSciMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerSpecializedSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerSpecializedSciMsg failed",
mpSciServer->registerSpecializedSciMsg(SCI_MSG_TYPE_SYSTEM, new SystemSciMsg(mpSystemManager)) );
// Check results
//
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("KO"),
+ CPPUNIT_ASSERT_MESSAGE ( "KO",
(*((mpSciServer->getSpecializedSciMsgArray())+(unsigned int)SCI_MSG_TYPE_SYSTEM)) != NULL );
}
@@ -279,7 +279,7 @@ void SciServerTest::receiveClockSciMsgTest ( Sci_Msg_Header & msg_header )
// Test the receiveMsg method
//
clog << "\tSciServerTest -> SciServer::receiveMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg ClockSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "receiveMsg ClockSciMsg failed",
mpSciServer->receiveMsg (&msg_header, dataLength, pData) );
// Free allocated memory
@@ -315,7 +315,7 @@ void SciServerTest::receiveSystemSciMsgTest ( Sci_Msg_Header & msg_header )
// Test the receiveMsg method
//
clog << "\tSciServerTest -> SciServer::receiveMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg SystemSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "receiveMsg SystemSciMsg failed",
mpSciServer->receiveMsg (&msg_header, dataLength, pData) );
// Free allocated memory
@@ -373,7 +373,7 @@ void SciServerTest::receivePhySciMsgTest ( Sci_Msg_Header & msg_header )
//
Sci_Msg_Station_Id destinationStationId = mpSystemManager->createStation();
clog << "\tSciServerTest -> SciServer::receiveMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg PhySciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "receiveMsg PhySciMsg failed",
mpSciServer->receiveMsg (&msg_header, dataLength, pData) );
mpSystemManager->removeStation(destinationStationId);
@@ -433,7 +433,7 @@ void SciServerTest::receiveFunctionSciMsgTest ( Sci_Msg_Header & msg_header )
if (NULL != mpFunctionCallManager)
{
clog << "\tSciServerTest -> FunctionCallManager::registerCallback" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("registerCallback failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "registerCallback failed",
mpFunctionCallManager->registerCallback (0x0001, &functionSciMsgCallback) );
}
else
@@ -444,7 +444,7 @@ void SciServerTest::receiveFunctionSciMsgTest ( Sci_Msg_Header & msg_header )
// Test the receiveMsg method
//
clog << "\tSciServerTest -> SciServer::receiveMsg" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("receiveMsg FunctionSciMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "receiveMsg FunctionSciMsg failed",
mpSciServer->receiveMsg (&msg_header, dataLength, pData) );
// Free allocated memory
diff --git a/maximus/system/src/SystemManagerTest.cpp b/maximus/system/src/SystemManagerTest.cpp
index bc565c0991..0bb420a83d 100644
--- a/maximus/system/src/SystemManagerTest.cpp
+++ b/maximus/system/src/SystemManagerTest.cpp
@@ -86,10 +86,10 @@ void SystemManagerTest::removeStationTest (void)
mpSystemManager->createStation();
clog << "\tSystemManagerTest -> SystemManager::removeStation" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("removeStation failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "removeStation failed",
mpSystemManager->removeStation (stationId2) );
clog << "\tSystemManagerTest -> SystemManager::removeStation" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("removeStation failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "removeStation failed",
mpSystemManager->removeStation (stationId1) );
}
catch ( Error &e )
@@ -126,7 +126,7 @@ void SystemManagerTest::areAllActiveStationsIdleTest (void)
mpSystemManager->createStation();
clog << "\tSystemManagerTest -> SystemManager::areAllActiveStationsIdle" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("areAllActiveStationsIdle failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "areAllActiveStationsIdle failed",
!mpSystemManager->areAllActiveStationsIdle() );
}
catch ( Error &e )
diff --git a/maximus/system/src/SystemSciMsgTest.cpp b/maximus/system/src/SystemSciMsgTest.cpp
index ac7c7a6d05..16333bd731 100644
--- a/maximus/system/src/SystemSciMsgTest.cpp
+++ b/maximus/system/src/SystemSciMsgTest.cpp
@@ -58,16 +58,16 @@ void SystemSciMsgTest::dispatchMsgTest (void)
try
{
clog << "\tSystemSciMsgTest -> SystemSciMsg::setSpecializedSciMsgType" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setSpecializedSciMsgType failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setSpecializedSciMsgType failed",
mpSystemSciMsg->setSpecializedSciMsgType(SYSTEM_TYPE_IDLE) );
Sci_Msg_Station_Id stationId = mpSystemManager->createStation();
clog << "\tSystemSciMsgTest -> SciMsg::setSciMsgStationId" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("setSciMsgStationId failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "setSciMsgStationId failed",
mpSystemSciMsg->setSciMsgStationId(stationId) );
clog << "\tSystemSciMsgTest -> SystemSciMsg::dispatch" << endl;
- CPPUNIT_ASSERT_MESSAGE ( CPPUNIT_NS::Message("dispatchMsg failed"),
+ CPPUNIT_ASSERT_MESSAGE ( "dispatchMsg failed",
mpSystemSciMsg->dispatchMsg() );
}
catch ( Error &e )