* 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

9 files changed, 302 insertions, 421 deletions

diff --git a/PluginCommandInterfaceDbus/test/DbusCommandInterfaceBackdoor.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp
index a61f693..c3f53e1 100644
--- a/PluginCommandInterfaceDbus/test/DbusCommandInterfaceBackdoor.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.cpp
@@ -23,35 +23,36 @@
 * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
 */
 
-#include "DbusCommandInterfaceBackdoor.h"
+#include "CAmCommandSenderDbusBackdoor.h"
+#include "command/IAmCommandReceive.h"
 
 
 using namespace am;
 
-DbusCommandInterfaceBackdoor::DbusCommandInterfaceBackdoor()
+CAmCommandSenderDbusBackdoor::CAmCommandSenderDbusBackdoor()
 {
 }
 
-DbusCommandInterfaceBackdoor::~DbusCommandInterfaceBackdoor()
+CAmCommandSenderDbusBackdoor::~CAmCommandSenderDbusBackdoor()
 {
 }
 
-void DbusCommandInterfaceBackdoor::setReceiveInterface(DbusCommandSender *sender, CommandReceiveInterface* interface)
+void CAmCommandSenderDbusBackdoor::setReceiveInterface(CAmCommandSenderDbus *sender, IAmCommandReceive* interface)
 {
-	sender->mCommandReceiveInterface=interface;
+	sender->mpIAmCommandReceive=interface;
 }
 
-void DbusCommandInterfaceBackdoor::setDbusConnection(DbusCommandSender *sender, DBusConnection *conn)
+void CAmCommandSenderDbusBackdoor::setDbusConnection(CAmCommandSenderDbus *sender, DBusConnection *conn)
 {
-	sender->mDBUSMessageHandler.setDBusConnection(conn);
+	sender->mCAmDbusMessageHandler.setDBusConnection(conn);
 }
 
-void DbusCommandInterfaceBackdoor::setListSinks(DbusCommandSender *sender, std::vector<am_SinkType_s> newList)
+void CAmCommandSenderDbusBackdoor::setListSinks(CAmCommandSenderDbus *sender, std::vector<am_SinkType_s> newList)
 {
 	sender->mlistSinks=newList;
 }
 
-void DbusCommandInterfaceBackdoor::setListSources(DbusCommandSender *sender, std::vector<am_SourceType_s> newList)
+void CAmCommandSenderDbusBackdoor::setListSources(CAmCommandSenderDbus *sender, std::vector<am_SourceType_s> newList)
 {
 	sender->mlistSources=newList;
 }
diff --git a/PluginCommandInterfaceDbus/test/DbusCommandInterfaceBackdoor.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h
index 1549e65..bbbeda9 100644
--- a/PluginCommandInterfaceDbus/test/DbusCommandInterfaceBackdoor.h
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusBackdoor.h
@@ -3,7 +3,7 @@
 *
 * GeniviAudioMananger AudioManagerDaemon
 *
-* \file DubsCommandInterfaceBackdoor.h
+* \file DubsIAmCommandBackdoor
 *
 * \date 20-Oct-2011 3:42:04 PM
 * \author Christian Mueller (christian.ei.mueller@bmw.de)
@@ -26,24 +26,25 @@
 #ifndef DBUSCOMMANDINTERFACEBACKDOOR_H_
 #define DBUSCOMMANDINTERFACEBACKDOOR_H_
 
+#include "../include/CAmCommandSenderDbus.h"
+#include <vector>
 #include <dbus/dbus.h>
-#include "../include/DBusCommandSender.h"
-#include "../include/DBusMessageHandler.h"
-#include "../include/CommandReceiverShadow.h"
+#include "audiomanagertypes.h"
+#include "command/IAmCommandReceive.h"
 
 namespace am {
 
-class DbusCommandSender;
+class CAmCommandSenderDbus;
 
-class DbusCommandInterfaceBackdoor
+class CAmCommandSenderDbusBackdoor
 {
 public:
-	DbusCommandInterfaceBackdoor();
-	virtual ~DbusCommandInterfaceBackdoor();
-	void setReceiveInterface(DbusCommandSender *sender, CommandReceiveInterface* interface);
-	void setDbusConnection(DbusCommandSender *sender,DBusConnection *conn);
-	void setListSinks(DbusCommandSender *sender, std::vector<am_SinkType_s> newList);
-	void setListSources(DbusCommandSender *sender, std::vector<am_SourceType_s> newList);
+	CAmCommandSenderDbusBackdoor();
+	virtual ~CAmCommandSenderDbusBackdoor();
+	void setReceiveInterface(CAmCommandSenderDbus *sender, IAmCommandReceive* interface);
+	void setDbusConnection(CAmCommandSenderDbus *sender,DBusConnection *conn);
+	void setListSinks(CAmCommandSenderDbus *sender, std::vector<am_SinkType_s> newList);
+	void setListSources(CAmCommandSenderDbus *sender, std::vector<am_SourceType_s> newList);
 };
 
 }
diff --git a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp
index 655a1f3..071af58 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp
@@ -23,48 +23,47 @@
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
  */
 
-#include "dbuscommaninterfacesignalsTest.h"
+#include "CAmCommandSenderDbusSignalTest.h"
+#include <python2.6/Python.h>
 #include <iostream>
 #include <fstream>
-#include <python2.6/Python.h>
-#include "../include/DBusCommandSender.h"
-#include "../include/DBusMessageHandler.h"
-#include "DbusCommandInterfaceBackdoor.h"
-#include "MockInterfaces.h"
-#include "DLTWrapper.h"
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <set>
+#include "CAmCommandSenderDbusBackdoor.h"
+#include "MockIAmCommandReceive.h"
+#include "../include/CAmCommandSenderDbus.h"
+#include "../include/CAmDbusMessageHandler.h"
+#include "../../AudioManagerDaemon/include/TAmPluginTemplate.h"
+#include "shared/CAmDltWrapper.h"
 
 using namespace am;
 using namespace testing;
 
-
-dbuscommaninterfacesignalsTest::dbuscommaninterfacesignalsTest()
+CAmCommandSenderDbusSignalTest::CAmCommandSenderDbusSignalTest()
 {
-    DLTWrapper::instance()->registerApp("dbusTest","dbusTest");
+    CAmDltWrapper::instance()->registerApp("dbusTest", "dbusTest");
     logInfo("dbusCommandInterfaceSignalTest started");
 }
 
-dbuscommaninterfacesignalsTest::~dbuscommaninterfacesignalsTest()
+CAmCommandSenderDbusSignalTest::~CAmCommandSenderDbusSignalTest()
 {
 }
 
-void* NumberOfMainConnectionsChanged(void*)
+void* NumberOfMainConnectionsChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNumberOfMainConnectionsChanged();
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    am_MainConnectionType_s mainConnection;
+    sender->cbNewMainConnection(mainConnection);
     return (NULL);
 }
 
-void* cbSinkAdded(void*)
+void* cbSinkAdded(void* ppCommandSend)
 {
     sleep(1);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     std::vector<am_SinkType_s> list;
     am_SinkType_s mysink;
     mysink.name = "MySink";
@@ -74,290 +73,191 @@ void* cbSinkAdded(void*)
     mysink.muteState = MS_UNKNOWN;
     mysink.sinkClassID = 3;
     mysink.volume = 234;
-    list.push_back(mysink);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    EXPECT_CALL(receiver,getListMainSinks(_)).WillOnce(DoAll(SetArgReferee<0>(list), Return(E_OK)));
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNewSink(mysink);
+    sender->cbNewSink(mysink);
     return (NULL);
 }
 
-void* cbSourceAdded(void*)
+void* cbSourceAdded(void* ppCommandSend)
 {
     sleep(1);
-    std::vector<am_SourceType_s> list;
-    am_SourceType_s myource;
-    myource.name = "MySink";
-    myource.sourceID = 42;
-    myource.availability.availability = A_MAX;
-    myource.availability.availabilityReason = AR_UNKNOWN;
-    myource.sourceClassID = 15;
-    list.push_back(myource);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    EXPECT_CALL(receiver,getListMainSources(_)).WillOnce(DoAll(SetArgReferee<0>(list), Return(E_OK)));
-    sender.cbNumberOfSourcesChanged();
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    am_SourceType_s mysource;
+    mysource.name = "MySink";
+    mysource.sourceID = 42;
+    mysource.availability.availability = A_MAX;
+    mysource.availability.availabilityReason = AR_UNKNOWN;
+    mysource.sourceClassID = 15;
+    sender->cbNewSource(mysource);
     return (NULL);
 }
 
-void* cbSourceRemoved(void*)
+void* cbSourceRemoved(void* ppCommandSend)
 {
     sleep(1);
-    std::vector<am_SourceType_s> list;
-    am_SourceType_s myource;
-    myource.name = "MySink";
-    myource.sourceID = 42;
-    myource.availability.availability = A_MAX;
-    myource.availability.availabilityReason = AR_UNKNOWN;
-    myource.sourceClassID = 15;
-    list.push_back(myource);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    backdoor.setListSources(&sender, list);
-    DBusError error;
-    dbus_error_init(&error);
-    list.clear();
-    EXPECT_CALL(receiver,getListMainSources(_)).WillOnce(DoAll(SetArgReferee<0>(list), Return(E_OK)));
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNumberOfSourcesChanged();
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    am_SourceType_s mysource;
+    mysource.name = "MySink";
+    mysource.sourceID = 42;
+    sender->cbRemovedSource(mysource.sourceID);
     return (NULL);
 }
 
-void* cbSinkRemoved(void*)
+void* cbSinkRemoved(void* ppCommandSend)
 {
     sleep(1);
-    std::vector<am_SinkType_s> list;
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_SinkType_s mysink;
     mysink.name = "MySink";
     mysink.sinkID = 23;
-    mysink.availability.availability = A_MAX;
-    mysink.availability.availabilityReason = AR_UNKNOWN;
-    mysink.muteState = MS_UNKNOWN;
-    mysink.sinkClassID = 3;
-    mysink.volume = 234;
-    list.push_back(mysink);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    backdoor.setListSinks(&sender, list);
-    DBusError error;
-    dbus_error_init(&error);
-    list.clear();
-    EXPECT_CALL(receiver,getListMainSinks(_)).WillOnce(DoAll(SetArgReferee<0>(list), Return(E_OK)));
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNumberOfSinksChanged();
+    sender->cbRemovedSink(mysink.sinkID);
     return (NULL);
 }
 
-void* NumberOfSinkClassesChanged(void*)
+void* NumberOfSinkClassesChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNumberOfSinkClassesChanged();
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    sender->cbNumberOfSinkClassesChanged();
     return (NULL);
 }
 
-void* NumberOfSourceClassesChanged(void*)
+void* NumberOfSourceClassesChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbNumberOfSourceClassesChanged();
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    sender->cbNumberOfSourceClassesChanged();
     return (NULL);
 }
 
-void* MainConnectionStateChanged(void*)
+void* MainConnectionStateChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_connectionID_t id = 4;
     am_ConnectionState_e state = CS_CONNECTING;
-    sender.cbMainConnectionStateChanged(id, state);
+    sender->cbMainConnectionStateChanged(id, state);
     return (NULL);
 }
 
-void* MainSinkSoundPropertyChanged(void*)
+void* MainSinkSoundPropertyChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_sinkID_t sinkID = 3;
     am_MainSoundProperty_s soundProperty;
     soundProperty.type = MSP_UNKNOWN;
     soundProperty.value = 23;
-    sender.cbMainSinkSoundPropertyChanged(sinkID, soundProperty);
+    sender->cbMainSinkSoundPropertyChanged(sinkID, soundProperty);
     return (NULL);
 }
 
-void* MainSourceSoundPropertyChanged(void*)
+void* MainSourceSoundPropertyChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_sourceID_t sourceID = 35;
     am_MainSoundProperty_s soundProperty;
     soundProperty.type = MSP_UNKNOWN;
     soundProperty.value = 233;
-    sender.cbMainSourceSoundPropertyChanged(sourceID, soundProperty);
+    sender->cbMainSourceSoundPropertyChanged(sourceID, soundProperty);
     return (NULL);
 }
 
-void* cbSinkAvailabilityChangedLoop(void*)
+void* cbSinkAvailabilityChangedLoop(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_Availability_s av;
     av.availability = A_AVAILABLE;
     av.availabilityReason = AR_UNKNOWN;
-    sender.cbSinkAvailabilityChanged(4, av);
+    sender->cbSinkAvailabilityChanged(4, av);
     return (NULL);
 }
 
-void* VolumeChanged(void*)
+void* VolumeChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_volume_t volume = 344;
-    sender.cbVolumeChanged(23, volume);
+    sender->cbVolumeChanged(23, volume);
     return (NULL);
 }
 
-void* cbSourceAvailabilityChangedLoop(void*)
+void* cbSourceAvailabilityChangedLoop(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_Availability_s av;
     av.availability = A_AVAILABLE;
     av.availabilityReason = AR_UNKNOWN;
-    sender.cbSourceAvailabilityChanged(2, av);
+    sender->cbSourceAvailabilityChanged(2, av);
     return (NULL);
 }
 
-void* SinkMuteStateChanged(void*)
+void* SinkMuteStateChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbSinkMuteStateChanged(42, MS_MUTED);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    sender->cbSinkMuteStateChanged(42, MS_MUTED);
     return (NULL);
 }
 
-void* SystemPropertyChanged(void*)
+void* SystemPropertyChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
     am_SystemProperty_s property;
     property.type = SYP_UNKNOWN;
     property.value = 355;
-    sender.cbSystemPropertyChanged(property);
+    sender->cbSystemPropertyChanged(property);
     return (NULL);
 }
 
-void* TimingInformationChanged(void*)
+void* TimingInformationChanged(void* ppCommandSend)
 {
     sleep(1);
-    DbusCommandSender sender;
-    MockCommandReceiveInterface receiver;
-    DbusCommandInterfaceBackdoor backdoor;
-    backdoor.setReceiveInterface(&sender, &receiver);
-    DBusError error;
-    dbus_error_init(&error);
-    DBusConnection* co = dbus_bus_get(DBUS_BUS_SESSION, &error);
-    backdoor.setDbusConnection(&sender, co);
-    sender.cbTimingInformationChanged(42, 233);
+    IAmCommandSend* sender=static_cast<IAmCommandSend*>(ppCommandSend);
+    sender->cbTimingInformationChanged(42, 233);
     return (NULL);
 }
 
-TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
+TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged)
 {
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
+    CAmSocketHandler pSocketHandler;
+    CAmDbusWrapper pDBusWrapper(&pSocketHandler);
+    MockIAmCommandReceive pReceiveInterface;
+
+    IAmCommandSend* (*createFunc)();
+    void* tempLibHandle = NULL;
+    std::string libname("../plugins/command/libPluginCommandInterfaceDbus.so");
+    createFunc = getCreateFunction<IAmCommandSend*()>(libname, tempLibHandle);
+
+    if (!createFunc)
+    {
+        logError("CommandSendInterface Test Entry point of RoutingPlugin not found");
+        exit(1);
+    }
+
+    ppCommandSend = createFunc();
+
+    if (!ppCommandSend)
+    {
+        logError("CommandSendInterface Test RoutingPlugin initialization failed. Entry Function not callable");
+        exit(1);
+    }
+
+    //  ok, here we give the DBusWrapper pointer to the Plugin and start the interface
+    EXPECT_CALL(pReceiveInterface,getDBusConnectionWrapper(_)).WillRepeatedly(DoAll(SetArgReferee<0>(&pDBusWrapper), Return(E_OK)));
+    EXPECT_CALL(pReceiveInterface, confirmCommandReady(10));
+
+    ppCommandSend->startupInterface(&pReceiveInterface);
+    ppCommandSend->setCommandReady(10);
+
     pthread_t pythonloop;
-    pthread_create(&pythonloop, NULL, NumberOfMainConnectionsChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, NumberOfMainConnectionsChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -373,7 +273,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
             "loop.run()\n", NULL);
     pthread_join(pythonloop, NULL);
 
-    pthread_create(&pythonloop, NULL, cbSinkAdded, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSinkAdded, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -402,7 +302,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
     }
     ifs.close();
 
-    pthread_create(&pythonloop, NULL, cbSinkRemoved, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSinkRemoved, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -432,7 +332,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
     }
     ifs.close();
 
-    pthread_create(&pythonloop, NULL, cbSourceAdded, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSourceAdded, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -461,7 +361,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
     }
     ifs.close();
 
-    pthread_create(&pythonloop, NULL, cbSourceRemoved, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSourceRemoved, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -491,7 +391,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
     }
     ifs.close();
 
-    pthread_create(&pythonloop, NULL, NumberOfSinkClassesChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, NumberOfSinkClassesChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -507,7 +407,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
             "loop.run()\n", NULL);
     pthread_join(pythonloop, NULL);
 
-    pthread_create(&pythonloop, NULL, NumberOfSourceClassesChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, NumberOfSourceClassesChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -525,7 +425,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, MainConnectionStateChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, MainConnectionStateChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -567,7 +467,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, MainSinkSoundPropertyChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, MainSinkSoundPropertyChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -600,7 +500,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
         }
         else if (lineCounter == 1)
         {
-            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(1), dbus.Int16(23)), signature=None)"), 0);
+            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(0), dbus.Int16(23)), signature=None)"), 0);
         }
         lineCounter++;
     }
@@ -608,7 +508,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, MainSourceSoundPropertyChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, MainSourceSoundPropertyChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -641,7 +541,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
         }
         else if (lineCounter == 1)
         {
-            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(1), dbus.Int16(233)), signature=None)"), 0);
+            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(0), dbus.Int16(233)), signature=None)"), 0);
         }
         lineCounter++;
     }
@@ -649,7 +549,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, cbSinkAvailabilityChangedLoop, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSinkAvailabilityChangedLoop, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -682,7 +582,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
         }
         else if (lineCounter == 1)
         {
-            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(0), dbus.Int16(3)), signature=None)"), 0);
+            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(1), dbus.Int16(0)), signature=None)"), 0);
         }
         lineCounter++;
     }
@@ -690,7 +590,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, cbSourceAvailabilityChangedLoop, (void*) NULL);
+    pthread_create(&pythonloop, NULL, cbSourceAvailabilityChangedLoop, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -723,7 +623,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
         }
         else if (lineCounter == 1)
         {
-            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(0), dbus.Int16(3)), signature=None)"), 0);
+            ASSERT_EQ(line.compare("dbus.Struct((dbus.Int16(1), dbus.Int16(0)), signature=None)"), 0);
         }
         lineCounter++;
     }
@@ -731,7 +631,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, VolumeChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, VolumeChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -773,7 +673,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, SinkMuteStateChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, SinkMuteStateChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -815,7 +715,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, SystemPropertyChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, SystemPropertyChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -846,7 +746,7 @@ TEST_F(dbuscommaninterfacesignalsTest,cbSourceAvailabilityChanged)
 
     //ok, now we want to test the signals. It did not work out that the python receiver worked in an own thread (as originally intended)
     //so it is running in the main context and the signals are send from threads...
-    pthread_create(&pythonloop, NULL, TimingInformationChanged, (void*) NULL);
+    pthread_create(&pythonloop, NULL, TimingInformationChanged, (void*) ppCommandSend);
     PyRun_SimpleStringFlags("import sys\n"
             "import traceback\n"
             "import gobject\n"
@@ -894,12 +794,12 @@ int main(int argc, char **argv)
     return RUN_ALL_TESTS();
 }
 
-void dbuscommaninterfacesignalsTest::SetUp()
+void CAmCommandSenderDbusSignalTest::SetUp()
 {
     Py_Initialize();
 }
 
-void dbuscommaninterfacesignalsTest::TearDown()
+void CAmCommandSenderDbusSignalTest::TearDown()
 {
     Py_Finalize();
 }
diff --git a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h
index 0f930d6..14ad9ef 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommaninterfacesignalsTest.h
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.h
@@ -25,25 +25,23 @@
 
 #ifndef DBUSCOMMANINTERFACESIGNALSTEST_H_
 #define DBUSCOMMANINTERFACESIGNALSTEST_H_
+
+
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <set>
-#include "CommandReceiver.h"
-#include "CommandSender.h"
-#include "MockInterfaces.h"
 
 #define UNIT_TEST 1
 
 namespace am {
 
-class dbuscommaninterfacesignalsTest: public ::testing::Test
+class IAmCommandSend;
+
+class CAmCommandSenderDbusSignalTest: public ::testing::Test
 {
 public:
-	dbuscommaninterfacesignalsTest();
-	virtual ~dbuscommaninterfacesignalsTest();
+    IAmCommandSend *ppCommandSend;
+	CAmCommandSenderDbusSignalTest();
+	virtual ~CAmCommandSenderDbusSignalTest();
 	void SetUp();
 	void TearDown();
 };
diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
index f4dab30..e1d0197 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.cpp
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp
@@ -23,50 +23,51 @@
  * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
  */
 
+#include "CAmCommandSenderDbusTest.h"
 #include <python2.6/Python.h>
-#include <dbus/DBusWrapper.h>
-#include "dbuscommandpluginInterfaceTest.h"
 #include <iostream>
 #include <fstream>
-#include "../include/DBusCommandSender.h"
-#include "../include/DBusMessageHandler.h"
-#include "DbusCommandInterfaceBackdoor.h"
-#include "MockInterfaces.h"
-#include "DLTWrapper.h"
-#include "SocketHandler.h"
+#include <sstream>
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <set>
+#include "TAmPluginTemplate.h"
+#include "MockIAmCommandReceive.h"
+#include "shared/CAmDltWrapper.h"
+#include "shared/CAmSocketHandler.h"
+#include "shared/CAmDbusWrapper.h"
+#include "../include/CAmCommandSenderDbus.h"
+#include "../include/CAmDbusMessageHandler.h"
 
 using namespace am;
 using namespace testing;
 
-//DLT_DECLARE_CONTEXT(DLT_CONTEXT)
-
 std::string DBUSCOMMAND = "dbus-send --session --print-reply --dest=org.genivi.audiomanager /org/genivi/audiomanager/CommandInterface org.genivi.audiomanager.CommandInterface.";
 
 void* run_the_loop(void* wrapper)
 {
-    SocketHandler* wrap = (SocketHandler*) wrapper;
+    CAmSocketHandler* wrap = (CAmSocketHandler*) wrapper;
     wrap->start_listenting();
     return (NULL);
 }
 
-dbuscommandpluginInterfaceTest::dbuscommandpluginInterfaceTest() :
-        pDatabaseHandler(std::string(":memory:")), //
-        pControlSender("") //
+CAmCommandSenderDbusTest::CAmCommandSenderDbusTest()
 {
-    DLTWrapper::instance()->registerApp("dbusTest", "dbusTest");
+    CAmDltWrapper::instance()->registerApp("dbusTest", "dbusTest");
 }
 
-dbuscommandpluginInterfaceTest::~dbuscommandpluginInterfaceTest()
+CAmCommandSenderDbusTest::~CAmCommandSenderDbusTest()
 {
 
 }
 
-void dbuscommandpluginInterfaceTest::SetUp()
+void CAmCommandSenderDbusTest::SetUp()
 {
 
 }
 
-void dbuscommandpluginInterfaceTest::TearDown()
+void CAmCommandSenderDbusTest::TearDown()
 {
 
 }
@@ -172,26 +173,46 @@ am::am_timeSync_t time=23;
 arg1=time;
 }
 
-TEST_F(dbuscommandpluginInterfaceTest,Connect)
+TEST_F(CAmCommandSenderDbusTest, MessageTest)
 {
     Py_Initialize();
     //unfortunatly we need to put all in one testcase because testing with the dbus loop caused problems...
-    SocketHandler pSocketHandler;
-    DBusWrapper pDBusWrapper(&pSocketHandler);
+    CAmSocketHandler pSocketHandler;
+    CAmDbusWrapper pDBusWrapper(&pSocketHandler);
     pthread_t ptestThread;
     std::vector<std::string> plistCommandPluginDirs;
     plistCommandPluginDirs.push_back(std::string(DEFAULT_PLUGIN_COMMAND_DIR));
 
-    CommandSender pCommandSender(plistCommandPluginDirs);
-    MockCommandReceiveInterface pReceiveInterface;
+    MockIAmCommandReceive pReceiveInterface;
 
     //this class just creates the thread that will handle the mainloop...
     pthread_create(&ptestThread, NULL, run_the_loop, (void*) &pSocketHandler);
-    CommandReceiver pCommandReceiver(&pDatabaseHandler, &pControlSender, &pSocketHandler, &pDBusWrapper);
+
+    IAmCommandSend* (*createFunc)();
+    void* tempLibHandle = NULL;
+    std::string libname("../plugins/command/libPluginCommandInterfaceDbus.so");
+    createFunc = getCreateFunction<IAmCommandSend*()>(libname, tempLibHandle);
+
+    if (!createFunc)
+    {
+        logError("CommandSendInterface Test Entry point of RoutingPlugin not found");
+        exit(1);
+    }
+
+    ppCommandSend = createFunc();
+
+    if (!ppCommandSend)
+    {
+        logError("CommandSendInterface Test RoutingPlugin initialization failed. Entry Function not callable");
+        exit(1);
+    }
 
 //	ok, here we give the DBusWrapper pointer to the Plugin and start the interface
     EXPECT_CALL(pReceiveInterface,getDBusConnectionWrapper(_)).WillRepeatedly(DoAll(SetArgReferee<0>(&pDBusWrapper), Return(E_OK)));
-    pCommandSender.startupInterfaces(&pCommandReceiver);
+    EXPECT_CALL(pReceiveInterface, confirmCommandReady(10));
+
+    ppCommandSend->startupInterface(&pReceiveInterface);
+    ppCommandSend->setCommandReady(10);
 
     EXPECT_CALL(pReceiveInterface,connect(2,3,_)).WillRepeatedly(DoAll(SetArgReferee<2>(35), Return(E_OK)));
     system((DBUSCOMMAND + std::string("Connect uint16:2 uint16:3 > /tmp/result.txt ")).c_str());
@@ -204,12 +225,12 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     {
         if (lineCounter == 1)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   int16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 9, "")) >> result;
             ASSERT_EQ(result, E_OK);
         }
         else if (lineCounter == 2)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   uint16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 10, "")) >> result;
             ASSERT_EQ(result, 35);
         }
         lineCounter++;
@@ -229,7 +250,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     {
         if (lineCounter == 1)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   int16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 9, "")) >> result;
             ASSERT_EQ(result, E_OK);
         }
         lineCounter++;
@@ -249,7 +270,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     {
         if (lineCounter == 1)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   int16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 9, "")) >> result;
             ASSERT_EQ(result, E_OK);
         }
         lineCounter++;
@@ -269,7 +290,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     {
         if (lineCounter == 1)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   int16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 9, "")) >> result;
             ASSERT_EQ(result, E_OK);
         }
         lineCounter++;
@@ -289,7 +310,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     {
         if (lineCounter == 1)
         {
-            std::stringstream(line.substr(line.find_first_not_of("   int16 "))) >> result;
+            std::stringstream(line.replace(line.begin(), line.begin() + 9, "")) >> result;
             ASSERT_EQ(result, E_OK);
         }
         lineCounter++;
@@ -417,7 +438,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(24), dbus.String(u'mySink'), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None), dbus.Int16(124), dbus.Int16(1), dbus.UInt16(34)), signature=None)], signature=dbus.Signature('(qs(nn)nnq)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(24), dbus.String(u'mySink'), dbus.Struct((dbus.Int16(2), dbus.Int16(3)), signature=None), dbus.Int16(124), dbus.Int16(2), dbus.UInt16(34)), signature=None)], signature=dbus.Signature('(qs(nn)nnq)')))"), 0);
     }
     ifs.close();
 
@@ -442,7 +463,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(224), dbus.String(u'MySource'), dbus.Struct((dbus.Int16(3), dbus.Int16(1)), signature=None), dbus.UInt16(12)), signature=None), dbus.Struct((dbus.UInt16(22), dbus.String(u'NextSource'), dbus.Struct((dbus.Int16(3), dbus.Int16(1)), signature=None), dbus.UInt16(12)), signature=None)], signature=dbus.Signature('(qs(nn)q)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(224), dbus.String(u'MySource'), dbus.Struct((dbus.Int16(3), dbus.Int16(2)), signature=None), dbus.UInt16(12)), signature=None), dbus.Struct((dbus.UInt16(22), dbus.String(u'NextSource'), dbus.Struct((dbus.Int16(3), dbus.Int16(2)), signature=None), dbus.UInt16(12)), signature=None)], signature=dbus.Signature('(qs(nn)q)')))"), 0);
     }
     ifs.close();
 
@@ -467,7 +488,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(4), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
     }
     ifs.close();
 
@@ -492,7 +513,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.Int16(4), dbus.Int16(223)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(2)), signature=None)], signature=dbus.Signature('(nn)')))"), 0);
     }
     ifs.close();
 
@@ -517,7 +538,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(23), dbus.String(u'FirstCLass'), dbus.Array([dbus.Struct((dbus.Int16(1), dbus.Int16(12)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None), dbus.Struct((dbus.UInt16(2), dbus.String(u'SecondCLass'), dbus.Array([dbus.Struct((dbus.Int16(1), dbus.Int16(12)), signature=None), dbus.Struct((dbus.Int16(1), dbus.Int16(12)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None)], signature=dbus.Signature('(qsa(nn))')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(23), dbus.String(u'FirstCLass'), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(12)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None), dbus.Struct((dbus.UInt16(2), dbus.String(u'SecondCLass'), dbus.Array([dbus.Struct((dbus.Int16(2), dbus.Int16(12)), signature=None), dbus.Struct((dbus.Int16(2), dbus.Int16(12)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None)], signature=dbus.Signature('(qsa(nn))')))"), 0);
     }
     ifs.close();
 
@@ -542,7 +563,7 @@ TEST_F(dbuscommandpluginInterfaceTest,Connect)
     while (std::getline(ifs, line))
     {
         //we could parse here, but this is the fastest way....
-        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(2123), dbus.String(u'FirstCLass'), dbus.Array([dbus.Struct((dbus.Int16(0), dbus.Int16(122)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None), dbus.Struct((dbus.UInt16(23), dbus.String(u'SecondCLass'), dbus.Array([dbus.Struct((dbus.Int16(0), dbus.Int16(122)), signature=None), dbus.Struct((dbus.Int16(0), dbus.Int16(122)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None)], signature=dbus.Signature('(qsa(nn))')))"), 0);
+        ASSERT_EQ(line.compare("(dbus.Int16(9), dbus.Array([dbus.Struct((dbus.UInt16(2123), dbus.String(u'FirstCLass'), dbus.Array([dbus.Struct((dbus.Int16(1), dbus.Int16(122)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None), dbus.Struct((dbus.UInt16(23), dbus.String(u'SecondCLass'), dbus.Array([dbus.Struct((dbus.Int16(1), dbus.Int16(122)), signature=None), dbus.Struct((dbus.Int16(1), dbus.Int16(122)), signature=None)], signature=dbus.Signature('(nn)'))), signature=None)], signature=dbus.Signature('(qsa(nn))')))"), 0);
     }
     ifs.close();
 
diff --git a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h
index d45a107..a89affd 100644
--- a/PluginCommandInterfaceDbus/test/dbuscommandpluginInterfaceTest.h
+++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.h
@@ -29,23 +29,13 @@
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <set>
-#include "CommandReceiver.h"
-#include "CommandSender.h"
-#include "MockInterfaces.h"
-#include "DbusCommandInterfaceBackdoor.h"
-#include "DatabaseHandler.h"
-#include "ControlSender.h"
-
 
 #define UNIT_TEST 1
 
 namespace am {
 
-class DbusCommandInterfaceBackdoor;
+class CAmCommandSenderDbusBackdoor;
+class IAmCommandSend;
 
 /*
  * originally, I would want to have several tests, but there are problems implementing this with
@@ -55,13 +45,12 @@ class DbusCommandInterfaceBackdoor;
  */
 
 
-class dbuscommandpluginInterfaceTest :public ::testing::Test
+class CAmCommandSenderDbusTest :public ::testing::Test
 {
 public:
-    DatabaseHandler pDatabaseHandler;
-    ControlSender pControlSender;
-	dbuscommandpluginInterfaceTest();
-	~dbuscommandpluginInterfaceTest();
+    IAmCommandSend *ppCommandSend;
+	CAmCommandSenderDbusTest();
+	~CAmCommandSenderDbusTest();
 
 	void SetUp();
 	void TearDown();
diff --git a/PluginCommandInterfaceDbus/test/CMakeLists.txt b/PluginCommandInterfaceDbus/test/CMakeLists.txt
index 8745af8..d1eabbf 100644
--- a/PluginCommandInterfaceDbus/test/CMakeLists.txt
+++ b/PluginCommandInterfaceDbus/test/CMakeLists.txt
@@ -23,7 +23,7 @@
 
 cmake_minimum_required(VERSION 2.6)
 
-PROJECT(controlInterfacetest)
+PROJECT(CAmCommandSenderDbusTests)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
 
@@ -41,13 +41,13 @@ INCLUDE_DIRECTORIES(
     ${STD_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR} 
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${AUDIO_INCLUDES_FOLDER}
+    ${AUDIO_include_FOLDER}
     ${DBUS_ARCH_INCLUDE_DIR}
-    ${DBUS_INCLUDES_FOLDER} 
+    ${DBUS_include_FOLDER} 
     ${CMAKE_SOURCE_DIR} 
     ${DLT_INCLUDE_DIRS}
     ${DBUS_INCLUDE_DIR}
-    ${INCLUDES_FOLDER}
+    ${include_FOLDER}
     ${PYTHON_INCLUDE_DIRS}
     ${GTEST_INCLUDE_DIR}
     "../../AudioManagerDaemon/include"
@@ -55,31 +55,28 @@ INCLUDE_DIRECTORIES(
 )
    
 file(GLOB DBUS_PLUGIN_INTERFACE_SRCS_CXX 
-     "../../AudioManagerDaemon/src/DBusWrapper.cpp"
-     "../../AudioManagerDaemon/src/CommandSender.cpp"
-     "../../AudioManagerDaemon/src/SocketHandler.cpp"
-     "../../AudioManagerDaemon/src/DLTWrapper.cpp"
+     "../../AudioManagerDaemon/src/CAmDbusWrapper.cpp"
+     "../../AudioManagerDaemon/src/CAmSocketHandler.cpp"
+     "../../AudioManagerDaemon/src/CAmDltWrapper.cpp"
      "../src/*.cpp"  
-     "dbuscommandpluginInterfaceTest.cpp" 
-     "DbusCommanInterfaceBackdoor.cpp"
+     "CAmCommandSenderDbusBackdoor.cpp"
+     "CAmCommandSenderDbusTest.cpp"
+
 )
 
 file(GLOB DBUS_SIGNAL_INTERFACE_SRCS_CXX 
-     "../../AudioManagerDaemon/src/DBusWrapper.cpp"
-     "../../AudioManagerDaemon/src/CommandSender.cpp"
-     "../../AudioManagerDaemon/src/SocketHandler.cpp"
-     "../../AudioManagerDaemon/src/DLTWrapper.cpp"
-     "../../AudioManagerDaemon/src/DatabaseHandler.cpp"
-     "../../AudioManagerDaemon/src/ControlSender.cpp"
-     "../src/*.cpp" 
-     "dbuscommaninterfacesignalsTest.cpp" 
-     "DbusCommandInterfaceBackdoor.cpp"
+     "../../AudioManagerDaemon/src/CAmDbusWrapper.cpp"
+     "../../AudioManagerDaemon/src/CAmSocketHandler.cpp"
+     "../../AudioManagerDaemon/src/CAmDltWrapper.cpp"
+     "../src/*.cpp"  
+     "CAmCommandSenderDbusBackdoor.cpp"
+     "CAmCommandSenderDbusSignalTest.cpp"
 )
-ADD_EXECUTABLE(dbusCommandMessages ${DBUS_PLUGIN_INTERFACE_SRCS_CXX})
+ADD_EXECUTABLE(AmCommandSenderDbusTest ${DBUS_PLUGIN_INTERFACE_SRCS_CXX})
 
-ADD_EXECUTABLE(dbusCommandSignals ${DBUS_SIGNAL_INTERFACE_SRCS_CXX})
+ADD_EXECUTABLE(AmCommandSenderDbusSignalTest ${DBUS_SIGNAL_INTERFACE_SRCS_CXX})
 
-TARGET_LINK_LIBRARIES(dbusCommandMessages 
+TARGET_LINK_LIBRARIES(AmCommandSenderDbusTest 
     ${DLT_LIBRARIES}
     ${DBUS_LIBRARY}
     ${CMAKE_DL_LIBS}
@@ -90,7 +87,7 @@ TARGET_LINK_LIBRARIES(dbusCommandMessages
 )
 
 
-TARGET_LINK_LIBRARIES(dbusCommandSignals 
+TARGET_LINK_LIBRARIES(AmCommandSenderDbusSignalTest 
     ${DLT_LIBRARIES}
     ${DBUS_LIBRARY}
     ${CMAKE_DL_LIBS}
@@ -100,13 +97,13 @@ TARGET_LINK_LIBRARIES(dbusCommandSignals
     gmock
 )
 
-INSTALL(TARGETS dbusCommandMessages 
+INSTALL(TARGETS AmCommandSenderDbusTest 
         DESTINATION "~/AudioManagerTest/"
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         COMPONENT tests
 )
 
-INSTALL(TARGETS dbusCommandSignals 
+INSTALL(TARGETS AmCommandSenderDbusSignalTest 
         DESTINATION "~/AudioManagerTest/"
         PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
         COMPONENT tests
diff --git a/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h
new file mode 100644
index 0000000..bb9e53f
--- /dev/null
+++ b/PluginCommandInterfaceDbus/test/MockIAmCommandReceive.h
@@ -0,0 +1,59 @@
+#ifndef MOCKCOMMANDRECEIVENTERFACE_H_
+#define MOCKCOMMANDRECEIVENTERFACE_H_
+
+#include "command/IAmCommandReceive.h"
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+namespace am {
+
+class MockIAmCommandReceive : public IAmCommandReceive {
+ public:
+  MOCK_METHOD3(connect,
+      am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
+  MOCK_METHOD1(disconnect,
+      am_Error_e(const am_mainConnectionID_t mainConnectionID));
+  MOCK_METHOD2(setVolume,
+      am_Error_e(const am_sinkID_t sinkID, const am_mainVolume_t volume));
+  MOCK_METHOD2(volumeStep,
+      am_Error_e(const am_sinkID_t sinkID, const int16_t volumeStep));
+  MOCK_METHOD2(setSinkMuteState,
+      am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
+  MOCK_METHOD2(setMainSinkSoundProperty,
+      am_Error_e(const am_MainSoundProperty_s& soundProperty, const am_sinkID_t sinkID));
+  MOCK_METHOD2(setMainSourceSoundProperty,
+      am_Error_e(const am_MainSoundProperty_s& soundProperty, const am_sourceID_t sourceID));
+  MOCK_METHOD1(setSystemProperty,
+      am_Error_e(const am_SystemProperty_s& property));
+  MOCK_CONST_METHOD1(getListMainConnections,
+      am_Error_e(std::vector<am_MainConnectionType_s>& listConnections));
+  MOCK_CONST_METHOD1(getListMainSinks,
+      am_Error_e(std::vector<am_SinkType_s>& listMainSinks));
+  MOCK_CONST_METHOD1(getListMainSources,
+      am_Error_e(std::vector<am_SourceType_s>& listMainSources));
+  MOCK_CONST_METHOD2(getListMainSinkSoundProperties,
+      am_Error_e(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties));
+  MOCK_CONST_METHOD2(getListMainSourceSoundProperties,
+      am_Error_e(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties));
+  MOCK_CONST_METHOD1(getListSourceClasses,
+      am_Error_e(std::vector<am_SourceClass_s>& listSourceClasses));
+  MOCK_CONST_METHOD1(getListSinkClasses,
+      am_Error_e(std::vector<am_SinkClass_s>& listSinkClasses));
+  MOCK_CONST_METHOD1(getListSystemProperties,
+      am_Error_e(std::vector<am_SystemProperty_s>& listSystemProperties));
+  MOCK_CONST_METHOD2(getTimingInformation,
+      am_Error_e(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay));
+  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(confirmCommandReady,
+      void(const uint16_t handle));
+  MOCK_METHOD1(confirmCommandRundown,
+      void(const uint16_t handle));
+};
+
+}  // namespace am
+#endif /* MOCKCOMMANDRECEIVENTERFACE_H_ */
diff --git a/PluginCommandInterfaceDbus/test/MockInterfaces.h b/PluginCommandInterfaceDbus/test/MockInterfaces.h
deleted file mode 100644
index b4e7792..0000000
--- a/PluginCommandInterfaceDbus/test/MockInterfaces.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
-* Copyright (C) 2011, BMW AG
-*
-* GeniviAudioMananger AudioManagerDaemon
-*
-* \file MochInterfaces.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.
-*
-* THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
-*/
-
-#ifndef MOCKINTERFACES_H_
-#define MOCKINTERFACES_H_
-
-namespace am {
-
-class MockCommandReceiveInterface : public CommandReceiveInterface {
- public:
-    MOCK_METHOD3(connect,
-        am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, am_mainConnectionID_t& mainConnectionID));
-    MOCK_METHOD1(disconnect,
-        am_Error_e(const am_mainConnectionID_t mainConnectionID));
-    MOCK_METHOD2(setVolume,
-        am_Error_e(const am_sinkID_t sinkID, const am_mainVolume_t volume));
-    MOCK_METHOD2(volumeStep,
-        am_Error_e(const am_sinkID_t sinkID, const int16_t volumeStep));
-    MOCK_METHOD2(setSinkMuteState,
-        am_Error_e(const am_sinkID_t sinkID, const am_MuteState_e muteState));
-    MOCK_METHOD2(setMainSinkSoundProperty,
-        am_Error_e(const am_MainSoundProperty_s& soundProperty, const am_sinkID_t sinkID));
-    MOCK_METHOD2(setMainSourceSoundProperty,
-        am_Error_e(const am_MainSoundProperty_s& soundProperty, const am_sourceID_t sourceID));
-    MOCK_METHOD1(setSystemProperty,
-        am_Error_e(const am_SystemProperty_s& property));
-    MOCK_CONST_METHOD1(getListMainConnections,
-        am_Error_e(std::vector<am_MainConnectionType_s>& listConnections));
-    MOCK_CONST_METHOD1(getListMainSinks,
-        am_Error_e(std::vector<am_SinkType_s>& listMainSinks));
-    MOCK_CONST_METHOD1(getListMainSources,
-        am_Error_e(std::vector<am_SourceType_s>& listMainSources));
-    MOCK_CONST_METHOD2(getListMainSinkSoundProperties,
-        am_Error_e(const am_sinkID_t sinkID, std::vector<am_MainSoundProperty_s>& listSoundProperties));
-    MOCK_CONST_METHOD2(getListMainSourceSoundProperties,
-        am_Error_e(const am_sourceID_t sourceID, std::vector<am_MainSoundProperty_s>& listSourceProperties));
-    MOCK_CONST_METHOD1(getListSourceClasses,
-        am_Error_e(std::vector<am_SourceClass_s>& listSourceClasses));
-    MOCK_CONST_METHOD1(getListSinkClasses,
-        am_Error_e(std::vector<am_SinkClass_s>& listSinkClasses));
-    MOCK_CONST_METHOD1(getListSystemProperties,
-        am_Error_e(std::vector<am_SystemProperty_s>& listSystemProperties));
-    MOCK_CONST_METHOD2(getTimingInformation,
-        am_Error_e(const am_mainConnectionID_t mainConnectionID, am_timeSync_t& delay));
-    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(confirmCommandReady,
-        void(const uint16_t handle));
-    MOCK_METHOD1(confirmCommandRundown,
-        void(const uint16_t handle));
-
-
-};
-
-}  // namespace am
-
-
-
-#endif /* MOCKINTERFACES_H_ */