From 7ba5224b44b63e414eb51d8064050085a4bfb407 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Wed, 19 Mar 2014 15:06:12 +0100 Subject: * some adoptions Signed-off-by: Christian Linke --- .../test/CAmRoutingInterfaceCAPITests.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'PluginRoutingInterfaceCAPI') diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp index 3bf118d..7238dc2 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp @@ -69,7 +69,7 @@ void initSink(org::genivi::am::am_Sink_s & newSink, am_Sink_s & newAmSink, const org::genivi::am::am_MuteState_e muteState = org::genivi::am::am_MuteState_e::MS_UNKNOWN; org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast(AR_MAX)); org::genivi::am::am_SoundProperty_L listSoundProperties; - listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INTERR_OVERLAYID), 100)); + listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INPUTB), 100)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_EXAMPLE_BASS), 101)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_MAX), 102)); org::genivi::am::am_ConnectionFormat_L listConnectionFormats; @@ -95,7 +95,7 @@ void initSource(org::genivi::am::am_Source_s & newSource, am_Source_s & newAmSou org::genivi::am::am_SourceState_e srcState = org::genivi::am::am_SourceState_e::SS_MAX; org::genivi::am::am_Availability_s available(org::genivi::am::am_Availability_e::A_MAX, static_cast(AR_MAX)); org::genivi::am::am_SoundProperty_L listSoundProperties; - listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INTERR_OVERLAYID), 100)); + listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_INPUTB), 100)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_EXAMPLE_BASS), 101)); listSoundProperties.push_back(org::genivi::am::am_SoundProperty_s(static_cast(SP_MAX), 102)); org::genivi::am::am_ConnectionFormat_L listConnectionFormats; @@ -1913,7 +1913,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperties) am_SourceState_e state = am_SourceState_e::SS_MAX; std::vector listSoundProperties; - listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100}); @@ -1942,7 +1942,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSinkSoundProperty) am_SourceState_e state = am_SourceState_e::SS_MAX; EXPECT_CALL(*env->mpRoutingReceive, ackSetSinkSoundProperty(IsHandleEqual(handle), E_OK)).Times(1); - am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + am_Error_e error = env->mpPlugin->asyncSetSinkSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); usleep(50000); ASSERT_EQ( error, E_OK ); ASSERT_FALSE( backdoor.containsHandle( handle.handle) ); @@ -1966,7 +1966,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperties) am_SourceState_e state = am_SourceState_e::SS_MAX; std::vector listSoundProperties; - listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_MAX, 101}); listSoundProperties.push_back((am_SoundProperty_s){am_SoundPropertyType_e::SP_PRIORITY, 100}); @@ -1995,7 +1995,7 @@ TEST_F(CAmRoutingSenderCAPITests, TestDomain_asyncSetSourceSoundProperty) am_SourceState_e state = am_SourceState_e::SS_MAX; EXPECT_CALL(*env->mpRoutingReceive, ackSetSourceSoundProperty(IsHandleEqual(handle), E_OK)).Times(1); - am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INTERR_OVERLAYID, 100}); + am_Error_e error = env->mpPlugin->asyncSetSourceSoundProperty(handle, sID, (am_SoundProperty_s){am_SoundPropertyType_e::SP_INPUTB, 100}); usleep(50000); ASSERT_EQ( error, E_OK ); ASSERT_FALSE( backdoor.containsHandle( handle.handle) ); -- cgit v1.2.1