Commit b72bd8a9 authored by kzangeli's avatar kzangeli
Browse files

Restore our test fixes the develop merge dropped: where both sides changed the...

Restore our test fixes the develop merge dropped: where both sides changed the same lines, -X theirs kept develop's and lost ours (temporal pagination 020_13/020_14/021_15/021_16 + their keywords in AssertionUtils, the DistOps D0xx expectations, 001_02, 002_02, 054_02, 056_02, 051_04); tags follow develop's TS 104 175/176 scheme
parent 5105c7a5
Loading
Loading
Loading
Loading
+41 −24
Changes for TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_15.robot: 41 added lines, 24 removed lines.
Original line number Diff line number Diff line
@@ -21,30 +21,47 @@ ${timeAfter}= 2021-01-01T01:01:00Z


*** Test Cases ***
021_15_01 Retrieve The Entity With lastN And Timerel Before
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    lastN=${20}    expectedSize=20    timerel=before    timeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
021_15_02 Retrieve The Entity With lastN And Timerel Between
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    lastN=${20}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
021_15_03 Retrieve The Entity With lastN And Timerel After
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    lastN=${20}    expectedSize=20    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${mrt}    expectedRangeEnd=${lrt}
021_15_04 Retrieve The Entity With Timerel Before
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    timerel=before    expectedSize=*    timeAt=${timeAfter}    expectedRangeEnd=${mrt}
021_15_05 Retrieve The Entity With Timerel Between
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
021_15_06 Retrieve The Entity With Timerel After
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
021_15_07 Retrieve The Entity With temporalValues And Timerel After
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    representation=temporalValues    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
021_15_08 Retrieve The Entity With temporalValues, lastN And Timerel Between
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    since_v1.5.1
    representation=temporalValues    lastN=${20}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
021_15_01 Query With lastN Smaller Than The Available Instances
    [Documentation]    lastN paginates in descending order; the deeper page holds EARLIER timestamps → rel="intervalbefore"
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    lastN=${5}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}
    ...    maxInstances=5    expectBeforeOffset=5

021_15_02 Query The Second Page With lastN And offsetN
    [Documentation]    A middle page carries both pointers
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    lastN=${5}    offsetN=${5}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}
    ...    maxInstances=5    expectBeforeOffset=10    expectAfterOffset=0

021_15_03 Query With firstN
    [Documentation]    firstN paginates in ascending order; the deeper page holds LATER timestamps → rel="intervalafter"
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    firstN=${5}    timerel=after    timeAt=${timeBefore}
    ...    maxInstances=5    expectAfterOffset=5

021_15_04 Query The Last Page With firstN And offsetN
    [Documentation]    Past the largest attribute's instance count only the backward pointer remains
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    firstN=${5}    offsetN=${18}    timerel=after    timeAt=${timeBefore}
    ...    maxInstances=2    expectBeforeOffset=13

021_15_05 Query With lastN Covering All Instances
    [Documentation]    Nothing remains beyond the page — no pagination pointers
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    lastN=${20}    timerel=after    timeAt=${timeBefore}
    ...    maxInstances=20

021_15_06 Query With temporalValues And lastN
    [Documentation]    Pagination pointers are representation-independent
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    representation=temporalValues    lastN=${5}    timerel=after    timeAt=${timeBefore}
    ...    expectBeforeOffset=5

021_15_07 Query With Both firstN And lastN
    [Documentation]    Ascending and descending pagination at once is contradictory
    [Tags]    te-query    core_11_3_3    http_6_4_7_3    since_v1.9.1
    firstN=${5}    lastN=${5}    timerel=after    timeAt=${timeBefore}
    ...    expectedStatus=400


*** Keywords ***
+1 −1
Changes for TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/QueryTemporalEvolutionOfEntities/021_16.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ${second_vehicle_payload_file}= 2020-09-vehicle-temporal-representation.json
*** Test Cases ***    PAYLOAD_FILE
021_16_01 Retrieve The Entities Via Post
    [Tags]    te-retrieve    core_11_3_3    http_6_4_7_3    http_8_7_3_1    since_v1.5.1
    entity-operations-before-query.jsonld
    entity-operations-paginated-query.jsonld


*** Keywords ***
+46 −30
Changes for TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_13.robot: 46 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -20,36 +20,52 @@ ${timeAfter}= 2021-01-01T01:01:00Z


*** Test Cases ***
020_13_01 Retrieve An Entity With 20 Instances On Two Attributes
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    ${EMPTY}    expectedSize=*    expectedRangeStart=${lrt}    expectedRangeEnd=${mrt}
020_13_02 Retrieve The Entity With lastN
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    lastN=${20}    expectedSize=20    expectedRangeStart=${mrt}    expectedRangeEnd=${lrt}
020_13_03 Retrieve The Entity With lastN And Timerel Before
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    lastN=${20}    expectedSize=20    timerel=before    timeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
020_13_04 Retrieve The Entity With lastN And Timerel Between
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    lastN=${20}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
020_13_05 Retrieve The Entity With lastN And Timerel After
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    lastN=${20}    expectedSize=20    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${mrt}    expectedRangeEnd=${lrt}
020_13_06 Retrieve The Entity With Timerel Before
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    timerel=before    expectedSize=*    timeAt=${timeAfter}    expectedRangeEnd=${mrt}
020_13_07 Retrieve The Entity With Timerel Between
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
020_13_08 Retrieve The Entity With Timerel After
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
020_13_09 Retrieve The Entity With temporalValues And Timerel After
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    representation=temporalValues    timerel=after    timeAt=${timeBefore}    expectedRangeStart=${timeBefore}    expectedRangeEnd=${mrt}
020_13_10 Retrieve The Entity With temporalValues, lastN And Timerel Between
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    representation=temporalValues    lastN=${20}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    expectedRangeStart=${timeAfter}    expectedRangeEnd=${lrt}
020_13_01 Retrieve The Entity With lastN Smaller Than The Available Instances
    [Documentation]    lastN paginates in descending order; the deeper page holds EARLIER timestamps → rel="intervalbefore"
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${5}    maxInstances=5    expectBeforeOffset=5

020_13_02 Retrieve The Second Page With lastN And offsetN
    [Documentation]    A middle page carries both pointers
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${5}    offsetN=${5}    maxInstances=5    expectBeforeOffset=10    expectAfterOffset=0

020_13_03 Retrieve The Entity With firstN
    [Documentation]    firstN paginates in ascending order; the deeper page holds LATER timestamps → rel="intervalafter"
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    firstN=${5}    maxInstances=5    expectAfterOffset=5

020_13_04 Retrieve The Last Page With firstN And offsetN
    [Documentation]    Past the attribute's instance count only the backward pointer remains
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    firstN=${5}    offsetN=${18}    maxInstances=2    expectBeforeOffset=13

020_13_05 Retrieve The Entity With lastN Covering All Instances
    [Documentation]    Nothing remains beyond the page — no pagination pointers
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${20}    maxInstances=20

020_13_06 Retrieve The Entity With lastN And Timerel Before
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${5}    timerel=before    timeAt=${timeAfter}    maxInstances=5    expectBeforeOffset=5

020_13_07 Retrieve The Entity With lastN And Timerel Between
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${5}    timerel=between    timeAt=${timeBefore}    endTimeAt=${timeAfter}    maxInstances=5    expectBeforeOffset=5

020_13_08 Retrieve The Entity With firstN And Timerel After
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    firstN=${5}    timerel=after    timeAt=${timeBefore}    maxInstances=5    expectAfterOffset=5

020_13_09 Retrieve The Entity With temporalValues And lastN
    [Documentation]    Pagination pointers are representation-independent
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    representation=temporalValues    lastN=${5}    expectBeforeOffset=5

020_13_10 Retrieve The Entity With Both firstN And lastN
    [Documentation]    Ascending and descending pagination at once is contradictory
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    firstN=${5}    lastN=${5}    expectedStatus=400


*** Keywords ***
+8 −6
Changes for TP/NGSI-LD/ContextInformation/Consumption/TemporalEntity/RetrieveTemporalEvolutionOfEntity/020_14.robot: 8 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ ${timeAfter}= 2021-01-01T01:01:00Z


*** Test Cases ***
020_14_01 Retrieve An Entity With 60 Instances Of Unsynchronized Attributes
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    timerel=after    timeAt=${timeBefore}    emptyAttr=fuelLevel
020_14_02 Retrieve The Entity With lastN
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.5.1
    lastN=${100}    timerel=before    timeAt=${timeAfter}    emptyAttr=speed
020_14_01 Retrieve An Entity With Unsynchronized Attributes And firstN
    [Documentation]    Both attributes return their own first page even though their time ranges do not overlap
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    firstN=${30}    timerel=after    timeAt=${timeBefore}    expectedInstances=30
020_14_02 Retrieve An Entity With Unsynchronized Attributes And lastN
    [Documentation]    Both attributes return their own last page even though their time ranges do not overlap
    [Tags]    te-retrieve    core_11_3_2    http_6_4_7_3    since_v1.9.1
    lastN=${30}    timerel=before    timeAt=${timeAfter}    expectedInstances=30


*** Keywords ***
+1 −1
Changes for TP/NGSI-LD/ContextInformation/Provision/Entities/CreateEntity/001_02.robot: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ Test Template Create Entity With Invalid Request Scenarios
    invalid-json.jsonld    ${ERROR_TYPE_INVALID_REQUEST}
001_02_02 EmptyJson
    [Tags]    e-create    core_10_2_2
    empty.jsonld    ${ERROR_TYPE_INVALID_REQUEST}
    empty.jsonld    ${ERROR_TYPE_BAD_REQUEST_DATA}
001_02_03 EntityWithNoContext
    [Tags]    e-create    core_10_2_2
    building-minimal.json    ${ERROR_TYPE_BAD_REQUEST_DATA}
Loading