add test_zmq as a test class for microservice_test app

CMakeLists.txt

@@ -57,8 +57,8 @@ add_executable(test_MicroserviceClient test/Microservice_ClientTest.cpp) #EXCLUD
 target_link_libraries (test_MicroserviceClient Microservice)
 
 # test_ZMQ
-add_executable(test_ZMQ test/Microservice_ZMQTest.cpp) #EXCLUDE_FROM_ALL ${Microservice_TEST_SOURCES})
-target_link_libraries (test_ZMQ Microservice)
+#add_executable(test_ZMQ test/Microservice_ZMQTest.cpp) #EXCLUDE_FROM_ALL ${Microservice_TEST_SOURCES})
+#target_link_libraries (test_ZMQ Microservice)
 
 # install part
 #set (CMAKE_INSTALL_PREFIX ../internals)

doc/todo.txt

-
-- client->createAsync(asyncTaskParams,[asyncTaskParams](MSRetstat retstat) {
-        if (retStat.IsSuccess())
-            clientAsyncTaskParamsPtr->p_IContainer_->WriteObjectToResponse(
-                    clientAsyncTaskParamsPtr->p_IResponse_.get(),
-                    *clientAsyncTaskParamsPtr->p_baseRestResoonse_);
-        else
-            clientAsyncTaskParamsPtr->p_IContainer_->SendErrorResp(clientAsyncTaskParamsPtr->p_IResponse_.get(),
-                                                                   retStat.GetError());
-    });
-
+- memory leak on performance testing of SendZmqRestRequests
 - upon receiving the response , forward it to a new task to be carried by another thread
\ No newline at end of file

test/Microservice_ClientTest.cpp

@@ -29,13 +29,14 @@ static const char *const PUBSUBHOST = "zmqpubsub";
 using namespace std;
 
 
+
 void pubsubtest(cMicroservice_Client *p_Client);
 
 void performance(cMicroservice_Client *p_Client);
 
 void testRapidJson();
 
-void SendZmqRestRequests(const Microservice_App &msApp, cMicroservice_Client *p_zmqClient);
+void SendZmqRestRequests(const Microservice_App &msApp, cMicroservice_Client *p_zmqClient, int iterations);
 
 void runTest()
 {
@@ -335,6 +336,8 @@ void runRestZmqTest(){
 
     std::string appName("myZmqService");
     Microservice_App msApp(appName.c_str());
+
+
     /**
      * Start server
      */
@@ -343,11 +346,17 @@ void runRestZmqTest(){
         .withMonitoring() // need to add reload
         .withPubSub(NULL)
         .withServiceDiscovery(NULL)
+        .addClient(ClientFactory::createZmqCommandImpl(appName,"clientApp", 0,"serverApp", 0,Microservice_ZMQServerParams::eProtocol::eIpc))
         .addServer(ServerFactory::createIRestServerCivetWebImpl("", 50010, 1))
         .addServer(ServerFactory::createIRestServerZmqImpl("serverApp",0,Microservice_ZMQServerParams::eProtocol::eIpc))
         .addTest("SendZmqRestRequests", [&msApp,&appName](std::stringstream& output,DequeStringMap& queryParams) -> MSRetStat {
-            auto p_zmqClient = ClientFactory::createZmqCommandImpl(appName,"clientApp", 0,"serverApp", 0,Microservice_ZMQServerParams::eProtocol::eIpc);
-            output <<" Testing " << ITERATIONS << " SendZmqRestRequests took: " << CommonUtils::measureFunc<>(SendZmqRestRequests,msApp, p_zmqClient) << "msec" << '\n';
+            auto p_zmqClient = msApp.GetMSClient(appName);
+            int iterations = ITERATIONS;
+            auto iterator = queryParams.find("iterations");
+            if (iterator != queryParams.end()){
+                iterations = std::atoi(iterator->second.begin()->c_str());
+            }
+            output <<" Testing " << iterations << " iterations in SendZmqRestRequests took: " << CommonUtils::measureFunc<>(SendZmqRestRequests,msApp, p_zmqClient,iterations) << "msec" << '\n';
             return MSRetStat();
         })
         .addTest("testCaches",[&msApp,&appName](std::stringstream& output,DequeStringMap& queryParams) -> MSRetStat {
@@ -366,9 +375,9 @@ void runRestZmqTest(){
     getchar();
 }
 
-void SendZmqRestRequests(const Microservice_App &msApp, cMicroservice_Client *p_zmqClient) {
+void SendZmqRestRequests(const Microservice_App &msApp, cMicroservice_Client *p_zmqClient, int iterations) {
     auto p_logger = msApp.GetLogger();
-    for (int i = 0; i < ITERATIONS; i++) {
+    for (int i = 0; i < iterations; i++) {
             ClientAsyncTaskParamsPtr clientAsyncTaskParamsPtr =
                     ClientAsyncTaskParamsFactory::CreateCommndParamsAsyncTask(nullptr, nullptr);
             clientAsyncTaskParamsPtr->p_command_params_->WithEntity("")
@@ -386,11 +395,6 @@ void SendZmqRestRequests(const Microservice_App &msApp, cMicroservice_Client *p_
                             if (i != p_rr->getCommandId())
                                 cerr << "CommandId mismatch" << endl;
                         //}
-//                        rapidjson::StringBuffer buffer;
-//                        rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
-//                        clientAsyncTaskParamsPtr->p_baseRestResoonse_->GetObjectNode().Accept(writer);
-//                        p_logger->info("SUCCESS: Response: %s",buffer.GetString());
-
                     }
                     else {
                         p_logger->error("%s, failed on %s, Cmnd Id: %u",__PRETTY_FUNCTION__,retStat.GetError().c_str(),i);

test/Microservice_Test.cpp

@@ -26,6 +26,7 @@
 #include <common/Microservice_RestResponse.h>
 #include <utils/ServerFactory.h>
 #include <utils/ClientFactory.h>
+#include "Microservice_ZMQTest.cpp"
 
 static const char *const START = "Start";
 static const char *const STOP = "Stop";
@@ -288,30 +289,8 @@ public:
 
 };
 
-void runNewMS(){
-
-
-    cMicroservice_BaseClientParams clientParams("other-service", true, 10, false,"localhost",32010,"localhost:6379");
-
-    Microservice_App msApp("myCppService");
-    msApp
-            .withMetrics()
-            .withMonitoring() // need to add reload
-            .withPubSub(NULL)
-            .withServiceDiscovery(NULL)
-            .addClient(ClientFactory::createHttpImplMsClient("other-service", "localhost", 32010, true, 10, false,"localhost:6379")) //new cMicroservice_Client(new MSICommandClientHttpImpl(),&clientParams))
-            .addClient(ClientFactory::createZmqMsgQImp("zmq-service", msApp.name(), 0,
-                                                       Microservice_ZMQServerParams::eProtocol::eIpc))
-            .addServer(ServerFactory::createIRestServerCivetWebImpl("", 50010, 1))// .addRestServer(new cMicroservice_IRestServerCivetWebImpl(new cMicroservice_RestServerParams(50010,"",1)))
-            .addServer(ServerFactory::createIMsgQueueServerZmqImpl(msApp.name(), 0, Microservice_ZMQServerParams::eProtocol::eIpc))
-            .addHandler("/xxx",(Microservice_RestHandler*)new cMicroserviceHandler("hello"))
-            .addHandler("/zmq",new MSMsgQHandler())
-            .build()
-            .run();
-}
-
 void testCache(){
-    using CacheClient = nsMicroservice_Iface::ICacheClient;
+    using CacheClient = nsMicroservice_Iface::ICacheClient<std::string,std::string>;
     using Str = std::string;
     std::vector<std::pair<std::string,std::string>> retKeyValue;
     Str key = "keytest";
@@ -385,18 +364,23 @@ void test_timers()
 int main(int argc, char *argv[])
 {
 
-    // testCache();
-    //TO to2 = testDocs();
-
-//    test_timers();
-    runNewMS();
-
-    if (argc < 6)
-    {
-        printf("Usage: Test_Microservice app-name host port handler-prefix get-returned-string\n");
-        return 0;
-    }
-
-    //runOldMS(argv);
+    cMicroservice_BaseClientParams clientParams("other-service", true, 10, false,"localhost",32010,"localhost:6379");
+    zmqtest::TestZMQ testZMQ;
 
+    Microservice_App msApp("myCppService");
+    msApp
+            .withMetrics()
+            .withMonitoring() // need to add reload
+            .withPubSub(NULL)
+            .withServiceDiscovery(NULL)
+            .addClient(ClientFactory::createHttpImplMsClient("other-service", "localhost", 32010, true, 10, false,"localhost:6379")) //new cMicroservice_Client(new MSICommandClientHttpImpl(),&clientParams))
+            .addClient(ClientFactory::createZmqMsgQImp("zmq-service", msApp.name(), 0,
+                                                       Microservice_ZMQServerParams::eProtocol::eIpc))
+            .addServer(ServerFactory::createIRestServerCivetWebImpl("", 50010, 1))// .addRestServer(new cMicroservice_IRestServerCivetWebImpl(new cMicroservice_RestServerParams(50010,"",1)))
+            .addServer(ServerFactory::createIMsgQueueServerZmqImpl(msApp.name(), 0, Microservice_ZMQServerParams::eProtocol::eIpc))
+            .addHandler("/xxx",(Microservice_RestHandler*)new cMicroserviceHandler("hello"))
+            .addHandler("/zmq",new MSMsgQHandler())
+            .addTest(&testZMQ)
+            .build()
+            .run();
 }