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 595a6baee9fba423534e631f922d911557e0d531..12a546f6fe869d59872bc3ecbb44b0194e0eb0f8 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 28b2672a177603a6ed7904803026db942f72a943..1c39aed27cbd4576b017f217122bc528a8697dc8 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 b4826ab677282a9981be73d5ef2d3781efaf53f3..4560eee81efab13c9f2e44c981bb4717dfc708d6 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 5eb0def1a34a126cd83b6d3dafc8765f180ed86d..3a401bad106c5ef639b35dd5f91b09eb1a2e2bfd 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 a05b8ef579e0c2abd5e57c07fdb3ebf7886dfe2a..97515561f23592e90a3cc795d9cfaa44d25cb8ba 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 3f1faa32aee64f0054d595d37309d3bf2c50918f..c119434b217a4d043a576358432a59133b004ebb 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 8ea742e009a308c337f4fcf3472e929413e10088..329d4b7c08b0ae2d80a4197625d091ab34b2a544 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 a64c29ea3ff4f26c0df88527212e183b56798761..ed9e1d8e80a60532279fd711986acc9e91667649 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 f97a489b1e18f27435a5fc4f245c7987a149641c..35ac3fc034f3309807319dbb4c99b1912e14a41d 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 182acfd5e61b143275893a41aaaf0044f275ef1f..38760ce0a79618028041f19dce0c68558fe503d8 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 42364aee44520ba11e0cdfaf10d33ee0bf04b50d..68ef4bc98b54bdee268c54440ad2d270bf3509bf 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 d8676411dc608c99ff3099eac7ef66c4d5d77dd2..7d83cbbcc3174b762ccb58543e3a46e04e8d68bc 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 52d231789d9a0cf8a3b7e40b7a712336384c8d45..4a80a599535e4323d7be56fbf4acb84815410b5d 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 aae82c143ae3c1be255263004cf46a8893286945..d638652d7c5cac869bd7a5f2840cc5661735aeae 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 ab355ddabcfc52e4e9b327ba2f775d3a44767d13..17425354d25127c83d4de9f9526709d91f863c4f 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 ed1ac0794346adde478eaa0cbda50b07fc8adaf4..09591732571dea3f27c09e737163c293a9d39883 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 974c0ec39cf1d213cf400732af81510355b184ad..c027db75183a3e1214b8ff9d824653891e55388b 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 d0a82db9d59bb0ab3d4b2cd9962365ffa2a79f2c..f19891b5f0cbf8948cd2326099f41e628873eb10 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 0bcd3fdbcd265835b2621bb99941f51dd645a1d8..9286e21dd29f7d00c1daf64a95004d91841fa22e 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 504d7398acf0c925a098f1cb287715def57bca6e..ee67134fb057d1e4594c4ad4d5ecdf20a9a7bfcd 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 40c3e9662a088b5ad989ed4f545aab17d0063f6f..59c4e5957f39493277a85e2252c09c88f69d674e 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 8dc52e55682c78f57c1b2226f54b1c64dcd675e0..9d513e905f20817f9a0addbb3470eb10242218da 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 4822c1fa4b021f977b426b21b29c39fbdf508fcc..9a4012e3bbbdf54d4536c9dcfee4da66ba92ccd7 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 fd2286f481abc07569b10cc22ce0b34d7ff5f0b3..3db426ed26ec8af6ae69b2845db4919ccd27fd16 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 0c796a64c712b8d2f1f00cea6c9f0ef10e61edfc..aa4cf39e3b28c6c58022da1ce535fe5426beed90 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 622bbd7234c6469e65adbc55fc5bbd224f0b2334..fe1ac00828040413a165222c2713d6c4b6dc40bf 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 13ac0a574ae9044528dd7d754c43edcc20e61dbb..26bde451fe59880403646a2a68b82d2bd121649e 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 f6cbd80d4696a2420970306446d2bda26cb25a38..9bb93fdb5f364f910cde40425ed7c0cef785738b 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 dbd994905325496f7910761573b12fbbc8c50124..fd01831e4b8690aac6d0b939817e5577d5d9d33b 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 f4919f8b37ef81b3382337d87443b48a23ad43c8..2dbb680d5ddb34ef8b8943070a135d4c76ebb845 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 6e4ebcc033582a6d044bd1fcf2178cdf067f1490..8858a4e239adcb2bdbb67d159f636ff0883040a6 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 aca2a04ecf48561f3806eb6001d53ba54b89beca..2853928b384c579f655a165cef0b6947a9949f6d 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 410107277579f3539702fbea93a988c193a22112..fdf991952badf68d30effa6a62a3bd1b34f958ba 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 760279227ef6e42750083071e86dd5f3434902cc..8e4a66a2c056157e2f66c8617d579cfdd40bf06c 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 569ead7b124c92783aa7d4a306ec192a67f2b272..081c7a016c1efa3e51878f447b6d55c2aa978898 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 68058d33b662809f38a192cdca72a51d56443f52..778fe8f95f2b5734c82d4c1969cad1d14890cd38 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 15d052fc73b54178ca9bb3a4dcc16f1ac7d3938d..b304755a7180a8cb688fd6ccd68a9a9c59231edd 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 f5ef2a603a722d86e6ca68f4e8c1ebaa28cc7aaa..3de15791f3e396964b4372134517b6656b338fde 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 99efda91666765a49915316e7e9053c5bdc6dd3e..42c0f2af8430b1e31e517906e628376d292e7b25 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 57826a72a6d6a6bf7f8a7a2de273c3768e87a078..c87ae1ecadf9f8c9bd6096e11f716389b4519f09 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 d649d1ce1d82da89aabb9ddf24668670474daf1e..c82bc65b6a463088aff8e467998174faeca17a6f 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 3ae799de4dd9b0f85ddf68c3969950446776a024..d2151f1ec7113bb8c6bdb3634d1c69adb8d61e02 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 3c0922b5540f15b3e1346359bf3a9d2738cf35aa..ebfce095012d036550b2f22319b06d89b8203582 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 99eff6f7f9b7ff48a8a550f1220545b58f026b3e..a7238cbb9bd3e336116a5c8fb3ace170f2d08896 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 195b96980b06b582558a55c925eec798c176a842..4df3a8c4ea5d7c083eddb8b4dad1f340880c5fca 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 0c6924ba867cef113a28d9134ca036fd905ba9cd..29744061422af097b19af53ced2c0eacd36ad94f 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 218077353697c5a2e5f89a7102cd9dc59ccfde63..b005ba61bebde6e5e51c5ce49108f04deb203eda 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 37a8b2ccf98a647224cf38a882f69a150a09ec99..06decfb218146423061a49c7eeecbf2e2b7182f5 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 f49a139654dc0da5e2b132bb6545c037409fca29..1eb89b2ca4582831fef0705e3626cd29833bdf22 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 0c7cca5d263ad8d94e8ce8098674b9f9bdc4ef1e..aff9a0d989aefe5bafe8c924d8d2f2bfe4fe8f6a 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 e3a1d2b74e9fde3dba9432af76a45c26a47e4c24..d869007366625c4a80a13c6a06fa4079faa75a38 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 8dce6507717851bcd8db8d0ef9397251d1dbdd2d..4b1781067e1126faea59308a4433850f305485cf 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 546631d35ab8d44480f2e4e9e4953582ac19b09d..afa00eda0d5c7ec8bde99b4b1e0f48df66bf7dcc 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 af6837624e1a6ea36cd3489197538e50da3c93e9..32b7ddf438b43601b21f9b561c89583cd8f1f661 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 2dcd2a7cd71d435c6ffa508293470d89ade64ea8..cc6319ecbd545fe518880914f305f8e60c7c06a2 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 246b133a38fa278ee516aa25a5d8da638a1a7383..b01f0570bd52c734b29a3435dc09f8aa286fe627 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 3a1314c6577fedbb8865ed64f85eda76c417f152..ff248fede20c31a24ef3452723ed8d4229464081 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 5c834ade4944d857b1244d3ae96672c9bb1d40c2..774f93c22f311cd531b48aa9ba4c1f047f6832ef 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 1396ff7ba3d83b850de290be666b8e404d0bc8e3..0ff0b6c03931a37590b226eeff7a93f9594b4772 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 3788c6fc9386ab8065aab8d15ab4787e472bec8f..2ab1671543e9e304c5933fc34a4a3f49959ae901 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 0f1118c214820783d9a5c40c7c3056e5d91d9e63..9a023b68a1871de4c4a0f84b2bd91bef6e987ba9 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 8387c231fcfe83bad3c84cbb1dd5d0ddb74aaab2..692d09f735cdb1d7002a4baa82b747fc66c1ce41 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 7614a4c38dc1048fe16020383ad7b48195446589..5a7640a2fb0aeb6da92cbeae4e31f1390f1ba0ef 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 b63e9caa2854e27aa6cab6e48dd65459184ecdf2..2a4343ae50aa3dcb0b50fce6bc8c8fdc1347aedb 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 a51b3bebe4d423960396686247c57289686bff1d..52941b569bc053e5e958072ec47e83f607b34201 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 96efb66bc6f1a19adc83ace26aed5d63c7dc6653..fd3c5b3e9d9b2a77fcbdbe710ee3bbd59ef750ef 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 fb0fab8a9e41fdb332bf1edcf22803d76a223459..d84b42e45ba3ef4fe50ed1f5e21425fc58ce03ae 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 760279227ef6e42750083071e86dd5f3434902cc..8e4a66a2c056157e2f66c8617d579cfdd40bf06c 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 45479821383fb639c984fde70b908e3bcc6f734c..a42762b44cbf575223e61751b1cc19fb55d5c52b 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 5615bde96e3614082a7bcb30c222557db3f521bb..53363f9c02351ce09277434ae6b0cf20fc592f08 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 d04e0a881a6bb54c0ff6075488504a70c233c531..87e01ca2e34e466c23df1c4a510978eac772a03b 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 8f377f0a0fed6ea4cbd26eab730a317faeb4fb12..d72a77df9bff2732b1096e98c6e6c1954e15ba9c 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 baeb3c87efc107b4024dda6de2b2b569e6f0d695..81afd4bd0218cc9fb20cbd0f94d374a7bb1e6777 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 0688e6ecd6baae1ce8cfbb1682d555fd24f6eb57..2ba30b1f0b522269f227b229fe46027ef48f010e 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 74d6507b31cb4493c28a82c71c6fab65a325f84e..d7a6831132c413ceffd0e7875e172f8d3e704b9f 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 9342ee0097868be53e593aef740645fbfa0dab6b..6f280dce9b19bb93de3cb8984cdb3f1e50cedc73 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 138bdca2af7b5c3363fa0cdaf796ff14631318e8..2cce39704ac439f29b68e883ea9b299adafcabbc 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 91131d8dde7a6c42bb88db0855693fcb3dad758d..86bce0f38d7097c3e59db359484cdc6fcca0b9d5 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 c4a90b29ec5ca79da7dad9cded751d2722e492cf..574126366a421d52bfbb28db6a4b7f360cbc98fa 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 42b9d8b4dd19b82628aa673be85de88bfd860b7b..eb93455e8d107a4394fa1e57a9d5a4df8cc13d47 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 5616568ab340ac3d0c00e8bed4af61e09780a0cf..48bb27b23b4217de738d790830e4d07f3666973f 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 8dc52e55682c78f57c1b2226f54b1c64dcd675e0..9d513e905f20817f9a0addbb3470eb10242218da 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 b4b58b74e4f229a46d6bcfc11fd6335ac7fe7986..3762671e081d6db7dd599dd6ab914fc5b57761a5 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 0c9d8449d77bf21780c494263f1ba366710d0c6d..d045159043a7db4be1c4a3f11bf12767cb034183 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 fc953e4fc54287052efda4f619a7c6fbb6acd528..a6bd1088b592fe44070de914d0baab7059fe5691 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 fc953e4fc54287052efda4f619a7c6fbb6acd528..a6bd1088b592fe44070de914d0baab7059fe5691 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 6e4ebcc033582a6d044bd1fcf2178cdf067f1490..8858a4e239adcb2bdbb67d159f636ff0883040a6 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 8b0036427fd2fae6c0107dc9bf8a6c5e4ec24698..2b852243d86106bdaa0b3b03e45b1c0aaae51471 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 efd983749c9afb695db99fbecf2be9148f272143..81c4abbf3a6d40e29451d1813d0723856417205b 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 12773e34492187e33bfa75b44e5a3b10b83f75bf..f4f193b0e984ce26fcf0ce2cab12ee36c11ba890 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 e0149e9051af938ed0fdce127d63d75efdbb6b17..19c99418e794d0ef3922f4bb40e49ffa1374506b 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 d4f1a1610b13781afbf325ac4e5dcbfa72386a5b..b76e4ed3f14f04fc7fc682be8613f0316713ab4a 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 c4e59b0d19ef30626904ec14f8eefe246af38123..590f4701e3684f91eb15be8feacf3d642df7fce1 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 10e9d52e3d28bfd83a904bd2ae941355bab14232..a5033a0503342b0c71d4b88af96b54c92ab9cb9e 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 34e8819ab4475967148ec9f40be088b849b8e170..4c30edb72f1e05a11b5b7e6be2a5e575d3920607 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 e68302ae984862e25e83e77b2a8063e3b5b2d85a..d806a9c86d5894be27dd06385f358a31e74e733c 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 d076ab8a117870c930bf907651c955de1ebfeee1..4b10604514a9ad6a9a2731285545ad4074df2760 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 17873cc31bdee93e373d6ae472818355aced5839..99cbf8900edbd5ed4b54c1aba4ff74c673e023cb 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 6692234b37b53fc304549389246f2a153990cb53..8ffa880fa4c7566a00f25053ac684080057a79c2 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 8fdc0d934ae04ee944b607754e4eb614e07a6fe5..a65069610c3806dbf7a2dcc95aff226aa3e28dd8 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 d5fc2ca0f49e121f06f214d7ee9336f8c3bbe86f..19ea07fb51f7464f2f2a1eefdb11a5d8586945b6 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 0000000000000000000000000000000000000000..7422524377fde3f1cd844c93e86f491b807f46d8 --- /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 46fae04bee951e3123f5bdc10d73f95d1c10f79a..f24138c4ee655249db4b9e66af67c97996ec275b 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',