Commit 794c8a2d authored by kzangeli's avatar kzangeli
Browse files

fix: serve this branch's context from this branch 



resources/variables.py named `develop` in the context URL, so every run of every
fork - however carefully corrected - handed the broker UPSTREAM's context at
runtime. A change there altered what our tests mean with no commit on our side:
`isParked` was added to the upstream context, the broker started expanding it
correctly, and twelve expectation files that were written before that suddenly
disagreed. Nothing in our repository had moved.

The URL now names this branch. The compound context references its sibling
RELATIVELY, which is what makes the pair follow whichever branch serves it, so
this needed no other change - and the two context files, which until now were
carried but never used, are synced with develop so the behaviour is unchanged
today. Upstream's next context change arrives when we merge, deliberately, rather
than mid-run.

Also: 023_01_01's expectation expanded to match. It expects a read with NO
@context, where a term defined only in the suite context cannot compact and must
come back as an IRI - which the neighbouring entries in the same file already did.

Co-Authored-By: default avatarClaude Opus 5 (1M context) <noreply@anthropic.com>
parent 48f81435

data/csourceRegistrations/expectations/context-source-registration-expanded-format.json

+43 −41
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
            "https://ngsi-ld-test-suite/context#speed"

         ],

         "relationshipNames": [

        "isParked"

            "https://ngsi-ld-test-suite/context#isParked"

         ]

      },

      {
@@ -39,5 +39,7 @@ 
      }

   ],

   "mode": "inclusive",

  "operations": ["federationOps"]

   "operations": [

      "federationOps"

   ]

}

data/types/expectations/entity-type-023-01-01.json

+10 −10
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
      "typeName": "https://ngsi-ld-test-suite/context#Vehicle",

      "attributeNames": [

         "https://ngsi-ld-test-suite/context#brandName",

         "isParked"

         "https://ngsi-ld-test-suite/context#isParked"

      ]

   }

]

resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld

+2 −2
Original line number Diff line number Diff line 
{

    "@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.8.jsonld"

        "ngsi-ld-test-suite.jsonld",

        "https://uri.etsi.org/ngsi-ld/v1/ngsi-ld-core-context-v1.9.jsonld"

    ]

}

resources/jsonld-contexts/ngsi-ld-test-suite.jsonld

+4 −0
Original line number Diff line number Diff line
@@ -5,11 +5,15 @@ 
        "OffStreetParking": "https://ngsi-ld-test-suite/context#OffStreetParking",

        "airQualityLevel": "https://ngsi-ld-test-suite/context#airQualityLevel",

        "almostFull": "https://ngsi-ld-test-suite/context#almostFull",

        "availableSpotsNumber": "https://ngsi-ld-test-suite/context#availableSpotsNumber",

        "brandName": "https://ngsi-ld-test-suite/context#brandName",

        "fuelLevel": "https://ngsi-ld-test-suite/context#fuelLevel",

        "isParked": "https://ngsi-ld-test-suite/context#isParked",

        "name": "https://ngsi-ld-test-suite/context#name",

        "reliability": "https://ngsi-ld-test-suite/context#reliability",

        "source": "https://ngsi-ld-test-suite/context#source",

        "speed": "https://ngsi-ld-test-suite/context#speed",

        "totalSpotsNumber": "https://ngsi-ld-test-suite/context#totalSpotsNumber",

        "subCategory": "https://ngsi-ld-test-suite/context#subCategory"

    }

}

resources/variables.py

+7 −1
Original line number Diff line number Diff line 
url = 'http://localhost:8080/ngsi-ld/v1'

temporal_api_url = 'http://localhost:8080/ngsi-ld/v1'

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'

# The context this branch's tests are written against, served from THIS branch.

# It used to name `develop`, which meant every fork - however carefully corrected -

# handed the broker upstream's context at runtime, and a change there altered what

# our tests meant with no commit on our side. That is how `isParked` became an

# expanded IRI overnight. The compound context references its sibling RELATIVELY,

# so this pair follows whichever branch serves it.

ngsild_test_suite_context = 'https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/integration/all-fixes/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld'

notification_server_host = '0.0.0.0'

notification_server_port = 8085

mqtt_broker_host = '127.0.0.1'