FIX ftest

telefonicaid · Nov 20, 2023 · f4eb0a2 · f4eb0a2
1 parent a772397
commit f4eb0a2
Show file tree

Hide file tree

Showing 20 changed files with 390 additions and 48 deletions.
diff --git a/src/lib/mongoBackend/MongoCommonUpdate.cpp b/src/lib/mongoBackend/MongoCommonUpdate.cpp
@@ -3623,7 +3623,7 @@ static unsigned int updateEntity
   {
     for (unsigned int ix = 0; ix < eP->attributeVector.size(); ++ix)
     {
-      if (attrs.hasField(eP->attributeVector[ix]->name))
+      if (attrs.hasField(dbEncode(eP->attributeVector[ix]->name)))
       {
         alarmMgr.badInput(clientIp, "attribute already exists", eP->attributeVector[ix]->name);
         *attributeAlreadyExistsError = true;
@@ -3649,7 +3649,7 @@ static unsigned int updateEntity
   {
     for (unsigned int ix = 0; ix < eP->attributeVector.size(); ++ix)
     {
-      if (!attrs.hasField (eP->attributeVector[ix]->name))
+      if (!attrs.hasField(dbEncode(eP->attributeVector[ix]->name)))
       {
         *attributeNotExistingError = true;
 

diff --git a/test/functionalTest/cases/0979_patch_v2_entities_eid/patch_v2_entities_eid.test b/test/functionalTest/cases/0979_patch_v2_entities_eid/patch_v2_entities_eid.test
@@ -171,10 +171,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 110
+Content-Length: 115
 
 {
-    "description": "one or more of the attributes in the request do not exist: [ attr3 ]",
+    "description": "one or more of the attributes in the request do not exist: E1 - [ attr3 ]",
     "error": "Unprocessable"
 }
 

diff --git a/...ctionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test b/...ctionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test
@@ -169,10 +169,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 107
+Content-Length: 112
 
 {
-    "description": "one or more of the attributes in the request do not exist: [ A2 ]",
+    "description": "one or more of the attributes in the request do not exist: E1 - [ A2 ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/0981_POST_v2_attributes/append_and_append_only_combinations.test b/test/functionalTest/cases/0981_POST_v2_attributes/append_and_append_only_combinations.test
@@ -263,10 +263,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 111
+Content-Length: 116
 
 {
-    "description": "one or more of the attributes in the request already exist: [ attr4 ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ attr4 ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/0981_POST_v2_attributes/append_only_attribute_already_there.test b/test/functionalTest/cases/0981_POST_v2_attributes/append_only_attribute_already_there.test
@@ -75,10 +75,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 111
+Content-Length: 116
 
 {
-    "description": "one or more of the attributes in the request already exist: [ attr1 ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ attr1 ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/0981_POST_v2_attributes/append_only_error_if_exists.test b/test/functionalTest/cases/0981_POST_v2_attributes/append_only_error_if_exists.test
@@ -119,10 +119,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 111
+Content-Length: 116
 
 {
-    "description": "one or more of the attributes in the request already exist: [ attr1 ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ attr1 ]",
     "error": "Unprocessable"
 }
 

diff --git a/...unctionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test b/...unctionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test
@@ -238,10 +238,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 108
+Content-Length: 113
 
 {
-    "description": "one or more of the attributes in the request already exist: [ A3 ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ A3 ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_not_exist_attr.test b/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_not_exist_attr.test
@@ -102,15 +102,15 @@ Content-Length: 121
 
 03. DELETE /v2/entities/E1/attrs/none
 =====================================
-HTTP/1.1 404 Not Found
+HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 79
+Content-Length: 114
 
 {
-    "description": "The entity does not have such an attribute",
-    "error": "NotFound"
+    "description": "one or more of the attributes in the request do not exist: E1 - [ none ]",
+    "error": "Unprocessable"
 }
 
 

diff --git a/test/functionalTest/cases/1127_v1_append_strict/v1_append_strict.test b/test/functionalTest/cases/1127_v1_append_strict/v1_append_strict.test
@@ -239,7 +239,7 @@ HTTP/1.1 200 OK
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 224
+Content-Length: 229
 
 {
     "contextResponses": [
@@ -251,7 +251,7 @@ Content-Length: 224
             },
             "statusCode": {
                 "code": "400",
-                "details": "one or more of the attributes in the request already exist: [ attr2 ]",
+                "details": "one or more of the attributes in the request already exist: E1 - [ attr2 ]",
                 "reasonPhrase": "Bad Request"
             }
         }
@@ -289,7 +289,7 @@ HTTP/1.1 200 OK
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 388
+Content-Length: 393
 
 {
     "contextResponses": [
@@ -319,7 +319,7 @@ Content-Length: 388
             },
             "statusCode": {
                 "code": "400",
-                "details": "one or more of the attributes in the request already exist: [ attr2 ]",
+                "details": "one or more of the attributes in the request already exist: E1 - [ attr2 ]",
                 "reasonPhrase": "Bad Request"
             }
         }

diff --git a/test/functionalTest/cases/1278_patch_unknown_attribute/patch_unknown_attribute.test b/test/functionalTest/cases/1278_patch_unknown_attribute/patch_unknown_attribute.test
@@ -75,10 +75,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 107
+Content-Length: 112
 
 {
-    "description": "one or more of the attributes in the request do not exist: [ A2 ]",
+    "description": "one or more of the attributes in the request do not exist: E1 - [ A2 ]",
     "error": "Unprocessable"
 }
 

diff --git a/...t/cases/1360_error_response_for_entity_not_found/error_response_for_entity_not_found.test b/...t/cases/1360_error_response_for_entity_not_found/error_response_for_entity_not_found.test
@@ -97,10 +97,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 113
+Content-Length: 122
 
 {
-    "description": "one or more of the attributes in the request do not exist: [ dfgdfgdf ]",
+    "description": "one or more of the attributes in the request do not exist: room_2 - [ dfgdfgdf ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/1682_ngsiv2_entity_id/ngsiv2_entity_id_revisited.test b/test/functionalTest/cases/1682_ngsiv2_entity_id/ngsiv2_entity_id_revisited.test
@@ -148,10 +148,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 107
+Content-Length: 112
 
 {
-    "description": "one or more of the attributes in the request already exist: [ A ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ A ]",
     "error": "Unprocessable"
 }
 

diff --git a/test/functionalTest/cases/1715_batch_update/batch_update_APPEND.test b/test/functionalTest/cases/1715_batch_update/batch_update_APPEND.test
@@ -202,10 +202,10 @@ HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 108
+Content-Length: 113
 
 {
-    "description": "one or more of the attributes in the request already exist: [ A1 ]",
+    "description": "one or more of the attributes in the request already exist: E1 - [ A1 ]",
     "error": "Unprocessable"
 }
 

diff --git a/...functionalTest/cases/1715_batch_update/batch_update_DELETE_non_existing_and_existing.test b/...functionalTest/cases/1715_batch_update/batch_update_DELETE_non_existing_and_existing.test
@@ -229,15 +229,15 @@ Content-Length: 454
 
 03. Delete E1-A1/A2=null, E2-A1/A2=null (A2 not existing) and E3-A1/A2=null using POST /v2/op/update with delete, get error
 ===========================================================================================================================
-HTTP/1.1 404 Not Found
+HTTP/1.1 422 Unprocessable Content
 Date: REGEX(.*)
 Fiware-Correlator: REGEX([0-9a-f\-]{36})
 Content-Type: application/json
-Content-Length: 79
+Content-Length: 112
 
 {
-    "description": "The entity does not have such an attribute",
-    "error": "NotFound"
+    "description": "one or more of the attributes in the request do not exist: E2 - [ A2 ]",
+    "error": "Unprocessable"
 }