diff options
Diffstat (limited to 'PluginRoutingInterfaceCAPI/test')
4 files changed, 16 insertions, 16 deletions
diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp index 22c7705..3bf118d 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingInterfaceCAPITests.cpp @@ -619,10 +619,10 @@ TEST_F(CAmRoutingInterfaceCAPITests, registerDomain) ON_CALL(*env->mpRoutingReceive, registerDomain(_, _)).WillByDefault(Return(E_ABORTED)); EXPECT_CALL(*env->mpRoutingReceive, registerDomain(IsDomainDataEqualTo(amDomainData), _)).WillOnce(DoAll(actionRegister(), Return(E_ABORTED))); -//example: [local:org.genivi.audiomanger.testdomaininterface:org.genivi.audiomanger] +//example: [local:org.genivi.audiomanager.testdomaininterface:org.genivi.audiomanager] env->mProxy->registerDomain(domainData, - "org.genivi.audiomanger", //(last part) - "org.genivi.audiomanger.testdomaininterface", //(middle part) + "org.genivi.audiomanager", //(last part) + "org.genivi.audiomanager.testdomaininterface", //(middle part) callStatus, domainID, error); diff --git a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h index 8e858b4..0ddcb14 100644 --- a/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h +++ b/PluginRoutingInterfaceCAPI/test/CAmRoutingSenderService.h @@ -35,13 +35,13 @@ class CAmCommonAPIWrapper; /** * THE FOLLOWING DEFINES ARE POPULATED FROM THE CMAKELISTS.TXT . */ -#define CAPI_SENDER_INTERFACE "org.genivi.audiomanger.routingsender" +#define CAPI_SENDER_INTERFACE "org.genivi.audiomanager.routingsender" #define CAPI_SENDER_INSTANCE "org.genivi.routingsender" -#define CAPI_SENDER_PATH "/org/genivi/audiomanger/routingsender" +#define CAPI_SENDER_PATH "/org/genivi/audiomanager/routingsender" -#define CAPI_ROUTING_INTERFACE "org.genivi.audiomanger.routinginterface" -#define CAPI_ROUTING_INSTANCE "org.genivi.audiomanger" -#define CAPI_ROUTING_PATH "/org/genivi/audiomanger/routinginterface" +#define CAPI_ROUTING_INTERFACE "org.genivi.audiomanager.routinginterface" +#define CAPI_ROUTING_INSTANCE "org.genivi.audiomanager" +#define CAPI_ROUTING_PATH "/org/genivi/audiomanager/routinginterface" /** Test class implementing the routing sender service. diff --git a/PluginRoutingInterfaceCAPI/test/CMakeLists.txt b/PluginRoutingInterfaceCAPI/test/CMakeLists.txt index 26cdecf..86bbde6 100644 --- a/PluginRoutingInterfaceCAPI/test/CMakeLists.txt +++ b/PluginRoutingInterfaceCAPI/test/CMakeLists.txt @@ -76,17 +76,17 @@ file(GLOB_RECURSE CAPI_PLUGIN_INTERFACE_GEN_SRCS_CXX "../src-gen/*.cpp" ) -set (CAPI_SENDER_INTERFACE "org.genivi.audiomanger.routingsender") +set (CAPI_SENDER_INTERFACE "org.genivi.audiomanager.routingsender") set (CAPI_SENDER_INSTANCE "org.genivi.routingsender") -set (CAPI_SENDER_PATH "/org/genivi/audiomanger/routingsender") +set (CAPI_SENDER_PATH "/org/genivi/audiomanager/routingsender") set (CAPI_SENDER_INTERFACE_H "\"${CAPI_SENDER_INTERFACE}\"") set (CAPI_SENDER_INSTANCE_H "\"${CAPI_SENDER_INSTANCE}\"") set (CAPI_SENDER_PATH_H "\"${CAPI_SENDER_PATH}\"") -set (CAPI_ROUTING_INTERFACE "org.genivi.audiomanger.routinginterface") -set (CAPI_ROUTING_INSTANCE "org.genivi.audiomanger") -set (CAPI_ROUTING_PATH "/org/genivi/audiomanger/routinginterface") +set (CAPI_ROUTING_INTERFACE "org.genivi.audiomanager.routinginterface") +set (CAPI_ROUTING_INSTANCE "org.genivi.audiomanager") +set (CAPI_ROUTING_PATH "/org/genivi/audiomanager/routinginterface") set (CAPI_ROUTING_INTERFACE_H "\"${CAPI_ROUTING_INTERFACE}\"") set (CAPI_ROUTING_INSTANCE_H "\"${CAPI_ROUTING_INSTANCE}\"") diff --git a/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf b/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf index f54fdd7..30424b9 100755 --- a/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf +++ b/PluginRoutingInterfaceCAPI/test/RoutingSender_dbus.conf @@ -2,7 +2,7 @@ # RoutingSender_dbus.conf # # If you change something make sure you re-configure with 'ccmake..' which generates the *_dbus.conf file again. # ################################################################################################################## -[local:org.genivi.audiomanger.routingsender:org.genivi.routingsender] +[local:org.genivi.audiomanager.routingsender:org.genivi.routingsender] dbus_connection=org.genivi.routingsender -dbus_object=/org/genivi/audiomanger/routingsender -dbus_interface=org.genivi.audiomanger.routingsender +dbus_object=/org/genivi/audiomanager/routingsender +dbus_interface=org.genivi.audiomanager.routingsender |