From 036669d016f171f43318f59df36facb8ddd99c21 Mon Sep 17 00:00:00 2001 From: gpoujol Date: Fri, 10 Mar 2023 15:32:38 +0100 Subject: [PATCH] chore: add compound context with core context --- ...rce-registration-building-and-bus-entities-sample.jsonld | 2 +- .../context-source-registration-bus-entities-sample.jsonld | 2 +- ...t-source-registration-detailed-information-sample.jsonld | 2 +- .../context-source-registration-invalid-sample.jsonld | 2 +- ...text-source-registration-invalid-structure-sample.jsonld | 2 +- .../context-source-registration-location-sample.jsonld | 2 +- ...ext-source-registration-managementInterval-sample.jsonld | 2 +- .../context-source-registration-no-id-sample.jsonld | 2 +- ...xt-source-registration-observationInterval-sample.jsonld | 2 +- ...ontext-source-registration-past-expiration-sample.jsonld | 2 +- .../context-source-registration-sample.jsonld | 2 +- .../context-source-registration-simple-sample.jsonld | 2 +- ...ntext-source-registration-vehicle-entities-sample.jsonld | 2 +- ...ontext-source-registration-with-expiration-sample.jsonld | 2 +- ...istration-with-only-properties-information-sample.jsonld | 2 +- ...context-source-registration-different-type-sample.jsonld | 2 +- .../subscription-empty-watchedAttributes-sample.jsonld | 2 +- .../csourceSubscriptions/subscription-expired-sample.jsonld | 2 +- .../subscription-expiresAt-sample.jsonld | 2 +- data/csourceSubscriptions/subscription-geoQ-sample.jsonld | 2 +- .../subscription-geoQ-without-geoproperty-sample.jsonld | 2 +- .../subscription-inactive-sample.jsonld | 2 +- .../subscription-invalid-query-sample.jsonld | 2 +- .../subscription-invalid-type-sample.jsonld | 2 +- data/csourceSubscriptions/subscription-sample.jsonld | 2 +- .../subscription-temporalQ-createdAt-sample.jsonld | 2 +- .../subscription-temporalQ-modifiedAt-sample.jsonld | 2 +- .../subscription-temporalQ-observedAt-sample.jsonld | 2 +- .../subscription-timeInterval-sample.jsonld | 2 +- .../subscription-unreachable-endpoint-sample.jsonld | 2 +- .../subscription-watchedAttributes-sample.jsonld | 2 +- .../subscription-without-notification-sample.jsonld | 2 +- data/entities/batch/invalid-json-ld-sample.jsonld | 2 +- data/entities/batch/invalid-json-sample.jsonld | 2 +- data/entities/building-location-attribute-sample.jsonld | 2 +- data/entities/building-location-attribute.jsonld | 2 +- data/entities/building-minimal-sample.jsonld | 2 +- data/entities/building-minimal.jsonld | 2 +- data/entities/building-no-attributes.jsonld | 2 +- .../building-relationship-of-property-sample.jsonld | 2 +- data/entities/building-relationship-sample.jsonld | 2 +- data/entities/building-relationship.jsonld | 2 +- data/entities/building-simple-attributes-sample.jsonld | 2 +- .../vehicle-delete-datasetid-speed-expectation.jsonld | 2 +- .../vehicle-delete-default-speed-expectation.jsonld | 2 +- .../vehicle-delete-deleteall-speed-expectation.jsonld | 2 +- .../expectations/vehicle-isparked-update-expectation.jsonld | 2 +- .../vehicle-multi-attributes-expectation.jsonld | 2 +- .../expectations/vehicle-speed-appended-expectation.jsonld | 2 +- .../vehicle-speed-different-datasetid-expectation.jsonld | 2 +- .../vehicle-update-attributes-expectation.jsonld | 2 +- .../vehicle-update-datasetid-attributes-expectation.jsonld | 2 +- .../expectations/vehicle-update-speed-expectation.jsonld | 2 +- .../fragmentEntities/airQualityLevel-fragment.jsonld | 2 +- data/entities/fragmentEntities/invalid-fragment.jsonld | 2 +- .../vehicle-attribute-to-add-fragment.jsonld | 2 +- .../fragmentEntities/vehicle-brandname-fragment.jsonld | 2 +- .../fragmentEntities/vehicle-isparked-fragment.jsonld | 2 +- .../fragmentEntities/vehicle-new-attribute-fragment.jsonld | 2 +- .../vehicle-speed-different-datasetid-fragment.jsonld | 2 +- ...cle-speed-equal-datasetid-different-type-fragment.jsonld | 2 +- .../vehicle-speed-equal-datasetid-fragment.jsonld | 2 +- .../vehicle-speed-invalid-datasetid-fragment.jsonld | 2 +- .../vehicle-speed-two-datasetid-01-fragment.jsonld | 2 +- .../vehicle-speed-two-datasetid-02-fragment.jsonld | 2 +- .../vehicle-speed-two-datasetid-03-fragment.jsonld | 2 +- .../vehicle-speed-wrong-name-fragment.jsonld | 2 +- data/entities/invalid-json-sample.jsonld | 2 +- data/entities/parking-simple-attributes-sample.jsonld | 2 +- data/entities/vehicle-simple-attributes-sample.jsonld | 2 +- data/entities/vehicle-speed-two-datasetid-sample.jsonld | 2 +- .../entities/vehicle-two-datasetid-attributes-sample.jsonld | 2 +- .../expectations/subscription-028-01-expectation.jsonld | 2 +- .../subscription-vehicle-expanded-types-sample.jsonld | 2 +- .../expectations/subscription-vehicle-sample.jsonld | 2 +- .../subscription-building-entities-accept-jsonld.jsonld | 2 +- .../subscription-building-entities-active-query.jsonld | 2 +- ...-building-entities-active-watchedAttributes-query.jsonld | 2 +- ...iption-building-entities-active-watchedAttributes.jsonld | 2 +- .../subscription-building-entities-active.jsonld | 2 +- .../subscription-building-entities-default.jsonld | 2 +- data/subscriptions/subscription-inactive-sample.jsonld | 2 +- data/subscriptions/subscription-invalid-json-sample.jsonld | 2 +- data/subscriptions/subscription-sample.jsonld | 2 +- .../subscription-timeInterval-sample-query.jsonld | 2 +- data/subscriptions/subscription-timeInterval-sample.jsonld | 2 +- .../subscription-watchedAttributes-sample.jsonld | 2 +- .../2020-08-bus-temporal-representation-sample.jsonld | 2 +- ...temporal-representation-multiple-instances-sample.jsonld | 2 +- .../2020-08-vehicule-temporal-representation-sample.jsonld | 2 +- .../2020-09-vehicule-temporal-representation-sample.jsonld | 2 +- ...cule-temporal-representation-with-location-sample.jsonld | 2 +- data/temporalEntities/entity-operations-after-query.jsonld | 2 +- data/temporalEntities/entity-operations-before-query.jsonld | 2 +- ...ral-representation-delete-speed-instanceid-sample.jsonld | 2 +- .../vehicle-temporal-representation-fragment.jsonld | 2 +- ...cle-temporal-representation-invalid-json-fragment.jsonld | 2 +- .../vehicle-create-temporal-representation-sample.jsonld | 2 +- ...vehicle-simplified-temporal-representation-sample.jsonld | 2 +- .../vehicle-temporal-representation-sample.jsonld | 2 +- .../vehicle-temporal-representation-update-sample.jsonld | 2 +- .../jsonld-contexts/ngsi-ld-test-suite-compound.jsonld | 6 ++++++ .../ngsi-ld-test-suite.jsonld} | 0 resources/variables.py | 2 +- 104 files changed, 108 insertions(+), 102 deletions(-) create mode 100644 resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld rename resources/{ngsi-ld-test-suite-context.jsonld => jsonld-contexts/ngsi-ld-test-suite.jsonld} (100%) diff --git a/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld index 595a6bae..12a546f6 100644 --- a/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-building-and-bus-entities-sample.jsonld @@ -19,6 +19,6 @@ ], "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld index 28b2672a..1c39aed2 100644 --- a/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-bus-entities-sample.jsonld @@ -12,6 +12,6 @@ ], "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld index b4826ab6..4560eee8 100644 --- a/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-detailed-information-sample.jsonld @@ -14,6 +14,6 @@ ], "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld index 5eb0def1..3a401bad 100644 --- a/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-invalid-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld index a05b8ef5..97515561 100644 --- a/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-invalid-structure-sample.jsonld @@ -2,6 +2,6 @@ "id": "urn:ngsi-ld:ContextSourceRegistration:randomUUID", "type": "ContextSourceRegistration", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-location-sample.jsonld b/data/csourceRegistrations/context-source-registration-location-sample.jsonld index 3f1faa32..c119434b 100644 --- a/data/csourceRegistrations/context-source-registration-location-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-location-sample.jsonld @@ -19,6 +19,6 @@ }, "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld index 8ea742e0..329d4b7c 100644 --- a/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-managementInterval-sample.jsonld @@ -16,6 +16,6 @@ }, "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld index a64c29ea..ed9e1d8e 100644 --- a/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-no-id-sample.jsonld @@ -37,6 +37,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld b/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld index f97a489b..35ac3fc0 100644 --- a/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-observationInterval-sample.jsonld @@ -16,6 +16,6 @@ }, "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld index 182acfd5..38760ce0 100644 --- a/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-past-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": " 2018-11-29T14:53:15Z", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-sample.jsonld b/data/csourceRegistrations/context-source-registration-sample.jsonld index 42364aee..68ef4bc9 100644 --- a/data/csourceRegistrations/context-source-registration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-sample.jsonld @@ -38,6 +38,6 @@ "startAt": "2017-11-29T14:53:15Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-simple-sample.jsonld b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld index d8676411..7d83cbbc 100644 --- a/data/csourceRegistrations/context-source-registration-simple-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-simple-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld b/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld index 52d23178..4a80a599 100644 --- a/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-vehicle-entities-sample.jsonld @@ -12,6 +12,6 @@ ], "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld index aae82c14..d638652d 100644 --- a/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-with-expiration-sample.jsonld @@ -39,6 +39,6 @@ }, "expiresAt": "2025-11-29T14:53:15Z", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld b/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld index ab355dda..17425354 100644 --- a/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld +++ b/data/csourceRegistrations/context-source-registration-with-only-properties-information-sample.jsonld @@ -8,6 +8,6 @@ ], "endpoint":"http://my.csource.org:1026", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld index ed1ac079..09591732 100644 --- a/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld +++ b/data/csourceRegistrations/fragments/context-source-registration-different-type-sample.jsonld @@ -38,6 +38,6 @@ "startAt": " 2017-11-29T14:53:15Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld index 974c0ec3..c027db75 100644 --- a/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld +++ b/data/csourceSubscriptions/subscription-empty-watchedAttributes-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-expired-sample.jsonld b/data/csourceSubscriptions/subscription-expired-sample.jsonld index d0a82db9..f19891b5 100644 --- a/data/csourceSubscriptions/subscription-expired-sample.jsonld +++ b/data/csourceSubscriptions/subscription-expired-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld b/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld index 0bcd3fdb..9286e21d 100644 --- a/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld +++ b/data/csourceSubscriptions/subscription-expiresAt-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-geoQ-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ-sample.jsonld index 504d7398..ee67134f 100644 --- a/data/csourceSubscriptions/subscription-geoQ-sample.jsonld +++ b/data/csourceSubscriptions/subscription-geoQ-sample.jsonld @@ -20,6 +20,6 @@ "geoproperty": "location" }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld b/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld index 40c3e966..59c4e595 100644 --- a/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld +++ b/data/csourceSubscriptions/subscription-geoQ-without-geoproperty-sample.jsonld @@ -19,6 +19,6 @@ "coordinates":[-8.52,41.2] }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-inactive-sample.jsonld b/data/csourceSubscriptions/subscription-inactive-sample.jsonld index 8dc52e55..9d513e90 100644 --- a/data/csourceSubscriptions/subscription-inactive-sample.jsonld +++ b/data/csourceSubscriptions/subscription-inactive-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld index 4822c1fa..9a4012e3 100644 --- a/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld +++ b/data/csourceSubscriptions/subscription-invalid-query-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld b/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld index fd2286f4..3db426ed 100644 --- a/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld +++ b/data/csourceSubscriptions/subscription-invalid-type-sample.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-sample.jsonld b/data/csourceSubscriptions/subscription-sample.jsonld index 0c796a64..aa4cf39e 100644 --- a/data/csourceSubscriptions/subscription-sample.jsonld +++ b/data/csourceSubscriptions/subscription-sample.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld index 622bbd72..fe1ac008 100644 --- a/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld +++ b/data/csourceSubscriptions/subscription-temporalQ-createdAt-sample.jsonld @@ -19,6 +19,6 @@ "timeproperty": "createdAt" }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld index 13ac0a57..26bde451 100644 --- a/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld +++ b/data/csourceSubscriptions/subscription-temporalQ-modifiedAt-sample.jsonld @@ -19,6 +19,6 @@ "timeproperty": "modifiedAt" }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld b/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld index f6cbd80d..9bb93fdb 100644 --- a/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld +++ b/data/csourceSubscriptions/subscription-temporalQ-observedAt-sample.jsonld @@ -19,6 +19,6 @@ "timeproperty": "observedAt" }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld b/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld index dbd99490..fd01831e 100644 --- a/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld +++ b/data/csourceSubscriptions/subscription-timeInterval-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld b/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld index f4919f8b..2dbb680d 100644 --- a/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld +++ b/data/csourceSubscriptions/subscription-unreachable-endpoint-sample.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld b/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld index 6e4ebcc0..8858a4e2 100644 --- a/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld +++ b/data/csourceSubscriptions/subscription-watchedAttributes-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/csourceSubscriptions/subscription-without-notification-sample.jsonld b/data/csourceSubscriptions/subscription-without-notification-sample.jsonld index aca2a04e..2853928b 100644 --- a/data/csourceSubscriptions/subscription-without-notification-sample.jsonld +++ b/data/csourceSubscriptions/subscription-without-notification-sample.jsonld @@ -7,6 +7,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/batch/invalid-json-ld-sample.jsonld b/data/entities/batch/invalid-json-ld-sample.jsonld index 41010727..fdf99195 100644 --- a/data/entities/batch/invalid-json-ld-sample.jsonld +++ b/data/entities/batch/invalid-json-ld-sample.jsonld @@ -7,7 +7,7 @@ "value":null }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } diff --git a/data/entities/batch/invalid-json-sample.jsonld b/data/entities/batch/invalid-json-sample.jsonld index 76027922..8e4a66a2 100644 --- a/data/entities/batch/invalid-json-sample.jsonld +++ b/data/entities/batch/invalid-json-sample.jsonld @@ -3,7 +3,7 @@ "id":"urn:ngsi-ld:Building:randomUUID",, "type":"Building", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } diff --git a/data/entities/building-location-attribute-sample.jsonld b/data/entities/building-location-attribute-sample.jsonld index 569ead7b..081c7a01 100644 --- a/data/entities/building-location-attribute-sample.jsonld +++ b/data/entities/building-location-attribute-sample.jsonld @@ -17,6 +17,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-location-attribute.jsonld b/data/entities/building-location-attribute.jsonld index 68058d33..778fe8f9 100644 --- a/data/entities/building-location-attribute.jsonld +++ b/data/entities/building-location-attribute.jsonld @@ -17,7 +17,7 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-minimal-sample.jsonld b/data/entities/building-minimal-sample.jsonld index 15d052fc..b304755a 100644 --- a/data/entities/building-minimal-sample.jsonld +++ b/data/entities/building-minimal-sample.jsonld @@ -2,6 +2,6 @@ "id": "urn:ngsi-ld:Building:randomUUID", "type": "Building", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-minimal.jsonld b/data/entities/building-minimal.jsonld index f5ef2a60..3de15791 100644 --- a/data/entities/building-minimal.jsonld +++ b/data/entities/building-minimal.jsonld @@ -2,7 +2,7 @@ "id": "urn:ngsi-ld:Building:3009ef20-9f62-41f5-bd66-92f041b428b9", "type": "Building", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-no-attributes.jsonld b/data/entities/building-no-attributes.jsonld index 99efda91..42c0f2af 100644 --- a/data/entities/building-no-attributes.jsonld +++ b/data/entities/building-no-attributes.jsonld @@ -6,6 +6,6 @@ "value": "Eiffel Tower" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-relationship-of-property-sample.jsonld b/data/entities/building-relationship-of-property-sample.jsonld index 57826a72..c87ae1ec 100644 --- a/data/entities/building-relationship-of-property-sample.jsonld +++ b/data/entities/building-relationship-of-property-sample.jsonld @@ -24,6 +24,6 @@ "value": false }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-relationship-sample.jsonld b/data/entities/building-relationship-sample.jsonld index d649d1ce..c82bc65b 100644 --- a/data/entities/building-relationship-sample.jsonld +++ b/data/entities/building-relationship-sample.jsonld @@ -6,6 +6,6 @@ "object": "urn:ngsi-ld:City:Paris" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-relationship.jsonld b/data/entities/building-relationship.jsonld index 3ae799de..d2151f1e 100644 --- a/data/entities/building-relationship.jsonld +++ b/data/entities/building-relationship.jsonld @@ -6,7 +6,7 @@ "object": "urn:ngsi-ld:City:Paris" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } \ No newline at end of file diff --git a/data/entities/building-simple-attributes-sample.jsonld b/data/entities/building-simple-attributes-sample.jsonld index 3c0922b5..ebfce095 100644 --- a/data/entities/building-simple-attributes-sample.jsonld +++ b/data/entities/building-simple-attributes-sample.jsonld @@ -20,6 +20,6 @@ "value": false }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } diff --git a/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld index 99eff6f7..a7238cbb 100644 --- a/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld +++ b/data/entities/expectations/vehicle-delete-datasetid-speed-expectation.jsonld @@ -24,6 +24,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld index 195b9698..4df3a8c4 100644 --- a/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld +++ b/data/entities/expectations/vehicle-delete-default-speed-expectation.jsonld @@ -26,6 +26,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld b/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld index 0c6924ba..29744061 100644 --- a/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld +++ b/data/entities/expectations/vehicle-delete-deleteall-speed-expectation.jsonld @@ -16,6 +16,6 @@ "datasetId": "urn:ngsi-ld:Relationship:parked12345" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-isparked-update-expectation.jsonld b/data/entities/expectations/vehicle-isparked-update-expectation.jsonld index 21807735..b005ba61 100644 --- a/data/entities/expectations/vehicle-isparked-update-expectation.jsonld +++ b/data/entities/expectations/vehicle-isparked-update-expectation.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld b/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld index 37a8b2cc..06decfb2 100644 --- a/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld +++ b/data/entities/expectations/vehicle-multi-attributes-expectation.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-speed-appended-expectation.jsonld b/data/entities/expectations/vehicle-speed-appended-expectation.jsonld index f49a1396..1eb89b2c 100644 --- a/data/entities/expectations/vehicle-speed-appended-expectation.jsonld +++ b/data/entities/expectations/vehicle-speed-appended-expectation.jsonld @@ -39,6 +39,6 @@ "observedAt": "2017-07-29T12:00:04Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld b/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld index 0c7cca5d..aff9a0d9 100644 --- a/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld +++ b/data/entities/expectations/vehicle-speed-different-datasetid-expectation.jsonld @@ -48,6 +48,6 @@ "observedAt": "2017-07-29T12:00:04Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-update-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-attributes-expectation.jsonld index e3a1d2b7..d8690073 100644 --- a/data/entities/expectations/vehicle-update-attributes-expectation.jsonld +++ b/data/entities/expectations/vehicle-update-attributes-expectation.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld b/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld index 8dce6507..4b178106 100644 --- a/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld +++ b/data/entities/expectations/vehicle-update-datasetid-attributes-expectation.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/expectations/vehicle-update-speed-expectation.jsonld b/data/entities/expectations/vehicle-update-speed-expectation.jsonld index 546631d3..afa00eda 100644 --- a/data/entities/expectations/vehicle-update-speed-expectation.jsonld +++ b/data/entities/expectations/vehicle-update-speed-expectation.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/airQualityLevel-fragment.jsonld b/data/entities/fragmentEntities/airQualityLevel-fragment.jsonld index af683762..32b7ddf4 100644 --- a/data/entities/fragmentEntities/airQualityLevel-fragment.jsonld +++ b/data/entities/fragmentEntities/airQualityLevel-fragment.jsonld @@ -6,6 +6,6 @@ "observedAt": "2020-10-10T16:40:00.000Z" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/invalid-fragment.jsonld b/data/entities/fragmentEntities/invalid-fragment.jsonld index 2dcd2a7c..cc6319ec 100644 --- a/data/entities/fragmentEntities/invalid-fragment.jsonld +++ b/data/entities/fragmentEntities/invalid-fragment.jsonld @@ -13,6 +13,6 @@ "value": "BMW" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld b/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld index 246b133a..b01f0570 100644 --- a/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-attribute-to-add-fragment.jsonld @@ -13,6 +13,6 @@ "value": 23 }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-brandname-fragment.jsonld b/data/entities/fragmentEntities/vehicle-brandname-fragment.jsonld index 3a1314c6..ff248fed 100644 --- a/data/entities/fragmentEntities/vehicle-brandname-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-brandname-fragment.jsonld @@ -3,5 +3,5 @@ "type": "Property", "value": "BMW" }, - "@context": "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "@context": "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld b/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld index 5c834ade..774f93c2 100644 --- a/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-isparked-fragment.jsonld @@ -4,6 +4,6 @@ "object": "urn:ngsi-ld:Person:JohnDoe" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } diff --git a/data/entities/fragmentEntities/vehicle-new-attribute-fragment.jsonld b/data/entities/fragmentEntities/vehicle-new-attribute-fragment.jsonld index 1396ff7b..0ff0b6c0 100644 --- a/data/entities/fragmentEntities/vehicle-new-attribute-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-new-attribute-fragment.jsonld @@ -4,6 +4,6 @@ "value": 23 }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld index 3788c6fc..2ab16715 100644 --- a/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-different-datasetid-fragment.jsonld @@ -13,6 +13,6 @@ "value": 23 }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld index 0f1118c2..9a023b68 100644 --- a/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-different-type-fragment.jsonld @@ -2,6 +2,6 @@ "type": "Relationship", "object": "urn:ngsi-ld:Entity:01", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld index 8387c231..692d09f7 100644 --- a/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-equal-datasetid-fragment.jsonld @@ -2,6 +2,6 @@ "value": 56, "datasetId": "urn:ngsi-ld:Property:speedometer", "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld index 7614a4c3..5a7640a2 100644 --- a/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-invalid-datasetid-fragment.jsonld @@ -9,6 +9,6 @@ "datasetId": "" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld index b63e9caa..2a4343ae 100644 --- a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-01-fragment.jsonld @@ -8,6 +8,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld index a51b3beb..52941b56 100644 --- a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-02-fragment.jsonld @@ -19,6 +19,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld index 96efb66b..fd3c5b3e 100644 --- a/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-two-datasetid-03-fragment.jsonld @@ -19,6 +19,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld b/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld index fb0fab8a..d84b42e4 100644 --- a/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld +++ b/data/entities/fragmentEntities/vehicle-speed-wrong-name-fragment.jsonld @@ -13,6 +13,6 @@ "value": "BMW" }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/invalid-json-sample.jsonld b/data/entities/invalid-json-sample.jsonld index 76027922..8e4a66a2 100644 --- a/data/entities/invalid-json-sample.jsonld +++ b/data/entities/invalid-json-sample.jsonld @@ -3,7 +3,7 @@ "id":"urn:ngsi-ld:Building:randomUUID",, "type":"Building", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld", + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld", "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" ] } diff --git a/data/entities/parking-simple-attributes-sample.jsonld b/data/entities/parking-simple-attributes-sample.jsonld index 45479821..a42762b4 100644 --- a/data/entities/parking-simple-attributes-sample.jsonld +++ b/data/entities/parking-simple-attributes-sample.jsonld @@ -30,6 +30,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/vehicle-simple-attributes-sample.jsonld b/data/entities/vehicle-simple-attributes-sample.jsonld index 5615bde9..53363f9c 100644 --- a/data/entities/vehicle-simple-attributes-sample.jsonld +++ b/data/entities/vehicle-simple-attributes-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/vehicle-speed-two-datasetid-sample.jsonld b/data/entities/vehicle-speed-two-datasetid-sample.jsonld index d04e0a88..87e01ca2 100644 --- a/data/entities/vehicle-speed-two-datasetid-sample.jsonld +++ b/data/entities/vehicle-speed-two-datasetid-sample.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/entities/vehicle-two-datasetid-attributes-sample.jsonld b/data/entities/vehicle-two-datasetid-attributes-sample.jsonld index 8f377f0a..d72a77df 100644 --- a/data/entities/vehicle-two-datasetid-attributes-sample.jsonld +++ b/data/entities/vehicle-two-datasetid-attributes-sample.jsonld @@ -33,6 +33,6 @@ "datasetId": "urn:ngsi-ld:Property:gpsBxyz123-speed" }], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/expectations/subscription-028-01-expectation.jsonld b/data/subscriptions/expectations/subscription-028-01-expectation.jsonld index baeb3c87..81afd4bd 100644 --- a/data/subscriptions/expectations/subscription-028-01-expectation.jsonld +++ b/data/subscriptions/expectations/subscription-028-01-expectation.jsonld @@ -16,6 +16,6 @@ }, "status": "active", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld index 0688e6ec..2ba30b1f 100644 --- a/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld +++ b/data/subscriptions/expectations/subscription-vehicle-expanded-types-sample.jsonld @@ -16,6 +16,6 @@ }, "status": "active", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/expectations/subscription-vehicle-sample.jsonld b/data/subscriptions/expectations/subscription-vehicle-sample.jsonld index 74d6507b..d7a68311 100644 --- a/data/subscriptions/expectations/subscription-vehicle-sample.jsonld +++ b/data/subscriptions/expectations/subscription-vehicle-sample.jsonld @@ -16,6 +16,6 @@ }, "status": "active", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-accept-jsonld.jsonld b/data/subscriptions/subscription-building-entities-accept-jsonld.jsonld index 9342ee00..6f280dce 100644 --- a/data/subscriptions/subscription-building-entities-accept-jsonld.jsonld +++ b/data/subscriptions/subscription-building-entities-accept-jsonld.jsonld @@ -13,6 +13,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-active-query.jsonld b/data/subscriptions/subscription-building-entities-active-query.jsonld index 138bdca2..2cce3970 100644 --- a/data/subscriptions/subscription-building-entities-active-query.jsonld +++ b/data/subscriptions/subscription-building-entities-active-query.jsonld @@ -17,6 +17,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld b/data/subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld index 91131d8d..86bce0f3 100644 --- a/data/subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld +++ b/data/subscriptions/subscription-building-entities-active-watchedAttributes-query.jsonld @@ -16,6 +16,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-active-watchedAttributes.jsonld b/data/subscriptions/subscription-building-entities-active-watchedAttributes.jsonld index c4a90b29..57412636 100644 --- a/data/subscriptions/subscription-building-entities-active-watchedAttributes.jsonld +++ b/data/subscriptions/subscription-building-entities-active-watchedAttributes.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-active.jsonld b/data/subscriptions/subscription-building-entities-active.jsonld index 42b9d8b4..eb93455e 100644 --- a/data/subscriptions/subscription-building-entities-active.jsonld +++ b/data/subscriptions/subscription-building-entities-active.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-building-entities-default.jsonld b/data/subscriptions/subscription-building-entities-default.jsonld index 5616568a..48bb27b2 100644 --- a/data/subscriptions/subscription-building-entities-default.jsonld +++ b/data/subscriptions/subscription-building-entities-default.jsonld @@ -12,6 +12,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-inactive-sample.jsonld b/data/subscriptions/subscription-inactive-sample.jsonld index 8dc52e55..9d513e90 100644 --- a/data/subscriptions/subscription-inactive-sample.jsonld +++ b/data/subscriptions/subscription-inactive-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-invalid-json-sample.jsonld b/data/subscriptions/subscription-invalid-json-sample.jsonld index b4b58b74..3762671e 100644 --- a/data/subscriptions/subscription-invalid-json-sample.jsonld +++ b/data/subscriptions/subscription-invalid-json-sample.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-sample.jsonld b/data/subscriptions/subscription-sample.jsonld index 0c9d8449..d0451590 100644 --- a/data/subscriptions/subscription-sample.jsonld +++ b/data/subscriptions/subscription-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-timeInterval-sample-query.jsonld b/data/subscriptions/subscription-timeInterval-sample-query.jsonld index fc953e4f..a6bd1088 100644 --- a/data/subscriptions/subscription-timeInterval-sample-query.jsonld +++ b/data/subscriptions/subscription-timeInterval-sample-query.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-timeInterval-sample.jsonld b/data/subscriptions/subscription-timeInterval-sample.jsonld index fc953e4f..a6bd1088 100644 --- a/data/subscriptions/subscription-timeInterval-sample.jsonld +++ b/data/subscriptions/subscription-timeInterval-sample.jsonld @@ -14,6 +14,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/subscriptions/subscription-watchedAttributes-sample.jsonld b/data/subscriptions/subscription-watchedAttributes-sample.jsonld index 6e4ebcc0..8858a4e2 100644 --- a/data/subscriptions/subscription-watchedAttributes-sample.jsonld +++ b/data/subscriptions/subscription-watchedAttributes-sample.jsonld @@ -15,6 +15,6 @@ } }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld index 8b003642..2b852243 100644 --- a/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld +++ b/data/temporalEntities/2020-08-bus-temporal-representation-sample.jsonld @@ -42,6 +42,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld b/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld index efd98374..81c4abbf 100644 --- a/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld +++ b/data/temporalEntities/2020-08-vehicule-temporal-representation-multiple-instances-sample.jsonld @@ -177,6 +177,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld index 12773e34..f4f193b0 100644 --- a/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld +++ b/data/temporalEntities/2020-08-vehicule-temporal-representation-sample.jsonld @@ -42,6 +42,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld b/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld index e0149e90..19c99418 100644 --- a/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld +++ b/data/temporalEntities/2020-09-vehicule-temporal-representation-sample.jsonld @@ -42,6 +42,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld b/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld index d4f1a161..b76e4ed3 100644 --- a/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld +++ b/data/temporalEntities/2020-10-vehicule-temporal-representation-with-location-sample.jsonld @@ -60,6 +60,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/entity-operations-after-query.jsonld b/data/temporalEntities/entity-operations-after-query.jsonld index c4e59b0d..590f4701 100644 --- a/data/temporalEntities/entity-operations-after-query.jsonld +++ b/data/temporalEntities/entity-operations-after-query.jsonld @@ -3,6 +3,6 @@ "timerel":"after", "timeAt":"2020-08-02T12:05:00Z", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/entity-operations-before-query.jsonld b/data/temporalEntities/entity-operations-before-query.jsonld index 10e9d52e..a5033a05 100644 --- a/data/temporalEntities/entity-operations-before-query.jsonld +++ b/data/temporalEntities/entity-operations-before-query.jsonld @@ -3,6 +3,6 @@ "timerel":"before", "timeAt":"2020-08-02T12:05:00Z", "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld index 34e8819a..4c30edb7 100644 --- a/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld +++ b/data/temporalEntities/expectations/vehicle-temporal-representation-delete-speed-instanceid-sample.jsonld @@ -33,6 +33,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld index e68302ae..d806a9c8 100644 --- a/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld +++ b/data/temporalEntities/fragments/vehicle-temporal-representation-fragment.jsonld @@ -17,6 +17,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/fragments/vehicle-temporal-representation-invalid-json-fragment.jsonld b/data/temporalEntities/fragments/vehicle-temporal-representation-invalid-json-fragment.jsonld index d076ab8a..4b106045 100644 --- a/data/temporalEntities/fragments/vehicle-temporal-representation-invalid-json-fragment.jsonld +++ b/data/temporalEntities/fragments/vehicle-temporal-representation-invalid-json-fragment.jsonld @@ -42,6 +42,6 @@ } ], "@context": [ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld index 17873cc3..99cbf890 100644 --- a/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld +++ b/data/temporalEntities/vehicle-create-temporal-representation-sample.jsonld @@ -32,6 +32,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld index 6692234b..8ffa880f 100644 --- a/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld +++ b/data/temporalEntities/vehicle-simplified-temporal-representation-sample.jsonld @@ -16,6 +16,6 @@ ] }, "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/vehicle-temporal-representation-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-sample.jsonld index 8fdc0d93..a6506961 100644 --- a/data/temporalEntities/vehicle-temporal-representation-sample.jsonld +++ b/data/temporalEntities/vehicle-temporal-representation-sample.jsonld @@ -38,6 +38,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld b/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld index d5fc2ca0..19ea07fb 100644 --- a/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld +++ b/data/temporalEntities/vehicle-temporal-representation-update-sample.jsonld @@ -36,6 +36,6 @@ } ], "@context":[ - "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld" + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld" ] } \ No newline at end of file diff --git a/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld b/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld new file mode 100644 index 00000000..74225243 --- /dev/null +++ b/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld @@ -0,0 +1,6 @@ +{ + "@context": [ + "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite.jsonld", + "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.3.jsonld" + ] +} diff --git a/resources/ngsi-ld-test-suite-context.jsonld b/resources/jsonld-contexts/ngsi-ld-test-suite.jsonld similarity index 100% rename from resources/ngsi-ld-test-suite-context.jsonld rename to resources/jsonld-contexts/ngsi-ld-test-suite.jsonld diff --git a/resources/variables.py b/resources/variables.py index 46fae04b..f24138c4 100644 --- a/resources/variables.py +++ b/resources/variables.py @@ -1,7 +1,7 @@ def get_variables(arg=None): variables = { 'url': 'localhost:8080/ngsi-ld/v1', - 'ngsild_test_suite_context': 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/ngsi-ld-test-suite-context.jsonld', + 'ngsild_test_suite_context': 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld', 'notification_server_host': '0.0.0.0', 'notification_server_port': 8085, 'send_notification_server_host': '0.0.0.0', -- GitLab