From 4f90cec2d3cb8f19f03144297e2ce5fd62d80757 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Thu, 12 Sep 2013 14:38:42 +0200 Subject: * adopted test to new logic of no change stuff Signed-off-by: Christian Linke --- .../AmControlInterfaceTest/CAmControlInterfaceTest.cpp | 18 ++++++++++++------ .../AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp | 14 +++++++------- 2 files changed, 19 insertions(+), 13 deletions(-) (limited to 'AudioManagerDaemon') diff --git a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp index b126efc..3c4af7d 100644 --- a/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmControlInterfaceTest/CAmControlInterfaceTest.cpp @@ -208,7 +208,8 @@ TEST_F(CAmControlInterfaceTest,ackConnect) ASSERT_TRUE(!connectionList.empty()); //no we try the same, but do expect a no_change answer directly and no call because connection already exists - ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2)); + //ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_STEREO,2,2)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,ackDisconnect) @@ -369,7 +370,8 @@ TEST_F(CAmControlInterfaceTest,setSourceState) ASSERT_TRUE(handlesList.empty()); //we try again but expect a no change error - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceState(handle,source.sourceID,SS_PAUSED)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceState(handle,source.sourceID,SS_PAUSED)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,SetSinkVolumeChange) @@ -419,7 +421,8 @@ TEST_F(CAmControlInterfaceTest,SetSinkVolumeChange) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,sinkID,11,RAMP_GENIVI_DIRECT,23)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,ackSetSourceVolumeChange) @@ -469,7 +472,8 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceVolumeChange) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,source.sourceID,11,RAMP_GENIVI_DIRECT,23)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) @@ -521,7 +525,8 @@ TEST_F(CAmControlInterfaceTest,ackSetSinkSoundProperty) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkSoundProperty(handle,sink.sinkID,soundProperty)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkSoundProperty(handle,sink.sinkID,soundProperty)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) @@ -573,7 +578,8 @@ TEST_F(CAmControlInterfaceTest,ackSetSourceSoundProperty) ASSERT_TRUE(handlesList.empty()); //Now we try again, but the value is unchanged - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceSoundProperty(handle,source.sourceID,soundProperty)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceSoundProperty(handle,source.sourceID,soundProperty)); + //needed to be removed because logic changed here } TEST_F(CAmControlInterfaceTest,crossFading) diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index d7bb96d..d3415c4 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -129,7 +129,7 @@ TEST_F(CAmRoutingInterfaceTest,alreadyConnected) am_connectionID_t connectionID; ASSERT_EQ(E_OK, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_EQ(E_OK, pDatabaseHandler.changeConnectionFinal(connectionID)); - ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); + //ASSERT_EQ(E_ALREADY_EXISTS, pControlReceiver.connect(handle,connectionID,CF_GENIVI_ANALOG,1,2)); ASSERT_NE(handle.handle, 0); ASSERT_EQ(handle.handleType, H_CONNECT); } @@ -154,7 +154,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange) 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,_)).Times(0); + EXPECT_CALL(pMockInterface,asyncSetSinkSoundProperty(_,sinkID,_)).Times(1).WillOnce(Return(E_NO_CHANGE)); ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkSoundProperty(handle,sinkID,soundProperty)); } @@ -256,8 +256,8 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange) source.volume = volume; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); - EXPECT_CALL(pMockInterface,asyncSetSourceVolume(_,2,volume,rampType,rampTime)).Times(0); - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,2,volume,rampType,rampTime)); + //EXPECT_CALL(pMockInterface,asyncSetSourceVolume(_,2,volume,rampType,rampTime)).Times(1).WillOnce(Return(E_NO_CHANGE)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceVolume(handle,2,volume,rampType,rampTime)); ASSERT_EQ(E_OK, pControlReceiver.getListHandles(listHandles)); ASSERT_TRUE(listHandles.empty()); } @@ -310,8 +310,8 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange) sink.volume = volume; ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSinkDB(sink,sinkID)); - EXPECT_CALL(pMockInterface,asyncSetSinkVolume(_,2,volume,rampType,rampTime)).Times(0); - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,2,volume,rampType,rampTime)); + //EXPECT_CALL(pMockInterface,asyncSetSinkVolume(_,2,volume,rampType,rampTime)).Times(0); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSinkVolume(handle,2,volume,rampType,rampTime)); ASSERT_EQ(E_OK, pControlReceiver.getListHandles(listHandles)); ASSERT_TRUE(listHandles.empty()); } @@ -428,7 +428,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceStateNoChange) ASSERT_EQ(E_OK, pDatabaseHandler.enterDomainDB(domain,domainID)); ASSERT_EQ(E_OK, pDatabaseHandler.enterSourceDB(source,sourceID)); EXPECT_CALL(pMockInterface,asyncSetSourceState(_,sourceID,state)).Times(0); - ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceState(handle,sourceID,state)); + //ASSERT_EQ(E_NO_CHANGE, pControlReceiver.setSourceState(handle,sourceID,state)); } int main(int argc, char **argv) -- cgit v1.2.1