1 files changed, 19 insertions, 9 deletions
diff --git a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h b/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h
index 364100c..3139b5a 100644
--- a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h
+++ b/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h
@@ -30,33 +30,43 @@
 #include "mocklnterfaces.h"
 #include "SocketHandler.h"
 #include "../../AudioManagerDaemon/include/RoutingSender.h"
+#include "CAmSerializer.h"
 
 #define UNIT_TEST 1
 
 namespace am
 {
 
-class testRoutingInterfaceAsync: public ::testing::Test
+class MyEnvironment: public ::testing::Environment
 {
 public:
-    static std::vector<std::string> pListRoutingPluginDirs;
-    SocketHandler pSocketHandler;
-    MockRoutingReceiveInterface pReceiveInterface;
-    static RoutingSender pRoutingSender;
     static std::vector<std::string> returnListPlugins();
     static am_Error_e handleDomainRegister(const am_Domain_s& domainData, am_domainID_t& domainID);
     static am_Error_e handleSourceRegister(const am_Source_s& sourceData, am_sourceID_t& sourceID);
     static am_Error_e handleSinkRegister(const am_Sink_s& sinkData, am_sinkID_t& sinkID);
     void timerCallback(sh_timerHandle_t handle, void* userData);
-    shTimerCallBack_T<testRoutingInterfaceAsync> ptimerCallback;
-    testRoutingInterfaceAsync();
-    virtual ~testRoutingInterfaceAsync();
-
+    shTimerCallBack_T<MyEnvironment> ptimerCallback;
+    MyEnvironment();
+    ~MyEnvironment();
+    // Override this to define how to set up the environment.
     void SetUp();
+    // Override this to define how to tear down the environment.
     void TearDown();
 private:
     static am_domainID_t mDomainIDCount;
 };
 
+class testRoutingInterfaceAsync: public ::testing::Test
+{
+public:
+    testRoutingInterfaceAsync();
+    ~testRoutingInterfaceAsync();
+    void timerCallback(sh_timerHandle_t handle, void* userData);
+    shTimerCallBack_T<testRoutingInterfaceAsync> ptimerCallback;
+    void SetUp();
+    void TearDown();
+private:
+};
+
 } /* namespace am */
 #endif /* TESTROUTINGINTERFACEASYNC_H_ */