* 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

3 files changed, 2100 insertions, 0 deletions

diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
new file mode 100644
index 0000000..a5948ed
--- /dev/null
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp
@@ -0,0 +1,1941 @@
+/**
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger AudioManagerDaemon
+ *
+ * \file databasetest.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.
+ *
+ * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN
+ */
+
+#include "CAmDatabaseHandlerTest.h"
+#include <algorithm>
+#include <string>
+#include <vector>
+#include <set>
+#include "shared/CAmDltWrapper.h"
+
+using namespace am;
+using namespace testing;
+
+//extern int GetRandomNumber(int nLow, int nHigh);
+//extern bool equalSoundProperty (const am_SoundProperty_s a, const am_SoundProperty_s b);
+extern bool equalMainSoundProperty(const am_MainSoundProperty_s a, const am_MainSoundProperty_s b);
+//extern bool equalRoutingElement(const am_RoutingElement_s a, const am_RoutingElement_s b);
+extern bool equalClassProperties(const am_ClassProperty_s a, const am_ClassProperty_s b);
+extern std::string int2string(int i);
+
+CAmDatabaseHandlerTest::CAmDatabaseHandlerTest() :
+        plistRoutingPluginDirs(), //
+        plistCommandPluginDirs(), //
+        pSocketHandler(),//
+        pDatabaseHandler(std::string(":memory:")), //
+        pRoutingSender(plistRoutingPluginDirs), //
+        pCommandSender(plistCommandPluginDirs), //
+        pMockInterface(), //
+        pRoutingInterfaceBackdoor(), //
+        pCommandInterfaceBackdoor(), //
+        pControlSender(""), //
+        pRouter(&pDatabaseHandler, &pControlSender), //
+        pControlReceiver(&pDatabaseHandler, &pRoutingSender, &pCommandSender,  &pSocketHandler, &pRouter), //
+        pObserver(&pCommandSender,&pRoutingSender, &pSocketHandler)
+{
+    pDatabaseHandler.registerObserver(&pObserver);
+    pCommandInterfaceBackdoor.injectInterface(&pCommandSender, &pMockInterface);
+}
+
+CAmDatabaseHandlerTest::~CAmDatabaseHandlerTest()
+{
+}
+
+void CAmDatabaseHandlerTest::createMainConnectionSetup()
+{
+    //fill the connection database
+    am_Connection_s connection;
+    am_Source_s source;
+    am_Sink_s sink;
+    std::vector<am_connectionID_t> connectionList;
+
+    //we create 9 sources and sinks:
+
+
+
+    for (uint16_t i = 1; i < 10; i++)
+    {
+        am_sinkID_t forgetSink;
+        am_sourceID_t forgetSource;
+        am_connectionID_t connectionID;
+
+        pCF.createSink(sink);
+        sink.sinkID = i;
+        sink.name = "sink" + int2string(i);
+        sink.domainID = 4;
+        pCF.createSource(source);
+        source.sourceID = i;
+        source.name = "source" + int2string(i);
+        source.domainID = 4;
+
+        connection.sinkID = i;
+        connection.sourceID = i;
+        connection.delay = -1;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
+        connection.connectionID = 0;
+
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,forgetSource));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+        ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
+        connectionList.push_back(connectionID);
+
+    }
+
+    //create a mainConnection
+    am_MainConnection_s mainConnection;
+    am_mainConnectionID_t mainConnectionID;
+    std::vector<am_MainConnection_s> mainConnectionList;
+    mainConnection.listConnectionID = connectionList;
+    mainConnection.mainConnectionID = 0;
+    mainConnection.sinkID = 1;
+    mainConnection.sourceID = 1;
+    mainConnection.connectionState = CS_CONNECTED;
+    mainConnection.delay = -1;
+
+    //enter mainconnection in database
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID));
+    ASSERT_NE(0, mainConnectionID);
+
+    //read out the mainconnections and check if they are equal to the data written.
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(mainConnectionList));
+    bool equal = true;
+    std::vector<am_MainConnection_s>::iterator listIterator = mainConnectionList.begin();
+    for (; listIterator < mainConnectionList.end(); ++listIterator)
+    {
+        if (listIterator->mainConnectionID == mainConnectionID)
+        {
+            equal = equal && (listIterator->connectionState == mainConnection.connectionState) && (listIterator->sinkID == mainConnection.sinkID) && (listIterator->sourceID == mainConnection.sourceID) && (listIterator->delay == mainConnection.delay) && (std::equal(listIterator->listConnectionID.begin(), listIterator->listConnectionID.end(), connectionList.begin()));
+        }
+    }
+    ASSERT_EQ(true, equal);
+}
+
+void CAmDatabaseHandlerTest::SetUp()
+{
+}
+
+void CAmDatabaseHandlerTest::TearDown()
+{
+}
+
+TEST_F(CAmDatabaseHandlerTest,getMainConnectionInfo)
+{
+    //fill the connection database
+    am_Connection_s connection;
+    am_Source_s source;
+    am_Sink_s sink;
+    std::vector<am_connectionID_t> connectionList;
+
+    //we create 9 sources and sinks:
+
+
+
+    for (uint16_t i = 1; i < 10; i++)
+    {
+        am_sinkID_t forgetSink;
+        am_sourceID_t forgetSource;
+        am_connectionID_t connectionID;
+
+        pCF.createSink(sink);
+        sink.sinkID = i;
+        sink.name = "sink" + int2string(i);
+        sink.domainID = 4;
+        pCF.createSource(source);
+        source.sourceID = i;
+        source.name = "source" + int2string(i);
+        source.domainID = 4;
+
+        connection.sinkID = i;
+        connection.sourceID = i;
+        connection.delay = -1;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
+        connection.connectionID = 0;
+
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,forgetSource));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+        ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
+        connectionList.push_back(connectionID);
+
+    }
+
+    //create a mainConnection
+    am_MainConnection_s mainConnection;
+    am_mainConnectionID_t mainConnectionID;
+    std::vector<am_MainConnection_s> mainConnectionList;
+    mainConnection.listConnectionID = connectionList;
+    mainConnection.mainConnectionID = 0;
+    mainConnection.sinkID = 1;
+    mainConnection.sourceID = 1;
+    mainConnection.connectionState = CS_CONNECTED;
+    mainConnection.delay = -1;
+
+    //enter mainconnection in database
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterMainConnectionDB(mainConnection,mainConnectionID));
+    ASSERT_NE(0, mainConnectionID);
+
+    //read out the mainconnections and check if they are equal to the data written.
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(mainConnectionList));
+    bool equal = true;
+    std::vector<am_MainConnection_s>::iterator listIterator = mainConnectionList.begin();
+    for (; listIterator < mainConnectionList.end(); ++listIterator)
+    {
+        if (listIterator->mainConnectionID == mainConnectionID)
+        {
+            equal = equal && (listIterator->connectionState == mainConnection.connectionState) && (listIterator->sinkID == mainConnection.sinkID) && (listIterator->sourceID == mainConnection.sourceID) && (listIterator->delay == mainConnection.delay) && (std::equal(listIterator->listConnectionID.begin(), listIterator->listConnectionID.end(), connectionList.begin()));
+        }
+    }ASSERT_EQ(true, equal);
+
+    am_MainConnection_s mainConnectionT;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getMainConnectionInfoDB(mainConnectionID,mainConnectionT));
+    ASSERT_TRUE( (mainConnection.connectionState==mainConnectionT.connectionState) && (mainConnection.delay==mainConnectionT.delay) && (std::equal(mainConnection.listConnectionID.begin(),mainConnection.listConnectionID.end(),mainConnectionT.listConnectionID.begin())) && (mainConnection.sinkID==mainConnectionT.sinkID) && (mainConnection.sourceID==mainConnectionT.sourceID) && (mainConnectionID==mainConnectionT.mainConnectionID));
+
+}
+
+TEST_F(CAmDatabaseHandlerTest,getSinKInfo)
+{
+    //fill the connection database
+    am_Sink_s staticSink, firstDynamicSink, secondDynamicSink;
+    am_sinkID_t staticSinkID, firstDynamicSinkID, secondDynamicSinkID;
+    std::vector<am_Sink_s> sinkList;
+
+    pCF.createSink(staticSink);
+    staticSink.sinkID = 4;
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(staticSink,staticSinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSink.sinkID,staticSinkID)
+        << "ERROR: ID not the one given in staticSink";
+
+    pCF.createSink(firstDynamicSink);
+    firstDynamicSink.name = "firstdynamic";
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(firstDynamicSink,firstDynamicSinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(firstDynamicSinkID,DYNAMIC_ID_BOUNDARY)
+        << "ERROR: ID not the one given in firstDynamicSink";
+
+    pCF.createSink(secondDynamicSink);
+    secondDynamicSink.name = "seconddynamic";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(secondDynamicSink,secondDynamicSinkID))
+        << "ERROR: database error";
+    ASSERT_NEAR(secondDynamicSinkID,DYNAMIC_ID_BOUNDARY,10)
+        << "ERROR: ID not the one given in secondDynamicSink";
+
+    //now read back and check the returns agains the given values
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(sinkList))
+        << "ERROR: database error";
+    bool equal = true;
+
+    std::vector<am_Sink_s>::iterator listIterator = sinkList.begin();
+    for (; listIterator < sinkList.end(); ++listIterator)
+    {
+        if (listIterator->sinkID == staticSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, staticSink);
+        }
+
+        if (listIterator->sinkID == firstDynamicSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, firstDynamicSink);
+        }
+
+        if (listIterator->sinkID == secondDynamicSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, secondDynamicSink);
+        }
+    }ASSERT_EQ(true, equal);
+
+    am_Sink_s sinkData;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkInfoDB(secondDynamicSinkID,sinkData));
+    ASSERT_TRUE( (secondDynamicSink.available.availability == sinkData.available.availability) && (secondDynamicSink.available.availabilityReason == sinkData.available.availabilityReason) && (secondDynamicSink.sinkClassID == sinkData.sinkClassID) && (secondDynamicSink.domainID == sinkData.domainID) && (secondDynamicSink.visible == sinkData.visible) && (secondDynamicSink.name.compare(sinkData.name) == 0) && (secondDynamicSink.volume == sinkData.volume) && std::equal(secondDynamicSink.listConnectionFormats.begin(), secondDynamicSink.listConnectionFormats.end(), sinkData.listConnectionFormats.begin()) && std::equal(secondDynamicSink.listMainSoundProperties.begin(), secondDynamicSink.listMainSoundProperties.end(), sinkData.listMainSoundProperties.begin(), equalMainSoundProperty));
+
+}
+
+TEST_F(CAmDatabaseHandlerTest,getSourceInfo)
+{
+    //fill the connection database
+    am_Source_s staticSource, firstDynamicSource, secondDynamicSource;
+    am_sourceID_t staticSourceID, firstDynamicSourceID, secondDynamicSourceID;
+    std::vector<am_Source_s> sourceList;
+
+    pCF.createSource(staticSource);
+    staticSource.sourceID = 4;
+    staticSource.name = "Static";
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(staticSource,staticSourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSource.sourceID,staticSourceID)
+        << "ERROR: ID not the one given in staticSource";
+
+    pCF.createSource(firstDynamicSource);
+    firstDynamicSource.name = "firstDynamicSource";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(firstDynamicSource,firstDynamicSourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(firstDynamicSourceID,DYNAMIC_ID_BOUNDARY)
+        << "ERROR: ID not the one given in firstDynamicSink";
+
+    pCF.createSource(secondDynamicSource);
+    secondDynamicSource.name = "secondDynamicSource";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(secondDynamicSource,secondDynamicSourceID))
+        << "ERROR: database error";
+    ASSERT_NEAR(secondDynamicSourceID,DYNAMIC_ID_BOUNDARY,10)
+        << "ERROR: ID not the one given in secondDynamicSink";
+
+    //now read back and check the returns agains the given values
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSources(sourceList))
+        << "ERROR: database error";
+    bool equal = true;
+
+    std::vector<am_Source_s>::iterator listIterator = sourceList.begin();
+    for (; listIterator < sourceList.end(); ++listIterator)
+    {
+        if (listIterator->sourceID == staticSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, staticSource);
+        }
+
+        if (listIterator->sourceID == firstDynamicSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, firstDynamicSource);
+        }
+
+        if (listIterator->sourceID == secondDynamicSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, secondDynamicSource);
+        }
+        pCF.compareSource(listIterator, secondDynamicSource);
+
+    }ASSERT_EQ(true, equal);
+
+    am_Source_s sourceData;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceInfoDB(secondDynamicSourceID,sourceData));
+    ASSERT_TRUE(
+            (secondDynamicSource.available.availability == sourceData.available.availability) && (secondDynamicSource.available.availabilityReason == sourceData.available.availabilityReason) && (secondDynamicSource.sourceClassID == sourceData.sourceClassID) && (secondDynamicSource.domainID == sourceData.domainID) && (secondDynamicSource.interruptState == sourceData.interruptState) && (secondDynamicSource.visible == sourceData.visible) && (secondDynamicSource.name.compare(sourceData.name) == 0) && (secondDynamicSource.volume == sourceData.volume) && std::equal(secondDynamicSource.listConnectionFormats.begin(), secondDynamicSource.listConnectionFormats.end(), sourceData.listConnectionFormats.begin()) && std::equal(secondDynamicSource.listMainSoundProperties.begin(), secondDynamicSource.listMainSoundProperties.end(), sourceData.listMainSoundProperties.begin(), equalMainSoundProperty));
+
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSourceID)
+{
+
+    std::string sourceName("myClassID");
+    am_sourceClass_t sourceClassID, peekID;
+    am_SourceClass_s sourceClass;
+    am_ClassProperty_s classProperty;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 13;
+    sourceClass.name = sourceName;
+    sourceClass.sourceClassID = 0;
+    sourceClass.listClassProperties.push_back(classProperty);
+
+    //first we peek without an existing class
+    ASSERT_EQ(E_NON_EXISTENT, pDatabaseHandler.peekSourceClassID(sourceName,sourceClassID));
+
+    //now we enter the class into the database
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+
+    //first we peek without an existing class
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSourceClassID(sourceName,peekID));
+    ASSERT_EQ(sourceClassID, peekID);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSinkID)
+{
+
+    std::string sinkName("myClassID");
+    am_sinkClass_t sinkClassID, peekID;
+    am_SinkClass_s sinkClass;
+    am_ClassProperty_s classProperty;
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 13;
+    sinkClass.name = sinkName;
+    sinkClass.sinkClassID = 0;
+    sinkClass.listClassProperties.push_back(classProperty);
+
+    //first we peek without an existing class
+    ASSERT_EQ(E_NON_EXISTENT, pDatabaseHandler.peekSinkClassID(sinkName,sinkClassID));
+
+    //now we enter the class into the database
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+
+    //first we peek without an existing class
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSinkClassID(sinkName,peekID));
+    ASSERT_EQ(sinkClassID, peekID);
+}
+
+TEST_F(CAmDatabaseHandlerTest,crossfaders)
+{
+
+
+
+    am_Crossfader_s crossfader;
+    am_crossfaderID_t crossfaderID;
+    am_Sink_s sinkA, sinkB;
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    am_sinkID_t sinkAID, sinkBID;
+    pCF.createSink(sinkA);
+    pCF.createSink(sinkB);
+    sinkB.name = "sinkB";
+    pCF.createSource(source);
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sinkA,sinkAID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sinkB,sinkBID));
+
+    crossfader.crossfaderID = 0;
+    crossfader.hotSink = HS_SINKA;
+    crossfader.sinkID_A = sinkAID;
+    crossfader.sinkID_B = sinkBID;
+    crossfader.sourceID = sourceID;
+    crossfader.name = "Crossfader";
+    crossfader.hotSink = HS_UNKNOWN;
+
+    std::vector<am_Crossfader_s> listCrossfaders;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterCrossfaderDB(crossfader,crossfaderID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListCrossfaders(listCrossfaders));
+    ASSERT_EQ(crossfader.sinkID_A, listCrossfaders[0].sinkID_A);
+    ASSERT_EQ(crossfader.sinkID_B, listCrossfaders[0].sinkID_B);
+    ASSERT_EQ(crossfader.sourceID, listCrossfaders[0].sourceID);
+    ASSERT_EQ(crossfader.hotSink, listCrossfaders[0].hotSink);
+    ASSERT_EQ(100, listCrossfaders[0].crossfaderID);
+    ASSERT_EQ(crossfader.name.compare(listCrossfaders[0].name), 0);
+}
+
+TEST_F(CAmDatabaseHandlerTest,crossfadersGetFromDomain)
+{
+
+
+
+    am_Crossfader_s crossfader;
+    am_crossfaderID_t crossfaderID;
+    am_Sink_s sinkA, sinkB;
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    am_sinkID_t sinkAID, sinkBID;
+    am_domainID_t domainID;
+    am_Domain_s domain;
+    pCF.createSink(sinkA);
+    pCF.createSink(sinkB);
+    pCF.createDomain(domain);
+    sinkB.name = "sinkB";
+    pCF.createSource(source);
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    source.domainID = domainID;
+    sinkA.domainID = domainID;
+    sinkB.domainID = domainID;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sinkA,sinkAID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sinkB,sinkBID));
+
+    crossfader.crossfaderID = 0;
+    crossfader.hotSink = HS_SINKA;
+    crossfader.sinkID_A = sinkAID;
+    crossfader.sinkID_B = sinkBID;
+    crossfader.sourceID = sourceID;
+    crossfader.name = "Crossfader";
+    crossfader.hotSink = HS_UNKNOWN;
+
+    std::vector<am_crossfaderID_t> listCrossfaders;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterCrossfaderDB(crossfader,crossfaderID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListCrossfadersOfDomain(source.domainID,listCrossfaders));
+    ASSERT_EQ(100, listCrossfaders[0]);
+
+}
+
+TEST_F(CAmDatabaseHandlerTest,sourceState)
+{
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    std::vector<am_Source_s> listSources;
+    pCF.createSource(source);
+    source.sourceState = SS_OFF;
+
+    //prepare the test
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+
+    //change the source state
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSourceState(sourceID,SS_ON));
+
+    //read out the changed values
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_EQ(listSources[0].sourceState, SS_ON);
+}
+
+TEST_F(CAmDatabaseHandlerTest,sinkVolumeChange)
+{
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    std::vector<am_Sink_s> listSinks;
+    pCF.createSink(sink);
+    sink.volume = 23;
+
+    //prepare the test
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+
+    //change the volume and check the read out
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSinkVolume(sinkID,34));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(listSinks[0].volume, 34);
+}
+
+TEST_F(CAmDatabaseHandlerTest,sourceVolumeChange)
+{
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    std::vector<am_Source_s> listSources;
+    pCF.createSource(source);
+    source.volume = 23;
+
+    //prepare test
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+
+    //change the volume and check the read out
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSourceVolume(sourceID,34));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_EQ(listSources[0].volume, 34);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSource)
+{
+    std::vector<am_Source_s> listSources;
+    am_sourceID_t sourceID, source2ID, source3ID;
+    am_Source_s source;
+    pCF.createSource(source);
+
+    //peek a source that does not exits
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSource(std::string("newsource"),sourceID));
+
+    //make sure it is not in the list
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_TRUE(listSources.empty());
+    ASSERT_EQ(sourceID, 100);
+
+    //now enter the source with the same name and make sure it does not get a new ID
+    source.name = "newsource";
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source2ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_EQ(sourceID, source2ID);
+    ASSERT_TRUE(listSources[0].sourceID==sourceID);
+
+    //now we peek again. This time, the source exists
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSource(source.name,source3ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_TRUE(listSources.size()==1);
+    ASSERT_EQ(source3ID, source2ID);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSourceDouble)
+{
+    std::vector<am_Source_s> listSources;
+    am_sourceID_t sourceID;
+    am_sourceID_t source2ID;
+    am_sourceID_t source3ID;
+    am_Source_s source;
+    pCF.createSource(source);
+
+    //peek a source that does not exits
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSource(std::string("newsource"),sourceID));
+
+    //peek a second source that does not exits
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSource(std::string("newsource2"),source2ID));
+
+    //make sure they are is not in the list
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_TRUE(listSources.empty());
+    ASSERT_EQ(sourceID, 100);
+    source.name = "newsource";
+
+    //now enter the source with the same name than the first peek and make sure it does not get a new ID
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,source3ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_EQ(sourceID, source3ID);
+    ASSERT_TRUE(listSources[0].sourceID==sourceID);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSink)
+{
+    std::vector<am_Sink_s> listSinks;
+    am_sinkID_t sinkID, sink2ID, sink3ID;
+    am_Sink_s sink;
+    pCF.createSink(sink);
+
+    //peek a sink that does not exits
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSink(std::string("newsink"),sinkID));
+
+    //make sure it is not in the list
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_TRUE(listSinks.empty());
+    ASSERT_EQ(sinkID, 100);
+    sink.name = "newsink";
+
+    //now enter the source with the same name and make sure it does not get a new ID
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sink2ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(sinkID, sink2ID);
+    ASSERT_TRUE(listSinks[0].sinkID==sinkID);
+
+    //now we peek again, this time, the sink exists
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSink(sink.name,sink3ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_TRUE(listSinks.size()==1);
+    ASSERT_EQ(sink3ID, sink2ID);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekSinkDouble)
+{
+    std::vector<am_Sink_s> listSinks;
+    am_sinkID_t sinkID;
+    am_sinkID_t sink2ID;
+    am_sinkID_t sink3ID;
+    am_Sink_s sink;
+    pCF.createSink(sink);
+
+    //peek a sink that does not exits
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSink(std::string("newsink"),sinkID));
+
+    //peek again
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekSink(std::string("nextsink"),sink2ID));
+
+    //make sure they are is not in the list
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_TRUE(listSinks.empty());
+    ASSERT_EQ(sinkID, 100);
+    sink.name = "newsink";
+
+    //now enter the sink with the same name than the first peek and make sure it does not get a new ID
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sink3ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(sinkID, sink3ID);
+    ASSERT_TRUE(listSinks[0].sinkID==sinkID);
+}
+
+TEST_F(CAmDatabaseHandlerTest,changeConnectionTimingInformationCheckMainConnection)
+{
+    std::vector<am_Connection_s> connectionList;
+    std::vector<am_MainConnectionType_s> mainList;
+
+    //prepare the test, it is one mainconnection, so we expect one callback
+    createMainConnectionSetup();
+
+    //first get all visible mainconnections and make sure, the delay is set to -1 for the first entry
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListVisibleMainConnections(mainList));
+    ASSERT_EQ(mainList[0].delay, -1);
+
+    //no go through all connections and set the delay time to 24 for each connection
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListConnections(connectionList));
+    std::vector<am_Connection_s>::iterator iteratorConnectionList = connectionList.begin();
+    for (; iteratorConnectionList < connectionList.end(); ++iteratorConnectionList)
+    {
+        ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionTimingInformation(iteratorConnectionList->sinkID,24));
+    }
+
+    //we read the result again and expect that the value is now different from -1
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListVisibleMainConnections(mainList));
+    ASSERT_EQ(mainList[0].delay, 216);
+}
+
+TEST_F(CAmDatabaseHandlerTest,changeConnectionTimingInformation)
+{
+    am_Connection_s connection;
+    am_connectionID_t connectionID;
+    std::vector<am_Connection_s> connectionList;
+    pCF.createConnection(connection);
+
+    //enter a connection
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
+
+    //change the timing and check it
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionTimingInformation(connectionID,24));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListConnections(connectionList));
+    ASSERT_TRUE(connectionList[0].delay==24);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getSinkClassOfSink)
+{
+    std::vector<am_SinkClass_s> sinkClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SinkClass_s sinkClass, returnClass;
+    am_ClassProperty_s classProperty;
+    am_sinkClass_t sinkClassID;
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sinkClass.name = "test";
+    sinkClass.sinkClassID = 4;
+    sinkClass.listClassProperties = classPropertyList;
+    pCF.createSink(sink);
+    sink.sinkClassID = 4;
+
+    //prepare test
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+
+    //enter a new sinkclass, read out again and check
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 4);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSinkClassInfoDB(sinkID,returnClass));
+    ASSERT_EQ(sinkClassList[0].name, returnClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, returnClass.sinkClassID);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),returnClass.listClassProperties.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,getSourceClassOfSource)
+{
+    std::vector<am_SourceClass_s> sourceClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SourceClass_s sourceClass, sinkSourceClass;
+    am_ClassProperty_s classProperty;
+    am_sourceClass_t sourceClassID;
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sourceClass.name = "test";
+    sourceClass.sourceClassID = 1;
+    sourceClass.listClassProperties = classPropertyList;
+    pCF.createSource(source);
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 1);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getSourceClassInfoDB(sourceID,sinkSourceClass));
+    ASSERT_EQ(sourceClassList[0].name, sinkSourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, sinkSourceClass.sourceClassID);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),sinkSourceClass.listClassProperties.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeSourceClass)
+{
+    std::vector<am_SourceClass_s> sourceClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SourceClass_s sourceClass;
+    am_ClassProperty_s classProperty;
+    am_sourceClass_t sourceClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sourceClass.name = "test";
+    sourceClass.sourceClassID = 3;
+    sourceClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 3);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.removeSourceClassDB(3));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_TRUE(sourceClassList.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,updateSourceClass)
+{
+    std::vector<am_SourceClass_s> sourceClassList;
+    std::vector<am_ClassProperty_s> classPropertyList, changedPropertyList;
+    am_SourceClass_s sourceClass, changedClass;
+    am_ClassProperty_s classProperty;
+    am_sourceClass_t sourceClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sourceClass.name = "test";
+    sourceClass.sourceClassID = 0;
+    sourceClass.listClassProperties = classPropertyList;
+    changedClass = sourceClass;
+    changedClass.listClassProperties[1].value = 6;
+    changedPropertyList = changedClass.listClassProperties;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+    changedClass.sourceClassID = sourceClassID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 100);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSourceClassInfoDB(changedClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 100);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),changedPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSourceClass)
+{
+    std::vector<am_SourceClass_s> sourceClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SourceClass_s sourceClass;
+    am_ClassProperty_s classProperty;
+    am_sourceClass_t sourceClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sourceClass.name = "test";
+    sourceClass.sourceClassID = 0;
+    sourceClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 100);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSourceClassStatic)
+{
+    std::vector<am_SourceClass_s> sourceClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SourceClass_s sourceClass;
+    am_ClassProperty_s classProperty;
+    am_sourceClass_t sourceClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sourceClass.name = "test";
+    sourceClass.sourceClassID = 3;
+    sourceClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceClassDB(sourceClassID,sourceClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSourceClasses(sourceClassList));
+    ASSERT_EQ(sourceClassList[0].name, sourceClass.name);
+    ASSERT_EQ(sourceClassList[0].sourceClassID, 3);
+    ASSERT_TRUE(std::equal(sourceClassList[0].listClassProperties.begin(),sourceClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeSinkClass)
+{
+    std::vector<am_SinkClass_s> sinkClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SinkClass_s sinkClass;
+    am_ClassProperty_s classProperty;
+    am_sinkClass_t sinkClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sinkClass.name = "test";
+    sinkClass.sinkClassID = 0;
+    sinkClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 100);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.removeSinkClassDB(sinkClassID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_TRUE(sinkClassList.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,updateSinkClass)
+{
+    std::vector<am_SinkClass_s> sinkClassList;
+    std::vector<am_ClassProperty_s> classPropertyList, changedPropertyList;
+    am_SinkClass_s sinkClass, changedClass;
+    am_ClassProperty_s classProperty;
+    am_sinkClass_t sinkClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sinkClass.name = "test";
+    sinkClass.sinkClassID = 0;
+    sinkClass.listClassProperties = classPropertyList;
+    changedClass = sinkClass;
+    changedClass.listClassProperties[1].value = 6;
+    changedPropertyList = changedClass.listClassProperties;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+    changedClass.sinkClassID = sinkClassID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 100);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSinkClassInfoDB(changedClass));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 100);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),changedPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSinkClass)
+{
+    std::vector<am_SinkClass_s> sinkClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SinkClass_s sinkClass;
+    am_ClassProperty_s classProperty;
+    am_sinkClass_t sinkClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sinkClass.name = "test";
+    sinkClass.sinkClassID = 0;
+    sinkClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 100);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSinkClassStatic)
+{
+    std::vector<am_SinkClass_s> sinkClassList;
+    std::vector<am_ClassProperty_s> classPropertyList;
+    am_SinkClass_s sinkClass;
+    am_ClassProperty_s classProperty;
+    am_sinkClass_t sinkClassID;
+    classProperty.classProperty = CP_GENIVI_SINK_TYPE;
+    classProperty.value = 1;
+    classPropertyList.push_back(classProperty);
+    classProperty.classProperty = CP_GENIVI_SOURCE_TYPE;
+    classProperty.value = 4;
+    classPropertyList.push_back(classProperty);
+    sinkClass.name = "test";
+    sinkClass.sinkClassID = 4;
+    sinkClass.listClassProperties = classPropertyList;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkClassDB(sinkClass,sinkClassID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinkClasses(sinkClassList));
+    ASSERT_EQ(sinkClassList[0].name, sinkClass.name);
+    ASSERT_EQ(sinkClassList[0].sinkClassID, 4);
+    ASSERT_TRUE(std::equal(sinkClassList[0].listClassProperties.begin(),sinkClassList[0].listClassProperties.end(),classPropertyList.begin(),equalClassProperties));
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSystemProperty)
+{
+    std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
+    am_SystemProperty_s systemProperty;
+
+    systemProperty.type = SYP_UNKNOWN;
+    systemProperty.value = 33;
+    listSystemProperties.push_back(systemProperty);
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSystemProperties(listSystemProperties));
+    systemProperty.value = 444;
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSystemPropertyDB(systemProperty));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSystemProperties(listReturn));
+    ASSERT_EQ(listReturn[0].type, systemProperty.type);
+    ASSERT_EQ(listReturn[0].value, systemProperty.value);
+}
+
+TEST_F(CAmDatabaseHandlerTest, systemProperties)
+{
+    std::vector<am_SystemProperty_s> listSystemProperties, listReturn;
+    am_SystemProperty_s systemProperty;
+
+    systemProperty.type = SYP_UNKNOWN;
+    systemProperty.value = 33;
+    listSystemProperties.push_back(systemProperty);
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSystemProperties(listSystemProperties));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSystemProperties(listReturn));
+    ASSERT_EQ(listReturn[0].type, systemProperty.type);
+    ASSERT_EQ(listReturn[0].value, systemProperty.value);
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSourcesCorrect)
+{
+    //fill the connection database
+    am_Source_s staticSource, firstDynamicSource, secondDynamicSource;
+    am_sourceID_t staticSourceID, firstDynamicSourceID, secondDynamicSourceID;
+    std::vector<am_Source_s> sourceList;
+
+    pCF.createSource(staticSource);
+    staticSource.sourceID = 4;
+    staticSource.name = "Static";
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(staticSource,staticSourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSource.sourceID,staticSourceID)
+        << "ERROR: ID not the one given in staticSource";
+
+    pCF.createSource(firstDynamicSource);
+    firstDynamicSource.name = "firstDynamicSource";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(firstDynamicSource,firstDynamicSourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(firstDynamicSourceID,DYNAMIC_ID_BOUNDARY)
+        << "ERROR: ID not the one given in firstDynamicSink";
+
+    pCF.createSource(secondDynamicSource);
+    secondDynamicSource.name = "secondDynamicSource";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(secondDynamicSource,secondDynamicSourceID))
+        << "ERROR: database error";
+    ASSERT_NEAR(secondDynamicSourceID,DYNAMIC_ID_BOUNDARY,10)
+        << "ERROR: ID not the one given in secondDynamicSink";
+
+    //now read back and check the returns agains the given values
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSources(sourceList))
+        << "ERROR: database error";
+    bool equal = true;
+
+    std::vector<am_Source_s>::iterator listIterator = sourceList.begin();
+    for (; listIterator < sourceList.end(); ++listIterator)
+    {
+        if (listIterator->sourceID == staticSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, staticSource);
+        }
+
+        if (listIterator->sourceID == firstDynamicSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, firstDynamicSource);
+        }
+
+        if (listIterator->sourceID == secondDynamicSourceID)
+        {
+            equal = equal && pCF.compareSource(listIterator, secondDynamicSource);
+        }
+
+    }
+    ASSERT_EQ(true, equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSourceMainSoundProperty)
+{
+    std::vector<am_Source_s> listSources;
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    pCF.createSource(source);
+    am_MainSoundProperty_s property;
+    property.type = MSP_UNKNOWN;
+    property.value = 33;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeMainSourceSoundPropertyDB(property,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    std::vector<am_MainSoundProperty_s>::iterator listIterator = listSources[0].listMainSoundProperties.begin();
+    for (; listIterator < listSources[0].listMainSoundProperties.end(); ++listIterator)
+    {
+        if (listIterator->type == property.type)
+        {
+            ASSERT_EQ(listIterator->value, property.value);
+        }
+    }
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSinkMuteState)
+{
+    std::vector<am_Sink_s> listSinks;
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    pCF.createSink(sink);
+    am_MuteState_e muteState = MS_MUTED;
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSinkMuteStateDB(muteState,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(muteState, listSinks[0].muteState);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSinkMainSoundProperty)
+{
+    std::vector<am_Sink_s> listSinks;
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    pCF.createSink(sink);
+    am_MainSoundProperty_s property;
+    property.type = MSP_UNKNOWN;
+    property.value = 33;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeMainSinkSoundPropertyDB(property,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    std::vector<am_MainSoundProperty_s>::iterator listIterator = listSinks[0].listMainSoundProperties.begin();
+    for (; listIterator < listSinks[0].listMainSoundProperties.end(); ++listIterator)
+    {
+        if (listIterator->type == property.type)
+        {
+            ASSERT_EQ(listIterator->value, property.value);
+        }
+    }
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekDomain)
+{
+    std::vector<am_Domain_s> listDomains;
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    am_domainID_t domain2ID;
+    pCF.createDomain(domain);
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekDomain(std::string("newdomain"),domainID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains));
+    ASSERT_TRUE(listDomains.empty());
+    ASSERT_EQ(domainID, 1);
+    domain.name = "newdomain";
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domain2ID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains));
+    ASSERT_EQ(domainID, domain2ID);
+    ASSERT_TRUE(listDomains[0].domainID==domainID);
+}
+
+TEST_F(CAmDatabaseHandlerTest, peekDomainFirstEntered)
+{
+    std::vector<am_Domain_s> listDomains;
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    am_domainID_t domain2ID;
+    pCF.createDomain(domain);
+    domain.name = "newdomain";
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.peekDomain(std::string("newdomain"),domain2ID));
+    ASSERT_EQ(domainID, domain2ID);
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains));
+    ASSERT_TRUE(listDomains.size()==1);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeDomainState)
+{
+    std::vector<am_Domain_s> listDomains;
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    pCF.createDomain(domain);
+    am_DomainState_e newState = DS_INDEPENDENT_STARTUP;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changDomainStateDB(newState,domainID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(listDomains));
+    ASSERT_EQ(newState, listDomains[0].state);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeMainConnectionState)
+{
+    std::vector<am_MainConnection_s> listMainConnections;
+    createMainConnectionSetup();
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeMainConnectionStateDB(1,CS_DISCONNECTING));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(listMainConnections));
+    ASSERT_EQ(CS_DISCONNECTING, listMainConnections[0].connectionState);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSinkAvailability)
+{
+    std::vector<am_Sink_s> listSinks;
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    pCF.createSink(sink);
+    am_Availability_s availability;
+    availability.availability = A_UNKNOWN;
+    availability.availabilityReason = AR_GENIVI_TEMPERATURE;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSinkAvailabilityDB(availability,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(availability.availability, listSinks[0].available.availability);
+    ASSERT_EQ(availability.availabilityReason, listSinks[0].available.availabilityReason);
+}
+
+TEST_F(CAmDatabaseHandlerTest, changeSourceAvailability)
+{
+    std::vector<am_Source_s> listSources;
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    pCF.createSource(source);
+    am_Availability_s availability;
+    availability.availability = A_UNKNOWN;
+    availability.availabilityReason = AR_GENIVI_TEMPERATURE;
+    source.visible = true;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSourceAvailabilityDB(availability,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSources(listSources));
+    ASSERT_EQ(availability.availability, listSources[0].available.availability);
+    ASSERT_EQ(availability.availabilityReason, listSources[0].available.availabilityReason);
+}
+
+TEST_F(CAmDatabaseHandlerTest,changeMainConnectionRoute)
+{
+    std::vector<am_MainConnection_s> originalList;
+    std::vector<am_MainConnection_s> newList;
+    createMainConnectionSetup();
+    //fill the connection database
+    am_Connection_s connection;
+    am_Source_s source;
+    am_Sink_s sink;
+    std::vector<am_connectionID_t> listConnectionID;
+
+
+
+    for (uint16_t i = 1; i < 10; i++)
+    {
+        am_sinkID_t forgetSink;
+        am_sourceID_t forgetSource;
+        am_connectionID_t connectionID;
+
+        connection.sinkID = i + 20;
+        connection.sourceID = i + 20;
+        connection.delay = -1;
+        connection.connectionFormat = CF_GENIVI_ANALOG;
+        connection.connectionID = 0;
+
+        pCF.createSink(sink);
+        sink.sinkID = i + 20;
+        sink.name = "sink" + int2string(i + 20);
+        sink.domainID = 4;
+        pCF.createSource(source);
+        source.sourceID = i + 20;
+        source.name = "source" + int2string(i + 30);
+        source.domainID = 4;
+
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,forgetSink));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,forgetSource));
+        ASSERT_EQ(E_OK, pDatabaseHandler.enterConnectionDB(connection,connectionID));
+        listConnectionID.push_back(connectionID);
+        ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(originalList));
+
+    }
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeMainConnectionRouteDB(1,listConnectionID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(newList));
+    ASSERT_FALSE(std::equal(newList[0].listConnectionID.begin(),newList[0].listConnectionID.end(),originalList[0].listConnectionID.begin()));
+}
+
+TEST_F(CAmDatabaseHandlerTest,changeMainSinkVolume)
+{
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    am_mainVolume_t newVol = 20;
+    std::vector<am_Sink_s> listSinks;
+    pCF.createSink(sink);
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeSinkMainVolumeDB(newVol,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListSinks(listSinks));
+    ASSERT_EQ(listSinks[0].mainVolume, newVol);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getMainSourceSoundProperties)
+{
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    pCF.createSource(source);
+    std::vector<am_MainSoundProperty_s> mainSoundProperties = source.listMainSoundProperties;
+    std::vector<am_MainSoundProperty_s> listMainSoundProperties;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSourceSoundProperties(sourceID,listMainSoundProperties));
+    ASSERT_TRUE(std::equal(mainSoundProperties.begin(),mainSoundProperties.end(),listMainSoundProperties.begin(),equalMainSoundProperty));
+}
+
+TEST_F(CAmDatabaseHandlerTest,getMainSinkSoundProperties)
+{
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    pCF.createSink(sink);
+    std::vector<am_MainSoundProperty_s> mainSoundProperties = sink.listMainSoundProperties;
+    std::vector<am_MainSoundProperty_s> listMainSoundProperties;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSinkSoundProperties(sinkID,listMainSoundProperties));
+    ASSERT_TRUE(std::equal(mainSoundProperties.begin(),mainSoundProperties.end(),listMainSoundProperties.begin(),equalMainSoundProperty));
+}
+
+TEST_F(CAmDatabaseHandlerTest,getMainSources)
+{
+    am_Source_s source, source1, source2;
+    am_sourceID_t sourceID;
+    pCF.createSource(source);
+    pCF.createSource(source1);
+    pCF.createSource(source2);
+    source1.name = "source1";
+    source2.name = "source2";
+    bool equal = true;
+    source1.visible = false;
+    std::vector<am_SourceType_s> listMainSources;
+    std::vector<am_Source_s> listSources;
+
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    source.sourceID = sourceID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source1,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source2,sourceID));
+    source2.sourceID = sourceID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSources(listMainSources));
+    listSources.push_back(source);
+    listSources.push_back(source2);
+    std::vector<am_SourceType_s>::iterator listIterator = listMainSources.begin();
+    for (; listIterator < listMainSources.end(); ++listIterator)
+    {
+        equal = equal && pCF.compareSinkMainSource(listIterator, listSources);
+    }
+    ASSERT_TRUE(equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getMainSinks)
+{
+    am_Sink_s sink, sink1, sink2;
+    am_sinkID_t sinkID;
+    pCF.createSink(sink);
+    pCF.createSink(sink1);
+    pCF.createSink(sink2);
+    sink1.name = "sink1";
+    sink2.name = "sink2";
+    bool equal = true;
+    sink1.visible = false;
+    std::vector<am_SinkType_s> listMainSinks;
+    std::vector<am_Sink_s> listSinks;
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    sink.sinkID = sinkID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink1,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink2,sinkID));
+    sink2.sinkID = sinkID;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainSinks(listMainSinks));
+    listSinks.push_back(sink);
+    listSinks.push_back(sink2);
+    std::vector<am_SinkType_s>::iterator listIterator = listMainSinks.begin();
+    for (; listIterator < listMainSinks.end(); ++listIterator)
+    {
+        equal = equal && pCF.compareSinkMainSink(listIterator, listSinks);
+    }
+    ASSERT_TRUE(equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getVisibleMainConnections)
+{
+    createMainConnectionSetup();
+    std::vector<am_MainConnectionType_s> listVisibleMainConnections;
+    std::vector<am_MainConnection_s> listMainConnections;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListVisibleMainConnections(listVisibleMainConnections));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListMainConnections(listMainConnections));
+    ASSERT_EQ(listMainConnections[0].mainConnectionID, listVisibleMainConnections[0].mainConnectionID);
+    ASSERT_EQ(listMainConnections[0].connectionState, listVisibleMainConnections[0].connectionState);
+    ASSERT_EQ(listMainConnections[0].delay, listVisibleMainConnections[0].delay);
+    ASSERT_EQ(listMainConnections[0].sinkID, listVisibleMainConnections[0].sinkID);
+    ASSERT_EQ(listMainConnections[0].sourceID, listVisibleMainConnections[0].sourceID);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getListSourcesOfDomain)
+{
+    am_Source_s source, source2;
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    am_sourceID_t sourceID;
+    std::vector<am_sourceID_t> sourceList, sourceCheckList;
+    pCF.createSource(source);
+    source.sourceID = 1;
+    source.name = "testSource";
+    source.domainID = 1;
+    pCF.createSource(source2);
+    source2.sourceID = 0;
+    source2.name = "testSource2";
+    source2.domainID = 5;
+    pCF.createDomain(domain);
+    sourceCheckList.push_back(1); //sink.sinkID);
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source,sourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source2,sourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListSourcesOfDomain(2,sourceList))
+        << "ERROR: database error";ASSERT_TRUE(sourceList.empty());
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSourcesOfDomain(1,sourceList))
+        << "ERROR: database error";
+    ASSERT_TRUE(std::equal(sourceList.begin(),sourceList.end(),sourceCheckList.begin()) && !sourceList.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,getListSinksOfDomain)
+{
+    am_Sink_s sink, sink2;
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    am_sinkID_t sinkID;
+    std::vector<am_sinkID_t> sinkList, sinkCheckList;
+    pCF.createSink(sink);
+    sink.sinkID = 1;
+    sink.domainID = 1;
+    pCF.createSink(sink2);
+    sink2.domainID = 5;
+    sink2.name = "sink2";
+    pCF.createDomain(domain);
+    sinkCheckList.push_back(1); //sink.sinkID);
+
+
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink,sinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink2,sinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListSinksOfDomain(2,sinkList))
+        << "ERROR: database error";ASSERT_TRUE(sinkList.empty());
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSinksOfDomain(1,sinkList))
+        << "ERROR: database error";
+    ASSERT_TRUE(std::equal(sinkList.begin(),sinkList.end(),sinkCheckList.begin()) && !sinkList.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,getListGatewaysOfDomain)
+{
+
+
+    am_Gateway_s gateway, gateway2;
+    am_gatewayID_t gatewayID;
+    am_domainID_t domainID;
+    am_Domain_s domain;
+    std::vector<am_gatewayID_t> gatewayList, gatewayCheckList;
+    pCF.createGateway(gateway);
+    gateway.gatewayID = 1;
+    gateway.name = "testGateway";
+    gateway.controlDomainID = 1;
+    gateway.sourceID = 1;
+    gateway.sinkID = 1;
+    gateway.domainSinkID = 1;
+    gateway.domainSourceID = 1;
+    pCF.createGateway(gateway2);
+    gateway2.gatewayID = 2;
+    gateway2.name = "testGateway2";
+    gateway2.controlDomainID = 4;
+    gateway2.sourceID = 1;
+    gateway2.sinkID = 1;
+    gateway2.domainSinkID = 1;
+    gateway2.domainSourceID = 1;
+    pCF.createDomain(domain);
+    gatewayCheckList.push_back(gateway.gatewayID);
+    am_Sink_s sink;
+    am_Source_s source;
+    am_sinkID_t sinkID;
+    am_sourceID_t sourceID;
+    pCF.createSink(sink);
+    pCF.createSource(source);
+    sink.sinkID = 1;
+    source.sourceID = 1;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway2,gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.getListGatewaysOfDomain(2,gatewayList))
+        << "ERROR: database error";ASSERT_TRUE(gatewayList.empty());
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListGatewaysOfDomain(1,gatewayList))
+        << "ERROR: database error";
+    ASSERT_TRUE(std::equal(gatewayList.begin(),gatewayList.end(),gatewayCheckList.begin()) && !gatewayList.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeDomain)
+{
+    am_Domain_s domain;
+    am_domainID_t domainID;
+    std::vector<am_Domain_s> listDomains;
+    pCF.createDomain(domain);
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterDomainDB(domain,domainID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.removeDomainDB(domainID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListDomains(listDomains))
+        << "ERROR: database error";
+    ASSERT_TRUE(listDomains.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeGateway)
+{
+
+
+    am_Gateway_s gateway;
+    am_gatewayID_t gatewayID;
+    std::vector<am_Gateway_s> listGateways;
+    pCF.createGateway(gateway);
+    am_Sink_s sink;
+    am_Source_s source;
+    am_sinkID_t sinkID;
+    am_sourceID_t sourceID;
+    pCF.createSink(sink);
+    pCF.createSource(source);
+    sink.sinkID = 1;
+    source.sourceID = 2;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.removeGatewayDB(gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListGateways(listGateways))
+        << "ERROR: database error";
+    ASSERT_TRUE(listGateways.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeSink)
+{
+    am_Sink_s sink;
+    am_sinkID_t sinkID;
+    std::vector<am_Sink_s> listSinks;
+    pCF.createSink(sink);
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(sink,sinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.removeSinkDB(sinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(listSinks))
+        << "ERROR: database error";
+    ASSERT_TRUE(listSinks.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeSource)
+{
+    //fill the connection database
+    am_Source_s source;
+    am_sourceID_t sourceID;
+    std::vector<am_Source_s> listSources;
+    pCF.createSource(source);
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(source,sourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.removeSourceDB(sourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSources(listSources))
+        << "ERROR: database error";
+    ASSERT_TRUE(listSources.empty());
+}
+
+TEST_F(CAmDatabaseHandlerTest, removeMainConnection)
+{
+    createMainConnectionSetup();
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.removeMainConnectionDB(1))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentMainConnectionFail)
+{
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeMainConnectionDB(34))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentSource)
+{
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeSourceDB(3))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentSink)
+{
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeSinkDB(2))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,removeNonexistentGateway)
+{
+    ASSERT_EQ(E_NON_EXISTENT,pDatabaseHandler.removeGatewayDB(12))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,registerGatewayCorrect)
+{
+
+
+    //initialize gateway
+    std::vector<am_Gateway_s> returnList;
+    am_Gateway_s gateway, gateway1, gateway2;
+    am_gatewayID_t gatewayID = 0, gatewayID1 = 0, gatewayID2 = 0;
+
+    pCF.createGateway(gateway);
+    pCF.createGateway(gateway1);
+    gateway1.gatewayID = 20;
+    pCF.createGateway(gateway2);
+    am_Sink_s sink;
+    am_Source_s source;
+    am_sinkID_t sinkID;
+    am_sourceID_t sourceID;
+    pCF.createSink(sink);
+    pCF.createSource(source);
+    sink.sinkID = 1;
+    source.sourceID = 2;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(100,gatewayID)
+        << "ERROR: domainID zero";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway1,gatewayID1))
+        << "ERROR: database error";
+    ASSERT_EQ(gateway1.gatewayID,gatewayID1)
+        << "ERROR: domainID zero";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway2,gatewayID2))
+        << "ERROR: database error";
+    ASSERT_EQ(101,gatewayID2)
+        << "ERROR: domainID zero";
+
+    //now check if we read out the correct values
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListGateways(returnList));
+    bool equal = true;
+    std::vector<am_Gateway_s>::iterator listIterator = returnList.begin();
+
+    for (; listIterator < returnList.end(); ++listIterator)
+    {
+        if (listIterator->gatewayID == gatewayID)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway);
+        }
+
+        if (listIterator->gatewayID == gatewayID1)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway1);
+        }
+
+        if (listIterator->gatewayID == gatewayID2)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway2);
+        }
+    }
+
+    ASSERT_EQ(true, equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest,getGatewayInfo)
+{
+
+
+    //initialize gateway
+    std::vector<am_Gateway_s> returnList;
+    am_Gateway_s gateway, gateway1, gateway2;
+    am_gatewayID_t gatewayID = 0, gatewayID1 = 0, gatewayID2 = 0;
+
+    pCF.createGateway(gateway);
+    pCF.createGateway(gateway1);
+    gateway1.gatewayID = 20;
+    pCF.createGateway(gateway2);
+    am_Sink_s sink;
+    am_Source_s source;
+    am_sinkID_t sinkID;
+    am_sourceID_t sourceID;
+    pCF.createSink(sink);
+    pCF.createSource(source);
+    sink.sinkID = 1;
+    source.sourceID = 2;
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID));
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway,gatewayID))
+        << "ERROR: database error";
+    ASSERT_EQ(100,gatewayID)
+        << "ERROR: domainID zero";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway1,gatewayID1))
+        << "ERROR: database error";
+    ASSERT_EQ(gateway1.gatewayID,gatewayID1)
+        << "ERROR: domainID zero";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterGatewayDB(gateway2,gatewayID2))
+        << "ERROR: database error";
+    ASSERT_EQ(101,gatewayID2)
+        << "ERROR: domainID zero";
+
+    //now check if we read out the correct values
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListGateways(returnList));
+    bool equal = true;
+    std::vector<am_Gateway_s>::iterator listIterator = returnList.begin();
+
+    for (; listIterator < returnList.end(); ++listIterator)
+    {
+        if (listIterator->gatewayID == gatewayID)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway);
+        }
+
+        if (listIterator->gatewayID == gatewayID1)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway1);
+        }
+
+        if (listIterator->gatewayID == gatewayID2)
+        {
+            equal = equal && pCF.compareGateway(listIterator, gateway2);
+        }
+    }
+
+    ASSERT_EQ(true, equal);
+
+    am_Gateway_s gatewayInfo;
+    ASSERT_EQ(E_OK, pDatabaseHandler.getGatewayInfoDB(20,gatewayInfo));
+    ASSERT_TRUE(pCF.compareGateway1(gateway1,gatewayInfo));
+
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSinkThatAlreadyExistFail)
+{
+    //fill the connection database
+    am_Sink_s staticSink, SecondSink;
+    am_sinkID_t staticSinkID, SecondSinkID;
+
+    pCF.createSink(staticSink);
+    staticSink.sinkID = 43;
+    staticSink.name = "Static";
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(staticSink,staticSinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSink.sinkID,staticSinkID)
+        << "ERROR: ID not the one given in staticSink";
+
+    pCF.createSink(SecondSink);
+    SecondSink.sinkID = 43;
+    SecondSink.name = "SecondSink";
+
+    ASSERT_EQ(E_ALREADY_EXISTS,pDatabaseHandler.enterSinkDB(SecondSink,SecondSinkID))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSourcesThatAlreadyExistFail)
+{
+    //fill the connection database
+    am_Source_s staticSource, SecondSource;
+    am_sourceID_t staticSourceID, SecondSourceID;
+    pCF.createSource(staticSource);
+    staticSource.sourceID = 4;
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSourceDB(staticSource,staticSourceID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSource.sourceID,staticSourceID)
+        << "ERROR: ID not the one given in staticSource";
+
+    pCF.createSource(SecondSource);
+    SecondSource.sourceID = 4;
+
+    ASSERT_EQ(E_ALREADY_EXISTS,pDatabaseHandler.enterSourceDB(SecondSource,SecondSourceID))
+        << "ERROR: database error";
+}
+
+TEST_F(CAmDatabaseHandlerTest,registerDomainCorrect)
+{
+    //initialize domain
+    std::vector<am_Domain_s> returnList;
+    am_Domain_s domain;
+    am_domainID_t domainID = 0;
+    pCF.createDomain(domain);
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterDomainDB(domain,domainID))
+        << "ERROR: database error";
+    ASSERT_NE(0,domainID)
+        << "ERROR: domainID zero";
+
+    //now check if we read out the correct values
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListDomains(returnList));
+    bool equal = true;
+    std::vector<am_Domain_s>::iterator listIterator = returnList.begin();
+    for (; listIterator < returnList.end(); ++listIterator)
+    {
+        if (listIterator->domainID == domainID)
+        {
+            equal = equal && (listIterator->name.compare(domain.name) == 0) && (listIterator->busname.compare(domain.busname) == 0) && (listIterator->complete == domain.complete) && (listIterator->early == domain.early) && (listIterator->state == domain.state);
+        }
+    }
+    ASSERT_EQ(true, equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest,registerConnectionCorrect)
+{
+    am_Connection_s connection;
+    am_connectionID_t connectionID;
+    std::vector<am_Connection_s> returnList;
+    pCF.createConnection(connection);
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterConnectionDB(connection,connectionID))
+        << "ERROR: database error";;
+    ASSERT_NE(0,connectionID)
+        << "ERROR: connectionID zero";
+
+    //now check if we read out the correct values
+    ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID));
+    ASSERT_EQ(E_OK, pDatabaseHandler.getListConnections(returnList));
+    bool equal = false;
+    std::vector<am_Connection_s>::iterator listIterator = returnList.begin();
+    for (; listIterator < returnList.end(); ++listIterator)
+    {
+        if (listIterator->connectionID == connectionID)
+        {
+            equal = (listIterator->sourceID == connection.sourceID) && (listIterator->sinkID == connection.sinkID) && (listIterator->delay == connection.delay) && (listIterator->connectionFormat = connection.connectionFormat);
+        }
+    }
+    ASSERT_EQ(true, equal);
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterMainConnectionCorrect)
+{
+    createMainConnectionSetup();
+}
+
+TEST_F(CAmDatabaseHandlerTest,enterSinksCorrect)
+{
+    //fill the connection database
+    am_Sink_s staticSink, firstDynamicSink, secondDynamicSink;
+    am_sinkID_t staticSinkID, firstDynamicSinkID, secondDynamicSinkID;
+    std::vector<am_Sink_s> sinkList;
+
+    pCF.createSink(staticSink);
+    staticSink.sinkID = 4;
+
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(staticSink,staticSinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(staticSink.sinkID,staticSinkID)
+        << "ERROR: ID not the one given in staticSink";
+
+    pCF.createSink(firstDynamicSink);
+    firstDynamicSink.name = "firstdynamic";
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(firstDynamicSink,firstDynamicSinkID))
+        << "ERROR: database error";
+    ASSERT_EQ(firstDynamicSinkID,DYNAMIC_ID_BOUNDARY)
+        << "ERROR: ID not the one given in firstDynamicSink";
+
+    pCF.createSink(secondDynamicSink);
+    secondDynamicSink.name = "seconddynamic";
+
+    ASSERT_EQ(E_OK,pDatabaseHandler.enterSinkDB(secondDynamicSink,secondDynamicSinkID))
+        << "ERROR: database error";
+    ASSERT_NEAR(secondDynamicSinkID,DYNAMIC_ID_BOUNDARY,10)
+        << "ERROR: ID not the one given in secondDynamicSink";
+
+    //now read back and check the returns agains the given values
+    ASSERT_EQ(E_OK,pDatabaseHandler.getListSinks(sinkList))
+        << "ERROR: database error";
+    bool equal = true;
+
+    std::vector<am_Sink_s>::iterator listIterator = sinkList.begin();
+    for (; listIterator < sinkList.end(); ++listIterator)
+    {
+        if (listIterator->sinkID == staticSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, staticSink);
+        }
+
+        if (listIterator->sinkID == firstDynamicSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, firstDynamicSink);
+        }
+
+        if (listIterator->sinkID == secondDynamicSinkID)
+        {
+            equal = equal && pCF.compareSink(listIterator, secondDynamicSink);
+        }
+    }
+    ASSERT_EQ(true, equal);
+}
+
+//Commented out - gives always a warning..
+//TEST_F(databaseTest,registerDomainFailonID0)
+//{
+//	am_Domain_s domain;
+//	am_domainID_t domainID=5;
+//	pCF.createDomain(domain);
+//	domain.domainID=1;
+//	ASSERT_DEATH(pDatabaseHandler.enterDomainDB(domain,domainID),"Assertion `domainData.domainID==0'");
+//}
+
+int main(int argc, char **argv)
+{
+    CAmDltWrapper::instance()->registerApp("databse", "databasetest");
+    logInfo("Database Test started ");
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
+
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
new file mode 100644
index 0000000..a66af97
--- /dev/null
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.h
@@ -0,0 +1,78 @@
+/**
+ * Copyright (C) 2011, BMW AG
+ *
+ * GeniviAudioMananger AudioManagerDaemon
+ *
+ * \file databasetest.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 DATABASETEST_H_
+#define DATABASETEST_H_
+
+#define UNIT_TEST 1
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+
+#include "CAmDatabaseHandler.h"
+#include "CAmControlReceiver.h"
+#include "CAmControlSender.h"
+#include "CAmDatabaseObserver.h"
+#include "CAmRoutingSender.h"
+#include "CAmRouter.h"
+#include "CAmControlSender.h"
+#include "../IAmControlBackdoor.h"
+#include "../IAmCommandBackdoor.h"
+#include "../CAmCommonFunctions.h"
+#include "../MockIAmControlSend.h"
+#include "../MockIAmCommandSend.h"
+#include "shared/CAmSocketHandler.h"
+
+namespace am
+{
+
+class CAmDatabaseHandlerTest: public ::testing::Test
+{
+public:
+    CAmDatabaseHandlerTest();
+    ~CAmDatabaseHandlerTest();
+    std::vector<std::string> plistRoutingPluginDirs;
+    std::vector<std::string> plistCommandPluginDirs;
+    CAmSocketHandler pSocketHandler;
+    CAmDatabaseHandler pDatabaseHandler;
+    CAmRoutingSender pRoutingSender;
+    CAmCommandSender pCommandSender;
+    MockIAmCommandSend pMockInterface;
+    IAmRoutingBackdoor pRoutingInterfaceBackdoor;
+    IAmCommandBackdoor pCommandInterfaceBackdoor;
+    CAmControlSender pControlSender;
+    CAmRouter pRouter;
+    CAmControlReceiver pControlReceiver;
+    CAmDatabaseObserver pObserver;
+    CAmCommonFunctions pCF;
+    void SetUp();
+    void TearDown();
+
+    void createMainConnectionSetup();
+};
+
+}
+
+#endif /* DATABASETEST_H_ */
diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
new file mode 100644
index 0000000..da326da
--- /dev/null
+++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CMakeLists.txt
@@ -0,0 +1,81 @@
+#
+# Copyright (C) 2011, BMW AG
+#
+# GeniviAudioMananger AmDatabaseHandlerTest
+#
+# \file CMakeLists.txt
+#
+# \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.
+#
+
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(AmDatabaseHandlerTest)
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -DUNIT_TEST=1 -DDLT_CONTEXT=AudioManager")
+
+FIND_PACKAGE(PkgConfig)
+pkg_check_modules(SQLITE REQUIRED sqlite3)
+pkg_check_modules(DLT REQUIRED automotive-dlt)
+
+INCLUDE_DIRECTORIES(   
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${AUDIO_include_FOLDER}
+    ${DBUS_ARCH_INCLUDE_DIR}
+    ${DBUS_include_FOLDER} 
+    ${CMAKE_SOURCE_DIR} 
+    ${STD_INCLUDE_DIRS}
+    ${DLT_INCLUDE_DIRS}
+    ${DBUS_INCLUDE_DIR}
+    ${include_FOLDER}
+)
+
+file(GLOB DATABASE_SRCS_CXX 
+    "../../src/CAmDatabaseHandler.cpp"
+    "../../src/CAmDatabaseObserver.cpp"
+    "../../src/CAmCommandSender.cpp"
+    "../../src/CAmRoutingSender.cpp"
+    "../../src/CAmControlReceiver.cpp"
+    "../../src/CAmControlSender.cpp"
+    "../../src/CAmRouter.cpp"
+    "../../src/CAmDltWrapper.cpp"
+    "../../src/CAmSocketHandler.cpp"
+    "../../src/CAmCommandReceiver.cpp"
+    "../../src/CAmRoutingReceiver.cpp"
+    "../CAmCommonFunctions.cpp" 
+    "*.cpp"
+    )
+
+ADD_EXECUTABLE( AmDatabaseHandlerTest ${DATABASE_SRCS_CXX})
+
+TARGET_LINK_LIBRARIES( AmDatabaseHandlerTest 
+	${SQLITE_LIBRARIES}
+	${DLT_LIBRARIES}
+	${DBUS_LIBRARY}
+	${CMAKE_THREAD_LIBS_INIT}
+	${GTEST_LIBRARIES}
+	gmock
+)
+
+INSTALL(TARGETS AmDatabaseHandlerTest 
+        DESTINATION "~/AudioManagerTest/"
+        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+        COMPONENT tests
+)
+
+SET(ADD_DEPEND "audiomanager-bin" "sqlite3(>=3.6.22)" "dlt" "libdbus-1-3(>=1.2.16)" "libgtest-dev(>=1.6.0-1)" "google-mock" "libpthread-stubs0")
+set_property(GLOBAL APPEND PROPERTY tests_prop "${ADD_DEPEND}")
+