Commit 0661fd99 authored by kzangeli's avatar kzangeli
Browse files

Merge develop (ee8eac6d) into integration/all-fixes

Conflicts:
- resources/AssertionUtils.resource: both sides added keywords; kept both
  (Check Temporal Pagination Link / Link Absent, and Check Response Body
  Containing Attribute Value set to).
- doc/analysis/requests.py: query_entities expected_parameters = the union
  of both lists.

doc/analysis/parsevariablesfile.py: develop's IOP precondition tests read
resources/variables.py through ParseVariablesFile, which split it line by
line on '='. On this branch variables.py has an import and a value over
several lines (the context branch from NGSILD_TEST_SUITE_BRANCH), so all 12
of those tests failed with IndexError. The parser now runs the file and keeps
its public string variables.

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parents 86349841 c16cd2ec
Loading
Loading
Loading
Loading
+3 −0
Changes for .gitignore: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,12 @@ results
*.pyc
*.http
.vscode/
.idea/*
!.idea/runConfigurations/
.venv
.DS_Store
.claude/settings.local.json
.claude/archives/
results*/
*.out
/tools/interoperability_visualizer/output/
+68 −0
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_31.robot: 68 added lines, 0 removed lines.
Original line number Diff line number Diff line
*** Settings ***
Documentation       Check that entities can be queried in a concise representation for every kind of attribute

Resource            ${EXECDIR}/resources/ApiUtils/Common.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource
Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationProvision.resource
Resource            ${EXECDIR}/resources/AssertionUtils.resource
Resource            ${EXECDIR}/resources/JsonUtils.resource

Test Teardown       Delete Created Entity
Test Template       Query Entities In A Concise Representation


*** Test Cases ***    EXPECTATION_FILENAME
019_31_01 Property
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-simple-attributes.jsonld
    concise/building-simple-attributes-concise.json
019_31_02 Relationship
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-relationship.jsonld
    concise/building-relationship-concise.json
019_31_03 GeoProperty
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-location-attribute.jsonld
    concise/building-location-attribute-concise.json
019_31_04 JsonProperty
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-json-property-object.jsonld
    concise/building-json-property-object-concise.json
019_31_05 LanguageProperty
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-language-property.jsonld
    concise/building-language-property-concise.json
019_31_06 VocabProperty
    [Tags]    e-query    core_10_4_3    core_5_3_2_3    since_v1.6.1
    [Setup]    Create Initial Entity    building-vocab-property-string.jsonld
    concise/building-vocab-property-string-concise.json


*** Keywords ***
Query Entities In A Concise Representation
    [Documentation]    Check that entities can be queried in a concise representation for a given kind of attribute
    [Arguments]    ${expectation_filename}
    ${response}=    Query Entities
    ...    entity_ids=${entity_id}
    ...    entity_types=Building
    ...    format=concise
    ...    context=${ngsild_test_suite_context}
    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entity element
    ...    ${expectation_filename}
    ...    ${entity_id}
    ...    ${response.json()[0]}
    ...    ${True}

Create Initial Entity
    [Arguments]    ${source_filename}
    ${entity_id}=    Generate Random Building Entity Id
    Set Test Variable    ${entity_id}
    ${response}=    Create Entity Selecting Content Type
    ...    ${source_filename}
    ...    ${entity_id}
    ...    ${CONTENT_TYPE_LD_JSON}
    Check Response Status Code    201    ${response.status_code}

Delete Created Entity
    Delete Entity    ${entity_id}
+20 −10
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_05.robot: 20 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -16,29 +16,39 @@ Test Template Retrieve Entity In GeoJSON Representation
${filename}=    building-two-geometry-attributes.jsonld


*** Test Cases ***    OPTIONS    EXPECTATION_FILENAME
018_05_01 Simplified
*** Test Cases ***    OPTIONS    FORMAT    GEOMETRY_PROPERTY    EXPECTATION_FILENAME
018_05_01 Simplified Using Options Param
    [Tags]    e-retrieve    http_6_4_2
    keyValues    ${EMPTY}    building-two-geometry-attribute-simplified.geojson
018_05_02 Normalized
    keyValues    ${EMPTY}    ${EMPTY}    building-two-geometry-attribute-simplified.geojson
018_05_02 Simplified Using Format Param
    [Tags]    e-retrieve    http_6_4_2
    ${EMPTY}    ${EMPTY}    building-two-geometry-attribute-normalized.geojson
018_05_03 With geometryProperty
    ${EMPTY}    keyValues    ${EMPTY}    building-two-geometry-attribute-simplified.geojson
018_05_03 Normalized
    [Tags]    e-retrieve    http_6_4_2
    ${EMPTY}    observationSpace    building-two-geometry-property-on-observation-space.geojson
018_05_04 With Nonexistent geometryProperty
    ${EMPTY}    ${EMPTY}    ${EMPTY}    building-two-geometry-attribute-normalized.geojson
018_05_04 With geometryProperty
    [Tags]    e-retrieve    http_6_4_2
    ${EMPTY}    operationSpace    building-two-geometry-property-on-nonexistent-operation-space.geojson
    ${EMPTY}    ${EMPTY}    observationSpace    building-two-geometry-property-on-observation-space.geojson
018_05_05 With Nonexistent geometryProperty
    [Tags]    e-retrieve    http_6_4_2
    ${EMPTY}    ${EMPTY}    operationSpace    building-two-geometry-property-on-nonexistent-operation-space.geojson
018_05_06 Concise Using Options Param
    [Tags]    e-retrieve    http_6_4_2    core_5_3_2_3    core_5_3_3_4    since_v1.6.1
    concise    ${EMPTY}    ${EMPTY}    concise/building-two-geometry-attribute-concise.geojson
018_05_07 Concise Using Format Param
    [Tags]    e-retrieve    http_6_4_2    core_5_3_2_3    core_5_3_3_4    since_v1.6.1
    ${EMPTY}    concise    ${EMPTY}    concise/building-two-geometry-attribute-concise.geojson


*** Keywords ***
Retrieve Entity In GeoJSON Representation
    [Documentation]    Check that the queried entity by id can be returned in a GeoJSON format
    [Arguments]    ${options}    ${geometry_property}    ${expectation_filename}
    [Arguments]    ${options}    ${format}    ${geometry_property}    ${expectation_filename}
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    accept=${CONTENT_TYPE_GEOJSON}
    ...    options=${options}
    ...    format=${format}
    ...    context=${ngsild_test_suite_context}
    ...    geometryProperty=${geometry_property}
    Check Response Status Code    200    ${response.status_code}
+16 −6
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_08.robot: 16 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -16,22 +16,32 @@ Test Template Retrieve Entity With observationSpace Geospatial Property
${filename}=    building-observation-space-geoproperty.jsonld


*** Test Cases ***    OPTIONS    EXPECTATION_FILENAME
018_08_01 Simplified
*** Test Cases ***    OPTIONS    FORMAT    EXPECTATION_FILENAME
018_08_01 Simplified Using Options Param
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    keyValues    building-observation-space-geoproperty-simplified.jsonld
018_08_02 Normalized
    keyValues    ${EMPTY}    building-observation-space-geoproperty-simplified.jsonld
018_08_02 Simplified Using Format Param
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    ${EMPTY}    building-observation-space-geoproperty-normalized.jsonld
    ${EMPTY}    keyValues    building-observation-space-geoproperty-simplified.jsonld
018_08_03 Normalized
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    ${EMPTY}    ${EMPTY}    building-observation-space-geoproperty-normalized.jsonld
018_08_04 Concise Using Options Param
    [Tags]    e-retrieve    core_10_4_2    core_5_3_2_3    since_v1.6.1
    concise    ${EMPTY}    concise/building-observation-space-geoproperty-concise.json
018_08_05 Concise Using Format Param
    [Tags]    e-retrieve    core_10_4_2    core_5_3_2_3    since_v1.6.1
    ${EMPTY}    concise    concise/building-observation-space-geoproperty-concise.json


*** Keywords ***
Retrieve Entity With observationSpace Geospatial Property
    [Documentation]    Check that an entity with observationSpace geospatial Property can be retrieved
    [Arguments]    ${options}    ${expectation_filename}
    [Arguments]    ${options}    ${format}    ${expectation_filename}
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    options=${options}
    ...    format=${format}
    ...    context=${ngsild_test_suite_context}
    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entity element    ${expectation_filename}    ${entity_id}    ${response.json()}
+16 −6
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/RetrieveEntity/018_09.robot: 16 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -16,22 +16,32 @@ Test Template Retrieve Entity With operationSpace Geospatial Property
${filename}=    building-operation-space-geoproperty.jsonld


*** Test Cases ***    OPTIONS    EXPECTATION_FILENAME
018_09_01 Simplified
*** Test Cases ***    OPTIONS    FORMAT    EXPECTATION_FILENAME
018_09_01 Simplified Using Options Param
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    keyValues    building-operation-space-geoproperty-simplified.jsonld
018_09_02 Normalized
    keyValues    ${EMPTY}    building-operation-space-geoproperty-simplified.jsonld
018_09_02 Simplified Using Format Param
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    ${EMPTY}    building-operation-space-geoproperty-normalized.jsonld
    ${EMPTY}    keyValues    building-operation-space-geoproperty-simplified.jsonld
018_09_03 Normalized
    [Tags]    e-retrieve    core_10_4_2    core_5_2_6_4_5
    ${EMPTY}    ${EMPTY}    building-operation-space-geoproperty-normalized.jsonld
018_09_04 Concise Using Options Param
    [Tags]    e-retrieve    core_10_4_2    core_5_3_2_3    since_v1.6.1
    concise    ${EMPTY}    concise/building-operation-space-geoproperty-concise.json
018_09_05 Concise Using Format Param
    [Tags]    e-retrieve    core_10_4_2    core_5_3_2_3    since_v1.6.1
    ${EMPTY}    concise    concise/building-operation-space-geoproperty-concise.json


*** Keywords ***
Retrieve Entity With operationSpace Geospatial Property
    [Documentation]    Check that an entity with operationSpace geospatial Property can be retrieved
    [Arguments]    ${options}    ${expectation_filename}
    [Arguments]    ${options}    ${format}    ${expectation_filename}
    ${response}=    Retrieve Entity
    ...    id=${entity_id}
    ...    options=${options}
    ...    format=${format}
    ...    context=${ngsild_test_suite_context}
    Check Response Status Code    200    ${response.status_code}
    Check Response Body Containing Entity element    ${expectation_filename}    ${entity_id}    ${response.json()}
Loading