diff --git a/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md b/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md index 91482ce6cb96aad29f0f72b8a6d2c9921a2ea6c6..a289170af4aeac313f65e6daab04345e25e1a119 100644 --- a/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md +++ b/TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md @@ -111,57 +111,6 @@ NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURA [Annex B (informative): Bibliography](#annex-b-informative-bibliography) [History](#history) -1 Scope 4 -2 References 4 -2.1 Normative references 4 -2.2 Informative references 4 -3 Definition of terms, symbols and abbreviations 5 -3.1 Terms 5 -3.2 Symbols 5 -3.2 Abbreviations 5 -4 Conventions 6 -5 Abstract Test Method (ATM) 6 -5.1 Abstract protocol tester 6 -5.2 Test Configuration 6 -5.2.1 AE Test Configuration 6 -5.3 Test architecture 7 -5.4 Ports and ASPs (Abstract Services Primitives) 9 -5.4.0 Introduction 9 -5.4.1 mcaPort, mcaPortIn, mccPort, mccPortIn 9 -5.4.2 utPort 10 -5.4.2.0 Introduction 10 -5.4.2.1 Usage for Automated AE Testing 10 -5.4.2.2 Upper Tester Control Primitives 11 -5.4.2.2.1 Introduction 11 -5.4.2.2.2 UtTrigger and UtTriggerAck Primitives 11 -5.4.2.2.3 Control Communication Protocol 14 -5.4.2.2.4 Control Message Serialization 14 -5.4.3 acPort 14 -5.4.4 infoPort 14 -5.5 Test components 14 -5.5.1 Tester 14 -5.5.2 AeSimu 15 -5.5.3 CseSimu 15 -5.6 Test strategy 16 -6 Untestable Test Purposes 17 -7 ATS Conventions 17 -7.0 Introduction 17 -7.1 Testing conventions 17 -7.1.1 Testing states 17 -7.1.1.1 Initial state 17 -7.1.1.2 Final state 17 -7.2 Naming conventions 17 -7.2.1 General guidelines 17 -7.2.2 oneM2M specific TTCN-3 naming conventions 19 -7.2.3 Usage of Log statements 19 -7.2.4 Test Case (TC) identifier 20 -7.3 IXIT 20 -8 TTCN-3 Verifications 22 -Annex A (normative): TTCN-3 library modules 23 -A.1 Electronic annex, zip file with TTCN-3 code 23 -Annex B (informative): Bibliography 24 -History 25 - # 1 Scope @@ -258,9 +207,7 @@ An abstract protocol tester (APT) is a process that provides behaviours for test APTs used by the oneM2M test suite are described in figure 5.1-1. The test system will simulate valid and invalid protocol behaviour, and will analyse the reaction of the IUT. -  - -  + **Figure 5.1-1: Abstract protocol testers - oneM2M** @@ -377,10 +324,10 @@ Both primitives contain another parameters that permits to dynamically configure |TTCN-3 Primitive |oneM2M Message |Direction |IUT | |-|-|-|-| -|M2MRequestPrimitive |Request Primitive |<=<br />=> |AE | -|M2MRequestPrimitive |Request Primitive |=><br /><= |CSE | -|M2MResponsePrimitive |Response Primitive |=><br /><= |AE | -|M2MResponsePrimitive |Response Primitive |=><br /><= |CSE | +|M2MRequestPrimitive |Request Primitive |<=> |AE | +|M2MRequestPrimitive |Request Primitive |<=> |CSE | +|M2MResponsePrimitive |Response Primitive |<=> |AE | +|M2MResponsePrimitive |Response Primitive |<=> |CSE | @@ -428,9 +375,8 @@ The upper tester triggering message type maps to particular message formats for |Upper Tester Control Message Type |TTCN-3 Primitives |Direction |Direction | |-|-|-|-| -|Upper Tester Control Message Type |TTCN-3 Primitives |TS |UT | -|Trigger |UtTrigger Primitive |=> |=> | -|Trigger Acknowledgement |UtTriggerAck Primitive |<= |<= | +|Trigger |UtTrigger Primitive |TS |UT | +|Trigger Acknowledgement |UtTriggerAck Primitive |UT |TS | @@ -439,7 +385,7 @@ The upper tester triggering message type maps to particular message formats for The UtTrigger primitive is initialized by the Test System to send triggering message to the target IUT as depicted in figure 5.4.2.2.2-1. The IUT will send acknowledgement message back to the Test System using UtTriggerAck primitive if trigger message is successfully transported to the IUT. Then IUT starts interaction with Test System through oneM2M request and response primitives. - + **Figure 5.4.2.2.2-1: Trigger message flow** @@ -464,10 +410,21 @@ Table 5.4.2.2.2-1 defines UtTrigger and UtTriggerAck primitives including oneM2M +The rules for defining UtTrigger and UtTriggerAck primitives are: -**Table 5.4.2.2.2-2: Rules for defining UtTrigger and UtTriggerAck primitives**<a name="table_5.4.2.2.2-2"></a> +1. UtTrigger primitive is represented in requestPrimitive serialized in JSON format. + +1. UtTrigger primitive shall be interpreted as follows: + - Any attribute/parameter containing a value shall be present and equal in the triggered request primitive. + - Any attribute/parameter containing "UNINITIALIZED" value shall be present in the triggered request primitive. + - Any other attribute/parameter shall comply with oneM2M TS-0004 <a href="#_ref_2">[2]</a>. + +1. Parameters within UtTrigger are listed as following: + - operation: (mandatory) operation type that IUT is triggered to perform. + - resourceType: (optional) resource type of a target resource against which IUT is triggered to perform certain operation + - to: (mandatory) target resource against which IUT is triggered to perform certain operation. + - primitiveContent: (optional) represents the resource attributes that shall be included in the requestPrimitive. -|**UtTrigger** **primitive** **is** **represented** **in** **requestPrimitive** **serialized** **in** **JSON** **format.** <br />**UtTrigger** **primitive** **shall** **be** **interpreted** **as** **follows:**<br />Any attribute/parameter containing a value shall be present and equal in the triggered request primitive.<br />Any attribute/parameter containing "UNINITIALIZED" value shall be present in the triggered request primitive.<br />Any other attribute/parameter shall comply with oneM2M TS-0004 <a href="#_ref_2">[2]</a>.<br />**Parameters** **within** **UtTrigger** **are** **listed** **as** **following:**<br />operation: (**mandatory** )operation type that IUT is triggered to perform.<br />resourceType: (**optional** )resource type of a target resource against which IUT is triggered to perform certain operation<br />to: (**mandatory** )target resource against which IUT is triggered to perform certain operation.<br />primitiveContent:(**optional** )represents the resource attributes that shall be included in the requestPrimitive. | @@ -579,7 +536,7 @@ This clause introduces the test strategy being used for the TTCN-3 test cases. T The use of the TTCN-3 MTC and PTC(s) is as depicted in figure 5.6-1. - + **Figure 5.6-1: Use of TTCN-3 components** diff --git a/media/image10.png b/media/image10.png new file mode 100644 index 0000000000000000000000000000000000000000..dec7f72a7d4aefe56519e08f27d78d46fcf1499b Binary files /dev/null and b/media/image10.png differ diff --git a/media/image11.png b/media/image11.png new file mode 100644 index 0000000000000000000000000000000000000000..d0884834df5ecd8c217510c5b81678adab1b0068 Binary files /dev/null and b/media/image11.png differ diff --git a/media/image2.png b/media/image2.png index b1a7d923cfd493a68c5070f8ce7f23a38ff3e9d0..1c7741582a5829f377c93dc30c4b2226fe9e5501 100644 Binary files a/media/image2.png and b/media/image2.png differ diff --git a/media/image3.png b/media/image3.png deleted file mode 100644 index d67c1ade753c921e803e9e52e5c643408f95b115..0000000000000000000000000000000000000000 Binary files a/media/image3.png and /dev/null differ diff --git a/media/image4.png b/media/image4.png deleted file mode 100644 index ac279b284206d364f3913fffac6ecdcedd50fb24..0000000000000000000000000000000000000000 Binary files a/media/image4.png and /dev/null differ diff --git a/media/image5.png b/media/image5.png deleted file mode 100644 index 2f233d66080dc34cc886239d42d181dce07f6f21..0000000000000000000000000000000000000000 Binary files a/media/image5.png and /dev/null differ