diff options
| author | Jens Lorenz <jlorenz@de.adit-jv.com> | 2014-06-11 18:14:58 +0200 |
|---|---|---|
| committer | Christian Linke <christian.linke@bmw.de> | 2014-06-23 14:05:37 +0200 |
| commit | 20491c0f31d70e254c56f171c69b95f3d4ad2813 (patch) | |
| tree | 5409ce980ecf4285a21cf0f1b38ba19dafe3129a /AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp | |
| parent | b0bc6ede2d23dde9a177483aa9470871422fe9aa (diff) | |
| download | audiomanager-20491c0f31d70e254c56f171c69b95f3d4ad2813.tar.gz | |
* Bug #100 - removed projecttypes.h which causes compiling conflicts5.1
Signed-off-by: Jens Lorenz <jlorenz@de.adit-jv.com>
Diffstat (limited to 'AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp')
| -rw-r--r-- | AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index 3c4af7d..5448c7d 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -492,7 +492,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = 1; - soundProperty.type = SP_EXAMPLE_BASS; + soundProperty.type = SP_GENIVI_BASS; soundProperty.value = 244; //setup environment, we need a domain and a sink @@ -509,7 +509,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) ASSERT_EQ(handlesList[0].handleType, H_SETSINKSOUNDPROPERTY); //read out this property. There is no change, because the ack did not arrive yet. - ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue)); ASSERT_EQ(sink.listSoundProperties[0].value, oldvalue); //lets send the answer and expect a call on the controlInterface @@ -517,7 +517,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) pRoutingReceiver.ackSetSinkSoundProperty(handle, E_OK); //finally, the new value must be in the database - ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_EXAMPLE_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSinkSoundPropertyValue(sinkID,SP_GENIVI_BASS,oldvalue)); ASSERT_EQ(soundProperty.value, oldvalue); //and the handle must be destroyed @@ -545,7 +545,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) domain.busname = "mock"; source.sourceID = 2; source.domainID = 1; - soundProperty.type = SP_EXAMPLE_BASS; + soundProperty.type = SP_GENIVI_BASS; soundProperty.value = 244; //prepare the scene @@ -562,7 +562,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) ASSERT_EQ(handlesList[0].handleType, H_SETSOURCESOUNDPROPERTY); //read out this property. There is no change, because the ack did not arrive yet. - ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_EXAMPLE_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(2,SP_GENIVI_BASS,oldvalue)); ASSERT_EQ(source.listSoundProperties[0].value, oldvalue); //lets send the answer and expect a call on the controlInterface @@ -570,7 +570,7 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) pRoutingReceiver.ackSetSourceSoundProperty(handle, E_OK); //finally, the new value must be in the database - ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_EXAMPLE_BASS,oldvalue)); + ASSERT_EQ(E_OK, pDatabaseHandler.getSourceSoundPropertyValue(sourceID,SP_GENIVI_BASS,oldvalue)); ASSERT_EQ(soundProperty.value, oldvalue); //and the handle must be destroyed |