From e88eef97f1530d1533e1c16766c5fc4a3489204b Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 1 Mar 2018 11:17:24 +0100
Subject: [PATCH] Use of universal charstring type for UT actions as for AE
testing
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_PermutationFunctions.ttcn | 2 +-
OneM2M_Testcases_CSE_Release_1.ttcn | 24 ++++++++++++------------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 715c013..4e62882 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -1405,7 +1405,7 @@ module OneM2M_PermutationFunctions {
}
- function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
+ function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var ResponsePrimitive v_responsePrimitive;
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 211a9ed..9c8941e 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -386,7 +386,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- var charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is allowed to register: " & PX_ALLOWED_C_AE_IDS[0];
+ var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is allowed to register: " & PX_ALLOWED_C_AE_IDS[0];
//Test control
if(not(PICS_IN_CSE)) {
@@ -513,7 +513,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- var charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is not allowed to register: " & PX_NOT_ALLOWED_C_AE_IDS[0];
+ var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is not allowed to register: " & PX_NOT_ALLOWED_C_AE_IDS[0];
//Test control
@@ -1091,7 +1091,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- var charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_APP_ID;
+ var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_APP_ID;
//Test control
@@ -1523,7 +1523,7 @@ module OneM2M_Testcases_CSE_Release_1 {
// Local variables
var ResponsePrimitive v_responsePrimitive;
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
//Test control
if(not(PICS_MN_CSE or PICS_ASN_CSE)) {
@@ -1632,7 +1632,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
v_utRequest.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
v_request.primitiveContent.remoteCSE.resourceName := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -1641,7 +1641,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
v_utRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
v_request.primitiveContent.remoteCSE.expirationTime := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -1650,7 +1650,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
v_utRequest.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
v_request.primitiveContent.remoteCSE.labels := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -1659,7 +1659,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
v_utRequest.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -1668,7 +1668,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
v_utRequest.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
v_request.primitiveContent.remoteCSE.nodeLink := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -1677,7 +1677,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
var template RequestPrimitive v_request := mw_createRemoteCSE;
- var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
+ var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
v_utRequest.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
v_request.primitiveContent.remoteCSE.cseType := ?;
f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
@@ -2296,7 +2296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var ResourceType v_resourceType := int16; //remoteCSE
var template PrimitiveContent v_contentResponse;
var template UtTriggerPrimitive v_utRequest;
- var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
// Test control
if(not(PICS_MN_CSE)) {
@@ -2749,7 +2749,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
var UtTriggerAckPrimitive v_trigger_response;
var integer v_auxInteger;
- var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
+ var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
//Test control
if(not(PICS_MN_CSE)) {
--
GitLab