diff options
Diffstat (limited to 'AudioManagerDaemon/test')
8 files changed, 45 insertions, 45 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 diff --git a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp index 6b61816..1881955 100644 --- a/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmDatabaseHandlerTest/CAmDatabaseHandlerTest.cpp @@ -2077,7 +2077,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSink) testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; @@ -2112,7 +2112,7 @@ TEST_F(CAmDatabaseHandlerTest,getMainNotificationsSources) testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; @@ -2147,12 +2147,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSources) testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=10; @@ -2197,12 +2197,12 @@ TEST_F(CAmDatabaseHandlerTest,changeMainNotificationsSink) testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=27; diff --git a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp index ae05960..25c61cc 100644 --- a/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp +++ b/AudioManagerDaemon/test/AmMapHandlerTest/CAmMapHandlerTest.cpp @@ -2092,7 +2092,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSink) testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; @@ -2127,7 +2127,7 @@ TEST_F(CAmMapHandlerTest,getMainNotificationsSources) testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; @@ -2162,12 +2162,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSources) testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=10; @@ -2215,12 +2215,12 @@ TEST_F(CAmMapHandlerTest,changeMainNotificationsSink) testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=27; @@ -2524,7 +2524,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSource) })!=listSources.end(); ASSERT_TRUE(containsSourceID); std::vector<am_SoundProperty_s> listSoundProperties; - std::vector<am_ConnectionFormat_e> listConnectionFormats; + std::vector<am_CustomAvailabilityReason_t> listConnectionFormats; std::vector<am_MainSoundProperty_s> listMainSoundProperties; EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sourceUpdated(sourceID, _, _, _)).Times(1); ASSERT_EQ(E_OK,pDatabaseHandler.changeSourceDB(sourceID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error"; @@ -2570,7 +2570,7 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, peek_enter_update_removeSink) })!=listSinks.end(); ASSERT_TRUE(containsSourceID); std::vector<am_SoundProperty_s> listSoundProperties; - std::vector<am_ConnectionFormat_e> listConnectionFormats; + std::vector<am_CustomAvailabilityReason_t> listConnectionFormats; std::vector<am_MainSoundProperty_s> listMainSoundProperties; EXPECT_CALL(*MockDatabaseObserver::getMockObserverObject(), sinkUpdated(sinkID, _, _, _)).Times(1); ASSERT_EQ(E_OK,pDatabaseHandler.changeSinkDB(sinkID, 1, listSoundProperties, listConnectionFormats, listMainSoundProperties))<< "ERROR: database error"; @@ -2858,12 +2858,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSink) testSinkData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=27; @@ -2896,12 +2896,12 @@ TEST_F(CAmMapHandlerObserverCallbacksTest, changeMainNotificationsSources) testSourceData.listMainNotificationConfigurations.push_back(notify); am_NotificationConfiguration_s notify1; - notify1.type=NT_MAX; + notify1.type=NT_UNKNOWN; notify1.status=NS_PERIODIC; notify1.parameter=5; am_NotificationConfiguration_s notify2; - notify2.type=NT_MAX; + notify2.type=NT_UNKNOWN; notify2.status=NS_CHANGE; notify2.parameter=10; diff --git a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp index d3415c4..42ef261 100644 --- a/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp +++ b/AudioManagerDaemon/test/AmRoutingInterfaceTest/CAmRoutingInterfaceTest.cpp @@ -142,7 +142,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundPropertyNoChange) am_domainID_t domainID; am_Handle_s handle; am_SoundProperty_s soundProperty; - soundProperty.type = SP_EXAMPLE_TREBLE; + soundProperty.type = SP_GENIVI_TREBLE; soundProperty.value = 23; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -215,7 +215,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkSoundProperty) am_Handle_s handle; am_SoundProperty_s soundProperty; soundProperty.value=5; - soundProperty.type=SP_EXAMPLE_MID; + soundProperty.type=SP_GENIVI_MID; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); pCF.createDomain(domain); @@ -244,7 +244,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -270,7 +270,7 @@ TEST_F(CAmRoutingInterfaceTest,setSourceVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSource(source); @@ -298,7 +298,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolumeNoChange) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); @@ -324,7 +324,7 @@ TEST_F(CAmRoutingInterfaceTest,setSinkVolume) am_domainID_t domainID; am_Handle_s handle; am_volume_t volume = 34; - am_RampType_e rampType = RAMP_GENIVI_DIRECT; + am_CustomRampType_t rampType = RAMP_GENIVI_DIRECT; am_time_t rampTime = 300; std::vector<am_Handle_s> listHandles; pCF.createSink(sink); diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.cpp b/AudioManagerDaemon/test/CAmCommonFunctions.cpp index d8c2e03..47b09e6 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.cpp +++ b/AudioManagerDaemon/test/CAmCommonFunctions.cpp @@ -205,9 +205,9 @@ bool CAmCommonFunctions::compareRoute(am_Route_s a, am_Route_s b) return retVal; } -std::vector<am_ConnectionFormat_e> CAmCommonFunctions::getStandardConnectionFormatList() +std::vector<am_CustomAvailabilityReason_t> CAmCommonFunctions::getStandardConnectionFormatList() { - std::vector<am_ConnectionFormat_e> list; + std::vector<am_CustomAvailabilityReason_t> list; list.push_back(CF_GENIVI_ANALOG); list.push_back(CF_GENIVI_STEREO); return list; @@ -217,10 +217,10 @@ std::vector<am_SoundProperty_s> CAmCommonFunctions::getStandardSoundPropertyList { std::vector<am_SoundProperty_s> soundPropertyList; am_SoundProperty_s soundProperty; - soundProperty.type = SP_EXAMPLE_BASS; + soundProperty.type = SP_GENIVI_BASS; soundProperty.value = 23; soundPropertyList.push_back(soundProperty); - soundProperty.type = SP_EXAMPLE_MID; + soundProperty.type = SP_GENIVI_MID; soundProperty.value = 2; soundPropertyList.push_back(soundProperty); return soundPropertyList; @@ -331,7 +331,7 @@ std::vector<am_NotificationConfiguration_s> am::CAmCommonFunctions::getStandardN am_NotificationConfiguration_s tempNotificationConfiguration; tempNotificationConfiguration.parameter=12; tempNotificationConfiguration.status=NS_PERIODIC; - tempNotificationConfiguration.type=NT_MAX; + tempNotificationConfiguration.type=NT_UNKNOWN; listNotificationConfigurations.push_back(tempNotificationConfiguration); tempNotificationConfiguration.parameter=16; diff --git a/AudioManagerDaemon/test/CAmCommonFunctions.h b/AudioManagerDaemon/test/CAmCommonFunctions.h index 0c9e362..345d178 100644 --- a/AudioManagerDaemon/test/CAmCommonFunctions.h +++ b/AudioManagerDaemon/test/CAmCommonFunctions.h @@ -30,7 +30,7 @@ class CAmCommonFunctions { public: - static std::vector<am_ConnectionFormat_e> getStandardConnectionFormatList(); + static std::vector<am_CustomAvailabilityReason_t> getStandardConnectionFormatList(); static std::vector<am_SoundProperty_s> getStandardSoundPropertyList(); static std::vector<am_MainSoundProperty_s> getStandardMainSoundPropertyList(); static std::vector<bool> getStandardConvertionMatrix(); @@ -59,7 +59,7 @@ public: struct sortByConnectionFormat { - bool operator()(const am_ConnectionFormat_e & a, const am_ConnectionFormat_e & b) const + bool operator()(const am_CustomAvailabilityReason_t & a, const am_CustomAvailabilityReason_t & b) const { return (a < b); } diff --git a/AudioManagerDaemon/test/MockIAmControlSend.h b/AudioManagerDaemon/test/MockIAmControlSend.h index fca6073..5d9b528 100644 --- a/AudioManagerDaemon/test/MockIAmControlSend.h +++ b/AudioManagerDaemon/test/MockIAmControlSend.h @@ -114,7 +114,7 @@ class MockIAmControlSend : public IAmControlSend { MOCK_METHOD2(cbAckSetSinkSoundProperty, void(const am_Handle_s handle, const am_Error_e error)); MOCK_METHOD5(getConnectionFormatChoice, - am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_ConnectionFormat_e> listPossibleConnectionFormats, std::vector<am_ConnectionFormat_e>& listPrioConnectionFormats)); + am_Error_e(const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_Route_s listRoute, const std::vector<am_CustomAvailabilityReason_t> listPossibleConnectionFormats, std::vector<am_CustomAvailabilityReason_t>& listPrioConnectionFormats)); MOCK_METHOD1(confirmCommandReady, void(const am_Error_e error)); MOCK_METHOD1(confirmRoutingReady, @@ -124,11 +124,11 @@ class MockIAmControlSend : public IAmControlSend { MOCK_METHOD1(confirmRoutingRundown, void(const am_Error_e error)); MOCK_METHOD5(hookSystemUpdateSink, - am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); + am_Error_e(const am_sinkID_t sinkID, const am_sinkClass_t sinkClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); MOCK_METHOD5(hookSystemUpdateSource, - am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_ConnectionFormat_e>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); + am_Error_e(const am_sourceID_t sourceID, const am_sourceClass_t sourceClassID, const std::vector<am_SoundProperty_s>& listSoundProperties, const std::vector<am_CustomAvailabilityReason_t>& listConnectionFormats, const std::vector<am_MainSoundProperty_s>& listMainSoundProperties)); MOCK_METHOD4(hookSystemUpdateGateway, - am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_ConnectionFormat_e>& listSourceConnectionFormats, const std::vector<am_ConnectionFormat_e>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)); + am_Error_e(const am_gatewayID_t gatewayID, const std::vector<am_CustomAvailabilityReason_t>& listSourceConnectionFormats, const std::vector<am_CustomAvailabilityReason_t>& listSinkConnectionFormats, const std::vector<bool>& convertionMatrix)); MOCK_METHOD3(cbAckSetVolumes, void(const am_Handle_s handle, const std::vector<am_Volumes_s>& listVolumes, const am_Error_e error)); MOCK_METHOD2(cbAckSetSinkNotificationConfiguration, diff --git a/AudioManagerDaemon/test/MockIAmRoutingSend.h b/AudioManagerDaemon/test/MockIAmRoutingSend.h index 029790e..6ebb94d 100644 --- a/AudioManagerDaemon/test/MockIAmRoutingSend.h +++ b/AudioManagerDaemon/test/MockIAmRoutingSend.h @@ -40,13 +40,13 @@ class MockIAmRoutingSend : public IAmRoutingSend { MOCK_METHOD1(asyncAbort, am_Error_e(const am_Handle_s handle)); MOCK_METHOD5(asyncConnect, - am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_ConnectionFormat_e connectionFormat)); + am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID, const am_sourceID_t sourceID, const am_sinkID_t sinkID, const am_CustomAvailabilityReason_t connectionFormat)); MOCK_METHOD2(asyncDisconnect, am_Error_e(const am_Handle_s handle, const am_connectionID_t connectionID)); MOCK_METHOD5(asyncSetSinkVolume, - am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)); + am_Error_e(const am_Handle_s handle, const am_sinkID_t sinkID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)); MOCK_METHOD5(asyncSetSourceVolume, - am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_RampType_e ramp, const am_time_t time)); + am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_volume_t volume, const am_CustomRampType_t ramp, const am_time_t time)); MOCK_METHOD3(asyncSetSourceState, am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SourceState_e state)); MOCK_METHOD3(asyncSetSinkSoundProperties, @@ -58,7 +58,7 @@ class MockIAmRoutingSend : public IAmRoutingSend { MOCK_METHOD3(asyncSetSourceSoundProperty, am_Error_e(const am_Handle_s handle, const am_sourceID_t sourceID, const am_SoundProperty_s& soundProperty)); MOCK_METHOD5(asyncCrossFade, - am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_RampType_e rampType, const am_time_t time)); + am_Error_e(const am_Handle_s handle, const am_crossfaderID_t crossfaderID, const am_HotSink_e hotSink, const am_CustomRampType_t rampType, const am_time_t time)); MOCK_METHOD2(setDomainState, am_Error_e(const am_domainID_t domainID, const am_DomainState_e domainState)); MOCK_CONST_METHOD1(returnBusName, |