From 68f0d1485bd80c1f252110c0d89df5786727316b Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 25 Jul 2018 17:01:09 +0200
Subject: [PATCH] Improving AE_DMR_CRE group to make action message clearer
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 4 ++--
OneM2M_Testcases_AE_Release_1.ttcn | 36 +++++++++++++++---------------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index e79bcef..ee30177 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -506,7 +506,7 @@ module OneM2M_PermutationFunctions {
v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action);
+ f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_containerIndex, -, -));
//Test behavior
tc_ac.start;
@@ -552,7 +552,7 @@ module OneM2M_PermutationFunctions {
//send triggering primitive to SUT
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
p_request.to_ := p_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(p_utRequest,p_action);
+ f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 666676c..1747921 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -817,14 +817,14 @@ module OneM2M_Testcases_AE_Release_1 {
var PrimitiveContent v_resource;
var template RequestPrimitive v_requestPrimitive := mw_createContainer;
var ResponsePrimitive v_responsePrimitive;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container to ";
f_cf03Up();
//send triggering primitive to SUT
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(-, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(-, -, -));
//Test behavior
tc_ac.start;
@@ -879,7 +879,7 @@ module OneM2M_Testcases_AE_Release_1 {
var integer v_containerIndex := -1;
var template RequestPrimitive v_requestPrimitive := mw_createContentInstance;
var ResponsePrimitive v_responsePrimitive;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance to ";
//Test component configuration
f_cf03Up();
@@ -889,7 +889,7 @@ module OneM2M_Testcases_AE_Release_1 {
v_containerIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
v_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
v_requestPrimitive.to_ := v_utRequest.requestPrimitive.to_;
- f_sendUtPrimitive(v_utRequest,v_action);
+ f_sendUtPrimitive(v_utRequest,v_action & f_getLocalResourceAddress(v_containerIndex, -, -));
//Test behavior
tc_ac.start;
@@ -933,7 +933,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ContentInfo to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.contentInstance.contentInfo := "UNINITIALIZED";
@@ -947,7 +947,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ResourceName to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.contentInstance.resourceName := "UNINITIALIZED";
@@ -961,7 +961,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute ExpirationTime to";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.contentInstance.expirationTime := "20301231T012345";
@@ -976,7 +976,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Labels to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.contentInstance.labels := {"UNINITIALIZED"};
@@ -990,7 +990,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var template RequestPrimitive v_request := mw_createContentInstance;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance containing attribute Creator to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.contentInstance.creator := "UNINITIALIZED";
@@ -1014,7 +1014,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute AccessControlPolicyIDs to";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.accessControlPolicyIDs := {"UNINITIALIZED"};
@@ -1028,7 +1028,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxNrOfInstances to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
@@ -1043,7 +1043,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxByteSize to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
@@ -1058,7 +1058,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute MaxInstanceAge to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
@@ -1073,7 +1073,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute OntologyRef to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.ontologyRef := "UNINITIALIZED";
@@ -1087,7 +1087,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ResourceName to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.resourceName := "UNINITIALIZED";
@@ -1101,7 +1101,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute ExpirationTime to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
@@ -1116,7 +1116,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Labels to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
@@ -1130,7 +1130,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var template RequestPrimitive v_request := mw_createContainer;
- var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for Container containing attribute Creator to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.creator := "UNINITIALIZED";
--
GitLab