Commit 20c24598 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fixes on MEC028 v2.2.1

parent 8211dac1
Loading
Loading
Loading
Loading
+59 −58
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ Package MEC_MEC028_SRV_WAI {
            }
            }
        }
        }


/*
        //Bad request
        //Bad request
        Test Purpose {
        Test Purpose {
            TP Id "TP_MEC_MEC028_SRV_WAI_012_BR"
            TP Id "TP_MEC_MEC028_SRV_WAI_012_BR"
@@ -124,7 +125,7 @@ Package MEC_MEC028_SRV_WAI {
                }
                }
            }
            }
        }
        }

 */
        Test Purpose {
        Test Purpose {
            TP Id "TP_MEC_MEC028_SRV_WAI_013_OK"
            TP Id "TP_MEC_MEC028_SRV_WAI_013_OK"
            Test objective
            Test objective
@@ -145,25 +146,27 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vPOST containing
                        a vPOST containing
                            uri indicating value "/wai/v2/queries/measurements"
                            uri indicating value "/wai/v2/queries/measurements",
                            body containing
                            body containing
                                MeasurementConfig containing
                                MeasurementConfig containing
                                    staId set to STA_ID,
                                    measurementId set to MEAS_ID,
                                    measurementId set to MEAS_ID,
                                    measurementInfo set to CONFIG_VALUE
                                    measurementInfo set to CONFIG_VALUE,
                                    StaIdentity containing
                                    	staId set to STA_ID
                                    ;
                                ;
                                ;
                            ;
                            ;
                        ;
                        ;
                    from the MEC_APP entity
                    from the MEC_APP entity
                }
                } then {
                then {
                    // MEC 028, clause 7.7.3.4
                    // MEC 028, clause 7.7.3.4
                    the IUT entity sends a HTTP_RESPONSE containing
                    the IUT entity sends a HTTP_RESPONSE containing
                        status_code set to "200 OK"
                        status_code set to "200 OK"
                        body containing
                        body containing
                            MeasurementConfig containing 
                            MeasurementConfig containing 
                                links indicating value H_LINKS,
                                StaIdentity containing
                                staId set to STA_ID,
                                	staId set to STA_ID
                                ;,
                                measurementId set to MEAS_ID,
                                measurementId set to MEAS_ID,
                                measurementInfo set to CONFIG_VALUE
                                measurementInfo set to CONFIG_VALUE
                            ;
                            ;
@@ -198,8 +201,9 @@ Package MEC_MEC028_SRV_WAI {
                            // How to trigger an error response.
                            // How to trigger an error response.
                            body containing
                            body containing
                                MeasurementConfig containing 
                                MeasurementConfig containing 
                                    links indicating value H_LINKS,
                                    StaIdentities containing					// StaIdentity is misspelled
                                    staId set to STA_ID,
                                    	staId set to STA_ID
                                    ;,
                                    measurementId set to MEAS_ID,
                                    measurementId set to MEAS_ID,
                                    measurementInfo set to CONFIG_VALUE
                                    measurementInfo set to CONFIG_VALUE
                                ;
                                ;
@@ -216,7 +220,7 @@ Package MEC_MEC028_SRV_WAI {
                }
                }
            }
            }
        }
        }

/*
        Test Purpose {
        Test Purpose {
            TP Id "TP_MEC_MEC028_SRV_WAI_013_NF"
            TP Id "TP_MEC_MEC028_SRV_WAI_013_NF"
            Test objective
            Test objective
@@ -241,7 +245,9 @@ Package MEC_MEC028_SRV_WAI {
                            body containing
                            body containing
                                MeasurementConfig containing 
                                MeasurementConfig containing 
                                    links indicating value H_LINKS,
                                    links indicating value H_LINKS,
                                    staId set to STA_ID,
                                    StaIdentity containing
                                    	staId set to STA_ID
                                    ;,
                                    measurementId set to MEAS_ID,
                                    measurementId set to MEAS_ID,
                                    measurementInfo set to CONFIG_VALUE
                                    measurementInfo set to CONFIG_VALUE
                                ;
                                ;
@@ -258,7 +264,7 @@ Package MEC_MEC028_SRV_WAI {
                }
                }
            }
            }
        }
        }

 */
        Test Purpose {
        Test Purpose {
            TP Id "TP_MEC_MEC028_SRV_WAI_014_OK"
            TP Id "TP_MEC_MEC028_SRV_WAI_014_OK"
            Test objective
            Test objective
@@ -274,8 +280,7 @@ Package MEC_MEC028_SRV_WAI {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity having a MeasurementConfig containing
               measurementConfig containing
               measurementConfig containing
                  links set to "{measurementConfigId}",
                  measurementId set to MEASUREMENT_CONFIG_ID
                  measurementConfig set to CONFIG_VALUE
               ;
               ;
            ;
            ;
        }
        }
@@ -285,7 +290,7 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vGET containing
                        a vGET containing
                            uri indicating value "/wai/v2/queries/measurements/{measurementConfigId}"
                            uri indicating value "/wai/v2/queries/measurements/{MEASUREMENT_CONFIG_ID}"
                        ;
                        ;
                    from the MEC_APP entity
                    from the MEC_APP entity
                }
                }
@@ -295,9 +300,10 @@ Package MEC_MEC028_SRV_WAI {
                        status_code set to "200 OK"
                        status_code set to "200 OK"
                        body containing
                        body containing
                            MeasurementConfig containing 
                            MeasurementConfig containing 
                                links indicating value "{measurementConfigId}",
                                StaIdentity containing
                                staId set to STA_ID,
                                    	staId set to STA_ID
                                measurementId set to MEAS_ID,
                                ;,
                                measurementId set to MEASUREMENT_CONFIG_ID,
                                measurementInfo set to CONFIG_VALUE
                                measurementInfo set to CONFIG_VALUE
                            ;
                            ;
                        ;
                        ;
@@ -320,12 +326,9 @@ Package MEC_MEC028_SRV_WAI {


        Initial conditions  with {
        Initial conditions  with {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity "not" having a MeasurementConfig containing
                measurementConfig containing
                measurementConfig containing
                    links set to "{measurementConfigId}",
                    measurementId set to INVALID_MEASUREMENT_CONFIG_ID
                    staId set to STA_ID,
                    measurementId set to MEAS_ID,
                    measurementInfo set to CONFIG_VALUE
                ;
                ;
            ;
            ;
        }
        }
@@ -335,7 +338,7 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vGET containing
                        a vGET containing
                            uri indicating value "/wai/v2/queries/measurements/{Invalid_measurementConfigId}"
                            uri indicating value "/wai/v2/queries/measurements/{INVALID_MEASUREMENT_CONFIG_ID}"
                        ;
                        ;
                    from the MEC_APP entity
                    from the MEC_APP entity
                }
                }
@@ -364,9 +367,10 @@ Package MEC_MEC028_SRV_WAI {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity having a MeasurementConfig containing
                measurementConfig containing
                measurementConfig containing
                    links set to "{measurementConfigId}",
                    StaIdentity containing
                    staId set to STA_ID,
                    	staId set to STA_ID
                    measurementId set to MEAS_ID,
                    ;,
                    measurementId set to INVALID_MEASUREMENT_CONFIG_ID,
                    measurementInfo set to CONFIG_VALUE
                    measurementInfo set to CONFIG_VALUE
                ;
                ;
            ;
            ;
@@ -380,9 +384,10 @@ Package MEC_MEC028_SRV_WAI {
                            uri indicating value "/wai/v2/queries/measurements/{measurementConfigId}",
                            uri indicating value "/wai/v2/queries/measurements/{measurementConfigId}",
                            body containing
                            body containing
                                MeasurementConfig containing 
                                MeasurementConfig containing 
                                    links set to "{measurementConfigId}",
                                    StaIdentity containing
                                    staId set to STA_ID,
				                    	staId set to STA_ID
                                    measurementId set to MEAS_ID,
				                    ;,
                                    measurementId set to MEASUREMENT_CONFIG_ID,
                                    measurementInfo set to NEW_CONFIG_VALUE
                                    measurementInfo set to NEW_CONFIG_VALUE
                                ;
                                ;
                            ;
                            ;
@@ -395,9 +400,10 @@ Package MEC_MEC028_SRV_WAI {
                        status_code set to "200 OK"
                        status_code set to "200 OK"
                        body containing
                        body containing
                            MeasurementConfigLinkList containing 
                            MeasurementConfigLinkList containing 
                                links set to "{measurementConfigId}",
                                StaIdentity containing
                                staId set to STA_ID,
                                    	staId set to STA_ID
                                measurementId set to MEAS_ID,
                                    ;,
                                measurementId set to MEASUREMENT_CONFIG_ID,
                                measurementInfo set to NEW_CONFIG_VALUE
                                measurementInfo set to NEW_CONFIG_VALUE
                            ;
                            ;
                        ;
                        ;
@@ -420,12 +426,9 @@ Package MEC_MEC028_SRV_WAI {


        Initial conditions  with {
        Initial conditions  with {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity "not" having a MeasurementConfig containing
                measurementConfig containing
                measurementConfig containing
                    links set to "{measurementConfigId}",
                    measurementId set to INVALID_MEASUREMENT_CONFIG_ID
                    staId set to STA_ID,
                    measurementId set to MEAS_ID,
                    measurementInfo set to CONFIG_VALUE
                ;
                ;
            ;
            ;
        }
        }
@@ -435,12 +438,13 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vPUT containing
                        a vPUT containing
                            uri indicating value "/wai/v2/queries/measurements/{Invalid_measurementConfigId}",
                            uri indicating value "/wai/v2/queries/measurements/{INVALID_MEASUREMENT_CONFIG_ID}",
                            body containing
                            body containing
                                MeasurementConfigLinkList containing 
                                MeasurementConfigLinkList containing 
                                    links set to "{measurementConfigId}",
                                    StaIdentity containing
                                    staId set to STA_ID,
                                    	staId set to STA_ID
                                    measurementId set to MEAS_ID,
                                    ;,
                                    measurementId set to INVALID_MEASUREMENT_CONFIG_ID,
                                    measurementInfo set to NEW_CONFIG_VALUE
                                    measurementInfo set to NEW_CONFIG_VALUE
                                ;
                                ;
                            ;
                            ;
@@ -472,9 +476,10 @@ Package MEC_MEC028_SRV_WAI {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity having a MeasurementConfig containing
                measurementConfig containing
                measurementConfig containing
                    links set to "{measurementConfigId}",
                    StaIdentity containing
                    staId set to STA_ID,
                    	staId set to STA_ID
                    measurementId set to MEAS_ID,
                    ;,
                    measurementId set to MEASUREMENT_CONFIG_ID,
                    measurementInfo set to NCONFIG_VALUE
                    measurementInfo set to NCONFIG_VALUE
                ;
                ;
            ;
            ;
@@ -485,7 +490,7 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vDELETE containing
                        a vDELETE containing
                            uri indicating value "/wai/v2/queries/measurements/{measurementConfigId}"
                            uri indicating value "/wai/v2/queries/measurements/{MEASUREMENT_CONFIG_ID}"
                        ;
                        ;
                    from the MEC_APP entity
                    from the MEC_APP entity
                }
                }
@@ -512,13 +517,9 @@ Package MEC_MEC028_SRV_WAI {


        Initial conditions  with {
        Initial conditions  with {
            the IUT entity being_in idle_state and
            the IUT entity being_in idle_state and
            the IUT entity having a MeasurementConfig containing
            the IUT entity "not" having a 
                measurementConfig containing
            	MeasurementConfig containing
                    links set to "{measurementConfigId}",
                    measurementId set to INVALID_MEASUREMENT_CONFIG_ID
                    staId set to STA_ID,
                    measurementId set to MEAS_ID,
                    measurementInfo set to CONFIG_VALUE
                ;
                ;
                ;
        }
        }
        // MEC 028, clause 5.2.7
        // MEC 028, clause 5.2.7
@@ -527,7 +528,7 @@ Package MEC_MEC028_SRV_WAI {
                when {
                when {
                    the IUT entity receives
                    the IUT entity receives
                        a vDELETE containing
                        a vDELETE containing
                            uri indicating value "/wai/v2/queries/measurements/{Invalid_measurementConfigId}"
                            uri indicating value "/wai/v2/queries/measurements/{INVALID_MEASUREMENT_CONFIG_ID}"
                        ;
                        ;
                    from the MEC_APP entity
                    from the MEC_APP entity
                }
                }