From a9df367e7839ed601fd894fc2658d5db8b0530aa Mon Sep 17 00:00:00 2001
From: Alexey Rybalchenko <alexryba@gmail.com>
Date: Wed, 28 Nov 2018 17:54:15 +0100
Subject: [PATCH] Add test for FairMQMessage::Rebuild

---
 fairmq/nanomsg/FairMQSocketNN.cxx             |  2 +-
 fairmq/shmem/FairMQSocketSHM.cxx              |  2 +-
 fairmq/zeromq/FairMQSocketZMQ.cxx             |  2 +-
 test/CMakeLists.txt                           |  6 +--
 .../_message.cxx}                             | 44 ++++++++++++++++++-
 5 files changed, 48 insertions(+), 8 deletions(-)
 rename test/{message_resize/_message_resize.cxx => message/_message.cxx} (63%)

diff --git a/fairmq/nanomsg/FairMQSocketNN.cxx b/fairmq/nanomsg/FairMQSocketNN.cxx
index 3e4bb1625..30498fff9 100644
--- a/fairmq/nanomsg/FairMQSocketNN.cxx
+++ b/fairmq/nanomsg/FairMQSocketNN.cxx
@@ -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()
diff --git a/fairmq/shmem/FairMQSocketSHM.cxx b/fairmq/shmem/FairMQSocketSHM.cxx
index bc5591880..311c80007 100644
--- a/fairmq/shmem/FairMQSocketSHM.cxx
+++ b/fairmq/shmem/FairMQSocketSHM.cxx
@@ -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)
diff --git a/fairmq/zeromq/FairMQSocketZMQ.cxx b/fairmq/zeromq/FairMQSocketZMQ.cxx
index 8d3eea0c5..e775176e5 100644
--- a/fairmq/zeromq/FairMQSocketZMQ.cxx
+++ b/fairmq/zeromq/FairMQSocketZMQ.cxx
@@ -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()
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e9c3e5b4b..084eac08d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -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}
diff --git a/test/message_resize/_message_resize.cxx b/test/message/_message.cxx
similarity index 63%
rename from test/message_resize/_message_resize.cxx
rename to test/message/_message.cxx
index 632cb4538..df42bd512 100644
--- a/test/message_resize/_message_resize.cxx
+++ b/test/message/_message.cxx
@@ -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