add test file for poi search (common api version)

3 files changed, 58 insertions, 4 deletions

diff --git a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
index 7e34b39..7665f13 100644
--- a/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
+++ b/src/navigation/map-viewer/configuration-server-plugin/genivi_mapviewer_configuration.cxx
@@ -159,8 +159,8 @@ void MapViewerConfigurationServerStub::setLocale(const std::shared_ptr<CommonAPI
     m_scriptCode = _scriptCode;
 
     changedSettings.push_back(Configuration::Settings::LOCALE);
-
     fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void MapViewerConfigurationServerStub::getLocale(const std::shared_ptr<CommonAPI::ClientId> _client, getLocaleReply_t _reply)
@@ -175,7 +175,13 @@ void MapViewerConfigurationServerStub::getSupportedLocales(const std::shared_ptr
 
 void MapViewerConfigurationServerStub::setTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, NavigationTypes::TimeFormat _format, setTimeFormatReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_timeFormat = _format;
+
+    changedSettings.push_back(Configuration::Settings::TIME_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void MapViewerConfigurationServerStub::getTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getTimeFormatReply_t _reply)
@@ -190,7 +196,13 @@ void MapViewerConfigurationServerStub::getSupportedTimeFormats(const std::shared
 
 void MapViewerConfigurationServerStub::setCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, Configuration::CoordinatesFormat _coordinatesFormat, setCoordinatesFormatReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_coordinatesFormat = _coordinatesFormat;
+
+    changedSettings.push_back(Configuration::Settings::COORDINATES_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void MapViewerConfigurationServerStub::getCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getCoordinatesFormatReply_t _reply)
@@ -205,7 +217,13 @@ void MapViewerConfigurationServerStub::getSupportedCoordinatesFormat(const std::
 
 void MapViewerConfigurationServerStub::setUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, Configuration::UnitsOfMeasurement _unitsOfMeasurementList, setUnitsOfMeasurementReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_unitsOfMeasurement = _unitsOfMeasurementList;
+
+    changedSettings.push_back(Configuration::Settings::UNITS_OF_MEASUREMENT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void MapViewerConfigurationServerStub::getUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, getUnitsOfMeasurementReply_t _reply)
diff --git a/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx b/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
index 88c15de..76b5aa3 100644
--- a/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
+++ b/src/navigation/navigation-core/configuration-server-plugin/genivi_navigationcore_configuration.cxx
@@ -168,8 +168,8 @@ void NavigationCoreConfigurationServerStub::setLocale(const std::shared_ptr<Comm
     m_scriptCode = _scriptCode;
 
     changedSettings.push_back(Configuration::Settings::LOCALE);
-
     fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void NavigationCoreConfigurationServerStub::getLocale(const std::shared_ptr<CommonAPI::ClientId> _client, getLocaleReply_t _reply)
@@ -184,7 +184,13 @@ void NavigationCoreConfigurationServerStub::getSupportedLocales(const std::share
 
 void NavigationCoreConfigurationServerStub::setTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, NavigationTypes::TimeFormat _format, setTimeFormatReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_timeFormat = _format;
+
+    changedSettings.push_back(Configuration::Settings::TIME_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void NavigationCoreConfigurationServerStub::getTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getTimeFormatReply_t _reply)
@@ -199,7 +205,13 @@ void NavigationCoreConfigurationServerStub::getSupportedTimeFormats(const std::s
 
 void NavigationCoreConfigurationServerStub::setCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, Configuration::CoordinatesFormat _coordinatesFormat, setCoordinatesFormatReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_coordinatesFormat = _coordinatesFormat;
+
+    changedSettings.push_back(Configuration::Settings::COORDINATES_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void NavigationCoreConfigurationServerStub::getCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getCoordinatesFormatReply_t _reply)
@@ -214,7 +226,13 @@ void NavigationCoreConfigurationServerStub::getSupportedCoordinatesFormat(const
 
 void NavigationCoreConfigurationServerStub::setUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, Configuration::UnitsOfMeasurement _unitsOfMeasurementList, setUnitsOfMeasurementReply_t _reply)
 {
+    std::vector<Configuration::Settings> changedSettings;
+
     m_unitsOfMeasurement = _unitsOfMeasurementList;
+
+    changedSettings.push_back(Configuration::Settings::UNITS_OF_MEASUREMENT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void NavigationCoreConfigurationServerStub::getUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, getUnitsOfMeasurementReply_t _reply)
diff --git a/src/poi-service/poi-server-capi/main.cpp b/src/poi-service/poi-server-capi/main.cpp
index 5ef7306..1f9756e 100644
--- a/src/poi-service/poi-server-capi/main.cpp
+++ b/src/poi-service/poi-server-capi/main.cpp
@@ -1402,6 +1402,7 @@ void POISearchServerStub::getCategoriesDetails(const std::shared_ptr<CommonAPI::
                 categoryAttribute.setId((m_availableCategoryTable[category_index].attributeList.at(sub_index)).id);
                 categoryAttribute.setName((m_availableCategoryTable[category_index].attributeList.at(sub_index)).name);
                 categoryAttribute.setType(POIServiceTypes::AttributeType::BOOLEAN);
+                operatorList.clear();
                 categoryOperator.setType(POIServiceTypes::OperatorType::EQUAL);
                 categoryOperator.setName("EQUAL"); //redondancy
                 categoryOperator.setValue(std::string(""));
@@ -1684,7 +1685,6 @@ void POISearchServerStub::cancelPoiSearch(const std::shared_ptr<CommonAPI::Clien
     _reply();
 }
 
-
 void POISearchServerStub::startPoiProximityAlert(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _poiSearchHandle, std::string _inputString, ::v4::org::genivi::navigation::poiservice::POIServiceTypes::SortOption _sortOption, startPoiProximityAlertReply_t _reply)
 {
     if ((m_poiSearchHandle == INVALID_HANDLE) || (_poiSearchHandle != m_poiSearchHandle))
@@ -2428,8 +2428,8 @@ void POIConfigurationServerStub::setLocale(const std::shared_ptr<CommonAPI::Clie
     m_scriptCode = _scriptCode;
 
     changedSettings.push_back(POIServiceTypes::Settings::LOCALE);
-
     fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void POIConfigurationServerStub::getLocale(const std::shared_ptr<CommonAPI::ClientId> _client, getLocaleReply_t _reply)
@@ -2444,7 +2444,13 @@ void POIConfigurationServerStub::getSupportedLocales(const std::shared_ptr<Commo
 
 void POIConfigurationServerStub::setTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, NavigationTypes::TimeFormat _format, setTimeFormatReply_t _reply)
 {
+    std::vector<POIServiceTypes::Settings> changedSettings;
+
     m_timeFormat = _format;
+
+    changedSettings.push_back(POIServiceTypes::Settings::TIME_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void POIConfigurationServerStub::getTimeFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getTimeFormatReply_t _reply)
@@ -2459,7 +2465,13 @@ void POIConfigurationServerStub::getSupportedTimeFormats(const std::shared_ptr<C
 
 void POIConfigurationServerStub::setCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, POIConfiguration::CoordinatesFormat _coordinatesFormat, setCoordinatesFormatReply_t _reply)
 {
+    std::vector<POIServiceTypes::Settings> changedSettings;
+
     m_coordinatesFormat = _coordinatesFormat;
+
+    changedSettings.push_back(POIServiceTypes::Settings::COORDINATES_FORMAT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void POIConfigurationServerStub::getCoordinatesFormat(const std::shared_ptr<CommonAPI::ClientId> _client, getCoordinatesFormatReply_t _reply)
@@ -2474,7 +2486,13 @@ void POIConfigurationServerStub::getSupportedCoordinatesFormat(const std::shared
 
 void POIConfigurationServerStub::setUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, POIConfiguration::UnitsOfMeasurement _unitsOfMeasurementList, setUnitsOfMeasurementReply_t _reply)
 {
+    std::vector<POIServiceTypes::Settings> changedSettings;
+
     m_unitsOfMeasurement = _unitsOfMeasurementList;
+
+    changedSettings.push_back(POIServiceTypes::Settings::UNITS_OF_MEASUREMENT);
+    fireConfigurationChangedEvent(changedSettings);
+    _reply();
 }
 
 void POIConfigurationServerStub::getUnitsOfMeasurement(const std::shared_ptr<CommonAPI::ClientId> _client, getUnitsOfMeasurementReply_t _reply)