Some adaptations after conversion

TS-0019-Abstract_Test_Suite_&_implementation_eXtra_Information_for_Test.md

@@ -114,60 +114,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    5
-2    References    5
-2.1    Normative references    5
-2.2    Informative references    5
-3    Definition of terms, symbols and abbreviations    6
-3.1    Terms    6
-3.2    Symbols    6
-3.2    Abbreviations    6
-4    Conventions    6
-5    Abstract Test Method (ATM)    7
-5.1    Abstract protocol tester    7
-5.2    Test Configuration    7
-5.2.1    AE Test Configuration    7
-5.3    Test architecture    8
-5.4    Ports and ASPs (Abstract Services Primitives)    12
-5.4.0    Introduction    12
-5.4.1    mcaPort, mcaPortIn, mccPort, mccPortIn    12
-5.4.2    mcnPort, mcnPortIn    13
-5.4.3    mccPortInternal    13
-5.4.4    utPort    13
-5.4.4.0    Introduction    13
-5.4.4.1    Usage for Automated AE Testing    13
-5.4.4.2    Upper Tester Control Primitives    14
-5.4.4.2.1    Introduction    14
-5.4.4.2.2    UtTrigger and UtTriggerAck Primitives    14
-5.4.4.2.3    Control Communication Protocol    19
-5.4.4.2.4    Control Message Serialization    19
-5.4.5    acPort    19
-5.4.6    infoPort    19
-5.5    Test components    20
-5.5.1    Tester    20
-5.5.2    AeSimu    20
-5.5.3    CseSimu    21
-5.5.4    ScefSimu    21
-5.6    Test strategy    22
-6    Untestable Test Purposes    23
-7    ATS Conventions    23
-7.0    Introduction    23
-7.1    Testing conventions    23
-7.1.1    Testing states    23
-7.1.1.1    Initial state    23
-7.1.1.2    Final state    23
-7.2    Naming conventions    24
-7.2.1    General guidelines    24
-7.2.2    oneM2M specific TTCN-3 naming conventions    25
-7.2.3    Usage of Log statements    25
-7.2.4    Test Case (TC) identifier    26
-7.3    IXIT    26
-8    TTCN-3 Verifications    28
-Annex A (normative): TTCN-3 library modules    29
-A.1    Electronic annex, zip file with TTCN-3 code    29
-Annex B (informative): Bibliography    30
-History    31
-
 
 
 # 1 Scope
@@ -266,9 +212,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](media/image2.png)                           ![Figure 5.1-1: Abstract protocol testers - oneM2M](media/image3.png)
-
-![Figure 5.1-1: Abstract protocol testers - oneM2M](media/image4.png)                           ![Figure 5.1-1: Abstract protocol testers - oneM2M](media/image5.png) 
+![Figure 5.1-1: Abstract protocol testers - oneM2M](media/image2.png)
 
 **Figure 5.1-1: Abstract protocol testers - oneM2M**
 
@@ -385,10 +329,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 |
 
 
 
@@ -465,9 +409,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 |
 
 
 
@@ -476,7 +419,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.4.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: Example of automated AE test using Ut interface](media/image10.png)
 
 **Figure 5.4.4.2.2-1: Trigger message flow**
 
@@ -509,15 +452,23 @@ Table 5.4.4.2.2-1 defines UtTrigger and UtTriggerAck primitives including oneM2M
 
 
 
+The rules for defining UtTrigger and UtTriggerAck primitives are:
 
-**Table 5.4.4.2.2-3: Rules for defining UtTrigger and UtTriggerAck primitives**<a name="table_5.4.4.2.2-3"></a>
+1. UtTrigger primitive is represented in requestPrimitive serialized in JSON format. 
 
-|**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. |
+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.
 
 
-
-**Table 5.4.4.2.2-4: Definition of ResponseStatusCode for UtTriggerAck primitive**<a name="table_5.4.4.2.2-4"></a>
+**Table 5.4.4.2.2-3: Definition of ResponseStatusCode for UtTriggerAck primitive**<a name="table_5.4.4.2.2-3"></a>
 
 |Response Status Code Description |Response Status Code Value |Interpretation |
 |-|-|-|
@@ -655,7 +606,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](media/image11.png)
 
 **Figure 5.6-1: Use of TTCN-3 components**