diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index 93962509e7..b058f336f0 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -29,3 +29,4 @@ - Add: orderBy URI param in NGSIv1 queries to sort entities by attribute (Issue #1103) - Fix: Returning 422 InvalidModification instead of 404 NotFound when POSTing entity (Issue #1817) - Add implemented new operation: POST /v2/op/update (Issue #1715) +- Add: ?type URL parameter in Location header upon entity creation in NGSIv2 (Issue #1765) diff --git a/doc/apiary/v2/fiware-ngsiv2-cookbook.apib b/doc/apiary/v2/fiware-ngsiv2-cookbook.apib index 5c991f8ed7..329c6b32f4 100644 --- a/doc/apiary/v2/fiware-ngsiv2-cookbook.apib +++ b/doc/apiary/v2/fiware-ngsiv2-cookbook.apib @@ -450,7 +450,7 @@ This resource allows you to obtain a list of subresources published by the API: + Headers - Location: /v2/entities/Bcn-Welt + Location: /v2/entities/Bcn-Welt?type=Room ### Create a new entity. Error [POST /v2/entities] diff --git a/doc/apiary/v2/fiware-ngsiv2-reference.apib b/doc/apiary/v2/fiware-ngsiv2-reference.apib index 44aaaa5ecc..00b8ca9130 100644 --- a/doc/apiary/v2/fiware-ngsiv2-reference.apib +++ b/doc/apiary/v2/fiware-ngsiv2-reference.apib @@ -768,7 +768,7 @@ Response: + Headers - Location: /v2/entities/Bcn-Welt + Location: /v2/entities/Bcn-Welt?type=Room ## Entity by ID [/v2/entities/{entityId}{?type,attrs,options}] diff --git a/src/lib/serviceRoutinesV2/postEntities.cpp b/src/lib/serviceRoutinesV2/postEntities.cpp index ff97d47483..9fd460db82 100644 --- a/src/lib/serviceRoutinesV2/postEntities.cpp +++ b/src/lib/serviceRoutinesV2/postEntities.cpp @@ -108,6 +108,14 @@ std::string postEntities if (rhttpcode == SccOk || rhttpcode == SccNone) { std::string location = "/v2/entities/" + eP->id; + if (eP->type != "" ) + { + location += "?type=" + eP->type; + } + else + { + location += "?type=none"; + } ciP->httpHeader.push_back("Location"); ciP->httpHeaderValue.push_back(location); diff --git a/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test b/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test index 170193456d..37fc492a4f 100644 --- a/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test +++ b/test/functionalTest/cases/0864_filter_string_scope/filter_string_scope.test @@ -134,7 +134,7 @@ echo ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -143,7 +143,7 @@ Date: REGEX(.*) ======================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) @@ -152,7 +152,7 @@ Date: REGEX(.*) ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -161,7 +161,7 @@ Date: REGEX(.*) ======================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T Date: REGEX(.*) @@ -170,7 +170,7 @@ Date: REGEX(.*) ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test index b82fb443c1..8fd4a0ee73 100644 --- a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test +++ b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities.test @@ -146,7 +146,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -234,7 +234,7 @@ Date: REGEX(.*) =================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test index 0b4f260469..bbbb634bfc 100644 --- a/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test +++ b/test/functionalTest/cases/0947_v2_list_all_entities/GET_v2_all_entities_pagination.test @@ -119,7 +119,7 @@ echo ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -128,7 +128,7 @@ Date: REGEX(.*) =========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T2 Date: REGEX(.*) @@ -137,7 +137,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T3 Date: REGEX(.*) @@ -146,7 +146,7 @@ Date: REGEX(.*) =========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T4 Date: REGEX(.*) @@ -155,7 +155,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T5 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test index a60e11709f..ad3eb76e94 100755 --- a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test +++ b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity.test @@ -76,7 +76,7 @@ echo =================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/8787GHY +Location: /v2/entities/8787GHY?type=Car Date: REGEX(.*) diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test index 0fd1095132..f391d4d4a3 100644 --- a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test +++ b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_not_found.test @@ -115,7 +115,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test index ef7891dacc..49626aab36 100644 --- a/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test +++ b/test/functionalTest/cases/0950_GET_v2_entity/GET_v2_entity_too_many.test @@ -104,7 +104,7 @@ echo ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -113,7 +113,7 @@ Date: REGEX(.*) ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) @@ -122,7 +122,7 @@ Date: REGEX(.*) ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -131,7 +131,7 @@ Date: REGEX(.*) ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T4 Date: REGEX(.*) @@ -140,7 +140,7 @@ Date: REGEX(.*) ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T5 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test b/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test index 61c73151b1..d35b5c86ef 100644 --- a/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test +++ b/test/functionalTest/cases/0951_get_v2_param_type/get_v2_param_type.test @@ -99,7 +99,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -108,7 +108,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test index cbe15c80bf..586594bda8 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities.test @@ -118,7 +118,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -168,7 +168,7 @@ Date: REGEX(.*) ================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test index 507095c296..0e78083cc5 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_all_entities_pagination.test @@ -118,7 +118,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -127,7 +127,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T2 Date: REGEX(.*) @@ -136,7 +136,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T3 Date: REGEX(.*) @@ -145,7 +145,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T4 Date: REGEX(.*) @@ -154,7 +154,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T5 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test index d3d2500a91..91a650f036 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_both_params.test @@ -79,7 +79,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test index 48b51f8846..b677eda576 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_several.test @@ -119,7 +119,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -128,7 +128,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -137,7 +137,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T2 Date: REGEX(.*) @@ -146,7 +146,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -155,7 +155,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T3 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test index 652ef0e65d..482076f6ba 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_id_type.test @@ -117,7 +117,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -126,7 +126,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -135,7 +135,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T2 Date: REGEX(.*) @@ -144,7 +144,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -153,7 +153,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T3 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern.test index fd14fc443e..4df6cea4bd 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern.test @@ -121,7 +121,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -171,7 +171,7 @@ Date: REGEX(.*) ================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern_type.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern_type.test index 7ff82a69fa..035767bf78 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern_type.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_pattern_type.test @@ -118,7 +118,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -127,7 +127,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -136,7 +136,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T2 Date: REGEX(.*) @@ -145,7 +145,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -154,7 +154,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T3 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_type.test b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_type.test index ad718fc86d..d8b736fe83 100644 --- a/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_type.test +++ b/test/functionalTest/cases/0953_list_all_ents_id/GET_v2_entities_type.test @@ -126,7 +126,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -135,7 +135,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -144,7 +144,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T2 Date: REGEX(.*) @@ -153,7 +153,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -162,7 +162,7 @@ Date: REGEX(.*) ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T3 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0967_v2_query_op/q_in_uri_param_to_scope.test b/test/functionalTest/cases/0967_v2_query_op/q_in_uri_param_to_scope.test index 4b5f05ae44..4699538c4d 100644 --- a/test/functionalTest/cases/0967_v2_query_op/q_in_uri_param_to_scope.test +++ b/test/functionalTest/cases/0967_v2_query_op/q_in_uri_param_to_scope.test @@ -120,7 +120,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -129,7 +129,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) @@ -138,7 +138,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -147,7 +147,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T Date: REGEX(.*) @@ -156,7 +156,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/compound_creation.test b/test/functionalTest/cases/0970_create_entity/compound_creation.test index e851f712af..df13d77940 100644 --- a/test/functionalTest/cases/0970_create_entity/compound_creation.test +++ b/test/functionalTest/cases/0970_create_entity/compound_creation.test @@ -62,7 +62,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/compound_creation02.test b/test/functionalTest/cases/0970_create_entity/compound_creation02.test index 169e17157f..2561312255 100644 --- a/test/functionalTest/cases/0970_create_entity/compound_creation02.test +++ b/test/functionalTest/cases/0970_create_entity/compound_creation02.test @@ -72,7 +72,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/compound_inside_attribute_object.test b/test/functionalTest/cases/0970_create_entity/compound_inside_attribute_object.test index 0497af0272..6c1d9deb50 100644 --- a/test/functionalTest/cases/0970_create_entity/compound_inside_attribute_object.test +++ b/test/functionalTest/cases/0970_create_entity/compound_inside_attribute_object.test @@ -65,7 +65,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/compound_vector.test b/test/functionalTest/cases/0970_create_entity/compound_vector.test index 8bb73c3d1b..7934f51fdf 100644 --- a/test/functionalTest/cases/0970_create_entity/compound_vector.test +++ b/test/functionalTest/cases/0970_create_entity/compound_vector.test @@ -58,7 +58,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/compound_vector_with_objects.test b/test/functionalTest/cases/0970_create_entity/compound_vector_with_objects.test index cea0aa77eb..d901069c5d 100644 --- a/test/functionalTest/cases/0970_create_entity/compound_vector_with_objects.test +++ b/test/functionalTest/cases/0970_create_entity/compound_vector_with_objects.test @@ -78,7 +78,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/creation_with_attribute_as_object.test b/test/functionalTest/cases/0970_create_entity/creation_with_attribute_as_object.test index f580b967e3..f37478a8a5 100644 --- a/test/functionalTest/cases/0970_create_entity/creation_with_attribute_as_object.test +++ b/test/functionalTest/cases/0970_create_entity/creation_with_attribute_as_object.test @@ -67,7 +67,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/creation_with_metadata.test b/test/functionalTest/cases/0970_create_entity/creation_with_metadata.test index e6daeaf23a..d2f7904ef9 100644 --- a/test/functionalTest/cases/0970_create_entity/creation_with_metadata.test +++ b/test/functionalTest/cases/0970_create_entity/creation_with_metadata.test @@ -66,7 +66,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/empty_attribute_value.test b/test/functionalTest/cases/0970_create_entity/empty_attribute_value.test index dbaa15f933..5d9b820245 100644 --- a/test/functionalTest/cases/0970_create_entity/empty_attribute_value.test +++ b/test/functionalTest/cases/0970_create_entity/empty_attribute_value.test @@ -61,7 +61,7 @@ echo ================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/ID +Location: /v2/entities/ID?type=WT Date: REGEX(.*) diff --git a/test/functionalTest/cases/0970_create_entity/simple_creation.test b/test/functionalTest/cases/0970_create_entity/simple_creation.test index 9e15203374..8ff67e725f 100644 --- a/test/functionalTest/cases/0970_create_entity/simple_creation.test +++ b/test/functionalTest/cases/0970_create_entity/simple_creation.test @@ -62,7 +62,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) 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 index 135a1cb757..4b2b521466 100644 --- 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 @@ -102,7 +102,7 @@ Date: REGEX(.*) ========================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test b/test/functionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test index 2d10189a85..8830219cc8 100644 --- a/test/functionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test +++ b/test/functionalTest/cases/0980_patch_entity_v2_wihth_param_type/patch_entity_with_param_type.test @@ -104,7 +104,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -113,7 +113,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) 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 index 1c3f57eed0..70561aa914 100644 --- 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 @@ -121,7 +121,7 @@ echo ======================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) 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 index f26e9c1352..f4bbf6150f 100644 --- 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 @@ -63,7 +63,7 @@ echo =================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) 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 index c84f2fe3f2..286f38246a 100644 --- 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 @@ -88,7 +88,7 @@ echo ============= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test b/test/functionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test index c6eec2a683..15dc8efc21 100644 --- a/test/functionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test +++ b/test/functionalTest/cases/0982_post_entity_with_type_param/982_post_entity_with_type_param.test @@ -125,7 +125,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -134,7 +134,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0985_DELETE_v2_entity/delete_ok.test b/test/functionalTest/cases/0985_DELETE_v2_entity/delete_ok.test index fcd09e5c35..c20a8c083a 100644 --- a/test/functionalTest/cases/0985_DELETE_v2_entity/delete_ok.test +++ b/test/functionalTest/cases/0985_DELETE_v2_entity/delete_ok.test @@ -79,7 +79,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0986_delete_with_type_param/delete_with_type_param.test b/test/functionalTest/cases/0986_delete_with_type_param/delete_with_type_param.test index a86725a09e..298983c9b2 100644 --- a/test/functionalTest/cases/0986_delete_with_type_param/delete_with_type_param.test +++ b/test/functionalTest/cases/0986_delete_with_type_param/delete_with_type_param.test @@ -104,7 +104,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -113,7 +113,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0987_put_attributes/put_entity_complete_replace_attributes.test b/test/functionalTest/cases/0987_put_attributes/put_entity_complete_replace_attributes.test index fa0e69b972..c89ccc1e05 100644 --- a/test/functionalTest/cases/0987_put_attributes/put_entity_complete_replace_attributes.test +++ b/test/functionalTest/cases/0987_put_attributes/put_entity_complete_replace_attributes.test @@ -71,7 +71,7 @@ echo =================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/0987_put_attributes/put_entity_error.test b/test/functionalTest/cases/0987_put_attributes/put_entity_error.test index 49d1ae3d82..70ae563694 100644 --- a/test/functionalTest/cases/0987_put_attributes/put_entity_error.test +++ b/test/functionalTest/cases/0987_put_attributes/put_entity_error.test @@ -114,7 +114,7 @@ Date: REGEX(.*) ============= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/0987_put_attributes/put_entity_partially_replace_attributes.test b/test/functionalTest/cases/0987_put_attributes/put_entity_partially_replace_attributes.test index 0d5ab172a9..e6b60f4b1e 100644 --- a/test/functionalTest/cases/0987_put_attributes/put_entity_partially_replace_attributes.test +++ b/test/functionalTest/cases/0987_put_attributes/put_entity_partially_replace_attributes.test @@ -71,7 +71,7 @@ echo =================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/0988_put_with_param_type/0988_put_with_param_type.test b/test/functionalTest/cases/0988_put_with_param_type/0988_put_with_param_type.test index 5c47aa8efe..cb2bd3e893 100644 --- a/test/functionalTest/cases/0988_put_with_param_type/0988_put_with_param_type.test +++ b/test/functionalTest/cases/0988_put_with_param_type/0988_put_with_param_type.test @@ -126,7 +126,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -135,7 +135,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute.test b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute.test index 3fa512b436..5013ab895b 100755 --- a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute.test +++ b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute.test @@ -109,7 +109,7 @@ echo ============================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/8787GHY +Location: /v2/entities/8787GHY?type=Car Date: REGEX(.*) diff --git a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_not_found.test b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_not_found.test index 29db446024..fe80bc3e73 100644 --- a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_not_found.test +++ b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_not_found.test @@ -65,7 +65,7 @@ echo ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_too_many.test b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_too_many.test index feeeef66ba..c56f459149 100644 --- a/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_too_many.test +++ b/test/functionalTest/cases/0989_GET_v2_entity_attribute/GET_v2_entity_attribute_too_many.test @@ -78,7 +78,7 @@ echo =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -87,7 +87,7 @@ Date: REGEX(.*) =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0991_update_single_attr_by_eid/update_one_of_two_attributes_changing_type_and_metadata.test b/test/functionalTest/cases/0991_update_single_attr_by_eid/update_one_of_two_attributes_changing_type_and_metadata.test index 913bb86cb0..9b0020024b 100644 --- a/test/functionalTest/cases/0991_update_single_attr_by_eid/update_one_of_two_attributes_changing_type_and_metadata.test +++ b/test/functionalTest/cases/0991_update_single_attr_by_eid/update_one_of_two_attributes_changing_type_and_metadata.test @@ -105,7 +105,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_attr_ok.test b/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_attr_ok.test index 254299cea8..a2774b34bc 100644 --- a/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_attr_ok.test +++ b/test/functionalTest/cases/0993_DELETE_v2_entity_attr/delete_attr_ok.test @@ -93,7 +93,7 @@ echo ==================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) 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 index 2122584c66..790423cfdc 100644 --- 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 @@ -71,7 +71,7 @@ echo ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_one_of_two_attributes.test b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_one_of_two_attributes.test index 7872194c70..ff9aee2c28 100644 --- a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_one_of_two_attributes.test +++ b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_one_of_two_attributes.test @@ -71,7 +71,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_by_eid.test b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_by_eid.test index a92ef81616..7c6d7e2f83 100644 --- a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_by_eid.test +++ b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_by_eid.test @@ -172,7 +172,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_value_by_eid_fake_field_cases.test b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_value_by_eid_fake_field_cases.test index 34b8bcb4bc..f8092bbdae 100644 --- a/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_value_by_eid_fake_field_cases.test +++ b/test/functionalTest/cases/0999_update_single_attr_value_by_eid/update_single_attr_value_by_eid_fake_field_cases.test @@ -98,7 +98,7 @@ Date: REGEX(.*) ================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1005_GET_v2_entities_string/1005_GET_v2_entities_string.test b/test/functionalTest/cases/1005_GET_v2_entities_string/1005_GET_v2_entities_string.test index d95831e554..61d7665f9b 100755 --- a/test/functionalTest/cases/1005_GET_v2_entities_string/1005_GET_v2_entities_string.test +++ b/test/functionalTest/cases/1005_GET_v2_entities_string/1005_GET_v2_entities_string.test @@ -76,7 +76,7 @@ echo ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/8787GHY +Location: /v2/entities/8787GHY?type=Car Date: REGEX(.*) diff --git a/test/functionalTest/cases/1027_get_all_entity_types/get_all_entity_types.test b/test/functionalTest/cases/1027_get_all_entity_types/get_all_entity_types.test index bea24b035c..4b2ec058db 100644 --- a/test/functionalTest/cases/1027_get_all_entity_types/get_all_entity_types.test +++ b/test/functionalTest/cases/1027_get_all_entity_types/get_all_entity_types.test @@ -136,7 +136,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -167,7 +167,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T2 Date: REGEX(.*) @@ -176,7 +176,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T3 Date: REGEX(.*) @@ -229,7 +229,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T3 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1028_get_entity_type/get_entity_type.test b/test/functionalTest/cases/1028_get_entity_type/get_entity_type.test index a075e827df..f74e934ee2 100644 --- a/test/functionalTest/cases/1028_get_entity_type/get_entity_type.test +++ b/test/functionalTest/cases/1028_get_entity_type/get_entity_type.test @@ -139,7 +139,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -168,7 +168,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -177,7 +177,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T1 Date: REGEX(.*) @@ -212,7 +212,7 @@ Date: REGEX(.*) ====================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1038_geo_point_support/geo_errors.test b/test/functionalTest/cases/1038_geo_point_support/geo_errors.test index 0e477dbecd..d71d75bd82 100644 --- a/test/functionalTest/cases/1038_geo_point_support/geo_errors.test +++ b/test/functionalTest/cases/1038_geo_point_support/geo_errors.test @@ -263,7 +263,7 @@ Date: REGEX(.*) ================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1038_geo_point_support/geoquery_circle_geopoint.test b/test/functionalTest/cases/1038_geo_point_support/geoquery_circle_geopoint.test index 163b3c7db8..3b9f66473c 100644 --- a/test/functionalTest/cases/1038_geo_point_support/geoquery_circle_geopoint.test +++ b/test/functionalTest/cases/1038_geo_point_support/geoquery_circle_geopoint.test @@ -110,7 +110,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Madrid +Location: /v2/entities/Madrid?type=City Date: REGEX(.*) @@ -119,7 +119,7 @@ Date: REGEX(.*) ============================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Alcobendas +Location: /v2/entities/Alcobendas?type=City Date: REGEX(.*) @@ -128,7 +128,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Leganes +Location: /v2/entities/Leganes?type=City Date: REGEX(.*) diff --git a/test/functionalTest/cases/1038_geo_point_support/geoquery_polygon_geopoint.test b/test/functionalTest/cases/1038_geo_point_support/geoquery_polygon_geopoint.test index 3d489995f8..5725f35829 100644 --- a/test/functionalTest/cases/1038_geo_point_support/geoquery_polygon_geopoint.test +++ b/test/functionalTest/cases/1038_geo_point_support/geoquery_polygon_geopoint.test @@ -129,7 +129,7 @@ echo ================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/A +Location: /v2/entities/A?type=Point Date: REGEX(.*) @@ -138,7 +138,7 @@ Date: REGEX(.*) ================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/B +Location: /v2/entities/B?type=Point Date: REGEX(.*) @@ -147,7 +147,7 @@ Date: REGEX(.*) ================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/C +Location: /v2/entities/C?type=Point Date: REGEX(.*) diff --git a/test/functionalTest/cases/1039_ngsiv2_date_support/basic_dates_support.test b/test/functionalTest/cases/1039_ngsiv2_date_support/basic_dates_support.test index 91dbf9b851..7027dd166d 100644 --- a/test/functionalTest/cases/1039_ngsiv2_date_support/basic_dates_support.test +++ b/test/functionalTest/cases/1039_ngsiv2_date_support/basic_dates_support.test @@ -155,7 +155,7 @@ Date: REGEX(.*) ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param.test b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param.test index 6f5e177ac8..8da0ad329e 100644 --- a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param.test +++ b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param.test @@ -203,7 +203,7 @@ echo ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E24 +Location: /v2/entities/E24?type=none Date: REGEX(.*) @@ -212,7 +212,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E23 +Location: /v2/entities/E23?type=none Date: REGEX(.*) @@ -221,7 +221,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E22 +Location: /v2/entities/E22?type=none Date: REGEX(.*) @@ -460,7 +460,7 @@ Date: REGEX(.*) ========================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E25 +Location: /v2/entities/E25?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_lists.test b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_lists.test index 5b18eaf674..809cfe4262 100644 --- a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_lists.test +++ b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_lists.test @@ -116,7 +116,7 @@ echo ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E24 +Location: /v2/entities/E24?type=none Date: REGEX(.*) @@ -125,7 +125,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E23 +Location: /v2/entities/E23?type=none Date: REGEX(.*) @@ -134,7 +134,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E22 +Location: /v2/entities/E22?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_ranges.test b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_ranges.test index 04f70efb84..1e5619b7b5 100644 --- a/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_ranges.test +++ b/test/functionalTest/cases/1039_ngsiv2_date_support/dates_in_uri_param_ranges.test @@ -115,7 +115,7 @@ echo ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E24 +Location: /v2/entities/E24?type=none Date: REGEX(.*) @@ -124,7 +124,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E23 +Location: /v2/entities/E23?type=none Date: REGEX(.*) @@ -133,7 +133,7 @@ Date: REGEX(.*) ============================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E22 +Location: /v2/entities/E22?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1041_GET_v2_entities_options_count/get_entities_option_count.test b/test/functionalTest/cases/1041_GET_v2_entities_options_count/get_entities_option_count.test index 0a337cfc28..bc25cc8241 100644 --- a/test/functionalTest/cases/1041_GET_v2_entities_options_count/get_entities_option_count.test +++ b/test/functionalTest/cases/1041_GET_v2_entities_options_count/get_entities_option_count.test @@ -122,7 +122,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=Car Date: REGEX(.*) @@ -152,7 +152,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=Car Date: REGEX(.*) @@ -161,7 +161,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=Car Date: REGEX(.*) @@ -170,7 +170,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=Car Date: REGEX(.*) diff --git a/test/functionalTest/cases/1049_values_mode/attrs_order.test b/test/functionalTest/cases/1049_values_mode/attrs_order.test index c2333be578..e559dbc0bb 100644 --- a/test/functionalTest/cases/1049_values_mode/attrs_order.test +++ b/test/functionalTest/cases/1049_values_mode/attrs_order.test @@ -97,7 +97,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1049_values_mode/values_mode.test b/test/functionalTest/cases/1049_values_mode/values_mode.test index a85f70e4ee..270996e2be 100644 --- a/test/functionalTest/cases/1049_values_mode/values_mode.test +++ b/test/functionalTest/cases/1049_values_mode/values_mode.test @@ -81,7 +81,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1049_values_mode/values_mode_entities.test b/test/functionalTest/cases/1049_values_mode/values_mode_entities.test index eeac272032..0b72664d3a 100644 --- a/test/functionalTest/cases/1049_values_mode/values_mode_entities.test +++ b/test/functionalTest/cases/1049_values_mode/values_mode_entities.test @@ -85,7 +85,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -94,7 +94,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_attributes.test b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_attributes.test index 1a4960d5b7..0e51b86c7c 100644 --- a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_attributes.test +++ b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_attributes.test @@ -151,7 +151,7 @@ echo =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) @@ -160,7 +160,7 @@ Date: REGEX(.*) ============================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T2 Date: REGEX(.*) @@ -169,7 +169,7 @@ Date: REGEX(.*) ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_entities.test b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_entities.test index 401a65608d..50b38d64fa 100644 --- a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_entities.test +++ b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_entities.test @@ -176,7 +176,7 @@ echo =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) @@ -185,7 +185,7 @@ Date: REGEX(.*) ============================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T2 Date: REGEX(.*) @@ -194,7 +194,7 @@ Date: REGEX(.*) ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_keyvalues.test b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_keyvalues.test index 35402d0e07..dd37f4dc6c 100644 --- a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_keyvalues.test +++ b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_keyvalues.test @@ -151,7 +151,7 @@ echo =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) @@ -160,7 +160,7 @@ Date: REGEX(.*) ============================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T2 Date: REGEX(.*) @@ -169,7 +169,7 @@ Date: REGEX(.*) ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_scopes.test b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_scopes.test index 3db9e94b40..5ace343b17 100644 --- a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_scopes.test +++ b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_scopes.test @@ -208,7 +208,7 @@ echo =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) @@ -217,7 +217,7 @@ Date: REGEX(.*) ============================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T2 Date: REGEX(.*) @@ -226,7 +226,7 @@ Date: REGEX(.*) ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -338,7 +338,7 @@ Date: REGEX(.*) ========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=none Date: REGEX(.*) @@ -347,7 +347,7 @@ Date: REGEX(.*) ======================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T4 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_values.test b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_values.test index 0a41ce89a7..0530e95d3b 100644 --- a/test/functionalTest/cases/1080_batch_query_context/batch_query_context_values.test +++ b/test/functionalTest/cases/1080_batch_query_context/batch_query_context_values.test @@ -151,7 +151,7 @@ echo =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) @@ -160,7 +160,7 @@ Date: REGEX(.*) ============================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T2 Date: REGEX(.*) @@ -169,7 +169,7 @@ Date: REGEX(.*) ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1103_order_by/order_by_attribute.test b/test/functionalTest/cases/1103_order_by/order_by_attribute.test index c67ac4c149..fd7d44cc34 100644 --- a/test/functionalTest/cases/1103_order_by/order_by_attribute.test +++ b/test/functionalTest/cases/1103_order_by/order_by_attribute.test @@ -137,7 +137,7 @@ echo ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User1 +Location: /v2/entities/User1?type=User Date: REGEX(.*) @@ -146,7 +146,7 @@ Date: REGEX(.*) ========================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User2 +Location: /v2/entities/User2?type=User Date: REGEX(.*) @@ -155,7 +155,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User3 +Location: /v2/entities/User3?type=User Date: REGEX(.*) @@ -164,7 +164,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User4 +Location: /v2/entities/User4?type=User Date: REGEX(.*) diff --git a/test/functionalTest/cases/1103_order_by/order_by_attribute_batch.test b/test/functionalTest/cases/1103_order_by/order_by_attribute_batch.test index 04c1b9353b..c383e87660 100644 --- a/test/functionalTest/cases/1103_order_by/order_by_attribute_batch.test +++ b/test/functionalTest/cases/1103_order_by/order_by_attribute_batch.test @@ -172,7 +172,7 @@ echo ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User1 +Location: /v2/entities/User1?type=User Date: REGEX(.*) @@ -181,7 +181,7 @@ Date: REGEX(.*) ========================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User2 +Location: /v2/entities/User2?type=User Date: REGEX(.*) @@ -190,7 +190,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User3 +Location: /v2/entities/User3?type=User Date: REGEX(.*) @@ -199,7 +199,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User4 +Location: /v2/entities/User4?type=User Date: REGEX(.*) diff --git a/test/functionalTest/cases/1103_order_by/order_by_attribute_ngsiv1.test b/test/functionalTest/cases/1103_order_by/order_by_attribute_ngsiv1.test index 4cc9edfbeb..81a70e375a 100644 --- a/test/functionalTest/cases/1103_order_by/order_by_attribute_ngsiv1.test +++ b/test/functionalTest/cases/1103_order_by/order_by_attribute_ngsiv1.test @@ -182,7 +182,7 @@ echo ======================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User1 +Location: /v2/entities/User1?type=User Date: REGEX(.*) @@ -191,7 +191,7 @@ Date: REGEX(.*) ========================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User2 +Location: /v2/entities/User2?type=User Date: REGEX(.*) @@ -200,7 +200,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User3 +Location: /v2/entities/User3?type=User Date: REGEX(.*) @@ -209,7 +209,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/User4 +Location: /v2/entities/User4?type=User Date: REGEX(.*) diff --git a/test/functionalTest/cases/1103_order_by/order_by_proximity.test b/test/functionalTest/cases/1103_order_by/order_by_proximity.test index 082e64a86a..1522f09721 100644 --- a/test/functionalTest/cases/1103_order_by/order_by_proximity.test +++ b/test/functionalTest/cases/1103_order_by/order_by_proximity.test @@ -134,7 +134,7 @@ echo =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Barcelona +Location: /v2/entities/Barcelona?type=City Date: REGEX(.*) @@ -143,7 +143,7 @@ Date: REGEX(.*) ============================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Guadalajara +Location: /v2/entities/Guadalajara?type=City Date: REGEX(.*) @@ -152,7 +152,7 @@ Date: REGEX(.*) ======================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Lleida +Location: /v2/entities/Lleida?type=City Date: REGEX(.*) @@ -161,7 +161,7 @@ Date: REGEX(.*) ======================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Madrid +Location: /v2/entities/Madrid?type=City Date: REGEX(.*) @@ -170,7 +170,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Zaragoza +Location: /v2/entities/Zaragoza?type=City Date: REGEX(.*) diff --git a/test/functionalTest/cases/1113_bug_metadata_not_updated/metadata_not_updated.test b/test/functionalTest/cases/1113_bug_metadata_not_updated/metadata_not_updated.test index 6397942de0..2e8adf542c 100644 --- a/test/functionalTest/cases/1113_bug_metadata_not_updated/metadata_not_updated.test +++ b/test/functionalTest/cases/1113_bug_metadata_not_updated/metadata_not_updated.test @@ -75,7 +75,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1126_GET_v2_subscriptions/GET_v2_all_subscriptions.test b/test/functionalTest/cases/1126_GET_v2_subscriptions/GET_v2_all_subscriptions.test index 905d8053ab..8f0c24bfe6 100644 --- a/test/functionalTest/cases/1126_GET_v2_subscriptions/GET_v2_all_subscriptions.test +++ b/test/functionalTest/cases/1126_GET_v2_subscriptions/GET_v2_all_subscriptions.test @@ -254,7 +254,7 @@ Date: REGEX(.*) ==================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/MyCar +Location: /v2/entities/MyCar?type=Car Date: REGEX(.*) 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 index da0fce7f8f..0d07fb9797 100644 --- a/test/functionalTest/cases/1127_v1_append_strict/v1_append_strict.test +++ b/test/functionalTest/cases/1127_v1_append_strict/v1_append_strict.test @@ -151,7 +151,7 @@ echo ======================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1127_v1_replace/v1_replace.test b/test/functionalTest/cases/1127_v1_replace/v1_replace.test index a0f7732b06..63e4e83c83 100644 --- a/test/functionalTest/cases/1127_v1_replace/v1_replace.test +++ b/test/functionalTest/cases/1127_v1_replace/v1_replace.test @@ -90,7 +90,7 @@ echo ======================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1158_v2_entity_already_exists/create_already_exists.test b/test/functionalTest/cases/1158_v2_entity_already_exists/create_already_exists.test index 463a572549..7dc1293887 100644 --- a/test/functionalTest/cases/1158_v2_entity_already_exists/create_already_exists.test +++ b/test/functionalTest/cases/1158_v2_entity_already_exists/create_already_exists.test @@ -87,7 +87,7 @@ echo ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Room1 +Location: /v2/entities/Room1?type=Room Date: REGEX(.*) diff --git a/test/functionalTest/cases/1164_v2_update_entities_attr_empty_value/update_entities_attr_empty_value.test b/test/functionalTest/cases/1164_v2_update_entities_attr_empty_value/update_entities_attr_empty_value.test index 4fd4a7a2b1..6191d40608 100644 --- a/test/functionalTest/cases/1164_v2_update_entities_attr_empty_value/update_entities_attr_empty_value.test +++ b/test/functionalTest/cases/1164_v2_update_entities_attr_empty_value/update_entities_attr_empty_value.test @@ -75,7 +75,7 @@ echo ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1169_uri_param_options_map/uri_param_options_map.test b/test/functionalTest/cases/1169_uri_param_options_map/uri_param_options_map.test index 6e0d86bf10..7750ae804a 100644 --- a/test/functionalTest/cases/1169_uri_param_options_map/uri_param_options_map.test +++ b/test/functionalTest/cases/1169_uri_param_options_map/uri_param_options_map.test @@ -85,7 +85,7 @@ echo ==================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/ID +Location: /v2/entities/ID?type=type Date: REGEX(.*) @@ -94,7 +94,7 @@ Date: REGEX(.*) ================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/ID2 +Location: /v2/entities/ID2?type=type Date: REGEX(.*) @@ -116,7 +116,7 @@ Date: REGEX(.*) ========================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/ID4 +Location: /v2/entities/ID4?type=type Date: REGEX(.*) diff --git a/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords.test b/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords.test index 8e805de285..31d35b9a8d 100644 --- a/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords.test +++ b/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords.test @@ -193,7 +193,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Madrid +Location: /v2/entities/Madrid?type=City Date: REGEX(.*) @@ -202,7 +202,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Leganes +Location: /v2/entities/Leganes?type=City Date: REGEX(.*) @@ -211,7 +211,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Alcobendas +Location: /v2/entities/Alcobendas?type=City Date: REGEX(.*) diff --git a/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords_errors.test b/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords_errors.test index 5769f25ab0..b9e152fb32 100644 --- a/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords_errors.test +++ b/test/functionalTest/cases/1177_geometry_and_coords/geometry_and_coords_errors.test @@ -111,7 +111,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1179_options_test/GET_v2_ent_attr_val_options_text.test b/test/functionalTest/cases/1179_options_test/GET_v2_ent_attr_val_options_text.test index d979b64c60..bf790da865 100644 --- a/test/functionalTest/cases/1179_options_test/GET_v2_ent_attr_val_options_text.test +++ b/test/functionalTest/cases/1179_options_test/GET_v2_ent_attr_val_options_text.test @@ -98,7 +98,7 @@ echo ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1185_udpate_change_value_type/update_change_value_type.test b/test/functionalTest/cases/1185_udpate_change_value_type/update_change_value_type.test index 75f33e33d2..9a90e7ebdb 100644 --- a/test/functionalTest/cases/1185_udpate_change_value_type/update_change_value_type.test +++ b/test/functionalTest/cases/1185_udpate_change_value_type/update_change_value_type.test @@ -157,7 +157,7 @@ echo ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1187_empty_attribute_in_create/empty_attribute_in_create.test b/test/functionalTest/cases/1187_empty_attribute_in_create/empty_attribute_in_create.test index d77c926b06..ea250efbc2 100644 --- a/test/functionalTest/cases/1187_empty_attribute_in_create/empty_attribute_in_create.test +++ b/test/functionalTest/cases/1187_empty_attribute_in_create/empty_attribute_in_create.test @@ -71,7 +71,7 @@ echo ======================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1188_empty_attribute_value/empty_attribute_value.test b/test/functionalTest/cases/1188_empty_attribute_value/empty_attribute_value.test index 9f33345321..548058d7f3 100644 --- a/test/functionalTest/cases/1188_empty_attribute_value/empty_attribute_value.test +++ b/test/functionalTest/cases/1188_empty_attribute_value/empty_attribute_value.test @@ -104,7 +104,7 @@ echo ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1198_v2_update_entities_too_many_results/too_many_results.test b/test/functionalTest/cases/1198_v2_update_entities_too_many_results/too_many_results.test index 0294281395..15069a97d1 100644 --- a/test/functionalTest/cases/1198_v2_update_entities_too_many_results/too_many_results.test +++ b/test/functionalTest/cases/1198_v2_update_entities_too_many_results/too_many_results.test @@ -74,7 +74,7 @@ echo ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Room1 +Location: /v2/entities/Room1?type=Room Date: REGEX(.*) @@ -83,7 +83,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Room1 +Location: /v2/entities/Room1?type=Space Date: REGEX(.*) diff --git a/test/functionalTest/cases/1217_update_compound_with_dots/update_compound_with_dots.test b/test/functionalTest/cases/1217_update_compound_with_dots/update_compound_with_dots.test index 1357460bac..326878e9fe 100644 --- a/test/functionalTest/cases/1217_update_compound_with_dots/update_compound_with_dots.test +++ b/test/functionalTest/cases/1217_update_compound_with_dots/update_compound_with_dots.test @@ -72,7 +72,7 @@ echo ================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/apartment_3 +Location: /v2/entities/apartment_3?type=house Date: REGEX(.*) diff --git a/test/functionalTest/cases/1257_v2_update_patch_without_payload/update_patch_without_payload.test b/test/functionalTest/cases/1257_v2_update_patch_without_payload/update_patch_without_payload.test index 134b3de44c..1510d419e1 100644 --- a/test/functionalTest/cases/1257_v2_update_patch_without_payload/update_patch_without_payload.test +++ b/test/functionalTest/cases/1257_v2_update_patch_without_payload/update_patch_without_payload.test @@ -55,7 +55,7 @@ echo ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/compound_attributes_with_value_field.test b/test/functionalTest/cases/1259_new_json_for_v2/compound_attributes_with_value_field.test index 7258a50bd6..b5900f3fce 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/compound_attributes_with_value_field.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/compound_attributes_with_value_field.test @@ -77,7 +77,7 @@ echo ======================================================================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -86,7 +86,7 @@ Date: REGEX(.*) ========================================================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/compound_with_null_value.test b/test/functionalTest/cases/1259_new_json_for_v2/compound_with_null_value.test index 15b3de6776..f2ec3e75ba 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/compound_with_null_value.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/compound_with_null_value.test @@ -105,7 +105,7 @@ echo ==================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value.test b/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value.test index bad103021d..eb137885c4 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value.test @@ -246,7 +246,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value_small.test b/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value_small.test index a8d121fd62..ec5028edcd 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value_small.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/get_attribute_value_small.test @@ -63,7 +63,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_eid_with_keyvalues.test b/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_eid_with_keyvalues.test index 36cf764beb..66ad061ed1 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_eid_with_keyvalues.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_eid_with_keyvalues.test @@ -164,7 +164,7 @@ echo ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -290,7 +290,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_with_keyvalues.test b/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_with_keyvalues.test index a77c95b3d9..dc5d39edb8 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_with_keyvalues.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/post_v2_entities_with_keyvalues.test @@ -181,7 +181,7 @@ echo ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -190,7 +190,7 @@ Date: REGEX(.*) ============================================================================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/putPostPatch_v2_entities_eid.test b/test/functionalTest/cases/1259_new_json_for_v2/putPostPatch_v2_entities_eid.test index e45445ce4e..d19bd2f75f 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/putPostPatch_v2_entities_eid.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/putPostPatch_v2_entities_eid.test @@ -116,7 +116,7 @@ echo ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/put_attribute_value.test b/test/functionalTest/cases/1259_new_json_for_v2/put_attribute_value.test index a86de62e89..132a18f39c 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/put_attribute_value.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/put_attribute_value.test @@ -293,7 +293,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/put_v2_entities_eid_attrs_attr.test b/test/functionalTest/cases/1259_new_json_for_v2/put_v2_entities_eid_attrs_attr.test index 50be314dba..87d1c412f0 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/put_v2_entities_eid_attrs_attr.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/put_v2_entities_eid_attrs_attr.test @@ -126,7 +126,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/update_attribute_with_null_value.test b/test/functionalTest/cases/1259_new_json_for_v2/update_attribute_with_null_value.test index b2a61cdcdb..26fcf599bd 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/update_attribute_with_null_value.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/update_attribute_with_null_value.test @@ -283,7 +283,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -310,7 +310,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) @@ -345,7 +345,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -380,7 +380,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T Date: REGEX(.*) @@ -415,7 +415,7 @@ Date: REGEX(.*) =================================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T5 Date: REGEX(.*) @@ -438,7 +438,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E6 +Location: /v2/entities/E6?type=T6 Date: REGEX(.*) @@ -469,7 +469,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E7 +Location: /v2/entities/E7?type=T7 Date: REGEX(.*) @@ -500,7 +500,7 @@ Date: REGEX(.*) ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E8 +Location: /v2/entities/E8?type=T8 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1259_new_json_for_v2/v2_render_modes.test b/test/functionalTest/cases/1259_new_json_for_v2/v2_render_modes.test index d6629de315..a041dbdc18 100644 --- a/test/functionalTest/cases/1259_new_json_for_v2/v2_render_modes.test +++ b/test/functionalTest/cases/1259_new_json_for_v2/v2_render_modes.test @@ -155,7 +155,7 @@ echo ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1260_v2_update_patch_error_description/update_patch_error_description.test b/test/functionalTest/cases/1260_v2_update_patch_error_description/update_patch_error_description.test index a2a5841056..401f3fecf9 100644 --- a/test/functionalTest/cases/1260_v2_update_patch_error_description/update_patch_error_description.test +++ b/test/functionalTest/cases/1260_v2_update_patch_error_description/update_patch_error_description.test @@ -72,7 +72,7 @@ echo ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -81,7 +81,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) 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 index 17f918d356..35d6ba3b08 100644 --- a/test/functionalTest/cases/1278_patch_unknown_attribute/patch_unknown_attribute.test +++ b/test/functionalTest/cases/1278_patch_unknown_attribute/patch_unknown_attribute.test @@ -63,7 +63,7 @@ echo ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1305_all_tests_empty_payload/all_tests_empty_payload.test b/test/functionalTest/cases/1305_all_tests_empty_payload/all_tests_empty_payload.test index 047a61d93f..1e9321fe08 100644 --- a/test/functionalTest/cases/1305_all_tests_empty_payload/all_tests_empty_payload.test +++ b/test/functionalTest/cases/1305_all_tests_empty_payload/all_tests_empty_payload.test @@ -249,7 +249,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/cache_reset_from_db.test b/test/functionalTest/cases/1308_subscription_cache/cache_reset_from_db.test index be0d2234af..cf5ed433ed 100644 --- a/test/functionalTest/cases/1308_subscription_cache/cache_reset_from_db.test +++ b/test/functionalTest/cases/1308_subscription_cache/cache_reset_from_db.test @@ -285,7 +285,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s01 +Location: /v2/entities/s01?type=none Date: REGEX(.*) @@ -294,7 +294,7 @@ Date: REGEX(.*) ============================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s11 +Location: /v2/entities/s11?type=none Date: REGEX(.*) @@ -303,7 +303,7 @@ Date: REGEX(.*) ============================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s21 +Location: /v2/entities/s21?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpiration.test b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpiration.test index 3626fa2963..2948888019 100644 --- a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpiration.test +++ b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpiration.test @@ -166,7 +166,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s01 +Location: /v2/entities/s01?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterRefresh.test b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterRefresh.test index 95a070861e..a38ebec62b 100644 --- a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterRefresh.test +++ b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterRefresh.test @@ -204,7 +204,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s01 +Location: /v2/entities/s01?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdate.test b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdate.test index 200a74345e..0c777e88c0 100644 --- a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdate.test +++ b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdate.test @@ -203,7 +203,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s01 +Location: /v2/entities/s01?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdateWhenSubExpired.test b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdateWhenSubExpired.test index 68aec8cf95..3781faa55f 100644 --- a/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdateWhenSubExpired.test +++ b/test/functionalTest/cases/1308_subscription_cache/subCacheThrottlingAndExpirationAfterSubUpdateWhenSubExpired.test @@ -204,7 +204,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/s01 +Location: /v2/entities/s01?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1308_subscription_cache/sub_expired_and_updated_then_cache_refresh.test b/test/functionalTest/cases/1308_subscription_cache/sub_expired_and_updated_then_cache_refresh.test index 6903a91258..66342ce822 100644 --- a/test/functionalTest/cases/1308_subscription_cache/sub_expired_and_updated_then_cache_refresh.test +++ b/test/functionalTest/cases/1308_subscription_cache/sub_expired_and_updated_then_cache_refresh.test @@ -202,7 +202,7 @@ echo =================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E10 +Location: /v2/entities/E10?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_initial_notification.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_initial_notification.test index 954674e7d3..b1c588a89e 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_initial_notification.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_initial_notification.test @@ -152,7 +152,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -161,7 +161,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) @@ -170,7 +170,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -179,7 +179,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T Date: REGEX(.*) @@ -188,7 +188,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_combined.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_combined.test index 144927ef92..792bf031c5 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_combined.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_combined.test @@ -123,7 +123,7 @@ Date: REGEX(.*) =========================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_number.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_number.test index 8049441a36..76f991d4e7 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_number.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_number.test @@ -132,7 +132,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_string.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_string.test index 20f477b75a..a07cea7090 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_string.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_enum_string.test @@ -132,7 +132,7 @@ Date: REGEX(.*) =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_number.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_number.test index eee49bd318..8cf29616fd 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_number.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_number.test @@ -132,7 +132,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_string.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_string.test index adabbde939..c38a3e1ca9 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_string.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_equal_single_string.test @@ -131,7 +131,7 @@ Date: REGEX(.*) ============================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_exist_attr.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_exist_attr.test index 51be759581..514d8ce44b 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_exist_attr.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_exist_attr.test @@ -125,7 +125,7 @@ Date: REGEX(.*) =================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -134,7 +134,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_or_equal_than.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_or_equal_than.test index 18beb2c6b9..4ecd5adb2d 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_or_equal_than.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_or_equal_than.test @@ -120,7 +120,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_than.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_than.test index 3affa9469c..881d3a097e 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_than.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_greater_than.test @@ -120,7 +120,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_or_equal_than.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_or_equal_than.test index f929182a6f..c58a7a5f03 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_or_equal_than.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_or_equal_than.test @@ -120,7 +120,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_than.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_than.test index dbcd40edc4..b1c4436c7b 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_than.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_lesser_than.test @@ -120,7 +120,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_nocache.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_nocache.test index f13a899710..92558ed7cd 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_nocache.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_nocache.test @@ -142,7 +142,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_number.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_number.test index 62b35b2163..d3f27d29cd 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_number.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_number.test @@ -132,7 +132,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_string.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_string.test index 86b75569d3..8aa64f9b52 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_string.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_enum_string.test @@ -132,7 +132,7 @@ Date: REGEX(.*) =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_number.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_number.test index 0d49e9c9ff..2d7b37ebb1 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_number.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_number.test @@ -131,7 +131,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_string.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_string.test index 590204032b..6ffe34b22f 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_string.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_equal_single_string.test @@ -131,7 +131,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_exist_attr.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_exist_attr.test index 8fccbbfd46..f19cd2f54c 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_exist_attr.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_exist_attr.test @@ -114,7 +114,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -123,7 +123,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_range.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_range.test index 6cbb162110..fd20fec4e9 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_range.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_not_range.test @@ -164,7 +164,7 @@ Date: REGEX(.*) ======================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_quoted_enum.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_quoted_enum.test index bd432d8a7a..db3d891c6b 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_quoted_enum.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_quoted_enum.test @@ -132,7 +132,7 @@ Date: REGEX(.*) =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_range.test b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_range.test index 2259f84d7b..6cab1964c0 100644 --- a/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_range.test +++ b/test/functionalTest/cases/1316_create_subscription/post_subs_expr_q_range.test @@ -164,7 +164,7 @@ Date: REGEX(.*) ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1320_v2_error_put_attributes/error_put_attributes.test b/test/functionalTest/cases/1320_v2_error_put_attributes/error_put_attributes.test index b33c8e9cc5..81b0b5f053 100644 --- a/test/functionalTest/cases/1320_v2_error_put_attributes/error_put_attributes.test +++ b/test/functionalTest/cases/1320_v2_error_put_attributes/error_put_attributes.test @@ -73,7 +73,7 @@ echo ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -82,7 +82,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1323_put_replacing_dot_in_attrnames/put_replacing_dot_in_attrnames.test b/test/functionalTest/cases/1323_put_replacing_dot_in_attrnames/put_replacing_dot_in_attrnames.test index 758f65be64..ab52d5adf7 100644 --- a/test/functionalTest/cases/1323_put_replacing_dot_in_attrnames/put_replacing_dot_in_attrnames.test +++ b/test/functionalTest/cases/1323_put_replacing_dot_in_attrnames/put_replacing_dot_in_attrnames.test @@ -127,7 +127,7 @@ echo =================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1367_time_measures/time_measure_stats.test b/test/functionalTest/cases/1367_time_measures/time_measure_stats.test index b6a101f337..453d7451d3 100644 --- a/test/functionalTest/cases/1367_time_measures/time_measure_stats.test +++ b/test/functionalTest/cases/1367_time_measures/time_measure_stats.test @@ -568,7 +568,7 @@ Date: REGEX(.*) =================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=Test Date: REGEX(.*) diff --git a/test/functionalTest/cases/1387_update_two_entities/update_two_entities.test b/test/functionalTest/cases/1387_update_two_entities/update_two_entities.test index 0c1141046d..3a218ca225 100644 --- a/test/functionalTest/cases/1387_update_two_entities/update_two_entities.test +++ b/test/functionalTest/cases/1387_update_two_entities/update_two_entities.test @@ -65,7 +65,7 @@ echo ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -74,7 +74,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1423_get_v2_servicepath_long/get_long_servicepath.test b/test/functionalTest/cases/1423_get_v2_servicepath_long/get_long_servicepath.test index 5428934faf..d671e2b7f1 100644 --- a/test/functionalTest/cases/1423_get_v2_servicepath_long/get_long_servicepath.test +++ b/test/functionalTest/cases/1423_get_v2_servicepath_long/get_long_servicepath.test @@ -78,7 +78,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/8787GHY +Location: /v2/entities/8787GHY?type=Car Date: REGEX(.*) diff --git a/test/functionalTest/cases/1433_update_metadata_duplicated/update_meta.test b/test/functionalTest/cases/1433_update_metadata_duplicated/update_meta.test index dc48cdc4fa..047b94b7c3 100644 --- a/test/functionalTest/cases/1433_update_metadata_duplicated/update_meta.test +++ b/test/functionalTest/cases/1433_update_metadata_duplicated/update_meta.test @@ -107,7 +107,7 @@ echo ===================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Room10 +Location: /v2/entities/Room10?type=Room Date: REGEX(.*) diff --git a/test/functionalTest/cases/1471_ngsiv1_render_not_string_in_compounds/ngsiv1_render_not_string_in_compounds.test b/test/functionalTest/cases/1471_ngsiv1_render_not_string_in_compounds/ngsiv1_render_not_string_in_compounds.test index 7297a5b271..c14c05556a 100644 --- a/test/functionalTest/cases/1471_ngsiv1_render_not_string_in_compounds/ngsiv1_render_not_string_in_compounds.test +++ b/test/functionalTest/cases/1471_ngsiv1_render_not_string_in_compounds/ngsiv1_render_not_string_in_compounds.test @@ -93,7 +93,7 @@ echo ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -102,7 +102,7 @@ Date: REGEX(.*) ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T2 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1490_compound_values_with_dot_in_key/compound_values_with_dot_in_key.test b/test/functionalTest/cases/1490_compound_values_with_dot_in_key/compound_values_with_dot_in_key.test index 8c666920c2..75617bc407 100644 --- a/test/functionalTest/cases/1490_compound_values_with_dot_in_key/compound_values_with_dot_in_key.test +++ b/test/functionalTest/cases/1490_compound_values_with_dot_in_key/compound_values_with_dot_in_key.test @@ -69,7 +69,7 @@ echo ================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1587_q_query_has_type/q_query_has_type.test b/test/functionalTest/cases/1587_q_query_has_type/q_query_has_type.test index 8cc2eb6503..6669ec3e73 100644 --- a/test/functionalTest/cases/1587_q_query_has_type/q_query_has_type.test +++ b/test/functionalTest/cases/1587_q_query_has_type/q_query_has_type.test @@ -101,7 +101,7 @@ echo ==================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -110,7 +110,7 @@ Date: REGEX(.*) ==================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T2 Date: REGEX(.*) @@ -119,7 +119,7 @@ Date: REGEX(.*) ==================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1589_query_entities_with_specific_attributes/query_entities_with_specific_attributes.test b/test/functionalTest/cases/1589_query_entities_with_specific_attributes/query_entities_with_specific_attributes.test index 1f0dc2a87e..905a550a66 100644 --- a/test/functionalTest/cases/1589_query_entities_with_specific_attributes/query_entities_with_specific_attributes.test +++ b/test/functionalTest/cases/1589_query_entities_with_specific_attributes/query_entities_with_specific_attributes.test @@ -118,7 +118,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -127,7 +127,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) @@ -136,7 +136,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/attribute_exists_or_not.test b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/attribute_exists_or_not.test index c6742b548e..d3f9884755 100644 --- a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/attribute_exists_or_not.test +++ b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/attribute_exists_or_not.test @@ -100,7 +100,7 @@ echo ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -109,7 +109,7 @@ Date: REGEX(.*) ================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -118,7 +118,7 @@ Date: REGEX(.*) ==================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_greater_or_equal.test b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_greater_or_equal.test index b96b94b8a2..70b7075f44 100644 --- a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_greater_or_equal.test +++ b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_greater_or_equal.test @@ -147,7 +147,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -156,7 +156,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) @@ -165,7 +165,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_less_or_equal.test b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_less_or_equal.test index 4f12b17112..87fd643b0f 100644 --- a/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_less_or_equal.test +++ b/test/functionalTest/cases/1592_query_with_q_op_greater_or_equal/query_with_q_op_less_or_equal.test @@ -147,7 +147,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -156,7 +156,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) @@ -165,7 +165,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1594_query_with_q_and_equals_true/query_with_q_and_equals_true.test b/test/functionalTest/cases/1594_query_with_q_and_equals_true/query_with_q_and_equals_true.test index ddf2041e76..128a362c7e 100644 --- a/test/functionalTest/cases/1594_query_with_q_and_equals_true/query_with_q_and_equals_true.test +++ b/test/functionalTest/cases/1594_query_with_q_and_equals_true/query_with_q_and_equals_true.test @@ -130,7 +130,7 @@ echo ============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -139,7 +139,7 @@ Date: REGEX(.*) =============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) @@ -148,7 +148,7 @@ Date: REGEX(.*) ============================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1595_query_with_q_and_string_values/query_with_q_and_string_values.test b/test/functionalTest/cases/1595_query_with_q_and_string_values/query_with_q_and_string_values.test index 90cbae3701..90468b391c 100644 --- a/test/functionalTest/cases/1595_query_with_q_and_string_values/query_with_q_and_string_values.test +++ b/test/functionalTest/cases/1595_query_with_q_and_string_values/query_with_q_and_string_values.test @@ -110,7 +110,7 @@ echo ===================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -119,7 +119,7 @@ Date: REGEX(.*) ==================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1607_query_with_q_and_ranges_but_invalid_operator/query_with_q_and_ranges_but_invalid_operator.test b/test/functionalTest/cases/1607_query_with_q_and_ranges_but_invalid_operator/query_with_q_and_ranges_but_invalid_operator.test index e8fe3ec49a..330bebc8af 100644 --- a/test/functionalTest/cases/1607_query_with_q_and_ranges_but_invalid_operator/query_with_q_and_ranges_but_invalid_operator.test +++ b/test/functionalTest/cases/1607_query_with_q_and_ranges_but_invalid_operator/query_with_q_and_ranges_but_invalid_operator.test @@ -136,7 +136,7 @@ echo ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) @@ -145,7 +145,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=none Date: REGEX(.*) @@ -154,7 +154,7 @@ Date: REGEX(.*) ============================================ HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1658_v2_patch_subscription/patch_subs_expr_initial_notification.test b/test/functionalTest/cases/1658_v2_patch_subscription/patch_subs_expr_initial_notification.test index f90855f582..2bcf7ed524 100644 --- a/test/functionalTest/cases/1658_v2_patch_subscription/patch_subs_expr_initial_notification.test +++ b/test/functionalTest/cases/1658_v2_patch_subscription/patch_subs_expr_initial_notification.test @@ -186,7 +186,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T Date: REGEX(.*) @@ -195,7 +195,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T Date: REGEX(.*) @@ -204,7 +204,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E3 +Location: /v2/entities/E3?type=T Date: REGEX(.*) @@ -213,7 +213,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E4 +Location: /v2/entities/E4?type=T Date: REGEX(.*) @@ -222,7 +222,7 @@ Date: REGEX(.*) ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E5 +Location: /v2/entities/E5?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error.test b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error.test index 2e84059a79..198629d7c7 100644 --- a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error.test +++ b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error.test @@ -264,7 +264,7 @@ WriteResult({ "nMatched" : 1, "nUpserted" : 0, "nModified" : 1 }) ======================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_api_v1.test b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_api_v1.test index 03f46b1a57..88ecc1ec08 100644 --- a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_api_v1.test +++ b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_api_v1.test @@ -289,7 +289,7 @@ WriteResult({ "nMatched" : 1, "nUpserted" : 0, "nModified" : 1 }) ======================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=ET Date: REGEX(.*) diff --git a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms.test b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms.test index 3c41e11654..3489db2f8c 100644 --- a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms.test +++ b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms.test @@ -268,7 +268,7 @@ WriteResult({ "nMatched" : 1, "nUpserted" : 0, "nModified" : 1 }) ======================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms_api_v1.test b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms_api_v1.test index fa5dbf340e..0b1e1f712a 100644 --- a/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms_api_v1.test +++ b/test/functionalTest/cases/1661_bad_input_on_notification_error/bad_input_on_notification_error_with_relogged_alarms_api_v1.test @@ -293,7 +293,7 @@ WriteResult({ "nMatched" : 1, "nUpserted" : 0, "nModified" : 1 }) ======================================================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=ET Date: REGEX(.*) diff --git a/test/functionalTest/cases/1675_entity_with_plus_symbol/entity_with_plus_symbol_v2.test b/test/functionalTest/cases/1675_entity_with_plus_symbol/entity_with_plus_symbol_v2.test index be70b1cb55..e0fe19fda6 100644 --- a/test/functionalTest/cases/1675_entity_with_plus_symbol/entity_with_plus_symbol_v2.test +++ b/test/functionalTest/cases/1675_entity_with_plus_symbol/entity_with_plus_symbol_v2.test @@ -66,7 +66,7 @@ echo ============================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/+34666666666 +Location: /v2/entities/+34666666666?type=thing Date: REGEX(.*) diff --git a/test/functionalTest/cases/1677_geo_location_for_api_v2/geoquery_points.test b/test/functionalTest/cases/1677_geo_location_for_api_v2/geoquery_points.test index 91ef4ce26b..9190e0144d 100644 --- a/test/functionalTest/cases/1677_geo_location_for_api_v2/geoquery_points.test +++ b/test/functionalTest/cases/1677_geo_location_for_api_v2/geoquery_points.test @@ -277,7 +277,7 @@ echo ========================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/A +Location: /v2/entities/A?type=T Date: REGEX(.*) @@ -286,7 +286,7 @@ Date: REGEX(.*) ========================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/B +Location: /v2/entities/B?type=T Date: REGEX(.*) @@ -295,7 +295,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/C +Location: /v2/entities/C?type=T Date: REGEX(.*) @@ -304,7 +304,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/D +Location: /v2/entities/D?type=T Date: REGEX(.*) @@ -313,7 +313,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1.test b/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1.test index e76608e47c..de7011aab7 100644 --- a/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1.test +++ b/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1.test @@ -581,7 +581,7 @@ echo ========================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/A +Location: /v2/entities/A?type=T Date: REGEX(.*) @@ -590,7 +590,7 @@ Date: REGEX(.*) ========================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/B +Location: /v2/entities/B?type=T Date: REGEX(.*) @@ -599,7 +599,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/C +Location: /v2/entities/C?type=T Date: REGEX(.*) @@ -608,7 +608,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/D +Location: /v2/entities/D?type=T Date: REGEX(.*) @@ -617,7 +617,7 @@ Date: REGEX(.*) =========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E +Location: /v2/entities/E?type=T Date: REGEX(.*) diff --git a/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1_near.test b/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1_near.test index f820bd2146..f574e81d33 100644 --- a/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1_near.test +++ b/test/functionalTest/cases/1677_geo_location_for_api_v2/ngsiv2_location_in_ngsv1_near.test @@ -174,7 +174,7 @@ echo ========================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Madrid +Location: /v2/entities/Madrid?type=City Date: REGEX(.*) @@ -183,7 +183,7 @@ Date: REGEX(.*) ============================================= HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Alcobendas +Location: /v2/entities/Alcobendas?type=City Date: REGEX(.*) @@ -192,7 +192,7 @@ Date: REGEX(.*) ========================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/Leganes +Location: /v2/entities/Leganes?type=City Date: REGEX(.*) 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 index 53210d8b2d..68ebed19ac 100644 --- 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 @@ -127,7 +127,7 @@ Date: REGEX(.*) ================================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=none Date: REGEX(.*) diff --git a/test/functionalTest/cases/1713_null_value_for_metadatas/null_value_for_metadatas.test b/test/functionalTest/cases/1713_null_value_for_metadatas/null_value_for_metadatas.test index 9108c71ea7..653c59e145 100644 --- a/test/functionalTest/cases/1713_null_value_for_metadatas/null_value_for_metadatas.test +++ b/test/functionalTest/cases/1713_null_value_for_metadatas/null_value_for_metadatas.test @@ -56,7 +56,7 @@ echo ===================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/room17 +Location: /v2/entities/room17?type=room Date: REGEX(.*) diff --git a/test/functionalTest/cases/1720_get_entities_by_id/get_entities_by_id.test b/test/functionalTest/cases/1720_get_entities_by_id/get_entities_by_id.test index 9e833a89f6..7835026f26 100644 --- a/test/functionalTest/cases/1720_get_entities_by_id/get_entities_by_id.test +++ b/test/functionalTest/cases/1720_get_entities_by_id/get_entities_by_id.test @@ -91,7 +91,7 @@ echo ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/vehicle1 +Location: /v2/entities/vehicle1?type=car Date: REGEX(.*) @@ -100,7 +100,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/vehicle2 +Location: /v2/entities/vehicle2?type=car Date: REGEX(.*) @@ -109,7 +109,7 @@ Date: REGEX(.*) ========================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/vehicle3 +Location: /v2/entities/vehicle3?type=car Date: REGEX(.*) diff --git a/test/functionalTest/cases/1749_list_of_types_in_query/list_of_types_in_query.test b/test/functionalTest/cases/1749_list_of_types_in_query/list_of_types_in_query.test index d6532757b4..fea77a5696 100644 --- a/test/functionalTest/cases/1749_list_of_types_in_query/list_of_types_in_query.test +++ b/test/functionalTest/cases/1749_list_of_types_in_query/list_of_types_in_query.test @@ -189,7 +189,7 @@ echo ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T1 Date: REGEX(.*) @@ -198,7 +198,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T2 Date: REGEX(.*) @@ -207,7 +207,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E1 +Location: /v2/entities/E1?type=T3 Date: REGEX(.*) @@ -338,7 +338,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T1 Date: REGEX(.*) @@ -347,7 +347,7 @@ Date: REGEX(.*) ================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E2 +Location: /v2/entities/E2?type=T3 Date: REGEX(.*) @@ -383,7 +383,7 @@ Date: REGEX(.*) =================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/E12 +Location: /v2/entities/E12?type=T1 Date: REGEX(.*) diff --git a/test/functionalTest/cases/1764_long_servicepath_component/1764_long_servicepath_component.test b/test/functionalTest/cases/1764_long_servicepath_component/1764_long_servicepath_component.test index 8c3f0b904a..69c33e116d 100644 --- a/test/functionalTest/cases/1764_long_servicepath_component/1764_long_servicepath_component.test +++ b/test/functionalTest/cases/1764_long_servicepath_component/1764_long_servicepath_component.test @@ -97,7 +97,7 @@ echo ====================================== HTTP/1.1 201 Created Content-Length: 0 -Location: /v2/entities/8787GHY +Location: /v2/entities/8787GHY?type=Car Date: REGEX(.*)