Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

better tests output

Browse Source
This commit is contained in:
Alexey Rybalchenko 2017-03-01 09:53:19 +01:00 committed by Mohammad Al-Turany
parent 9e477264c8
commit eaa220e39e
6 changed files with 53 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fairmq/test/pub-sub/FairMQTestPub.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestPub.h" #include "FairMQTestPub.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,26 +21,38 @@ FairMQTestPub::FairMQTestPub()
void FairMQTestPub::Run() void FairMQTestPub::Run()
{ {
std::unique_ptr<FairMQMessage> ready1Msg(NewMessage()); FairMQMessagePtr ready1(NewMessage());
int r1 = Receive(ready1Msg, "control"); FairMQMessagePtr ready2(NewMessage());
std::unique_ptr<FairMQMessage> ready2Msg(NewMessage()); int r1 = Receive(ready1, "control");
int r2 = Receive(ready2Msg, "control"); int r2 = Receive(ready2, "control");
if (r1 >= 0 && r2 >= 0) if (r1 >= 0 && r2 >= 0)
{ {
std::unique_ptr<FairMQMessage> msg(NewMessage()); LOG(INFO) << "Received both ready signals, proceeding to publish data";
Send(msg, "data");
std::unique_ptr<FairMQMessage> ack1Msg(NewMessage()); FairMQMessagePtr msg(NewMessage());
std::unique_ptr<FairMQMessage> ack2Msg(NewMessage()); int d1 = Send(msg, "data");
if (Receive(ack1Msg, "control") >= 0) if (d1 < 0)
{ {
if (Receive(ack2Msg, "control") >= 0) LOG(ERROR) << "Failed sending data: d1 = " << d1;
}
FairMQMessagePtr ack1(NewMessage());
FairMQMessagePtr ack2(NewMessage());
int a1 = Receive(ack1, "control");
int a2 = Receive(ack2, "control");
if (a1 >= 0 && a2 >= 0)
{ {
LOG(INFO) << "PUB-SUB test successfull"; LOG(INFO) << "PUB-SUB test successfull";
} }
else
{
LOG(ERROR) << "Failed receiving ack signal: a1 = " << a1 << ", a2 = " << a2;
} }
} }
else
{
LOG(ERROR) << "Failed receiving ready signal: r1 = " << r1 << ", r2 = " << r2;
}
} }
FairMQTestPub::~FairMQTestPub() FairMQTestPub::~FairMQTestPub()

29
fairmq/test/pub-sub/FairMQTestSub.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestSub.h" #include "FairMQTestSub.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,18 +21,29 @@ FairMQTestSub::FairMQTestSub()
void FairMQTestSub::Run() void FairMQTestSub::Run()
{ {
std::unique_ptr<FairMQMessage> readyMsg(NewMessage()); FairMQMessagePtr ready(NewMessage());
Send(readyMsg, "control"); int r1 = Send(ready, "control");
if (r1 >= 0)
std::unique_ptr<FairMQMessage> msg(NewMessage());
if (Receive(msg, "data") >= 0)
{ {
std::unique_ptr<FairMQMessage> ackMsg(NewMessage()); FairMQMessagePtr msg(NewMessage());
Send(ackMsg, "control"); int d1 = Receive(msg, "data");
if (d1 >= 0)
{
FairMQMessagePtr ack(NewMessage());
int a1 = Send(ack, "control");
if (a1 < 0)
{
LOG(ERROR) << "Failed sending ack signal: a1 = " << a1;
}
} }
else else
{ {
LOG(ERROR) << "Test failed: size of the received message doesn't match. Expected: 0, Received: " << msg->GetSize(); LOG(ERROR) << "Failed receiving data: d1 = " << d1;
}
}
else
{
LOG(ERROR) << "Failed sending ready signal: r1 = " << r1;
} }
} }

4
fairmq/test/push-pull/FairMQTestPull.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestPull.h" #include "FairMQTestPull.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,7 +21,7 @@ FairMQTestPull::FairMQTestPull()
void FairMQTestPull::Run() void FairMQTestPull::Run()
{ {
std::unique_ptr<FairMQMessage> msg(NewMessage()); FairMQMessagePtr msg(NewMessage());
if (Receive(msg, "data") >= 0) if (Receive(msg, "data") >= 0)
{ {

4
fairmq/test/push-pull/FairMQTestPush.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestPush.h" #include "FairMQTestPush.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,7 +21,7 @@ FairMQTestPush::FairMQTestPush()
void FairMQTestPush::Run() void FairMQTestPush::Run()
{ {
std::unique_ptr<FairMQMessage> msg(NewMessage()); FairMQMessagePtr msg(NewMessage());
Send(msg, "data"); Send(msg, "data");
} }

10
fairmq/test/req-rep/FairMQTestRep.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestRep.h" #include "FairMQTestRep.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,18 +21,18 @@ FairMQTestRep::FairMQTestRep()
void FairMQTestRep::Run() void FairMQTestRep::Run()
{ {
std::unique_ptr<FairMQMessage> request1(NewMessage()); FairMQMessagePtr request1(NewMessage());
if (Receive(request1, "data") >= 0) if (Receive(request1, "data") >= 0)
{ {
LOG(INFO) << "Received request 1"; LOG(INFO) << "Received request 1";
std::unique_ptr<FairMQMessage> reply(NewMessage()); FairMQMessagePtr reply(NewMessage());
Send(reply, "data"); Send(reply, "data");
} }
std::unique_ptr<FairMQMessage> request2(NewMessage()); FairMQMessagePtr request2(NewMessage());
if (Receive(request2, "data") >= 0) if (Receive(request2, "data") >= 0)
{ {
LOG(INFO) << "Received request 2"; LOG(INFO) << "Received request 2";
std::unique_ptr<FairMQMessage> reply(NewMessage()); FairMQMessagePtr reply(NewMessage());
Send(reply, "data"); Send(reply, "data");
} }

6
fairmq/test/req-rep/FairMQTestReq.cxx
View File

@ -12,8 +12,6 @@
* @author A. Rybalchenko * @author A. Rybalchenko
*/ */
#include <memory> // unique_ptr
#include "FairMQTestReq.h" #include "FairMQTestReq.h"
#include "FairMQLogger.h" #include "FairMQLogger.h"
@ -23,10 +21,10 @@ FairMQTestReq::FairMQTestReq()
void FairMQTestReq::Run() void FairMQTestReq::Run()
{ {
std::unique_ptr<FairMQMessage> request(NewMessage()); FairMQMessagePtr request(NewMessage());
Send(request, "data"); Send(request, "data");
std::unique_ptr<FairMQMessage> reply(NewMessage()); FairMQMessagePtr reply(NewMessage());
if (Receive(reply, "data") >= 0) if (Receive(reply, "data") >= 0)
{ {
LOG(INFO) << "received reply"; LOG(INFO) << "received reply";