align the DBus signature of xml files with the one defined into Franca

7 files changed, 55 insertions, 187 deletions

diff --git a/test/navigation/intensive-testing.py b/test/navigation/intensive-testing.py
deleted file mode 100644
index d702672..0000000
--- a/test/navigation/intensive-testing.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/python
-
-"""
-**************************************************************************
-* @licence app begin@
-* SPDX-License-Identifier: MPL-2.0
-*
-* \copyright Copyright (C) 2014, PCA Peugeot Citroen
-*
-* \file intensive-testing.py
-*
-* \brief This script tests the enhanced position by using  the logreplayer at a given frame rate.
-*
-* \author Philippe Colliot <philippe.colliot@mpsa.com>
-*
-* \version 1.0
-*
-* This Source Code Form is subject to the terms of the
-* Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
-# this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-* List of changes:
-* <date>, <name>, <description of change>
-*
-* @licence end@
-**************************************************************************
-"""
-import sys,tty,termios,select,gobject,time,dbus,re,argparse,subprocess,signal,os
-
-from subprocess import call 
-from subprocess import Popen 
-from threading import Timer
-from enum import Enum
-from dbus.mainloop.glib import DBusGMainLoop
-from traceback import print_exc
-
-# Define some constants
-DURATION_TESTING = 20000 #in ms
-PATH_LOGFILES='./'
-
-def startEnhancedPositionServer(): 
-	global pathEnhancedposition
-	enhancedposition=pathEnhancedposition + 'enhanced-position-service'
-	FNULL = open(os.devnull,'w')
-	pid = Popen([enhancedposition], stdout=FNULL, stderr=FNULL)
-	return pid
-
-def launchLog(file): 
-	global pathLogreplayer
-	logreplayer=pathLogreplayer + 'log-replayer'
-	file=PATH_LOGFILES + file
-	FNULL = open(os.devnull,'w')
-	call([logreplayer, file], stdout=FNULL, stderr=FNULL)
-
-class Genivi(Enum):
-	ENHANCEDPOSITIONSERVICE_LATITUDE = 0x0020
-	ENHANCEDPOSITIONSERVICE_LONGITUDE = 0x0021
-	ENHANCEDPOSITIONSERVICE_ALTITUDE = 0x0022
-      
-def loopDbus():
-	global testCounter
-	# launch the logreplayer with test file
-	launchLog("test.log")
-	# get the geolocation
-	geoLocation = enhancedPositionInterface.GetData(dbus.Array([Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE,Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE]))
-	latitude=float(geoLocation[dbus.UInt16(Genivi.ENHANCEDPOSITIONSERVICE_LATITUDE)])
-	longitude=float(geoLocation[dbus.UInt16(Genivi.ENHANCEDPOSITIONSERVICE_LONGITUDE)])
-	testCounter += 1
-	print str(testCounter), str(latitude), str(longitude)
-	if testCounter >= maxLoopTesting:
-		cleanExit()
-	return True 
-
-def cleanExit():
-	global enhancedpositionPid
-	enhancedpositionPid.kill()
-	sys.exit(1)
-	
-def exitProg(signum, frame):
-	# restore the original signal handler and exit 
-	signal.signal(signal.SIGINT, original_sigint)
-	cleanExit()
-
-# Main program begins here
-parser = argparse.ArgumentParser(description='Intensive testing of enhanced position.')
-parser.add_argument('-p','--path',action='store', dest='path', help='Path for the bin of positioning')
-parser.add_argument('-f','--frame',action='store', dest='frame', type=int, help='Number of messages per second')
-args = parser.parse_args()
-
-if args.path == None:
-	pathEnhancedposition='../../src/navigation/bin/positioning/enhanced-position-service/src/'
-	pathLogreplayer='../../src/navigation/bin/positioning/log-replayer/src/'
-else:
-	pathEnhancedposition = args.path + 'bin/positioning/enhanced-position-service/src/' 
-	pathLogreplayer= args.path + 'bin/positioning/log-replayer/src/'
-
-if args.frame == None:
-	periodicityTesting = 200 #in ms
-else:
-	periodicityTesting = 1000/args.frame #in ms
-maxLoopTesting = DURATION_TESTING/periodicityTesting
-
-# Start the enhanced position server
-enhancedpositionPid = startEnhancedPositionServer()
-time.sleep(.5)
- 
-# Initialize DBus loop as the main loop
-DBusGMainLoop(set_as_default=True)
-
-# Connect on the bus
-dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-dbusConnectionBus = dbus.SessionBus()
-
-# Enhanced position
-try:
-	enhancedPositionObject = dbusConnectionBus.get_object("org.genivi.positioning.EnhancedPosition", "/org/genivi/positioning/EnhancedPosition")
-except dbus.DBusException:
-	print "connection to Enhanced position failed"
-	print_exc()
-	cleanExit()
-
-enhancedPositionInterface = dbus.Interface(enhancedPositionObject, "org.genivi.positioning.EnhancedPosition")
-
-# Start
-testCounter=0
-original_sigint = signal.getsignal(signal.SIGINT)
-signal.signal(signal.SIGINT, exitProg)
-gobject.timeout_add(periodicityTesting,loopDbus)
-loop = gobject.MainLoop()
-loop.run()
-
-
-
diff --git a/test/navigation/test-address-input.py b/test/navigation/test-address-input.py
index f561172..e9ab02a 100755
--- a/test/navigation/test-address-input.py
+++ b/test/navigation/test-address-input.py
@@ -330,15 +330,15 @@ def search_result_list_handler(handle, total_size, window_offset, window_size, r
 
 # add signal receiver
 bus.add_signal_receiver(search_status_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchStatus')
 
 bus.add_signal_receiver(search_result_list_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchResultList')
 
 bus.add_signal_receiver(content_updated_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='ContentUpdated')
 
 
@@ -374,16 +374,16 @@ def startSearch(address_index):
 
 startTrigger(test_name)  
   
-session = bus.get_object('org.genivi.navigationcore.Session', '/org/genivi/navigationcore')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session', '/org/genivi/navigationcore')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 # Get SessionHandle
 ret = session_interface.CreateSession(dbus.String('test location input'))
 session_handle=ret[1]
 print 'Session handle = ' + str(session_handle)
 
-location_input_obj = bus.get_object('org.genivi.navigationcore.LocationInput', '/org/genivi/navigationcore')
-location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigationcore.LocationInput')
+location_input_obj = bus.get_object('org.genivi.navigation.navigationcore.LocationInput', '/org/genivi/navigationcore')
+location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigation.navigationcore.LocationInput')
 
 # Get LocationInputHandle
 ret = location_input_interface.CreateLocationInput(dbus.UInt32(session_handle))
diff --git a/test/navigation/test-guidance.py b/test/navigation/test-guidance.py
index 7d8cb90..be53895 100755
--- a/test/navigation/test-guidance.py
+++ b/test/navigation/test-guidance.py
@@ -275,52 +275,52 @@ if __name__ == '__main__':
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(routing_routeCalculationProgressUpdate_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationProgressUpdate")
 
 bus.add_signal_receiver(routing_routeCalculationSuccessful_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationSuccessful")
 
 bus.add_signal_receiver(routing_routeDeleted_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteDeleted")
 
 bus.add_signal_receiver(session_sessionDeleted_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Session", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Session", \
                         signal_name = "SessionDeleted")
 
 bus.add_signal_receiver(guidance_guidanceStatusChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Guidance", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
                         signal_name = "GuidanceStatusChanged")
 
 bus.add_signal_receiver(guidance_positionOnRouteChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Guidance", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Guidance", \
                         signal_name = "PositionOnRouteChanged")
 
 bus.add_signal_receiver(mapmatchedposition_simulationStatusChanged_handler, \
-                        dbus_interface = "org.genivi.navigationcore.MapMatchedPosition", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.MapMatchedPosition", \
                         signal_name = "SimulationStatusChanged")
 
 startTrigger(test_name)
 
-navigationcore_session_obj = bus.get_object('org.genivi.navigationcore.Session','/org/genivi/navigationcore')
-g_navigationcore_session_interface = dbus.Interface(navigationcore_session_obj, dbus_interface='org.genivi.navigationcore.Session')
+navigationcore_session_obj = bus.get_object('org.genivi.navigation.navigationcore.Session','/org/genivi/navigationcore')
+g_navigationcore_session_interface = dbus.Interface(navigationcore_session_obj, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
-routing_obj = bus.get_object('org.genivi.navigationcore.Routing','/org/genivi/navigationcore')
-g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigationcore.Routing')
+routing_obj = bus.get_object('org.genivi.navigation.navigationcore.Routing','/org/genivi/navigationcore')
+g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigation.navigationcore.Routing')
 
-guidance_obj = bus.get_object('org.genivi.navigationcore.Guidance','/org/genivi/navigationcore')
-g_guidance_interface = dbus.Interface(guidance_obj, dbus_interface='org.genivi.navigationcore.Guidance')
+guidance_obj = bus.get_object('org.genivi.navigation.navigationcore.Guidance','/org/genivi/navigationcore')
+g_guidance_interface = dbus.Interface(guidance_obj, dbus_interface='org.genivi.navigation.navigationcore.Guidance')
 
-mapviewer_session_obj = bus.get_object('org.genivi.mapviewer.Session','/org/genivi/mapviewer')
-g_mapviewer_session_interface = dbus.Interface(mapviewer_session_obj, dbus_interface='org.genivi.mapviewer.Session')
+mapviewer_session_obj = bus.get_object('org.genivi.navigation.mapviewer.Session','/org/genivi/mapviewer')
+g_mapviewer_session_interface = dbus.Interface(mapviewer_session_obj, dbus_interface='org.genivi.navigation.mapviewer.Session')
 
-g_mapviewercontrol_obj = bus.get_object('org.genivi.mapviewer.MapViewerControl','/org/genivi/mapviewer')
-g_mapviewercontrol_interface = dbus.Interface(g_mapviewercontrol_obj, dbus_interface='org.genivi.mapviewer.MapViewerControl')
+g_mapviewercontrol_obj = bus.get_object('org.genivi.navigation.mapviewer.MapViewerControl','/org/genivi/mapviewer')
+g_mapviewercontrol_interface = dbus.Interface(g_mapviewercontrol_obj, dbus_interface='org.genivi.navigation.mapviewer.MapViewerControl')
 
-g_mapmatchedposition_obj = bus.get_object('org.genivi.navigationcore.MapMatchedPosition','/org/genivi/navigationcore')
-g_mapmatchedposition_interface = dbus.Interface(g_mapmatchedposition_obj, dbus_interface='org.genivi.navigationcore.MapMatchedPosition')
+g_mapmatchedposition_obj = bus.get_object('org.genivi.navigation.navigationcore.MapMatchedPosition','/org/genivi/navigationcore')
+g_mapmatchedposition_interface = dbus.Interface(g_mapmatchedposition_obj, dbus_interface='org.genivi.navigation.navigationcore.MapMatchedPosition')
 
 #get navigationcore session handle
 ret = g_navigationcore_session_handle = g_navigationcore_session_interface.CreateSession(dbus.String("test guidance"))
diff --git a/test/navigation/test-location-input.py b/test/navigation/test-location-input.py
index 2d5fe1f..935c1f9 100755
--- a/test/navigation/test-location-input.py
+++ b/test/navigation/test-location-input.py
@@ -411,19 +411,19 @@ def search_result_list_handler(handle, total_size, window_offset, window_size, r
 
 # add signal receiver
 bus.add_signal_receiver(search_status_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchStatus')
 
 bus.add_signal_receiver(search_result_list_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SearchResultList')
 
 bus.add_signal_receiver(spell_result_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='SpellResult')
 
 bus.add_signal_receiver(content_updated_handler,
-                        dbus_interface='org.genivi.navigationcore.LocationInput',
+                        dbus_interface='org.genivi.navigation.navigationcore.LocationInput',
                         signal_name='ContentUpdated')
 
 
@@ -464,16 +464,16 @@ def startSearch(address_index):
 
 startTrigger(test_name)  
   
-session = bus.get_object('org.genivi.navigationcore.Session', '/org/genivi/navigationcore')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session', '/org/genivi/navigationcore')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 # Get SessionHandle
 ret = session_interface.CreateSession(dbus.String('test location input'))
 session_handle=ret[1]
 print 'Session handle = ' + str(session_handle)
 
-location_input_obj = bus.get_object('org.genivi.navigationcore.LocationInput', '/org/genivi/navigationcore')
-location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigationcore.LocationInput')
+location_input_obj = bus.get_object('org.genivi.navigation.navigationcore.LocationInput', '/org/genivi/navigationcore')
+location_input_interface = dbus.Interface(location_input_obj, dbus_interface='org.genivi.navigation.navigationcore.LocationInput')
 
 # Get LocationInputHandle
 ret = location_input_interface.CreateLocationInput(dbus.UInt32(session_handle))
diff --git a/test/navigation/test-map-viewer-control.py b/test/navigation/test-map-viewer-control.py
index 628e706..aae6058 100755
--- a/test/navigation/test-map-viewer-control.py
+++ b/test/navigation/test-map-viewer-control.py
@@ -102,14 +102,14 @@ if __name__ == '__main__':
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(mapviewer_mapViewScaleChanged_handler, \
-                        dbus_interface = "org.genivi.mapviewer.MapViewerControl", \
+                        dbus_interface = "org.genivi.navigation.mapviewer.MapViewerControl", \
                         signal_name = "MapViewScaleChanged")
 
 
 startTrigger(test_name)  
 
-session = bus.get_object('org.genivi.mapviewer.Session','/org/genivi/mapviewer')
-session_interface = dbus.Interface(session, dbus_interface='org.genivi.mapviewer.Session')
+session = bus.get_object('org.genivi.navigation.mapviewer.Session','/org/genivi/mapviewer')
+session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.mapviewer.Session')
 
 #get session handle
 ret = session_interface.CreateSession(dbus.String("test mapviewer"))
@@ -122,8 +122,8 @@ print 'Session status: ' + str(sessionstatus)
 sessionlist = session_interface.GetAllSessions();
 print 'Active sessions = ' + str(len(sessionlist))
 
-MapViewerControl_obj = bus.get_object('org.genivi.mapviewer.MapViewerControl','/org/genivi/mapviewer')
-MapViewerControl_interface = dbus.Interface(MapViewerControl_obj, dbus_interface='org.genivi.mapviewer.MapViewerControl')
+MapViewerControl_obj = bus.get_object('org.genivi.navigation.mapviewer.MapViewerControl','/org/genivi/mapviewer')
+MapViewerControl_interface = dbus.Interface(MapViewerControl_obj, dbus_interface='org.genivi.navigation.mapviewer.MapViewerControl')
 
 #get mapviewer handle
 ret = MapViewerControl_interface.CreateMapViewInstance( \
diff --git a/test/navigation/test-poi.py b/test/navigation/test-poi.py
index 6346175..7df6c82 100755
--- a/test/navigation/test-poi.py
+++ b/test/navigation/test-poi.py
@@ -107,27 +107,27 @@ print("Search for hotel and station with keyword: "+ STRING_TO_SEARCH)
 bus = dbus.SessionBus()
 
 bus.add_signal_receiver(catch_poi_configurationChanged_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POIConfiguration", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POIConfiguration", \
                         signal_name = "configurationChanged")
 
 bus.add_signal_receiver(catch_poi_poiStatus_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POISearch", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
                         signal_name = "poiStatus")
 
 bus.add_signal_receiver(catch_poi_resultListChanged_signal_handler, \
-                        dbus_interface = "org.genivi.poiservice.POISearch", \
+                        dbus_interface = "org.genivi.navigation.poiservice.POISearch", \
                         signal_name = "resultListChanged")
 
 startTrigger(test_name)
 
-poiConfiguration = bus.get_object('org.genivi.poiservice.POIConfiguration','/org/genivi/poiservice')
-g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.poiservice.POIConfiguration')
+poiConfiguration = bus.get_object('org.genivi.navigation.poiservice.POIConfiguration','/org/genivi/poiservice')
+g_poiConfiguration_interface = dbus.Interface(poiConfiguration, dbus_interface='org.genivi.navigation.navigation.poiservice.POIConfiguration')
 
-poiContentAccess = bus.get_object('org.genivi.poiservice.POIContentAccess','/org/genivi/poiservice')
-g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.poiservice.POIContentAccess')
+poiContentAccess = bus.get_object('org.genivi.navigation.poiservice.POIContentAccess','/org/genivi/poiservice')
+g_poiContentAccess_interface = dbus.Interface(poiContentAccess, dbus_interface='org.genivi.navigation.navigation.poiservice.POIContentAccess')
 
-poiSearch = bus.get_object('org.genivi.poiservice.POISearch','/org/genivi/poiservice')
-g_poiSearch_interface = dbus.Interface(poiSearch, dbus_interface='org.genivi.poiservice.POISearch')
+poiSearch = bus.get_object('org.genivi.navigation.poiservice.POISearch','/org/genivi/poiservice')
+g_poiSearch_interface = dbus.Interface(poiSearch, dbus_interface='org.genivi.navigation.poiservice.POISearch')
 
 g_poiConfiguration_interface.setLocale(dbus.String("fra"),dbus.String("FRA"),dbus.String("Latn"))
 
diff --git a/test/navigation/test-route-calculation.py b/test/navigation/test-route-calculation.py
index 35fd997..f0a5221 100755
--- a/test/navigation/test-route-calculation.py
+++ b/test/navigation/test-route-calculation.py
@@ -145,15 +145,15 @@ def catchall_route_deleted_signals_handler(routeHandle):
     print('Route handle deleted: '+str(routeHandle))
 
 bus.add_signal_receiver(catchall_route_calculation_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteCalculationProgressUpdate")
 
 bus.add_signal_receiver(catchall_route_deleted_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Routing", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Routing", \
                         signal_name = "RouteDeleted")
 
 bus.add_signal_receiver(catchall_session_signals_handler, \
-                        dbus_interface = "org.genivi.navigationcore.Session", \
+                        dbus_interface = "org.genivi.navigation.navigationcore.Session", \
                         signal_name = "SessionDeleted")
 
 #timeout
@@ -197,16 +197,16 @@ def launch_route_calculation(route):
 
 startTrigger(test_name)  
 
-session = bus.get_object('org.genivi.navigationcore.Session','/org/genivi/navigationcore')
-g_session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigationcore.Session')
+session = bus.get_object('org.genivi.navigation.navigationcore.Session','/org/genivi/navigationcore')
+g_session_interface = dbus.Interface(session, dbus_interface='org.genivi.navigation.navigationcore.Session')
 
 #get session handle
 ret = g_session_interface.CreateSession(dbus.String("test route calculation"))
 g_session_handle=ret[1]
 print 'Session handle: ' + str(g_session_handle)
 
-routing_obj = bus.get_object('org.genivi.navigationcore.Routing','/org/genivi/navigationcore')
-g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigationcore.Routing')
+routing_obj = bus.get_object('org.genivi.navigation.navigationcore.Routing','/org/genivi/navigationcore')
+g_routing_interface = dbus.Interface(routing_obj, dbus_interface='org.genivi.navigation.navigationcore.Routing')
 
 g_current_route = 0
 launch_route_calculation(0)