diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE index dc2f033b73..82bf05ef83 100644 --- a/CHANGES_NEXT_RELEASE +++ b/CHANGES_NEXT_RELEASE @@ -8,5 +8,6 @@ ## New Features: #1707: Support for local=true in the type discovery endpoints (GET /ngsi-ld/v1/types[/{typeName}] #XXXX: Support for local=true in the ATTRIBUTE discovery endpoints (GET /ngsi-ld/v1/attributes}] + #XXXX: Made 1.8 the default core context ## Notes diff --git a/src/app/orionld/orionld.cpp b/src/app/orionld/orionld.cpp index 8bbe8afb6b..622ae383bc 100644 --- a/src/app/orionld/orionld.cpp +++ b/src/app/orionld/orionld.cpp @@ -930,6 +930,7 @@ static char* coreContextUrlSetup(const char* version) else if (strcmp(version, "v1.5") == 0) return ORIONLD_CORE_CONTEXT_URL_V1_5; else if (strcmp(version, "v1.6") == 0) return ORIONLD_CORE_CONTEXT_URL_V1_6; else if (strcmp(version, "v1.7") == 0) return ORIONLD_CORE_CONTEXT_URL_V1_7; + else if (strcmp(version, "v1.8") == 0) return ORIONLD_CORE_CONTEXT_URL_V1_8; return NULL; } diff --git a/src/lib/orionld/context/orionldContextHashTablesFill.cpp b/src/lib/orionld/context/orionldContextHashTablesFill.cpp index a2eadab42f..d47cb936d8 100644 --- a/src/lib/orionld/context/orionldContextHashTablesFill.cpp +++ b/src/lib/orionld/context/orionldContextHashTablesFill.cpp @@ -56,6 +56,20 @@ bool orionldContextHashTablesFill(OrionldContext* contextP, KjNode* keyValueTree for (KjNode* kvP = keyValueTree->value.firstChildP; kvP != NULL; kvP = kvP->next) { + // + // Two new fields, neither String nor Object were introduced in the Core Context version 1.8 + // + if (strcmp(kvP->name, "@version") == 0) + { + // FIXME: Keep the JSON-LD version ? + continue; + } + else if (strcmp(kvP->name, "@protected") == 0) + { + // FIXME: Keep the JSON-LD protection bool ? + continue; + } + OrionldContextItem* hiP = (OrionldContextItem*) kaAlloc(&kalloc, sizeof(OrionldContextItem)); hiP->name = kaStrdup(&kalloc, kvP->name); diff --git a/src/lib/orionld/context/orionldContextItemExpand.cpp b/src/lib/orionld/context/orionldContextItemExpand.cpp index ff91bdfc86..3b2a97848b 100644 --- a/src/lib/orionld/context/orionldContextItemExpand.cpp +++ b/src/lib/orionld/context/orionldContextItemExpand.cpp @@ -81,6 +81,9 @@ char* orionldContextItemExpand if (orionldCoreContextP != NULL) contextItemP = orionldContextItemLookup(orionldCoreContextP, shortName, NULL); + if (contextItemP != NULL) + LM_T(LmtExpand, ("Found '%s' in the core context (%s)", shortName, orionldCoreContextP->url)); + // 2. Lookup in given context (unless it's the Core Context) if ((contextItemP == NULL) && (contextP != orionldCoreContextP)) contextItemP = orionldContextItemLookup(contextP, shortName, NULL); diff --git a/src/lib/orionld/context/orionldCoreContext.h b/src/lib/orionld/context/orionldCoreContext.h index 9261647dd7..80794a84c1 100644 --- a/src/lib/orionld/context/orionldCoreContext.h +++ b/src/lib/orionld/context/orionldCoreContext.h @@ -45,7 +45,8 @@ extern "C" #define ORIONLD_CORE_CONTEXT_URL_V1_5 (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.5.jsonld" #define ORIONLD_CORE_CONTEXT_URL_V1_6 (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" #define ORIONLD_CORE_CONTEXT_URL_V1_7 (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.7.jsonld" -#define ORIONLD_CORE_CONTEXT_URL_DEFAULT (char*) "v1.6" +#define ORIONLD_CORE_CONTEXT_URL_V1_8 (char*) "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.8.jsonld" +#define ORIONLD_CORE_CONTEXT_URL_DEFAULT (char*) "v1.8" diff --git a/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp b/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp index 3378606eb9..f4faa187b0 100644 --- a/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp +++ b/src/lib/orionld/legacyDriver/kjTreeToContextAttribute.cpp @@ -73,8 +73,6 @@ static bool specialCompoundCheck(const char* attrName, KjNode* compoundValueP) KjNode* valueNodeP = NULL; KjNode* otherNodeP = NULL; - LM_W(("Attr name: '%s'", attrName)); - for (KjNode* nodeP = compoundValueP->value.firstChildP; nodeP != NULL; nodeP = nodeP->next) { if (nodeP->name[0] == '@') @@ -112,7 +110,6 @@ static bool specialCompoundCheck(const char* attrName, KjNode* compoundValueP) if (dateTimeFromString(valueNodeP->value.s, errorString, sizeof(errorString)) < 0) { orionldError(OrionldBadRequestData, "DateTime value of @value/@type compound must be a valid ISO8601", errorString, 400); - LM_W(("Attr name: '%s'", attrName)); pdAttribute(attrName); return false; } @@ -162,7 +159,6 @@ static bool attributeValueSet(ContextAttribute* caP, KjNode* valueP) if (valueP->type == KjObject) { - LM_W(("Attr name: '%s'", caP->name.c_str())); if (specialCompoundCheck(caP->name.c_str(), valueP) == false) return false; } @@ -207,8 +203,6 @@ bool kjTreeToContextAttribute(OrionldContext* contextP, KjNode* kNodeP, ContextA caP->name = attributeName; *detailP = (char*) "unknown error"; - LM_W(("attributeName: '%s'", caP->name.c_str())); - if (contextP == NULL) contextP = orionldCoreContextP; @@ -641,7 +635,6 @@ bool kjTreeToContextAttribute(OrionldContext* contextP, KjNode* kNodeP, ContextA } else { - LM_W(("Calling attributeValueSet for attribute '%s'", caP->name.c_str())); if (attributeValueSet(caP, valueP) == false) { // attributeValueSet calls orionldError diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test b/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test index 92e67e1555..c0cce8f593 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_GET_with_keyValues.test @@ -190,7 +190,7 @@ HTTP/1.1 200 OK Content-Length: 265 Content-Type: application/json Date: REGEX(.*) -Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" [ { @@ -319,6 +338,27 @@ Link: ; rel="h ] +15. Kill and restart the broker, now with v1.8 as Core Context +============================================================== +The broker is now running with v1.8 as Core Context + + +16. GET all entities, see Core Context v1.8 in Link header +========================================================== +HTTP/1.1 200 OK +Content-Length: 28 +Content-Type: application/json +Date: REGEX(.*) +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" + +[ + { + "id": "urn:E1", + "type": "T" + } +] + + --TEARDOWN-- brokerStop CB dbDrop CB diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get.test index 7b7b0c0a2b..6c9a35ef85 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get.test @@ -244,7 +244,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -260,7 +260,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", @@ -288,7 +288,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -304,7 +304,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", @@ -332,7 +332,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -361,7 +361,7 @@ NGSILD-Results-Count: 4 { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -377,7 +377,7 @@ NGSILD-Results-Count: 4 { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -393,7 +393,7 @@ NGSILD-Results-Count: 4 { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", @@ -409,7 +409,7 @@ NGSILD-Results-Count: 4 { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", @@ -460,7 +460,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -482,7 +482,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", @@ -516,7 +516,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -532,7 +532,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -548,7 +548,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", @@ -564,7 +564,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_eq.test index 884445e342..451289a215 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than.test index 69172a9ca0..ec66204863 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than_or_equal.test index 8880c5b2a3..2e3bfa9369 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_greater_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than.test index 85a3c5d122..e5017348fc 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than_or_equal.test index 43fdd8f64b..43e546c345 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_less_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_not_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_not_eq.test index 609501f88a..12beed2797 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_not_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_DateTime_attr_not_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_doesnt_exist.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_doesnt_exist.test index a8dde05d3c..f913599c1f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_doesnt_exist.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_doesnt_exist.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_eq.test index 9191f3afcf..7ccc8203c1 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_exists.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_exists.test index 2b0e1f6302..efb4ce5ab8 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_exists.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_exists.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_not_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_not_eq.test index a58cd4601d..424a19ad92 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_not_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_bool_attr_not_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_doesnt_exist.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_doesnt_exist.test index fbb4fa3825..2b22e46394 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_doesnt_exist.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_doesnt_exist.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_eq.test index 26c2ee5c2a..1ae2c2d07f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_exists.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_exists.test index 7f48002572..c98b2f70af 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_exists.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_exists.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than.test index af945e8ea4..ad48b3ab9f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than_or_equal.test index c80c23d419..0ca1df768a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_greater_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than.test index b0155b8059..98f66e9e8e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than_or_equal.test index 3f63c11e4c..1a10f6743a 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_less_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_list.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_list.test index 74b0e5a582..b54d1d8306 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_list.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_list.test @@ -182,7 +182,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -194,7 +194,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_not_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_not_eq.test index 0f127435ac..818bceca4e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_not_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_not_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_range.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_range.test index a420858509..c61d8e9e0b 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_range.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_int_attr_range.test @@ -182,7 +182,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -194,7 +194,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_doesnt_exist.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_doesnt_exist.test index 6a176c7b8c..fcff79cc3f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_doesnt_exist.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_doesnt_exist.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_eq.test index 1f513d9ab6..0de712bcd0 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_exists.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_exists.test index b516b1d453..cd31283e9c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_exists.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_exists.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than.test index 7df6ec4859..e5af238eaa 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than_or_equal.test index e7681a323a..982ce581be 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_greater_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than.test index 43d2522065..41b97b18ef 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than_or_equal.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than_or_equal.test index b883adb9c4..9e1dac30c1 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than_or_equal.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_less_than_or_equal.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_list.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_list.test index e36e0d3359..ec84d9d67e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_list.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_list.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_not_eq.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_not_eq.test index a4dfb2ecc7..0e91c8c9e1 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_not_eq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_not_eq.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_pattern.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_pattern.test index 65df272dba..32bb377ad6 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_pattern.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_pattern.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_range.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_range.test index 059bb794e5..78abddd537 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_range.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_q_string_attr_range.test @@ -156,7 +156,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -168,7 +168,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_attr_list.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_attr_list.test index f79d3c924a..a2a1728147 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_attr_list.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_attr_list.test @@ -211,7 +211,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -235,7 +235,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -247,7 +247,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T", @@ -271,7 +271,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -283,7 +283,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T", @@ -307,7 +307,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -319,7 +319,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T", @@ -335,7 +335,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", @@ -351,7 +351,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T", @@ -375,7 +375,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -387,7 +387,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T", @@ -403,7 +403,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_just_one_attr.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_just_one_attr.test index 915f41c49c..1a9f6cb171 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_just_one_attr.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_attrs_uri_param_just_one_attr.test @@ -188,7 +188,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -212,7 +212,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -224,7 +224,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_id_list.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_id_list.test index e6a8ca8cae..dc6f5f1c5f 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_id_list.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_id_list.test @@ -171,7 +171,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -183,7 +183,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T2", @@ -207,7 +207,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_type_list.test b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_type_list.test index 871d19bfac..c472636686 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_type_list.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entities_get_with_uri_param_type_list.test @@ -179,7 +179,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E1", "type": "T", @@ -203,7 +203,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", @@ -215,7 +215,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E3", "type": "T3", @@ -227,7 +227,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E4", "type": "T4", @@ -251,7 +251,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "id": "http://a.b.c/entity/E2", "type": "T2", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_entityMap_forwarded_attrs_param.test b/test/functionalTest/cases/0000_ngsild/ngsild_entityMap_forwarded_attrs_param.test index b41a6fa62d..f8761857df 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_entityMap_forwarded_attrs_param.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_entityMap_forwarded_attrs_param.test @@ -113,7 +113,7 @@ HTTP/1.1 200 OK Content-Length: 61 Content-Type: application/json Date: REGEX(.*) -Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="h ], "id": "urn:S1", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "notification": { "attributes": [ "P1", @@ -168,7 +168,7 @@ Link: ; rel="h ], "id": "urn:S2", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "notification": { "attributes": [ "P1", @@ -195,7 +195,7 @@ HTTP/1.1 200 OK Content-Length: 840 Content-Type: application/json Date: REGEX(.*) -Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="h ], "id": "urn:S1", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "notification": { "attributes": [ "P1", @@ -236,7 +236,7 @@ Link: ; rel="h ], "id": "urn:S2", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "notification": { "attributes": [ "P1", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0018_default_context_when_no_context.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0018_default_context_when_no_context.test index a9f1a569e9..b0dc3cb20e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0018_default_context_when_no_context.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0018_default_context_when_no_context.test @@ -71,7 +71,7 @@ Content-Type: application/ld+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "id": "urn:ngsi-ld:Vehicle:V233", "type": "Vehicle" } diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0023.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0023.test index ad02410749..32729ba963 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0023.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0023.test @@ -115,7 +115,7 @@ Content-Type: application/ld+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "id": "urn:ngsi-ld:Vehicle:V233", "type": "Vehicle" } diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0118.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0118.test index 815d2e6af2..f247188639 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0118.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0118.test @@ -350,7 +350,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "description": "Description of Test subscription 01", "entities": [ @@ -534,7 +534,7 @@ Date: REGEX(.*) { "@context": [ "https://fiware.github.io/NGSI-LD_TestSuite/ldContext/testContext.jsonld", - "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" ], "description": "Description of Test subscription 01", "entities": [ diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0518.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0518.test index d4eb3e4095..059cd3032d 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_0518.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_0518.test @@ -151,7 +151,7 @@ MongoDB server version: REGEX(.*) "attrs" : [ ], "metadata" : [ ], "blacklist" : false, - "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "createdAt" : REGEX(.*), "modifiedAt" : REGEX(.*), "conditions" : [ diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1033.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1033.test index 6af502a25c..55485f156c 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1033.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1033.test @@ -110,7 +110,7 @@ Content-Type: application/geo+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "geometry": { "coordinates": [ 13.356, @@ -153,7 +153,7 @@ Content-Type: application/geo+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "geometry": { "coordinates": [ 13.356, @@ -191,7 +191,7 @@ Content-Type: application/geo+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "geometry": { "coordinates": [ 13.356, @@ -223,7 +223,7 @@ Content-Type: application/geo+json Date: REGEX(.*) { - "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "@context": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "geometry": { "coordinates": [ 13.356, diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1467.test b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1467.test index 7cdb83a7bd..2f618edfb2 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_issue_1467.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_issue_1467.test @@ -163,7 +163,7 @@ HTTP/1.1 200 OK Content-Length: 130 Content-Type: application/json Date: REGEX(.*) -Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; ], "id": "http://a.b.c/subs/sub09", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "modifiedAt": REGEX(.*), "notification": { "attributes": [ @@ -749,7 +749,7 @@ MongoDB server REGEX(.*) "custom" : false, "servicePath" : "/#", "blacklist" : false, - "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld" + "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)" } bye diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_issue_1401.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_issue_1401.test index 903a895267..05538a8264 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_issue_1401.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_issue_1401.test @@ -143,7 +143,7 @@ Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="h }, "id": "urn:ngsi-ld:Subscription:S1", "isActive": false, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "lang": "es", "modifiedAt": "202REGEX(.*)Z", "notification": { @@ -435,7 +435,7 @@ MongoDB server version: REGEX(.*) "custom" : false, "servicePath" : "/#", "blacklist" : false, - "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "ldQ" : "https://uri=etsi=org/ngsi-ld/default-context/a.value>12", "name" : "New name", "expiration" : 2032768800.123 @@ -454,7 +454,7 @@ HTTP/1.1 200 OK Content-Length: 681 Content-Type: application/json Date: REGEX(.*) -Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="h }, "id": "urn:ngsi-ld:Subscription:S1", "isActive": false, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "lang": "es", "modifiedAt": "202REGEX(.*)Z", "notification": { diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test index efe6031e75..97d1dda944 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_new_subscription_patch_geoq.test @@ -195,7 +195,7 @@ Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="h ], "id": "urn:ngsi-ld:Subscription:SubscriptionPrivateSub", "isActive": true, - "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "jsonldContext": "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "notification": { "endpoint": { "accept": "application/json", diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_and_q_issue_1180.test b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_and_q_issue_1180.test index 7f71de16d3..4ac42afd4e 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_and_q_issue_1180.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_and_q_issue_1180.test @@ -137,7 +137,7 @@ MongoDB server version: REGEX(.*) "attrs" : [ ], "metadata" : [ ], "blacklist" : false, - "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.6.jsonld", + "ldContext" : "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-contextREGEX(.*)", "createdAt" : REGEX(\d+\.\d+), "modifiedAt" : REGEX(\d+\.\d+), "conditions" : [ ], diff --git a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test index b83ea04c05..a318381d70 100644 --- a/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test +++ b/test/functionalTest/cases/0000_ngsild/ngsild_subscription_cache_issue-1316.test @@ -118,7 +118,7 @@ Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: ; rel="http://www.w3.org/ns/json-ld#context"; type="application/ld+json" +Link: