From 2350868503594b414baf8dc84796762270a4496f Mon Sep 17 00:00:00 2001 From: Aleksandar Donchev Date: Wed, 12 Feb 2014 14:47:54 +0100 Subject: * Applied dbus_command_interface_changed_for_unit_tests.patch Signed-off-by: Christian Linke --- .../test/CAmCommandSenderDbusSignalTest.cpp | 32 +++++++------- .../test/CAmCommandSenderDbusTest.cpp | 50 +++++++++++----------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp index 3065e1f..e0d2b97 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusSignalTest.cpp @@ -265,7 +265,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchsignal, signal_name='NumberOfMainConnectionsChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchsignal, signal_name='NumberOfMainConnectionsChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "print('Started thread') \n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -286,7 +286,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSinkAdded, signal_name='SinkAdded', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSinkAdded, signal_name='SinkAdded', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -315,7 +315,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSinkRemoved, signal_name='SinkRemoved', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSinkRemoved, signal_name='SinkRemoved', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -345,7 +345,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSourceAdded, signal_name='SourceAdded', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSourceAdded, signal_name='SourceAdded', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -374,7 +374,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSourceRemoved, signal_name='SourceRemoved', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSourceRemoved, signal_name='SourceRemoved', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -400,7 +400,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchNumberOfSinkClassesChanged, signal_name='NumberOfSinkClassesChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchNumberOfSinkClassesChanged, signal_name='NumberOfSinkClassesChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -416,7 +416,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(CatchNumberOfSourceClassesChanged, signal_name='NumberOfSourceClassesChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(CatchNumberOfSourceClassesChanged, signal_name='NumberOfSourceClassesChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -439,7 +439,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchMainConnectionStateChanged, signal_name='MainConnectionStateChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchMainConnectionStateChanged, signal_name='MainConnectionStateChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -481,7 +481,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchMainSinkSoundPropertyChanged, signal_name='MainSinkSoundPropertyChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchMainSinkSoundPropertyChanged, signal_name='MainSinkSoundPropertyChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -522,7 +522,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchMainSourceSoundPropertyChanged, signal_name='MainSourceSoundPropertyChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchMainSourceSoundPropertyChanged, signal_name='MainSourceSoundPropertyChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -563,7 +563,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSinkAvailabilityChanged, signal_name='SinkAvailabilityChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSinkAvailabilityChanged, signal_name='SinkAvailabilityChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -604,7 +604,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSourceAvailability, signal_name='SourceAvailabilityChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSourceAvailability, signal_name='SourceAvailabilityChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -645,7 +645,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchVolumeChanged, signal_name='VolumeChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchVolumeChanged, signal_name='VolumeChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -687,7 +687,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSinkMuteStateChanged, signal_name='SinkMuteStateChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSinkMuteStateChanged, signal_name='SinkMuteStateChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -728,7 +728,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchSystemPropertyChanged, signal_name='SystemPropertyChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchSystemPropertyChanged, signal_name='SystemPropertyChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); @@ -760,7 +760,7 @@ TEST_F(CAmCommandSenderDbusSignalTest,cbSourceAvailabilityChanged) " loop.quit()\n" "dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)\n" "bus = dbus.SessionBus()\n" - "bus.add_signal_receiver(catchTimingInformationChanged, signal_name='TimingInformationChanged', dbus_interface = 'org.genivi.audiomanager.CommandInterface', message_keyword='dbus_message')\n" + "bus.add_signal_receiver(catchTimingInformationChanged, signal_name='TimingInformationChanged', dbus_interface = 'org.genivi.audiomanager.commandinterface', message_keyword='dbus_message')\n" "loop.run()\n", NULL); pthread_join(pythonloop, NULL); diff --git a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp index 932001a..59b0b25 100644 --- a/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp +++ b/PluginCommandInterfaceDbus/test/CAmCommandSenderDbusTest.cpp @@ -35,7 +35,7 @@ using namespace am; using namespace testing; -std::string DBUSCOMMAND = "dbus-send --session --print-reply --dest=org.genivi.audiomanager /org/genivi/audiomanager/CommandInterface org.genivi.audiomanager.CommandInterface."; +std::string DBUSCOMMAND = "dbus-send --session --print-reply --dest=org.genivi.audiomanager /org/genivi/audiomanager/commandinterface org.genivi.audiomanager.commandinterface."; void* run_the_loop(void* wrapper) { @@ -320,8 +320,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='SetMainSinkSoundProperty',\n" "signature='q(nn)',\n" "args=[1,(0,3)],) \n" @@ -345,8 +345,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='SetMainSourceSoundProperty',\n" "signature='q(nn)',\n" "args=[1,(0,3)],) \n" @@ -369,8 +369,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='SetSystemProperty',\n" "signature='(nn)',\n" "args=[(2,2)],) \n" @@ -394,8 +394,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListMainConnections',\n" "signature='',\n" "args=[],) \n" @@ -419,8 +419,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListMainSinks',\n" "signature='',\n" "args=[],) \n" @@ -444,8 +444,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListMainSources',\n" "signature='',\n" "args=[],) \n" @@ -469,8 +469,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListMainSinkSoundProperties',\n" "signature='q',\n" "args=[1],) \n" @@ -494,8 +494,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListMainSourceSoundProperties',\n" "signature='q',\n" "args=[1],) \n" @@ -519,8 +519,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListSourceClasses',\n" "signature='',\n" "args=[],) \n" @@ -544,8 +544,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListSinkClasses',\n" "signature='',\n" "args=[],) \n" @@ -569,8 +569,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetListSystemProperties',\n" "signature='',\n" "args=[],) \n" @@ -594,8 +594,8 @@ TEST_F(CAmCommandSenderDbusTest, MessageTest) "bus = dbus.SessionBus()\n" "retVal=dbus.Bus().call_blocking(\n" "bus_name='org.genivi.audiomanager',\n" - "object_path='/org/genivi/audiomanager/CommandInterface',\n" - "dbus_interface='org.genivi.audiomanager.CommandInterface',\n" + "object_path='/org/genivi/audiomanager/commandinterface',\n" + "dbus_interface='org.genivi.audiomanager.commandinterface',\n" "method='GetTimingInformation',\n" "signature='q',\n" "args=[2],) \n" -- cgit v1.2.1