Commit dada847f authored by Benjamin Hebgen's avatar Benjamin Hebgen
Browse files

Merge branch 'fix/geojsontests' into 'develop' 

adding fixed expectations and alternatives and adapted tests to test for the 3 valid responses

See merge request !177
parents efe6454b 64f19d40

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

+5 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ ${vehicle_id_prefix}= urn:ngsi-ld:Vehicle: 
${parking_id_prefix}=       urn:ngsi-ld:OffStreetParking:

${vehicle_filename}=        vehicle-simple-attributes.jsonld

${parking_filename}=        parking-simple-attributes.jsonld

${expectation_filename_alt2}=    vehicle-parking-019-02-05.alternative2.geojson

${expectation_filename_alt1}=    vehicle-parking-019-02-05.alternative.geojson

${expectation_filename}=    vehicle-parking-019-02-05.geojson

${vehicle_entity_type}=     https://ngsi-ld-test-suite/context#Vehicle

${parking_entity_type}=     https://ngsi-ld-test-suite/context#OffStreetParking
@@ -32,9 +34,10 @@ ${parking_entity_type}= https://ngsi-ld-test-suite/context#OffStreetParking 
    ...    accept=${CONTENT_TYPE_GEOJSON}

    ...    context=${ngsild_test_suite_context}

    Check Response Status Code    200    ${response.status_code}

    Check Response Body Content

    ...    expectation_filename=${expectation_filename}

    ${alternatives}=	Create List	${expectation_filename}	${expectation_filename_alt1}	${expectation_filename_alt2}

    Check Body With Alternatives

    ...    response_body=${response.json()}

    ...    alternatives=${alternatives}





*** Keywords ***

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

+6 −3
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ Suite Teardown Delete Entities 
${building_id_prefix}=      urn:ngsi-ld:Building:

${filename}=                building-location-attribute.jsonld

${expectation_filename}=    two-buildings-location-attribute-normalized-019-05.geojson

${expectation_filename_alt1}=    two-buildings-location-attribute-normalized-019-05.alternative.geojson

${expectation_filename_alt2}=    two-buildings-location-attribute-normalized-019-05.alternative2.geojson

${entity_type}=             https://ngsi-ld-test-suite/context#Building
@@ -30,11 +32,12 @@ ${entity_type}= https://ngsi-ld-test-suite/context#Building 
    ...    accept=${CONTENT_TYPE_GEOJSON}

    ...    context=${ngsild_test_suite_context}





    Check Response Status Code    200    ${response.status_code}

    Check Response Body Content

    ...    expectation_filename=${expectation_filename}

    ${alternatives}=	Create List	${expectation_filename}	${expectation_filename_alt1}	${expectation_filename_alt2}

    Check Body With Alternatives

    ...    response_body=${response.json()}



    ...    alternatives=${alternatives}



*** Keywords ***

Create Initial Entities

data/entities/expectations/building-two-geometry-attribute-normalized.geojson

+5 −5
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
                "type": "Point",

                "coordinates": [11.1111, 11.1111]

            }

        }

    },

    "@context": [

        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"

    ]

}
 
}

data/entities/expectations/building-two-geometry-attribute-simplified.geojson

+5 −5
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 
        "observationSpace": {

             "type": "Point",

             "coordinates": [11.1111, 11.1111]

        }

    },

    "@context": [

        "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"

    ]

}
 
}

data/entities/expectations/building-two-geometry-property-on-nonexistent-operation-space.geojson

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    "subCategory": {

      "type": "Property",

      "value": "tourism"

    }

  },

  "@context": "https://forge.etsi.org/rep/cim/ngsi-ld-test-suite/-/raw/develop/resources/jsonld-contexts/ngsi-ld-test-suite-compound.jsonld"

}
 
 No newline at end of file
 
}
 
 No newline at end of file