Commit b1ec5641 authored by Marco Cavalli's avatar Marco Cavalli
Browse files

Merge remote-tracking branch 'origin/develop' into iop-tests-viewer

parents 708085c4 48d5ff4e
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -92,13 +92,10 @@ Run Interoperability Scenario

    # Agent checks that b2 returns OffstreetParking:1 and OffstreetParking:2 and b3 returns OffstreetParking:2
    ${expected_first_b2}=    Load Entity    ${first_entity_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b2}    @context
    Check Resource Set To    ${expected_first_b2}    ${first_entity_b2}[0]
    ${expected_second_b2}=    Load Entity    ${third_entity_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b2}    @context
    Check Resource Set To    ${expected_second_b2}    ${second_entity_b2}[0]
    ${expected_second_b3}=    Load Entity    ${second_entity_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b3}    @context
    Check Resource Set To    ${expected_second_b3}    ${second_entity_b3}[0]

    # Agent checks that OffstreetParking:1 returned in step (2) matches b2 and OffstreetParking:2 combines b2 and b3
+0 −3
Original line number Diff line number Diff line
@@ -94,13 +94,10 @@ Run Interoperability Scenario

    # Agent checks that b2 returns OffstreetParking:1 and OffstreetParking:2 and b3 returns OffstreetParking:2
    ${expected_first_b2}=    Load Entity    ${first_entity_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b2}    @context
    Check Resource Set To    ${expected_first_b2}    ${first_entity_b2}[0]
    ${expected_second_b2}=    Load Entity    ${third_entity_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b2}    @context
    Check Resource Set To    ${expected_second_b2}    ${second_entity_b2}[0]
    ${expected_second_b3}=    Load Entity    ${second_entity_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b3}    @context
    Check Resource Set To    ${expected_second_b3}    ${second_entity_b3}[0]

    # Agent checks that OffstreetParking:1 returned in step (2) matches b2 and OffstreetParking:2 combines b2 and b3
+0 −5
Original line number Diff line number Diff line
@@ -104,19 +104,14 @@ Run Interoperability Scenario
    ${second_entity_b4}=    Get Value From JSON    ${response_b4.json()}    $[?(@.id=='${second_entity_id}')]

    ${expected_first_b2}=    Load Entity    ${first_entity_no_location_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b2}    @context
    Check Resource Set To    ${expected_first_b2}    ${first_entity_b2}[0]
    ${expected_second_b2}=    Load Entity    ${second_entity_no_location_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b2}    @context
    Check Resource Set To    ${expected_second_b2}    ${second_entity_b2}[0]
    ${expected_first_b3}=    Load Entity    ${first_full_entity_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b3}    @context
    Check Resource Set To    ${expected_first_b3}    ${first_entity_b3}[0]
    ${expected_second_b3}=    Load Entity    ${second_full_entity_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b3}    @context
    Check Resource Set To    ${expected_second_b3}    ${second_entity_b3}[0]
    ${expected_second_b4}=    Load Entity    ${location_name_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b4}    @context
    Check Resource Set To    ${expected_second_b4}    ${second_entity_b4}[0]

    # Agent checks the broker-b1 Entities against the attributes returned by b2, b3 and b4
+0 −4
Original line number Diff line number Diff line
@@ -101,13 +101,10 @@ Run Interoperability Scenario
    ${first_entity_b4}=    Get Value From JSON    ${response_b4.json()}    $[?(@.id=='${first_entity_id}')]

    ${expected_second_b2}=    Load Entity    ${offstreet_no_location_payload_filename}    ${second_entity_id}
    Remove From Dictionary    ${expected_second_b2}    @context
    Check Resource Set To    ${expected_second_b2}    ${second_entity_b2}[0]
    ${expected_first_b3}=    Load Entity    ${first_full_offstreet_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b3}    @context
    Check Resource Set To    ${expected_first_b3}    ${first_entity_b3}[0]
    ${expected_first_b4}=    Load Entity    ${first_offstreet_no_location_payload_filename}    ${first_entity_id}
    Remove From Dictionary    ${expected_first_b4}    @context
    Check Resource Set To    ${expected_first_b4}    ${first_entity_b4}[0]

    # Agent checks that OffstreetParking:1 combines b3 and b4 and OffstreetParking:2 matches b2
@@ -118,7 +115,6 @@ Run Interoperability Scenario
    ...    totalSpotsNumber=${first_entity_b4}[0][totalSpotsNumber]
    ...    name=${first_entity_b3}[0][name]
    ...    location=${first_entity_b3}[0][location]
    Remove From Dictionary    ${expected_first_b1}    @context
    Check Resource Set To    ${expected_first_b1}    ${first_entity_b1}[0]
    Check Resource Set To    ${second_entity_b2}[0]    ${second_entity_b1}[0]

+0 −1
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ Run Interoperability Scenario
    # Agent checks that OffstreetParking:1 matches b3, OffstreetParking:2 matches b4 and Vehicle:1 comes from b2
    Check Resource Set To    ${first_parking_b3}[0]    ${first_parking_b1}[0]
    Check Resource Set To    ${second_parking_b4}[0]    ${second_parking_b1}[0]
    Remove From Dictionary    ${first_vehicle_expected}    @context
    Check Resource Set To    ${first_vehicle_expected}    ${first_vehicle_b1}[0]

Setup Initial Context Source Registrations
Loading