diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-05-14 11:03:52 +0200 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-05-24 13:40:22 +0200 |
| commit | 2395206c904ed8253b90b19f3eca959730c57d6a (patch) | |
| tree | ff6ddf09485d2f15c2d63e2c619415c4490356d5 /AudioManagerDaemon | |
| parent | 72b64ac2df6c04ce80103fb3963149b9c083ecc9 (diff) | |
| download | audiomanager-2395206c904ed8253b90b19f3eca959730c57d6a.tar.gz | |
* fixed AmRoutingTest. Fixed missing mpDBusWrapper Initialisation
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
Diffstat (limited to 'AudioManagerDaemon')
| -rw-r--r-- | AudioManagerDaemon/src/CAmRoutingReceiver.cpp | 1 | ||||
| -rw-r--r-- | AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp index 1fb0dac..9cf6dbc 100644 --- a/AudioManagerDaemon/src/CAmRoutingReceiver.cpp +++ b/AudioManagerDaemon/src/CAmRoutingReceiver.cpp @@ -36,6 +36,7 @@ CAmRoutingReceiver::CAmRoutingReceiver(CAmDatabaseHandler *iDatabaseHandler, CAm mpRoutingSender(iRoutingSender), // mpControlSender(iControlSender), // mpSocketHandler(iSocketHandler), // + mpDBusWrapper(NULL), // mListStartupHandles(), // mListRundownHandles(), // handleCount(0), // diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index a5c82de..fe3694b 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -214,6 +214,8 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty) am_domainID_t domainID; am_Handle_s handle; am_SoundProperty_s soundProperty; + soundProperty.value=5; + soundProperty.type=SP_EXAMPLE_MID; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); pCF.createDomain(domain); @@ -221,9 +223,11 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty) domain.busname = "mock"; sink.sinkID = 2; sink.domainID = 1; + sink.listSoundProperties.push_back(soundProperty); ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); EXPECT_CALL(pMockInterface,asyncSetSinkSoundProperty(_,sinkID,_)).WillOnce(Return(E_OK)); + soundProperty.value=10; ASSERT_EQ(E_OK, pControlReceiver.setSinkSoundProperty(handle,sinkID,soundProperty)); ASSERT_NE(handle.handle, 0); ASSERT_EQ(handle.handleType, H_SETSINKSOUNDPROPERTY); |