Commit 31d8c5f0552ea29b8ebc289a8d49fbbac47f48ff

Authored by Miguel Angel Reina Ortega
1 parent 3b30b6d3

Some compilation errors detected in Titan

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author oneM2M
9 9 * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Pixits.ttcn $
10   - * $Id: OneM2M_Pixits.ttcn 310 2017-06-23 12:40:44Z reinaortega $
  10 + * $Id: OneM2M_Pixits.ttcn 312 2017-06-27 07:39:17Z reinaortega $
11 11 * @desc Module containing Pixits for oneM2M
12 12 *
13 13 */
... ... @@ -82,6 +82,6 @@ module OneM2M_Pixits {
82 82 modulepar boolean PX_IS_LOC_CONTAINER := false;//default //set it to true when the container is created to store location information
83 83  
84 84 modulepar PoaList PX_POA := {""};
85   - modulepar ResourceTypeList PX_SRT := {int1, int2, int3, int4};
  85 + modulepar ResourceTypeList_1 PX_SRT := {int1, int2, int3, int4};
86 86  
87 87 } // end of module
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author oneM2M
9 9 * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Templates.ttcn $
10   - * $Id: OneM2M_Templates.ttcn 308 2017-06-21 09:44:17Z reinaortega $
  10 + * $Id: OneM2M_Templates.ttcn 312 2017-06-27 07:39:17Z reinaortega $
11 11 * @desc Module containing templates for oneM2M
12 12 *
13 13 */
... ... @@ -1651,8 +1651,8 @@ module OneM2M_Templates {
1651 1651 announcedAttribute := omit,//O
1652 1652 cseType := omit,//O
1653 1653 pointOfAccess := omit,//O
1654   - cSEBase := "/" & p_cSEBase,//M
1655   - cSE_ID := "/" & p_cSE_ID,//M
  1654 + cSEBase := "/" & valueof(p_cSEBase),//M
  1655 + cSE_ID := "/" & valueof(p_cSE_ID),//M
1656 1656 m2M_Ext_ID := omit,//O
1657 1657 trigger_Recipient_ID := omit,//O
1658 1658 requestReachability := true,//M
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author oneM2M
9 9 * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Types.ttcn $
10   - * $Id: OneM2M_Types.ttcn 309 2017-06-21 13:08:02Z reinaortega $
  10 + * $Id: OneM2M_Types.ttcn 314 2017-06-27 09:23:19Z reinaortega $
11 11 * @desc OneM2M data types module
12 12 *
13 13 */
... ... @@ -6965,7 +6965,7 @@ type record CSEBase_optional
6965 6965 AcpType accessControlPolicyIDs optional,
6966 6966 CseTypeID cseType optional,
6967 6967 XSD.ID cSE_ID optional,
6968   - record of ResourceType supportedResourceType optional,
  6968 + ResourceTypeList_1 supportedResourceType optional,//TODO Remove inline type
6969 6969 PoaList pointOfAccess optional,
6970 6970 XSD.AnyURI nodeLink optional,
6971 6971 E2eSecInfo e2eSecInfo optional,
... ... @@ -7811,6 +7811,8 @@ group InvalidTypes {
7811 7811 e_nonHierarchical,
7812 7812 e_hierarchical
7813 7813 }
  7814 +
  7815 + type record of ResourceType ResourceTypeList_1;
7814 7816 }
7815 7817  
7816 7818 }
... ...
... ... @@ -7,7 +7,7 @@
7 7 *
8 8 * @author oneM2M
9 9 * @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
10   - * $Id: OneM2M_Testcases.ttcn 311 2017-06-27 07:31:00Z reinaortega $
  10 + * $Id: OneM2M_Testcases.ttcn 314 2017-06-27 09:23:19Z reinaortega $
11 11 * @desc Module containing test cases for oneM2M
12 12 *
13 13 */
... ... @@ -435,7 +435,7 @@ module OneM2M_Testcases {
435 435 function f_CSE_GEN_UPD_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
436 436  
437 437 // Local variables
438   - var RequestPrimitive v_updateRequest := m_updateContainerBase;
  438 + var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
439 439 var integer v_aeIndex := -1;
440 440 var integer v_resourceIndex := -1;
441 441  
... ... @@ -519,7 +519,7 @@ module OneM2M_Testcases {
519 519 function f_CSE_GEN_UPD_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
520 520  
521 521 // Local variables
522   - var RequestPrimitive v_updateRequest := m_updateContainerBase;
  522 + var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
523 523 var integer v_aeIndex := -1;
524 524 var integer v_resourceIndex := -1;
525 525  
... ... @@ -1197,7 +1197,7 @@ module OneM2M_Testcases {
1197 1197 // Local variables
1198 1198 var MsgIn v_response;
1199 1199 var RequestPrimitive v_request;
1200   - var RequestPrimitive v_createRequestPrimitive := m_createRemoteCSEBase;
  1200 + var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
1201 1201 var ResourceType v_resourceType := int16; //remoteCSE
1202 1202  
1203 1203 // Test control
... ... @@ -1241,7 +1241,7 @@ module OneM2M_Testcases {
1241 1241 // Local variables
1242 1242 var MsgIn v_response;
1243 1243 var RequestPrimitive v_request;
1244   - var RequestPrimitive v_createRequestPrimitive := m_createRemoteCSEBase;
  1244 + var RequestPrimitive v_createRequestPrimitive := valueof(m_createRemoteCSEBase);
1245 1245 var ResourceType v_resourceType := int16; //remoteCSE
1246 1246  
1247 1247 // Test control
... ... @@ -1382,7 +1382,6 @@ module OneM2M_Testcases {
1382 1382  
1383 1383 // Local variables
1384 1384 var MsgIn v_response;
1385   - var RequestPrimitive v_request;
1386 1385 var integer v_aeIndex := -1;
1387 1386 var template PrimitiveContent v_contentResponse;
1388 1387  
... ... @@ -1519,7 +1518,7 @@ module OneM2M_Testcases {
1519 1518 [] mcaPort.receive(mw_response(mw_responsePrimitiveOK(v_contentResponse))) -> value v_response {
1520 1519 tc_ac.stop;
1521 1520  
1522   - if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType==PX_SRT){
  1521 + if (v_response.primitive.responsePrimitive.primitiveContent.cSEBase.supportedResourceType == PX_SRT) {
1523 1522 setverdict(pass, testcasename() & ": supportedResourceTypes attribute is set according to PX_SRT");
1524 1523 }else{
1525 1524 setverdict(fail, testcasename() & ": supportedResourceTypes attribute is not set according to PX_SRT");
... ...