Unverified Commit 6565521f authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

fix(e-query): align scopeQ TCs with the clause 4.19 grammar and semantics 

- 019_01_06 QueryWithAndScope: wrap the conjunction in parentheses, as required
  by the ScopesQ grammar ("For logical and grouping parenthesis are needed")
- 019_01_06: add QueryWithHashMatchingIncludingScope ("#" also matches the given
  scope itself, see example 2) and QueryWithPlusAndHashMatching ("+" combined with "/#")
- 019_01_06: number permutations sequentially (019_01_06_NN), they all shared the same id
- add 019_03_07 checking that a syntactically invalid scopeQ is rejected with
  a BadRequestData error

Co-Authored-By: default avatarClaude Opus 5.5 <noreply@anthropic.com>
parent 56e721d0

TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_06.robot

+13 −7
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_01_06.robot: 13 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -19,24 +19,30 @@ ${entity_type}= https://ngsi-ld-test-suite/context#Building 




*** Test Cases ***    SCOPEQ    EXPECTED_COUNT

019_01_06 QueryWithFullScope

019_01_06_01 QueryWithFullScope

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/Gardens/ParqueNorte    ${2}

019_01_06 QueryWithPlusMatching

019_01_06_02 QueryWithPlusMatching

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/+/ParqueNorte    ${2}

019_01_06 QueryWithHashMatching

019_01_06_03 QueryWithHashMatching

    [Tags]    e-query    4_19    since_v1.5.1

    /CompanyA/#    ${1}

019_01_06 QueryNonEmptyScope

019_01_06_04 QueryNonEmptyScope

    [Tags]    e-query    4_19    since_v1.5.1

    /#    ${2}

019_01_06 QueryWithAndScope

019_01_06_05 QueryWithAndScope

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/Gardens/ParqueNorte;/CompanyA/OrganizationB/UnitC    ${1}

019_01_06 QueryWithOrScope

    (/Madrid/Gardens/ParqueNorte;/CompanyA/OrganizationB/UnitC)    ${1}

019_01_06_06 QueryWithOrScope

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/Gardens/ParqueNorte,/CompanyA/OrganizationB/UnitC    ${2}

019_01_06_07 QueryWithHashMatchingIncludingScope

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/Gardens/ParqueNorte/#    ${2}

019_01_06_08 QueryWithPlusAndHashMatching

    [Tags]    e-query    4_19    since_v1.5.1

    /Madrid/+/#    ${2}





*** Keywords ***

TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_07.robot

0 → 100644
+43 −0
Changes for TP/NGSI-LD/ContextInformation/Consumption/Entity/QueryEntities/019_03_07.robot: 43 added lines, 0 removed lines.
Original line number Diff line number Diff line 
*** Settings ***

Documentation       Check that one cannot query entities if the scopeQ parameter is syntactically invalid



Resource            ${EXECDIR}/resources/ApiUtils/Common.resource

Resource            ${EXECDIR}/resources/ApiUtils/ContextInformationConsumption.resource

Resource            ${EXECDIR}/resources/AssertionUtils.resource



Test Template       Query entities with invalid scopeQ





*** Variables ***

${entity_type}=     https://ngsi-ld-test-suite/context#Building





*** Test Cases ***    SCOPEQ

019_03_07_01 QueryWithUnclosedParenthesis

    [Tags]    e-query    4_19    5_7_2

    (/Madrid

019_03_07_02 QueryEndingWithLogicalOperator

    [Tags]    e-query    4_19    5_7_2

    /Madrid;

019_03_07_03 QueryWithConsecutiveLogicalOperators

    [Tags]    e-query    4_19    5_7_2

    /Madrid,,/CompanyA

019_03_07_04 QueryWithHashNotAtTheEnd

    [Tags]    e-query    4_19    5_7_2

    /Madrid/#/Gardens





*** Keywords ***

Query entities with invalid scopeQ

    [Documentation]    Check that a BadRequestData error is returned when scopeQ is syntactically invalid

    [Arguments]    ${scopeq}



    ${response}=    Query Entities

    ...    scopeq=${scopeq}

    ...    entity_types=${entity_type}



    Check Response Status Code    400    ${response.status_code}

    Check Response Body Containing ProblemDetails Element Containing Type Element set to

    ...    ${response.json()}

    ...    ${ERROR_TYPE_BAD_REQUEST_DATA}

    Check Response Body Containing ProblemDetails Element Containing Title Element    ${response.json()}