Alignment of Franca files, some more tests

10 files changed, 29 insertions, 29 deletions

diff --git a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
index e2e9fc8..b54966e 100644
--- a/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
+++ b/api/franca/navigation/navigationcore/MapMatchedPosition.fidl
@@ -193,7 +193,7 @@ interface MapMatchedPosition {
 			<**

 				@description : speedFactor = speed factor

 			**>

-			Int8 speedFactor

+			UInt8 speedFactor

 		}

 	}

 

@@ -206,7 +206,7 @@ interface MapMatchedPosition {
 			<**

 				@description : speedFactor = speed factor

 			**>

-			Int8 speedFactor

+			UInt8 speedFactor

 		}

 	}

 

@@ -333,7 +333,7 @@ interface MapMatchedPosition {
 			<**

 				@description : speedFactor = speed factor

 			**>

-			Int8 speedFactor

+			UInt8 speedFactor

 		}

 	}

 

diff --git a/api/franca/navigation/poiservice/POISearch.fidl b/api/franca/navigation/poiservice/POISearch.fidl
index 8a8f249..fc0fef5 100644
--- a/api/franca/navigation/poiservice/POISearch.fidl
+++ b/api/franca/navigation/poiservice/POISearch.fidl
@@ -168,7 +168,7 @@ interface POISearch {
 			String inputString				

 			<** @description : enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )

             If more than one category was defined for this search, the sort criteria should be compliant with all categories.**>

-			UInt16 sortOption				

+			SortOption sortOption				

 		}

 	}

 	

@@ -191,7 +191,7 @@ interface POISearch {
 			String inputString				

 			<** @description : enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )

             If more than one category was defined for this search, the sort criteria should be compliant with all categories.**>

-			UInt16 sortOption				

+			SortOption sortOption				

 		}

 	}

 	

@@ -217,7 +217,7 @@ interface POISearch {
 		}	

 		out {

 			<** @description : enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... ).**>

-			UInt16 statusValue				

+			SearchStatusState statusValue				

 			<** @description : Number of items of the results list.**>

 			UInt16 resultListSize				

 			<** @description : array[unique_id, distance, route_status, attributes].**>

diff --git a/api/poi-service/genivi-poiservice-poisearch.xml b/api/poi-service/genivi-poiservice-poisearch.xml
index 7cb0985..69e5245 100644
--- a/api/poi-service/genivi-poiservice-poisearch.xml
+++ b/api/poi-service/genivi-poiservice-poisearch.xml
@@ -367,7 +367,7 @@
           <line>inputString = contains the name of the poi that is searched. It could be a partial name or an empty string.</line>
         </doc>
       </arg>
-      <arg name="sortOption" type="q" direction="in">
+      <arg name="sortOption" type="i" direction="in">
         <doc>
           <line>sortOption = enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )</line>
           <line>If more than one category was defined for this search, the sort criteria should be compliant with all categories.</line>
@@ -420,7 +420,7 @@
           <line>inputString = contains the name of the poi that is searched. It could be a partial name or an empty string.</line>
         </doc>
       </arg>
-      <arg name="sortOption" type="q" direction="in">
+      <arg name="sortOption" type="i" direction="in">
         <doc>
           <line>sortOption = enum(SORT_DEFAULT,SORT_BY_DISTANCE,SORT_BY_TIME,ATTRIBUTE_CUSTOM, ... )</line>
           <line>If more than one category was defined for this search, the sort criteria should be compliant with all categories.</line>
@@ -506,7 +506,7 @@
           <line>attributeList = List of attributes id to retrieve. This is optional and the list could be empty.</line>
         </doc>
       </arg>
-      <arg name="statusValue" type="q" direction="out">
+      <arg name="statusValue" type="i" direction="out">
         <doc>
           <line>statusValue = enum(INVALID,NOT_STARTED,SEARCHING,FINISHED, ... )</line>
         </doc>
@@ -516,7 +516,7 @@
           <line>resultListSize = Number of items of the results list</line>
         </doc>
       </arg>
-      <arg name="resultListWindow" type="a(uuqa(ui(yv)))" direction="out">
+      <arg name="resultListWindow" type="a(uuia(ui(yv)))" direction="out">
         <doc>
           <line>resultListWindow = array[unique_id, distance, route_status, attributeList]</line>
           <line>unique_id = POI unique id</line>
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
index b016095..68bc969 100644
--- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
+++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx
@@ -98,7 +98,7 @@ class RoutingObj
     void GetRouteOverview(uint32_t routeHandle , std::map<DBusCommonAPIEnumeration, DBusCommonAPIVariant> &routeOverview);
     void GetRouteBoundingBox(::DBus::Struct< ::DBus::Struct< double, double >,::DBus::Struct< double, double > > &boundingBox);
     void CancelRouteCalculation(uint32_t sessionHandle);
-    bool RoutePreference(uint16_t preferenceSource, uint16_t preferenceMode);
+    bool RoutePreference(DBusCommonAPIEnumeration preferenceSource, DBusCommonAPIEnumeration preferenceMode);
     void SetRoutePreferences(uint32_t sessionHandle, const std::string& country, const std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& routePreferencesList);
     void GetRoutePreferences(const std::string& country, std::vector< ::DBus::Struct< DBusCommonAPIEnumeration, DBusCommonAPIEnumeration > >& roadPreferenceList);
     RoutingObj(Routing *routing, uint32_t session, uint32_t handle);
@@ -811,7 +811,7 @@ RoutingObj_Callback(struct RoutingObj *obj)
 
 
 bool
-RoutingObj::RoutePreference(uint16_t preferenceSource,uint16_t preferenceMode)
+RoutingObj::RoutePreference(DBusCommonAPIEnumeration preferenceSource, DBusCommonAPIEnumeration preferenceMode)
 {
     int index;
 
diff --git a/src/poi-service/poi-common/poi-common-dbus-data-model.h b/src/poi-service/poi-common/poi-common-dbus-data-model.h
index 5f5b540..26c88d6 100644
--- a/src/poi-service/poi-common/poi-common-dbus-data-model.h
+++ b/src/poi-service/poi-common/poi-common-dbus-data-model.h
@@ -952,18 +952,18 @@ private:
     poiDetails_t m_poiDetails;
 };
 
-class DBus_searchResult : DBus_dataFormatConverter //(uuqa(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
+class DBus_searchResult : DBus_dataFormatConverter //(uuia(ui(yv))) -->in this implementation, the variant data depends on the value of 'type'
 {
 public:
     struct searchResult_t
     {
         poiId_t id;
         uint distance;
-        ushort route_status;
+        int32_t route_status;
         std::vector<DBus_poiAttribute::poiAttribute_t> attributes;
     };
 
-    typedef ::DBus::Struct< uint32_t, uint32_t, uint16_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResult_t;
+    typedef ::DBus::Struct< uint32_t, uint32_t, int32_t, std::vector< ::DBus::Struct< uint32_t, int32_t, DBusCommonAPIVariant > > > DBus_searchResult_t;
 
     DBus_searchResult(){
         DBus_poiAttribute attrib;
diff --git a/src/poi-service/poi-server/main.cpp b/src/poi-service/poi-server/main.cpp
index daefa81..fffae27 100644
--- a/src/poi-service/poi-server/main.cpp
+++ b/src/poi-service/poi-server/main.cpp
@@ -1204,7 +1204,7 @@ void poiSearchServer::SetAttributes(const handleId_t& poiSearchHandle, const std
     }
 }
 
-void poiSearchServer::StartPoiSearch(const handleId_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
+void poiSearchServer::StartPoiSearch(const handleId_t& poiSearchHandle, const std::string& inputString, const int32_t& sortOption)
 {
 
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
@@ -1259,7 +1259,7 @@ void poiSearchServer::SetCenter(const handleId_t& poiSearchHandle, const DBus_ge
     }
 }
 
-void poiSearchServer::StartPoiProximityAlert(const handleId_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption)
+void poiSearchServer::StartPoiProximityAlert(const handleId_t& poiSearchHandle, const std::string& inputString, const int32_t &sortOption)
 {
     if ((m_poiSearchHandle == INVALID_HANDLE) || (poiSearchHandle != m_poiSearchHandle))
         // to do send an error message
@@ -1291,7 +1291,7 @@ void poiSearchServer::CancelPoiProximityAlert(const handleId_t& poiSearchHandle)
     }
 }
 
-void poiSearchServer::RequestResultList(const handleId_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< attributeId_t >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow)
+void poiSearchServer::RequestResultList(const handleId_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< attributeId_t >& attributes, int32_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow)
 {
     DBus_searchResult::searchResult_t element; //id distance status attributes[]
     DBus_searchResult el;
diff --git a/src/poi-service/poi-server/poi-server-class.h b/src/poi-service/poi-server/poi-server-class.h
index 8e29e0b..4e0146e 100644
--- a/src/poi-service/poi-server/poi-server-class.h
+++ b/src/poi-service/poi-server/poi-server-class.h
@@ -256,17 +256,17 @@ public:
 
     void SetAttributes(const handleId_t& poiSearchHandle, const std::vector< DBus_attributeDetails::DBus_attributeDetails_t >& poiAttributes);
 
-    void StartPoiSearch(const handleId_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
+    void StartPoiSearch(const handleId_t& poiSearchHandle, const std::string& inputString, const int32_t &sortOption);
 
     void CancelPoiSearch(const handleId_t& poiSearchHandle);
 
     void SetCenter(const handleId_t& poiSearchHandle, const DBus_geoCoordinate3D::DBus_geoCoordinate3D_t& location);
 
-    void StartPoiProximityAlert(const handleId_t& poiSearchHandle, const std::string& inputString, const uint16_t& sortOption);
+    void StartPoiProximityAlert(const handleId_t& poiSearchHandle, const std::string& inputString, const int32_t& sortOption);
 
     void CancelPoiProximityAlert(const handleId_t& poiSearchHandle);
 
-    void RequestResultList(const handleId_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< uint32_t >& attributes, uint16_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow);
+    void RequestResultList(const handleId_t& poiSearchHandle, const uint16_t& offset, const uint16_t& maxWindowSize, const std::vector< uint32_t >& attributes, int32_t& statusValue, uint16_t& resultListSize, std::vector< DBus_searchResult::DBus_searchResult_t >& resultListWindow);
 
     std::vector< DBus_searchResultDetails::DBus_searchResultDetails_t > GetPoiDetails(const std::vector< poiId_t >& id);
 
diff --git a/test/poi-service/poi-client/mainwindow.cpp b/test/poi-service/poi-client/mainwindow.cpp
index 0dab72a..ac09d1d 100644
--- a/test/poi-service/poi-client/mainwindow.cpp
+++ b/test/poi-service/poi-client/mainwindow.cpp
@@ -1070,7 +1070,7 @@ void MainWindow::refreshViewTable(ushort windowSize)
     clearViewTable();
 
     // RequestResultList
-    QDBusPendingReply<ushort, ushort, QList<resultSearch_t> >reply_0 = m_dbusPoiSearchInterface->RequestResultList(m_poiSearchHandle, m_currentTopListIndex, windowSize, attributes);
+    QDBusPendingReply<int, ushort, QList<resultSearch_t> >reply_0 = m_dbusPoiSearchInterface->RequestResultList(m_poiSearchHandle, m_currentTopListIndex, windowSize, attributes);
     reply_0.waitForFinished();
     if (reply_0.isError())
         manageDBusError(reply_0.reply()); // call failed
diff --git a/test/poi-service/poi-client/poi-client-DBusSearchInterface.h b/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
index 3cc2d5a..92b2e44 100644
--- a/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
+++ b/test/poi-service/poi-client/poi-client-DBusSearchInterface.h
@@ -131,7 +131,7 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QLatin1String("SetRouteHandle"), argumentList);
     }
 
-    inline QDBusPendingReply<>StartPoiSearch(handleId_t poiSearchHandle, const QString &inputString, ushort sortOption)
+    inline QDBusPendingReply<>StartPoiSearch(handleId_t poiSearchHandle, const QString &inputString, int sortOption)
     { // "u" "s" "q" in
         QList<QVariant> argumentList;
         argumentList << qVariantFromValue(poiSearchHandle) << qVariantFromValue(inputString) << qVariantFromValue(sortOption);
@@ -145,8 +145,8 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QLatin1String("CancelPoiSearch"), argumentList);
     }
 
-    inline QDBusPendingReply<>StartPoiProximityAlert(handleId_t poiSearchHandle, const QString &inputString, ushort sortOption)
-    { // "u" "s" "q" in
+    inline QDBusPendingReply<>StartPoiProximityAlert(handleId_t poiSearchHandle, const QString &inputString, int sortOption)
+    { // "u" "s" "i" in
         QList<QVariant> argumentList;
         argumentList << qVariantFromValue(poiSearchHandle) << qVariantFromValue(inputString) << qVariantFromValue(sortOption);
         return asyncCallWithArgumentList(QLatin1String("StartPoiProximityAlert"), argumentList);
@@ -159,8 +159,8 @@ public Q_SLOTS: // METHODS
         return asyncCallWithArgumentList(QLatin1String("CancelPoiProximityAlert"), argumentList);
     }
 
-    inline QDBusPendingReply<ushort, ushort, QList<resultSearch_t> >RequestResultList(handleId_t poiSearchHandle, ushort offset, ushort maxWindowSize, QList<attributeId_t> attributes)
-    { // "u" "q" "q" "au" in "q" "q" "a(uuqa(uiv))" out
+    inline QDBusPendingReply<int, ushort, QList<resultSearch_t> >RequestResultList(handleId_t poiSearchHandle, ushort offset, ushort maxWindowSize, QList<attributeId_t> attributes)
+    { // "u" "q" "q" "au" in "i" "q" "a(uuia(ui(yv)))" out
         QList<QVariant> argumentList;
         argumentList << qVariantFromValue(poiSearchHandle) << qVariantFromValue(offset) << qVariantFromValue(maxWindowSize) << qVariantFromValue(attributes);
         return asyncCallWithArgumentList(QLatin1String("RequestResultList"), argumentList);
diff --git a/test/poi-service/poi-common/poi-common-types.h b/test/poi-service/poi-common/poi-common-types.h
index bbf5344..66c98fd 100644
--- a/test/poi-service/poi-common/poi-common-types.h
+++ b/test/poi-service/poi-common/poi-common-types.h
@@ -118,11 +118,11 @@ struct poiAttributeFull_t //(uui(yv)ib)
     bool mandatory; //true if the attribute is mandatory for the search and false for optional
 };
 
-struct resultSearch_t //(uuqa(ui(yv)))
+struct resultSearch_t //(uuia(ui(yv)))
 {
     uint id;
     uint distance;
-    ushort route_status;
+    int route_status;
     QList<poiAttribute_t> attributes;
 };