fixup! feat: Singleton class mock test support for all modules

Author: AdityaKasar

languages/cpp/src/shared/src/CMakeLists.txt

@@ -40,6 +40,7 @@ endif ()
 add_library(${TARGET} ${FIREBOLT_LIBRARY_TYPE} ${SOURCES})
 
 if(ENABLE_UNIT_TESTS)
+    add_compile_definitions(MOCK_TEST)
     target_compile_definitions(FireboltSDK PRIVATE UNIT_TEST)
 endif()
 
@@ -61,6 +62,7 @@ target_link_libraries(${TARGET}
 target_include_directories(${TARGET}
     PRIVATE
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../test/include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
 )
 

languages/cpp/src/shared/src/Gateway/unidi/gateway_impl.h

@@ -25,18 +25,30 @@
 
 #include "../common.h"
 
+#ifndef MOCK_TEST
+#include "Transport/Transport.h"
+#else
+#include "IGatewayMock.h"
+#endif
+
 #include <string>
 #include <stdio.h>
 
-#include "mockGateway.h"
-
 namespace FireboltSDK
 {
 
     using EventCallback = std::function<void(const std::string & /* eventName */, const JsonObject & /* parameters */, Firebolt::Error /* error */)>;
 
+#ifndef MOCK_TEST
+    class GatewayImpl
+    {
+
+        Transport<WPEFramework::Core::JSON::IElement> *transport;
+#else
     class GatewayImpl : public IGatewayMock
     {
+#endif
+
     public:
         GatewayImpl()
         {
@@ -48,6 +60,17 @@ namespace FireboltSDK
            this->transport = transport;
         }
 
+#ifndef MOCK_TEST
+        template <typename RESPONSE>
+        Firebolt::Error Request(const std::string &method, const JsonObject &parameters, RESPONSE &response)
+        {
+            if (transport == nullptr)
+            {
+                return Firebolt::Error::NotConnected;
+            }
+            return transport->Invoke(method, parameters, response);
+        }
+#endif
 
         Firebolt::Error Response(unsigned id, const std::string &method, const JsonObject &response)
         {