Commit c1b552ba authored by Yann Garcia's avatar Yann Garcia
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/emergency-communications/NG112

parents c95c2d39 c20bd8a3

test_purposes/ecrf.tplan2

+97 −89
Original line number Original line Diff line number Diff line
@@ -53,119 +53,131 @@ Package NG112_ECRF { 
//            Const {

//            Const {

//        E_POLICE_SERVICE_URN: "urn:service:sos.police";

//        E_POLICE_SERVICE_URN: "urn:service:sos.police";

//        E_POLICE_SIP_URI: "sip:police@etsi.com";

//        E_POLICE_SIP_URI: "sip:police@etsi.com";

//        E_POLICE_SERVICE_BOUNDARY: "[

//        E_POLICE_SERVICE_BOUNDARY: "{

//          \"type\": \"Polygon\",

//          \"coordinates\": [

//          [

//          [

//            [

//            [

//              44.61613168422215,

//              7.06665,

//              7.052139043807983

//              43.61676

//            ],

//            ],

//            [

//            [

//              44.61613168422215,

//              7.07562,

//              7.054091691970825

//              43.61676

//            ],

//            ],

//            [

//            [

//              44.6176463155033,

//              7.07562,

//              7.054091691970825

//              43.62349

//            ],

//            ],

//            [

//            [

//              44.6176463155033,

//              7.06665,

//              7.052139043807983

//              43.62349

//            ],

//            ],

//            [

//            [

//              44.61613168422215,

//              7.06665,

//              7.052139043807983

//              43.61676

//            ]

//            ]

//          ]

//          ]

//        ]"; // (lat, lon))

//        ]

//        E_POLICE_SERVICE_BOUNDARY_POS_LIST: "44.61613168422215 7.052139043807983 44.61613168422215 7.054091691970825 44.6176463155033 7.054091691970825 44.6176463155033 7.052139043807983 44.61613168422215 7.052139043807983"

//        }"; // (geoJson)

//        E_POLICE_SERVICE_BOUNDARY_POS_LIST: "43.61676 7.06665 43.61676 7.07562 43.62349 7.07562 43.62349 7.06665 43.61676 7.06665"

//        V_FIRE_SERVICE_URN: "urn:service:sos.fire";

//        V_FIRE_SERVICE_URN: "urn:service:sos.fire";

//        V_FIRE_SIP_URI: "sip:fire@vienna.com";

//        V_FIRE_SIP_URI: "sip:fire@vienna.com";

//        V_FIRE_SERVICE_BOUNDARY: "[

//        V_FIRE_SERVICE_BOUNDARY: "{

//           \"type\": \"Polygon\",

//           \"coordinates\": [

//            [

//            [

//              [

//              [

//              48.13126755117026,

//                16.245346069335938,

//              16.245346069335938

//                48.13126755117026

//              ],

//              ],

//              [

//              [

//              48.13126755117026,

//                16.491851806640625,

//              16.491851806640625

//                48.13126755117026

//              ],

//              ],

//              [

//              [

//              48.294614813244344,

//                16.491851806640625,

//              16.491851806640625

//                48.294614813244344

//              ],

//              ],

//              [

//              [

//              48.294614813244344,

//                16.245346069335938,

//              16.245346069335938

//                48.294614813244344

//              ],

//              ],

//              [

//              [

//              48.13126755117026,

//                16.245346069335938,

//              16.245346069335938

//                48.13126755117026

//              ]

//            ]

//            ]

//          ]

//          ]

//        ]"; // (lat, lon))

//        }"; // (geoJson)

//        V_POLICE_SERVICE_URN: "urn:service:sos.police";

//        V_POLICE_SERVICE_URN: "urn:service:sos.police";

//        V_POLICE_SIP_URI: "sip:police@vienna.com";

//        V_POLICE_SIP_URI: "sip:police@vienna.com";

//        V_POLICE_SERVICE_BOUNDARY: "[

//        V_POLICE_SERVICE_BOUNDARY: "{

//           \"type\": \"Polygon\",

//           \"coordinates\": [

//            [

//            [

//              [

//              [

//              48.13126755117026,

//                16.245346069335938,

//              16.245346069335938

//                48.13126755117026

//              ],

//              ],

//              [

//              [

//              48.13126755117026,

//                16.491851806640625,

//              16.491851806640625

//                48.13126755117026

//              ],

//              ],

//              [

//              [

//              48.294614813244344,

//                16.491851806640625,

//              16.491851806640625

//                48.294614813244344

//              ],

//              ],

//              [

//              [

//              48.294614813244344,

//                16.245346069335938,

//              16.245346069335938

//                48.294614813244344

//              ],

//              ],

//              [

//              [

//              48.13126755117026,

//                16.245346069335938,

//              16.245346069335938

//                48.13126755117026

//              ]

//            ]

//            ]

//          ]

//          ]

//        ]"; // (lat, lon))

//        }"; // (geoJson)

//        H_FIRE_SERVICE_URN: "urn:service:sos.fire";

//        H_FIRE_SERVICE_URN: "urn:service:sos.fire";

//        H_FIRE_SIP_URI: "sip:fire@hadersdorf.com";

//        H_FIRE_SIP_URI: "sip:fire@hadersdorf.com";

//        H_FIRE_SERVICE_BOUNDARY: "[

//        H_FIRE_SERVICE_BOUNDARY: "{

//           \"type\": \"Polygon\",

//           \"coordinates\": [

//            [

//            [

//              [

//              [

//              48.20597092201654,

//                16.221656799316406,

//              16.221656799316406

//                48.20597092201654

//              ],

//              ],

//              [

//              [

//              48.20597092201654,

//                16.228179931640625,

//              16.228179931640625

//                48.20597092201654

//              ],

//              ],

//              [

//              [

//              48.21174802569084,

//                16.228179931640625,

//              16.228179931640625

//                48.21174802569084

//              ],

//              ],

//              [

//              [

//              48.21174802569084,

//                16.221656799316406,

//              16.221656799316406

//                48.21174802569084

//              ],

//              ],

//              [

//              [

//              48.20597092201654,

//                16.221656799316406,

//              16.221656799316406

//                48.20597092201654

//              ]

//              ]

//            ]

//            ]

//        ]"; // (lat, lon))

//          ]"; // (geoJson)

//

//

//

//

//        POINT_IN_E_POLICE_SERVICE_BOUNDARY: "44.617, 7.053"; // (lat, lon)

//        POINT_IN_E_POLICE_SERVICE_BOUNDARY: "43.62023 7.071032"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS: "48.221927869614504, 16.34010314941406"; // (lat, lon)

//        POINT_IN_V_POLICE_SERVICE_BOUNDARY: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS: "48.221927869614504, 16.34010314941406"; // (lat, lon)

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_POS: "48.22192 16.34010"; // (lat lon)

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_IN_V_POLICE_SERVICE_BOUNDARY_RADIUS: "2";

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_POS: "48.30260863571332, 16.351604461669922"; // (lat, lon)

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_POS: "48.30260 16.35160"; // (lat lon)

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_POS: "48.20688615019928, 16.22955322265625"; // (lat, lon)

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_POS: "48.20688615019928 16.22955322265625"; // (lat lon)

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";

//        CIRCLE_INTERSECTING_V_FIRE_SERVICE_BOUNDARY_AND_H_FIRE_SERVICE_BOUNDARY_RADIUS: "5000";

//        LOCATION_ID: "locationId";

//        LOCATION_ID: "locationId";

//     }

//     }
@@ -586,7 +598,7 @@ Expected behaviour 
Test Purpose {

Test Purpose {

TP Id TP_ECRF_HTTP_POST_BV_06

TP Id TP_ECRF_HTTP_POST_BV_06

Test objective 

Test objective 

    "IUT successfully responds with a service URI for a Circle that intersects service boundary" 

    "IUT successfully responds with a service URI for a Circle that intersects the service boundary" 

Reference 

Reference 

    "ETSI TS 103 479 [1], clause XXXX",

    "ETSI TS 103 479 [1], clause XXXX",

    "EENA Next Generation 112 LTD [2], clause 4.4",

    "EENA Next Generation 112 LTD [2], clause 4.4",
@@ -855,13 +867,9 @@ Expected behaviour 
                            element "location" containing

                            element "location" containing

                                attribute "profile" indicating value "geodetic-2d",

                                attribute "profile" indicating value "geodetic-2d",

                                attribute "id" indicating value LOCATION_ID,

                                attribute "id" indicating value LOCATION_ID,

                                element "Circle" inNamespace "http://www.opengis.net/pidflo/1.0" containing

                                element "Point" inNamespace "http://www.opengis.net/gml" containing

                                    attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",

                                    attribute "srsName" indicating value "urn:ogc:def:crs:EPSG::4326",

                                    element "pos" inNamespace "http://www.opengis.net/gml" indicating value CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_POS,

                                    element "pos" indicating value POINT_IN_V_POLICE_SERVICE_BOUNDARY;

                                    element "radius" indicating value CIRCLE_IN_V_FIRE_SERVICE_BOUNDARY_RADIUS containing

                                        attribute "uom" indicating value "urn:ogc:def:uom:EPSG::9001"

                                    ;

                                ;

                            ,

                            ,

                            element "service" indicating value "urn:service:sos";

                            element "service" indicating value "urn:service:sos";

                        ;

                        ;

test_purposes/lis.tplan2

+14 −12
Original line number Original line Diff line number Diff line
@@ -460,16 +460,17 @@ Expected behaviour 
                                    element "status" containing

                                    element "status" containing

                                        element "geopriv" inNamespace "urn:ietf:params:xml:ns:pidf:geopriv10" containing

                                        element "geopriv" inNamespace "urn:ietf:params:xml:ns:pidf:geopriv10" containing

                                            element "location-info" containing

                                            element "location-info" containing

                                            	element "civicAddress" inNamespace "urn:ietf:params:xml:ns:pidf:geopriv10:civicAddr" containing

                                                    element "country" indicating value "AU",

                                                    element "country" indicating value "AU",

                                                    element "A1" indicating value "NSW",

                                                    element "A1" indicating value "NSW",

                                                    element "A3" indicating value "Wollongong",

                                                    element "A3" indicating value "Wollongong",

                                                    element "A4" indicating value "Gwynneville",

                                                    element "A4" indicating value "Gwynneville",

                                                element "STS" indicating value "Nortfield Avenue",

                                                    element "STS" indicating value "Northfield Avenue",

                                                    element "LMK" indicating value "University of Wollongong",

                                                    element "LMK" indicating value "University of Wollongong",

                                                    element "FLR" indicating value "2",

                                                    element "FLR" indicating value "2",

                                                    element "NAM" indicating value "Andrew Corporation",

                                                    element "NAM" indicating value "Andrew Corporation",

                                                    element "PC" indicating value "2500",

                                                    element "PC" indicating value "2500",

                                                element "BLD" indicating value "36",

                                                    element "BLD" indicating value "39",

                                                    element "SEAT" indicating value "WS-183",

                                                    element "SEAT" indicating value "WS-183",

                                                    element "POBOX" indicating value "U40"

                                                    element "POBOX" indicating value "U40"

                                                ;

                                                ;
@@ -481,6 +482,7 @@ Expected behaviour 
                        ;

                        ;

                    ;

                    ;

                ;

                ;

            ;

        }

        }

    }

    }

} //End of TP_LIS_HTTP_POST_BV_06

} //End of TP_LIS_HTTP_POST_BV_06