Commit e88eef97f1530d1533e1c16766c5fc4a3489204b

Authored by Miguel Angel Reina Ortega
1 parent afaba088

Use of universal charstring type for UT actions as for AE testing

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -1405,7 +1405,7 @@ module OneM2M_PermutationFunctions {
1405 1405  
1406 1406 }
1407 1407  
1408   - function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in charstring p_action) runs on CseSimu {
  1408 + function f_CSE_REG_CRE_026(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
1409 1409  
1410 1410 var ResponsePrimitive v_responsePrimitive;
1411 1411  
... ...
... ... @@ -386,7 +386,7 @@ module OneM2M_Testcases_CSE_Release_1 {
386 386 var RequestPrimitive v_request;
387 387 var integer v_cseBaseIndex := -1;
388 388 var ResourceType v_resourceType := int2;
389   - var charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is allowed to register: " & PX_ALLOWED_C_AE_IDS[0];
  389 + var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AE-ID is allowed to register: " & PX_ALLOWED_C_AE_IDS[0];
390 390  
391 391 //Test control
392 392 if(not(PICS_IN_CSE)) {
... ... @@ -513,7 +513,7 @@ module OneM2M_Testcases_CSE_Release_1 {
513 513 var RequestPrimitive v_request;
514 514 var integer v_cseBaseIndex := -1;
515 515 var ResourceType v_resourceType := int2;
516   - 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];
  516 + 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];
517 517  
518 518 //Test control
519 519  
... ... @@ -1091,7 +1091,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1091 1091 var RequestPrimitive v_request;
1092 1092 var integer v_cseBaseIndex := -1;
1093 1093 var ResourceType v_resourceType := int2;
1094   - var charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_APP_ID;
  1094 + var universal charstring v_action := __SCOPE__ & ": Please, make sure that the following AppId is not allowed to register: " & PX_APP_ID;
1095 1095  
1096 1096 //Test control
1097 1097  
... ... @@ -1523,7 +1523,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1523 1523 // Local variables
1524 1524 var ResponsePrimitive v_responsePrimitive;
1525 1525 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1526   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
  1526 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with attributes multiplicity equals to 1";
1527 1527  
1528 1528 //Test control
1529 1529 if(not(PICS_MN_CSE or PICS_ASN_CSE)) {
... ... @@ -1632,7 +1632,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1632 1632 testcase TC_CSE_REG_CRE_026_RN() runs on CseSimu system CseSystem {
1633 1633 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1634 1634 var template RequestPrimitive v_request := mw_createRemoteCSE;
1635   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
  1635 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute resourceName";
1636 1636 v_utRequest.primitiveContent.remoteCSE.resourceName := "UNINITIALIZED";
1637 1637 v_request.primitiveContent.remoteCSE.resourceName := ?;
1638 1638 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -1641,7 +1641,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1641 1641 testcase TC_CSE_REG_CRE_026_ET() runs on CseSimu system CseSystem {
1642 1642 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1643 1643 var template RequestPrimitive v_request := mw_createRemoteCSE;
1644   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
  1644 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute expirationTime";
1645 1645 v_utRequest.primitiveContent.remoteCSE.expirationTime := "20301231T012345";
1646 1646 v_request.primitiveContent.remoteCSE.expirationTime := ?;
1647 1647 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -1650,7 +1650,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1650 1650 testcase TC_CSE_REG_CRE_026_LBL() runs on CseSimu system CseSystem {
1651 1651 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1652 1652 var template RequestPrimitive v_request := mw_createRemoteCSE;
1653   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
  1653 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute labels";
1654 1654 v_utRequest.primitiveContent.remoteCSE.labels := {"UNINITIALIZED"};
1655 1655 v_request.primitiveContent.remoteCSE.labels := ?;
1656 1656 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -1659,7 +1659,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1659 1659 testcase TC_CSE_REG_CRE_026_POA() runs on CseSimu system CseSystem {
1660 1660 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1661 1661 var template RequestPrimitive v_request := mw_createRemoteCSE;
1662   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
  1662 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute pointOfAccess";
1663 1663 v_utRequest.primitiveContent.remoteCSE.pointOfAccess := {"UNINITIALIZED"};
1664 1664 v_request.primitiveContent.remoteCSE.pointOfAccess := ?;
1665 1665 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -1668,7 +1668,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1668 1668 testcase TC_CSE_REG_CRE_026_NL() runs on CseSimu system CseSystem {
1669 1669 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1670 1670 var template RequestPrimitive v_request := mw_createRemoteCSE;
1671   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
  1671 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute nodeLink";
1672 1672 v_utRequest.primitiveContent.remoteCSE.nodeLink := "UNINITIALIZED";
1673 1673 v_request.primitiveContent.remoteCSE.nodeLink := ?;
1674 1674 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -1677,7 +1677,7 @@ module OneM2M_Testcases_CSE_Release_1 {
1677 1677 testcase TC_CSE_REG_CRE_026_CST() runs on CseSimu system CseSystem {
1678 1678 var template UtTriggerPrimitive v_utRequest := m_utCreateRemoteCSE;
1679 1679 var template RequestPrimitive v_request := mw_createRemoteCSE;
1680   - var charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
  1680 + var universal charstring v_action := __SCOPE__ & ": Please, send a CSE registration request with optional attribute cseType";
1681 1681 v_utRequest.primitiveContent.remoteCSE.cseType := int1;//TODO It should be marked as "UNITIALIZED"
1682 1682 v_request.primitiveContent.remoteCSE.cseType := ?;
1683 1683 f_CSE_REG_CRE_026(v_utRequest,v_request,v_action);
... ... @@ -2296,7 +2296,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2296 2296 var ResourceType v_resourceType := int16; //remoteCSE
2297 2297 var template PrimitiveContent v_contentResponse;
2298 2298 var template UtTriggerPrimitive v_utRequest;
2299   - var charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
  2299 + var universal charstring v_action := __SCOPE__ & ": Please, send a valid RETRIEVE Request containing To set to " & PX_CSE1_ADDRESS;
2300 2300  
2301 2301 // Test control
2302 2302 if(not(PICS_MN_CSE)) {
... ... @@ -2749,7 +2749,7 @@ module OneM2M_Testcases_CSE_Release_1 {
2749 2749 var template UtTriggerPrimitive v_utRequest := m_utDeleteRequest;
2750 2750 var UtTriggerAckPrimitive v_trigger_response;
2751 2751 var integer v_auxInteger;
2752   - var charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
  2752 + var universal charstring v_action := __SCOPE__ & ": Please, send a valid DELETE Request containing To set to " & PX_CSE1_ADDRESS;
2753 2753  
2754 2754 //Test control
2755 2755 if(not(PICS_MN_CSE)) {
... ...