Merge pull request #2301 from telefonicaid/bug/2174_incorrect_error_r…

…esponse_when_running_invalid_query

bug/2174_incorrect_error_response_when_running_invalid_query

CHANGES_NEXT_RELEASE

@@ -20,4 +20,4 @@
 - Fix: Correctly returning error on present but empty attribute types in PATCH v2/entites/{id} operation (Issue #1785)
 - Fix: Error returned on encountering non-existing attributes in PATCH /v2/entities/<id>/attrs (Issue #1784)
 - Fix: Error payload returned on encountering non-existing entity/attribute in PUT /v2/entities/<entity-id>/attrs/<attr-name> (Issue #1360)
-
+- Fix: Better error returned on invalid geoquery (Issue #2174)

src/lib/orionTypes/areas.cpp

@@ -529,7 +529,7 @@ int Georel::parse(const char* in, std::string* errorString)
     }
     else
     {
-      *errorString = "Invalid selector in georel specification";
+      *errorString = "Invalid modifier in georel parameter";
       return -1;
     }
   }

test/functionalTest/cases/2174_incorrect_error_response_when_running_invalid_query/incorrect_error_response_when_running_invalid_query.test

@@ -0,0 +1,60 @@
+# Copyright 2016 Telefonica Investigacion y Desarrollo, S.A.U
+#
+# This file is part of Orion Context Broker.
+#
+# Orion Context Broker is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# Orion Context Broker is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Orion Context Broker. If not, see http://www.gnu.org/licenses/.
+#
+# For those usages not covered by this license please contact with
+# iot_support at tid dot es
+
+# VALGRIND_READY - to mark the test ready for valgrindTestSuite.sh
+
+--NAME--
+Incorrect error response when running invalid query
+
+--SHELL-INIT--
+dbInit CB
+brokerStart CB
+
+--SHELL--
+
+#
+# 01. Query with invalid modifier in georel parameter, and see error
+#
+
+echo "01. Query with invalid modifier in georel parameter, and see error"
+echo "=================================================================="
+orionCurl --url '/v2/entities/?type=Restaurant&georel=near;maxDistance=1000&geometry=point&coords=43.42015,-2.761160&options=keyValues'
+echo
+echo
+
+
+--REGEXPECT--
+01. Query with invalid modifier in georel parameter, and see error
+==================================================================
+HTTP/1.1 400 Bad Request
+Content-Length: 90
+Content-Type: application/json
+Fiware-Correlator: REGEX([0-9a-f\-]{36})
+Date: REGEX(.*)
+
+{
+    "description": "Invalid query: Invalid modifier in georel parameter",
+    "error": "BadRequest"
+}
+
+
+--TEARDOWN--
+brokerStop CB
+dbDrop CB