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

Add test for FairMQMessage::Rebuild

Browse Source
This commit is contained in:
Alexey Rybalchenko 2018-11-28 17:54:15 +01:00 committed by Dennis Klein
parent c605cbc3f6
commit a9619a06d0
5 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fairmq/nanomsg/FairMQSocketNN.cxx
View File

@ -88,7 +88,7 @@ FairMQSocketNN::FairMQSocketNN(const string& type, const string& name, const str
}
#endif
// LOG(info) << "created socket " << fId;
LOG(debug) << "Created socket " << GetId();
}
string FairMQSocketNN::GetId()

2
fairmq/shmem/FairMQSocketSHM.cxx
View File

@ -81,7 +81,7 @@ FairMQSocketSHM::FairMQSocketSHM(Manager& manager, const string& type, const str
throw fair::mq::SocketError("PUB/SUB socket type is not supported for shared memory transport");
}
// LOG(info) << "created socket " << fId;
LOG(debug) << "Created socket " << GetId();
}
bool FairMQSocketSHM::Bind(const string& address)

2
fairmq/zeromq/FairMQSocketZMQ.cxx
View File

@ -71,7 +71,7 @@ FairMQSocketZMQ::FairMQSocketZMQ(const string& type, const string& name, const s
}
}
// LOG(info) << "created socket " << fId;
LOG(debug) << "Created socket " << GetId();
}
string FairMQSocketZMQ::GetId()

6
test/CMakeLists.txt
View File

@ -74,14 +74,14 @@ add_testsuite(FairMQ.Parts
TIMEOUT 5
)
add_testsuite(FairMQ.MessageResize
add_testsuite(FairMQ.Message
SOURCES
${CMAKE_CURRENT_BINARY_DIR}/runner.cxx
message_resize/_message_resize.cxx
message/_message.cxx
LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/message_resize
${CMAKE_CURRENT_SOURCE_DIR}/message
${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5
${definitions}

44
test/message_resize/_message_resize.cxx → test/message/_message.cxx
View File

@ -21,8 +21,8 @@ namespace
using namespace std;
auto RunPushPullWithMsgResize(string transport, string address) -> void {
void RunPushPullWithMsgResize(const string& transport, const string& address)
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
@ -53,6 +53,29 @@ auto RunPushPullWithMsgResize(string transport, string address) -> void {
ASSERT_EQ(inMsg->GetSize(), 250);
}
void RunMsgRebuild(const string& transport)
{
size_t session{fair::mq::tools::UuidHash()};
FairMQProgOptions config;
config.SetValue<string>("session", to_string(session));
auto factory = FairMQTransportFactory::CreateTransportFactory(transport, fair::mq::tools::Uuid(), &config);
FairMQMessagePtr msg(factory->CreateMessage());
EXPECT_EQ(msg->GetSize(), 0);
msg->Rebuild(100);
EXPECT_EQ(msg->GetSize(), 100);
string* str = new string("asdf");
msg->Rebuild(const_cast<char*>(str->c_str()),
str->length(),
[](void* /*data*/, void* obj) { delete static_cast<string*>(obj); },
str);
EXPECT_NE(msg->GetSize(), 100);
EXPECT_EQ(msg->GetSize(), string("asdf").length());
EXPECT_EQ(string(static_cast<char*>(msg->GetData()), msg->GetSize()), string("asdf"));
}
TEST(MessageResize, ZeroMQ)
{
RunPushPullWithMsgResize("zeromq", "ipc://test_message_resize");
@ -70,4 +93,21 @@ TEST(MessageResize, nanomsg)
}
#endif /* BUILD_NANOMSG_TRANSPORT */
TEST(MessageRebuild, ZeroMQ)
{
RunMsgRebuild("zeromq");
}
TEST(MessageRebuild, shmem)
{
RunMsgRebuild("shmem");
}
#ifdef BUILD_NANOMSG_TRANSPORT
TEST(MessageRebuild, nanomsg)
{
RunMsgRebuild("nanomsg");
}
#endif /* BUILD_NANOMSG_TRANSPORT */
} // namespace