* fix [GAM-28] problems in routingsender.cpp

* [GAM-27] major refactoring: bringing everything to standardized names
* Enhancement of CAmSerializer.h
* improvement of documentation
* adoption & regeneration of inerfaces

6 files changed, 163 insertions, 364 deletions

diff --git a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
index 1e672a6..2d3cbca 100644
--- a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.cpp
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.cpp
@@ -22,31 +22,32 @@
  *
  */
 
-#include "testRoutingInterfaceAsync.h"
+#include "CAmRoutingReceiverAsync.h"
 #include "config.h"
-#include "DLTWrapper.h"
-#include "RoutingReceiver.h"
-#include "PluginTemplate.h"
+#include "CAmRoutingReceiver.h"
+#include "TAmPluginTemplate.h"
+#include "MockIAmRoutingReceive.h"
+#include "shared/CAmDltWrapper.h"
 
 using namespace am;
 using namespace testing;
 
-am_domainID_t MyEnvironment::mDomainIDCount = 0;
-static RoutingSendInterface* pRouter;
-static SocketHandler pSocketHandler;
-static MockRoutingReceiveInterface pReceiveInterface;
+am_domainID_t CAmEnvironment::mDomainIDCount = 0;
+static IAmRoutingSend* pRouter;
+static CAmSocketHandler pSocketHandler;
+static MockIAmRoutingReceive pReceiveInterface;
 
-MyEnvironment::MyEnvironment() :
-        ptimerCallback(this, &MyEnvironment::timerCallback)
+CAmEnvironment::CAmEnvironment() :
+        ptimerCallback(this, &CAmEnvironment::timerCallback)
 {
     DefaultValue<am_Error_e>::Set(E_OK); // Sets the default value to be returned.
 }
 
-MyEnvironment::~MyEnvironment()
+CAmEnvironment::~CAmEnvironment()
 {
 }
 
-void MyEnvironment::SetUp()
+void CAmEnvironment::SetUp()
 {
     logInfo("RoutingSendInterface Test started ");
 
@@ -55,15 +56,15 @@ void MyEnvironment::SetUp()
     domainIDs.push_back(1);
 
     EXPECT_CALL(pReceiveInterface,getSocketHandler(_)).WillOnce(DoAll(SetArgReferee<0>(&pSocketHandler), Return(E_OK)));
-    EXPECT_CALL(pReceiveInterface,registerDomain(_,_)).WillRepeatedly(Invoke(MyEnvironment::handleDomainRegister));
-    EXPECT_CALL(pReceiveInterface,registerSource(_,_)).WillRepeatedly(Invoke(MyEnvironment::handleSourceRegister));
-    EXPECT_CALL(pReceiveInterface,registerSink(_,_)).WillRepeatedly(Invoke(MyEnvironment::handleSinkRegister));
+    EXPECT_CALL(pReceiveInterface,registerDomain(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleDomainRegister));
+    EXPECT_CALL(pReceiveInterface,registerSource(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSourceRegister));
+    EXPECT_CALL(pReceiveInterface,registerSink(_,_)).WillRepeatedly(Invoke(CAmEnvironment::handleSinkRegister));
     EXPECT_CALL(pReceiveInterface,confirmRoutingReady(_)).Times(1);
 
-    RoutingSendInterface* (*createFunc)();
+    IAmRoutingSend* (*createFunc)();
     void* tempLibHandle = NULL;
     std::string libname("../plugins/routing/libPluginRoutingInterfaceAsync.so");
-    createFunc = getCreateFunction<RoutingSendInterface*()>(libname, tempLibHandle);
+    createFunc = getCreateFunction<IAmRoutingSend*()>(libname, tempLibHandle);
 
     if (!createFunc)
     {
@@ -88,35 +89,35 @@ void MyEnvironment::SetUp()
 
     sh_timerHandle_t handle;
 
-    shTimerCallBack *buf = &ptimerCallback;
+    CAmShTimerCallBack *buf = &ptimerCallback;
     //lets use a timeout so the test will finish
     pSocketHandler.addTimer(t, buf, handle, (void*) NULL);
     pSocketHandler.start_listenting();
 
 }
 
-void MyEnvironment::TearDown()
+void CAmEnvironment::TearDown()
 {
 
 }
 
-testRoutingInterfaceAsync::testRoutingInterfaceAsync() :
-        ptimerCallback(this, &testRoutingInterfaceAsync::timerCallback)
+CAmRoutingReceiverAsync::CAmRoutingReceiverAsync() :
+        ptimerCallback(this, &CAmRoutingReceiverAsync::timerCallback)
 {
 }
 
-testRoutingInterfaceAsync::~testRoutingInterfaceAsync()
+CAmRoutingReceiverAsync::~CAmRoutingReceiverAsync()
 {
 }
 
-void testRoutingInterfaceAsync::timerCallback(sh_timerHandle_t handle, void *userData)
+void CAmRoutingReceiverAsync::timerCallback(sh_timerHandle_t handle, void *userData)
 {
     (void) handle;
     (void) userData;
     pSocketHandler.stop_listening();
 }
 
-void testRoutingInterfaceAsync::SetUp()
+void CAmRoutingReceiverAsync::SetUp()
 {
 //    timespec t;
 //    t.tv_nsec = 0;
@@ -129,26 +130,26 @@ void testRoutingInterfaceAsync::SetUp()
 //    pSocketHandler.addTimer(t, buf, handle, (void*) NULL);
 }
 
-std::vector<std::string> MyEnvironment::returnListPlugins()
+std::vector<std::string> CAmEnvironment::returnListPlugins()
 {
     std::vector<std::string> list;
     list.push_back(std::string(DEFAULT_PLUGIN_ROUTING_DIR));
     return (list);
 }
 
-am_Error_e MyEnvironment::handleSourceRegister(const am_Source_s & sourceData, am_sourceID_t & sourceID)
+am_Error_e CAmEnvironment::handleSourceRegister(const am_Source_s & sourceData, am_sourceID_t & sourceID)
 {
     sourceID = sourceData.sourceID;
     return (E_OK);
 }
 
-am_Error_e MyEnvironment::handleSinkRegister(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
+am_Error_e CAmEnvironment::handleSinkRegister(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
 {
     sinkID = sinkData.sinkID;
     return (E_OK);
 }
 
-am_Error_e MyEnvironment::handleDomainRegister(const am_Domain_s & domainData, am_domainID_t & domainID)
+am_Error_e CAmEnvironment::handleDomainRegister(const am_Domain_s & domainData, am_domainID_t & domainID)
 {
     am_Domain_s domain = domainData;
     domainID = ++mDomainIDCount;
@@ -156,7 +157,7 @@ am_Error_e MyEnvironment::handleDomainRegister(const am_Domain_s & domainData, a
     return (E_OK);
 }
 
-void MyEnvironment::timerCallback(sh_timerHandle_t handle, void *userData)
+void CAmEnvironment::timerCallback(sh_timerHandle_t handle, void *userData)
 {
     (void) handle;
     (void) userData;
@@ -167,11 +168,11 @@ void MyEnvironment::timerCallback(sh_timerHandle_t handle, void *userData)
     pSocketHandler.restartTimer(handle, t);
 }
 
-void testRoutingInterfaceAsync::TearDown()
+void CAmRoutingReceiverAsync::TearDown()
 {
 }
 
-TEST_F(testRoutingInterfaceAsync,setDomainState)
+TEST_F(CAmRoutingReceiverAsync,setDomainState)
 {
     am_domainID_t domainID = 1;
     am_DomainState_e state = DS_INDEPENDENT_RUNDOWN;
@@ -182,7 +183,7 @@ TEST_F(testRoutingInterfaceAsync,setDomainState)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSourceSoundProperty)
+TEST_F(CAmRoutingReceiverAsync,setSourceSoundProperty)
 {
 
     am_Handle_s handle;
@@ -200,7 +201,7 @@ TEST_F(testRoutingInterfaceAsync,setSourceSoundProperty)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSinkSoundProperty)
+TEST_F(CAmRoutingReceiverAsync,setSinkSoundProperty)
 {
 
     am_Handle_s handle;
@@ -218,7 +219,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkSoundProperty)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSourceState)
+TEST_F(CAmRoutingReceiverAsync,setSourceState)
 {
 
     am_Handle_s handle;
@@ -234,7 +235,7 @@ TEST_F(testRoutingInterfaceAsync,setSourceState)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSourceVolume)
+TEST_F(CAmRoutingReceiverAsync,setSourceVolume)
 {
 
     am_Handle_s handle;
@@ -253,7 +254,7 @@ TEST_F(testRoutingInterfaceAsync,setSourceVolume)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSinkVolume)
+TEST_F(CAmRoutingReceiverAsync,setSinkVolume)
 {
 
     am_Handle_s handle;
@@ -272,7 +273,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkVolume)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,setSinkVolumeAbort)
+TEST_F(CAmRoutingReceiverAsync,setSinkVolumeAbort)
 {
 
     am_Handle_s handle;
@@ -293,7 +294,7 @@ TEST_F(testRoutingInterfaceAsync,setSinkVolumeAbort)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,disconnectNonExisting)
+TEST_F(CAmRoutingReceiverAsync,disconnectNonExisting)
 {
 
     am_Handle_s handle;
@@ -308,7 +309,7 @@ TEST_F(testRoutingInterfaceAsync,disconnectNonExisting)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,disconnectTooEarly)
+TEST_F(CAmRoutingReceiverAsync,disconnectTooEarly)
 {
 
     am_Handle_s handle_c;
@@ -331,7 +332,7 @@ TEST_F(testRoutingInterfaceAsync,disconnectTooEarly)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,disconnectAbort)
+TEST_F(CAmRoutingReceiverAsync,disconnectAbort)
 {
 
     am_Handle_s handle_c;
@@ -356,7 +357,7 @@ TEST_F(testRoutingInterfaceAsync,disconnectAbort)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,disconnect)
+TEST_F(CAmRoutingReceiverAsync,disconnect)
 {
 
     am_Handle_s handle_c;
@@ -380,7 +381,7 @@ TEST_F(testRoutingInterfaceAsync,disconnect)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectNoMoreThreads)
+TEST_F(CAmRoutingReceiverAsync,connectNoMoreThreads)
 {
 
     am_Handle_s handle;
@@ -402,7 +403,7 @@ TEST_F(testRoutingInterfaceAsync,connectNoMoreThreads)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectAbortTooLate)
+TEST_F(CAmRoutingReceiverAsync,connectAbortTooLate)
 {
 
     am_Handle_s handle;
@@ -421,7 +422,7 @@ TEST_F(testRoutingInterfaceAsync,connectAbortTooLate)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectAbort)
+TEST_F(CAmRoutingReceiverAsync,connectAbort)
 {
 
     am_Handle_s handle;
@@ -440,7 +441,7 @@ TEST_F(testRoutingInterfaceAsync,connectAbort)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectWrongFormat)
+TEST_F(CAmRoutingReceiverAsync,connectWrongFormat)
 {
 
     am_Handle_s handle;
@@ -457,7 +458,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongFormat)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectWrongSink)
+TEST_F(CAmRoutingReceiverAsync,connectWrongSink)
 {
 
     am_Handle_s handle;
@@ -474,7 +475,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongSink)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connectWrongSource)
+TEST_F(CAmRoutingReceiverAsync,connectWrongSource)
 {
     am_Handle_s handle;
     handle.handle = 1;
@@ -490,7 +491,7 @@ TEST_F(testRoutingInterfaceAsync,connectWrongSource)
     pSocketHandler.start_listenting();
 }
 
-TEST_F(testRoutingInterfaceAsync,connect)
+TEST_F(CAmRoutingReceiverAsync,connect)
 {
 
     am_Handle_s handle;
@@ -510,7 +511,7 @@ TEST_F(testRoutingInterfaceAsync,connect)
 int main(int argc, char **argv)
 {
     ::testing::InitGoogleTest(&argc, argv);
-    ::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new MyEnvironment);
+    ::testing::Environment* const env = ::testing::AddGlobalTestEnvironment(new CAmEnvironment);
     (void) env;
     return RUN_ALL_TESTS();
 }
diff --git a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
index 3139b5a..ec33c9f 100644
--- a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsync.h
+++ b/PluginRoutingInterfaceAsync/test/CAmRoutingReceiverAsync.h
@@ -27,17 +27,18 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include "mocklnterfaces.h"
-#include "SocketHandler.h"
-#include "../../AudioManagerDaemon/include/RoutingSender.h"
-#include "CAmSerializer.h"
+
+#include "MockIAmRoutingReceive.h"
+#include "shared/CAmSocketHandler.h"
+#include "shared/CAmSerializer.h"
+#include "../../AudioManagerDaemon/include/CAmRoutingSender.h"
 
 #define UNIT_TEST 1
 
 namespace am
 {
 
-class MyEnvironment: public ::testing::Environment
+class CAmEnvironment: public ::testing::Environment
 {
 public:
     static std::vector<std::string> returnListPlugins();
@@ -45,9 +46,9 @@ public:
     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<MyEnvironment> ptimerCallback;
-    MyEnvironment();
-    ~MyEnvironment();
+    TAmShTimerCallBack<CAmEnvironment> ptimerCallback;
+    CAmEnvironment();
+    ~CAmEnvironment();
     // Override this to define how to set up the environment.
     void SetUp();
     // Override this to define how to tear down the environment.
@@ -56,13 +57,13 @@ private:
     static am_domainID_t mDomainIDCount;
 };
 
-class testRoutingInterfaceAsync: public ::testing::Test
+class CAmRoutingReceiverAsync: public ::testing::Test
 {
 public:
-    testRoutingInterfaceAsync();
-    ~testRoutingInterfaceAsync();
+    CAmRoutingReceiverAsync();
+    ~CAmRoutingReceiverAsync();
     void timerCallback(sh_timerHandle_t handle, void* userData);
-    shTimerCallBack_T<testRoutingInterfaceAsync> ptimerCallback;
+    TAmShTimerCallBack<CAmRoutingReceiverAsync> ptimerCallback;
     void SetUp();
     void TearDown();
 private:
diff --git a/PluginRoutingInterfaceAsync/test/CMakeLists.txt b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
index aa4c39d..59c50dc 100644
--- a/PluginRoutingInterfaceAsync/test/CMakeLists.txt
+++ b/PluginRoutingInterfaceAsync/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-PROJECT(routingAsyncTest)
+PROJECT(AmRoutingReceiverAsync)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
@@ -40,10 +40,10 @@ INCLUDE_DIRECTORIES(
     ${STD_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR} 
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${AUDIO_INCLUDES_FOLDER}
+    ${AUDIO_include_FOLDER}
     ${CMAKE_SOURCE_DIR} 
     ${DLT_INCLUDE_DIRS}
-    ${INCLUDES_FOLDER}
+    ${include_FOLDER}
     ${GTEST_INCLUDE_DIR}
     ${DBUS_INCLUDE_DIR}
     ${DBUS_ARCH_INCLUDE_DIR}
@@ -52,26 +52,17 @@ INCLUDE_DIRECTORIES(
 )
    
 file(GLOB ASYNC_PLUGIN_INTERFACE_SRCS_CXX 
-     "../../AudioManagerDaemon/src/SocketHandler.cpp"
-     "../../AudioManagerDaemon/src/DLTWrapper.cpp"
+     "../../AudioManagerDaemon/src/CAmSocketHandler.cpp"
+     "../../AudioManagerDaemon/src/CAmDltWrapper.cpp"
      "../src/*.cpp"  
-     "testRoutingInterfaceAsync.cpp" 
+     "CAmRoutingReceiverAsync.cpp" 
 )
 
-file(GLOB ASYNC_PLUGIN_INTERFACE_INTERRUPT_SRCS_CXX 
-     "../../AudioManagerDaemon/src/SocketHandler.cpp"
-     "../../AudioManagerDaemon/src/RoutingSender.cpp"
-     "../../AudioManagerDaemon/src/DLTWrapper.cpp"
-     "../src/*.cpp"  
-     "testRoutingInterfaceAsyncInterrupt.cpp" 
-
-)
 
-ADD_EXECUTABLE(asyncRoutingInterfaceTest ${ASYNC_PLUGIN_INTERFACE_SRCS_CXX})
-#ADD_EXECUTABLE(asyncRoutingInterfaceInterruptTest ${ASYNC_PLUGIN_INTERFACE_INTERRUPT_SRCS_CXX})
+ADD_EXECUTABLE(AmRoutingReceiveAsyncTest ${ASYNC_PLUGIN_INTERFACE_SRCS_CXX})
 
 
-TARGET_LINK_LIBRARIES(asyncRoutingInterfaceTest 
+TARGET_LINK_LIBRARIES(AmRoutingReceiveAsyncTest 
     ${DLT_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT}
@@ -81,16 +72,7 @@ TARGET_LINK_LIBRARIES(asyncRoutingInterfaceTest
     gmock
 )
 
-#TARGET_LINK_LIBRARIES(asyncRoutingInterfaceInterruptTest 
-#    ${DLT_LIBRARIES}
-#    ${CMAKE_DL_LIBS}
-#    ${CMAKE_THREAD_LIBS_INIT}
-#    ${GTEST_LIBRARIES}
-#    ${DBUS_LIBRARY}
-#    gmock
-#)
-
-INSTALL(TARGETS asyncRoutingInterfaceTest 
+INSTALL(TARGETS AmRoutingReceiveAsyncTest 
         DESTINATION "~/AudioManagerTest/"
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         COMPONENT tests
diff --git a/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h
new file mode 100644
index 0000000..145afd4
--- /dev/null
+++ b/PluginRoutingInterfaceAsync/test/MockIAmRoutingReceive.h
@@ -0,0 +1,91 @@
+#ifndef MOCKROUTINGINTERFACE_H_
+#define MOCKROUTINGINTERFACE_H_
+
+#include "routing/IAmRoutingReceive.h"
+
+namespace am {
+
+class MockIAmRoutingReceive : public IAmRoutingReceive {
+ public:
+  MOCK_METHOD3(ackConnect,
+      void(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error));
+  MOCK_METHOD3(ackDisconnect,
+      void(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error));
+  MOCK_METHOD3(ackSetSinkVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
+  MOCK_METHOD3(ackSetSourceVolumeChange,
+      void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
+  MOCK_METHOD2(ackSetSourceState,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(ackSetSinkSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(ackSetSinkSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(ackSetSourceSoundProperties,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD2(ackSetSourceSoundProperty,
+      void(const am_Handle_s handle, const am_Error_e error));
+  MOCK_METHOD3(ackCrossFading,
+      void(const am_Handle_s handle, const am_HotSink_e hotSink, const am_Error_e error));
+  MOCK_METHOD3(ackSourceVolumeTick,
+      void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
+  MOCK_METHOD3(ackSinkVolumeTick,
+      void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
+  MOCK_METHOD2(peekDomain,
+      am_Error_e(const std::string& name, am_domainID_t& domainID));
+  MOCK_METHOD2(registerDomain,
+      am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
+  MOCK_METHOD1(deregisterDomain,
+      am_Error_e(const am_domainID_t domainID));
+  MOCK_METHOD2(registerGateway,
+      am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
+  MOCK_METHOD1(deregisterGateway,
+      am_Error_e(const am_gatewayID_t gatewayID));
+  MOCK_METHOD2(peekSink,
+      am_Error_e(const std::string& name, am_sinkID_t& sinkID));
+  MOCK_METHOD2(registerSink,
+      am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
+  MOCK_METHOD1(deregisterSink,
+      am_Error_e(const am_sinkID_t sinkID));
+  MOCK_METHOD2(peekSource,
+      am_Error_e(const std::string& name, am_sourceID_t& sourceID));
+  MOCK_METHOD2(registerSource,
+      am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
+  MOCK_METHOD1(deregisterSource,
+      am_Error_e(const am_sourceID_t sourceID));
+  MOCK_METHOD2(registerCrossfader,
+      am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
+  MOCK_METHOD1(deregisterCrossfader,
+      am_Error_e(const am_crossfaderID_t crossfaderID));
+  MOCK_METHOD2(peekSourceClassID,
+      am_Error_e(const std::string& name, am_sourceClass_t& sourceClassID));
+  MOCK_METHOD2(peekSinkClassID,
+      am_Error_e(const std::string& name, am_sinkClass_t& sinkClassID));
+  MOCK_METHOD2(hookInterruptStatusChange,
+      void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
+  MOCK_METHOD1(hookDomainRegistrationComplete,
+      void(const am_domainID_t domainID));
+  MOCK_METHOD2(hookSinkAvailablityStatusChange,
+      void(const am_sinkID_t sinkID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookSourceAvailablityStatusChange,
+      void(const am_sourceID_t sourceID, const am_Availability_s& availability));
+  MOCK_METHOD2(hookDomainStateChange,
+      void(const am_domainID_t domainID, const am_DomainState_e domainState));
+  MOCK_METHOD2(hookTimingInformationChanged,
+      void(const am_connectionID_t connectionID, const am_timeSync_t delay));
+  MOCK_METHOD1(sendChangedData,
+      void(const std::vector<am_EarlyData_s>& earlyData));
+  MOCK_CONST_METHOD1(getDBusConnectionWrapper,
+      am_Error_e(CAmDbusWrapper*& dbusConnectionWrapper));
+  MOCK_CONST_METHOD1(getSocketHandler,
+      am_Error_e(CAmSocketHandler*& socketHandler));
+  MOCK_CONST_METHOD1(getInterfaceVersion,
+      void(std::string& version));
+  MOCK_METHOD1(confirmRoutingReady,
+      void(const uint16_t handle));
+  MOCK_METHOD1(confirmRoutingRundown,
+      void(const uint16_t handle));
+};
+
+}  // namespace am
+#endif /* MOCKROUTINGINTERFACE_H_ */
diff --git a/PluginRoutingInterfaceAsync/test/mocklnterfaces.h b/PluginRoutingInterfaceAsync/test/mocklnterfaces.h
deleted file mode 100644
index d8eef1f..0000000
--- a/PluginRoutingInterfaceAsync/test/mocklnterfaces.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file mockInterfaces.h
-*
-* \date 20-Oct-2011 3:42:04 PM
-* \author Christian Mueller (christian.ei.mueller@bmw.de)
-*
-* \section License
-* GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
-* Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
-*
-* This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
-* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
-* You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
-* Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
-* Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
-* As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
-* Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
-*
-*/
-
-#ifndef MOCKLNTERFACES_H_
-#define MOCKLNTERFACES_H_
-
-#include <routing/RoutingReceiveInterface.h>
-
-namespace am {
-
-class MockRoutingReceiveInterface : public RoutingReceiveInterface {
- public:
-    MOCK_METHOD3(ackConnect,
-        void(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error));
-    MOCK_METHOD3(ackDisconnect,
-        void(const am_Handle_s handle, const am_connectionID_t connectionID, const am_Error_e error));
-    MOCK_METHOD3(ackSetSinkVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
-    MOCK_METHOD3(ackSetSourceVolumeChange,
-        void(const am_Handle_s handle, const am_volume_t volume, const am_Error_e error));
-    MOCK_METHOD2(ackSetSourceState,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(ackSetSinkSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(ackSetSinkSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(ackSetSourceSoundProperties,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD2(ackSetSourceSoundProperty,
-        void(const am_Handle_s handle, const am_Error_e error));
-    MOCK_METHOD3(ackCrossFading,
-        void(const am_Handle_s handle, const am_HotSink_e hotSink, const am_Error_e error));
-    MOCK_METHOD3(ackSourceVolumeTick,
-        void(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume));
-    MOCK_METHOD3(ackSinkVolumeTick,
-        void(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume));
-    MOCK_METHOD2(peekDomain,
-        am_Error_e(const std::string& name, am_domainID_t& domainID));
-    MOCK_METHOD2(registerDomain,
-        am_Error_e(const am_Domain_s& domainData, am_domainID_t& domainID));
-    MOCK_METHOD1(deregisterDomain,
-        am_Error_e(const am_domainID_t domainID));
-    MOCK_METHOD2(registerGateway,
-        am_Error_e(const am_Gateway_s& gatewayData, am_gatewayID_t& gatewayID));
-    MOCK_METHOD1(deregisterGateway,
-        am_Error_e(const am_gatewayID_t gatewayID));
-    MOCK_METHOD2(peekSink,
-        am_Error_e(const std::string& name, am_sinkID_t& sinkID));
-    MOCK_METHOD2(registerSink,
-        am_Error_e(const am_Sink_s& sinkData, am_sinkID_t& sinkID));
-    MOCK_METHOD1(deregisterSink,
-        am_Error_e(const am_sinkID_t sinkID));
-    MOCK_METHOD2(peekSource,
-        am_Error_e(const std::string& name, am_sourceID_t& sourceID));
-    MOCK_METHOD2(registerSource,
-        am_Error_e(const am_Source_s& sourceData, am_sourceID_t& sourceID));
-    MOCK_METHOD1(deregisterSource,
-        am_Error_e(const am_sourceID_t sourceID));
-    MOCK_METHOD2(registerCrossfader,
-        am_Error_e(const am_Crossfader_s& crossfaderData, am_crossfaderID_t& crossfaderID));
-    MOCK_METHOD1(deregisterCrossfader,
-        am_Error_e(const am_crossfaderID_t crossfaderID));
-    MOCK_METHOD2(peekSourceClassID,
-        am_Error_e(const std::string& name, am_sourceClass_t& sourceClassID));
-    MOCK_METHOD2(peekSinkClassID,
-        am_Error_e(const std::string& name, am_sinkClass_t& sinkClassID));
-    MOCK_METHOD2(hookInterruptStatusChange,
-        void(const am_sourceID_t sourceID, const am_InterruptState_e interruptState));
-    MOCK_METHOD1(hookDomainRegistrationComplete,
-        void(const am_domainID_t domainID));
-    MOCK_METHOD2(hookSinkAvailablityStatusChange,
-        void(const am_sinkID_t sinkID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookSourceAvailablityStatusChange,
-        void(const am_sourceID_t sourceID, const am_Availability_s& availability));
-    MOCK_METHOD2(hookDomainStateChange,
-        void(const am_domainID_t domainID, const am_DomainState_e domainState));
-    MOCK_METHOD2(hookTimingInformationChanged,
-        void(const am_connectionID_t connectionID, const am_timeSync_t delay));
-    MOCK_METHOD1(sendChangedData,
-        void(const std::vector<am_EarlyData_s>& earlyData));
-    MOCK_CONST_METHOD1(getDBusConnectionWrapper,
-        am_Error_e(DBusWrapper*& dbusConnectionWrapper));
-    MOCK_CONST_METHOD1(getSocketHandler,
-        am_Error_e(SocketHandler*& socketHandler));
-    MOCK_CONST_METHOD1(getInterfaceVersion,
-        void(std::string& version));
-    MOCK_METHOD1(confirmRoutingReady,
-        void(const uint16_t handle));
-    MOCK_METHOD1(confirmRoutingRundown,
-        void(const uint16_t handle));
-
-  };
-
-}  // namespace am
-
-
-
-#endif /* MOCKLNTERFACES_H_ */
diff --git a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsyncInterrupt.cpp b/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsyncInterrupt.cpp
deleted file mode 100644
index e00de40..0000000
--- a/PluginRoutingInterfaceAsync/test/testRoutingInterfaceAsyncInterrupt.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-/**
- * Copyright (C) 2011, BMW AG
- *
- * GeniviAudioMananger AudioManagerDaemon
- *
- * \file testRoutingItnerfaceAsyncInterrupt.cpp
- *
- * \date 20-Oct-2011 3:42:04 PM
- * \author Christian Mueller (christian.ei.mueller@bmw.de)
- *
- * \section License
- * GNU Lesser General Public License, version 2.1, with special exception (GENIVI clause)
- * Copyright (C) 2011, BMW AG Christian Mueller  Christian.ei.mueller@bmw.de
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License, version 2.1, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License, version 2.1, for more details.
- * You should have received a copy of the GNU Lesser General Public License, version 2.1, along with this program; if not, see <http://www.gnu.org/licenses/lgpl-2.1.html>.
- * Note that the copyright holders assume that the GNU Lesser General Public License, version 2.1, may also be applicable to programs even in cases in which the program is not a library in the technical sense.
- * Linking AudioManager statically or dynamically with other modules is making a combined work based on AudioManager. You may license such other modules under the GNU Lesser General Public License, version 2.1. If you do not want to license your linked modules under the GNU Lesser General Public License, version 2.1, you may use the program under the following exception.
- * As a special exception, the copyright holders of AudioManager give you permission to combine AudioManager with software programs or libraries that are released under any license unless such a combination is not permitted by the license of such a software program or library. You may copy and distribute such a system following the terms of the GNU Lesser General Public License, version 2.1, including this special exception, for AudioManager and the licenses of the other code concerned.
- * Note that people who make modified versions of AudioManager are not obligated to grant this special exception for their modified versions; it is their choice whether to do so. The GNU Lesser General Public License, version 2.1, gives permission to release a modified version without this exception; this exception also makes it possible to release a modified version which carries forward this exception.
- *
- */
-
-#define INTERRUPT_TEST 1
-
-#include "testRoutingInterfaceAsync.h"
-#include "config.h"
-#include "DLTWrapper.h"
-
-using namespace am;
-using namespace testing;
-
-std::vector<std::string> testRoutingInterfaceAsync::pListRoutingPluginDirs = returnListPlugins();
-am_domainID_t testRoutingInterfaceAsync::mDomainIDCount = 0;
-RoutingSender testRoutingInterfaceAsync::pRoutingSender = RoutingSender(pListRoutingPluginDirs);
-
-testRoutingInterfaceAsync::testRoutingInterfaceAsync() :
-        pSocketHandler(), //
-        pReceiveInterface(), //
-        ptimerCallback(this, &testRoutingInterfaceAsync::timerCallback)
-{
-}
-
-testRoutingInterfaceAsync::~testRoutingInterfaceAsync()
-{
-}
-
-void testRoutingInterfaceAsync::SetUp()
-{
-    logInfo("RoutingSendInterface Test started ");
-
-    std::vector<int> domainIDs;
-    domainIDs.push_back(0);
-    domainIDs.push_back(1);
-
-    EXPECT_CALL(pReceiveInterface,getSocketHandler(_)).WillOnce(DoAll(SetArgReferee<0>(&pSocketHandler), Return(E_OK)));
-    EXPECT_CALL(pReceiveInterface,registerDomain(_,_)).WillRepeatedly(Invoke(testRoutingInterfaceAsync::handleDomainRegister));
-    EXPECT_CALL(pReceiveInterface,registerSource(_,_)).WillRepeatedly(Invoke(testRoutingInterfaceAsync::handleSourceRegister));
-    EXPECT_CALL(pReceiveInterface,registerSink(_,_)).WillRepeatedly(Invoke(testRoutingInterfaceAsync::handleSinkRegister));
-
-    //pRoutingSender.startupRoutingInterface(&pReceiveInterface);
-    //pRoutingSender.routingInterfacesReady();
-
-    timespec t;
-    t.tv_nsec = 0;
-    t.tv_sec = 4;
-
-    sh_timerHandle_t handle;
-
-    shTimerCallBack *buf = &ptimerCallback;
-    //lets use a timeout so the test will finish
-    pSocketHandler.addTimer(t, buf, handle, (void*) NULL);
-}
-
-std::vector<std::string> am::testRoutingInterfaceAsync::returnListPlugins()
-{
-    std::vector<std::string> list;
-    list.push_back(std::string(DEFAULT_PLUGIN_ROUTING_DIR));
-    return (list);
-}
-
-am_Error_e am::testRoutingInterfaceAsync::handleSourceRegister(const am_Source_s & sourceData, am_sourceID_t & sourceID)
-{
-    sourceID = sourceData.sourceID;
-    pRoutingSender.addSourceLookup(sourceData);
-    return (E_OK);
-}
-
-am_Error_e am::testRoutingInterfaceAsync::handleSinkRegister(const am_Sink_s & sinkData, am_sinkID_t & sinkID)
-{
-    sinkID = sinkData.sinkID;
-    pRoutingSender.addSinkLookup(sinkData);
-    return (E_OK);
-}
-
-am_Error_e am::testRoutingInterfaceAsync::handleDomainRegister(const am_Domain_s & domainData, am_domainID_t & domainID)
-{
-    am_Domain_s domain = domainData;
-    domainID = mDomainIDCount++;
-    domain.domainID = domainID;
-    pRoutingSender.addDomainLookup(domain);
-    return (E_OK);
-}
-
-void testRoutingInterfaceAsync::timerCallback(sh_timerHandle_t handle, void *userData)
-{
-    (void) handle;
-    (void) userData;
-    pSocketHandler.stop_listening();
-}
-
-void testRoutingInterfaceAsync::TearDown()
-{
-}
-
-std::string DBUSCOMMAND = "dbus-send --session --print-reply --dest=org.genivi.test /org/genivi/test org.genivi.test.";
-
-TEST_F(testRoutingInterfaceAsync,hookInterruptStatusChange)
-{
-    am_sourceID_t sourceID = 2;
-    EXPECT_CALL(pReceiveInterface,hookInterruptStatusChange(sourceID,_)).Times(1);
-    system((DBUSCOMMAND + std::string("InterruptStatusChange int16:2")).c_str());
-    pSocketHandler.start_listenting();
-}
-
-TEST_F(testRoutingInterfaceAsync,hookSourceAvailablityStatusChange)
-{
-    am_sourceID_t sourceID = 2;
-    EXPECT_CALL(pReceiveInterface,hookSourceAvailablityStatusChange(sourceID,_)).Times(1);
-    system((DBUSCOMMAND + std::string("SourceAvailablityStatusChange int16:2")).c_str());
-    pSocketHandler.start_listenting();
-}
-
-TEST_F(testRoutingInterfaceAsync,hookSinkAvailablityStatusChange)
-{
-    am_sinkID_t sinkID = 2;
-    EXPECT_CALL(pReceiveInterface,hookSinkAvailablityStatusChange(sinkID,_)).Times(1);
-    system((DBUSCOMMAND + std::string("SinkAvailablityStatusChange int16:2")).c_str());
-    pSocketHandler.start_listenting();
-}
-
-TEST_F(testRoutingInterfaceAsync,hookTimingInformationChanged)
-{
-    am_connectionID_t connectionID = 4;
-    am_timeSync_t delay = 35;
-    EXPECT_CALL(pReceiveInterface,hookTimingInformationChanged(connectionID,delay)).Times(1);
-    system((DBUSCOMMAND + std::string("timingChanged int16:4 int16:35")).c_str());
-    pSocketHandler.start_listenting();
-}
-
-int main(int argc, char **argv)
-{
-    ::testing::InitGoogleTest(&argc, argv);
-    return RUN_ALL_TESTS();
-}
-