Fixed errors found in:TC_CSE_SUB_CRE_004

LibOneM2M/OneM2M_Functions.ttcn

@@ -1463,10 +1463,10 @@ module OneM2M_Functions {
 			if (p_resourceType == int9) {//group
 				if(match(valueof(p_request.primitiveContent.group_.memberIDs), v_defaultListOfURIs )){
 					if (p_parentIndex == -1){
-						p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[vc_aeAuxIndex].resource)};
-					}else{
-						p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
-					}
+					p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[vc_aeAuxIndex].resource)};
+				}else{
+					p_request.primitiveContent.group_.memberIDs := {f_getResourceId(vc_resourcesList[p_parentIndex].resource)};
+				}
 				}
 			}
 			

OneM2M_Testcases.ttcn

@@ -16331,6 +16331,7 @@ module OneM2M_Testcases {
 				
 					 // Test Body
 					v_request := f_getCreateRequestPrimitive(int23, m_createSubscriptionBase, v_aeIndex);
+					v_request.primitiveContent.subscription.notificationURI := {f_getResourceAddress(v_ae2Index)};
 	
 					 mcaPort.send(m_request(valueof(v_request)));
 					
@@ -16657,7 +16658,7 @@ module OneM2M_Testcases {
 					v_notifyHandler.start(f_cse_notifyProcedure_representationHandler(v_contentResponse)); // check if the notification is well received and if its content matchs
 					
 					v_request:= f_getUpdateRequestPrimitive(int2, v_aeIndex, v_updateRequest); // Update request
-					v_updateRequest.primitiveContent.aE.labels := v_labels_1; 
+					v_request.primitiveContent.aE.labels := v_labels_1; 
 
 					mcaPort.send(m_request(v_request));
 					tc_ac.start;
@@ -17336,6 +17337,7 @@ module OneM2M_Testcases {
 					v_notifyHandler.start(f_CSE_SUB_DEL_001(f_getResourceAddress(v_resourceIndex))); // check that no notification is received
 					
 					mcaPort.send(m_request(v_request));
+					tc_ac.start;
 					alt {
 						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2002))) -> value v_response {
 							tc_ac.stop;
@@ -17591,7 +17593,7 @@ module OneM2M_Testcases {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
-								v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1);
+								v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, int1,  v_aeIndex);
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -17663,7 +17665,7 @@ module OneM2M_Testcases {
 							[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
 								tc_ac.stop;
 								setverdict(pass, __SCOPE__ & ": Resource type " & int2str(enum2int(c_accessControlPolicyType)) & " created successfully");
-								v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, c_accessControlPolicyType);
+								v_acpIndex := f_setResource(v_response.primitive.responsePrimitive.primitiveContent, c_accessControlPolicyType,  v_aeIndex);
 							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
@@ -17766,7 +17768,7 @@ module OneM2M_Testcases {
 						v_primitiveContentRetrievedResource := f_cse_retrieveResource(v_aeIndex);
 						if(getverdict == pass){
 							if(ischosen(v_primitiveContentRetrievedResource.aE)) {
-								 if(not match (v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs, valueof(v_updateRequest.primitiveContent.aE.accessControlPolicyIDs))){
+								 if(not match (f_resourceIdCleaner(v_primitiveContentRetrievedResource.aE.accessControlPolicyIDs[0]), v_updateRequest.primitiveContent.aE.accessControlPolicyIDs[0])){
 									  setverdict(fail, __SCOPE__ & ": Error: Access Control policy ID attribute not updated correctly")
 							}
 						  }
@@ -18321,15 +18323,15 @@ module OneM2M_Testcases {
 							var template RequestPrimitive v_updateRequest := m_updateContainerBase;
 							var Labels v_labels_1:= {"VALUE_1"};
 							v_updateRequest.primitiveContent.container.labels := v_labels_1;
-							f_CSE_SEC_ACP_012(v_updateRequest, int62);	//TODO Fix p_acor
+							f_CSE_SEC_ACP_012(v_updateRequest, int59);
 						}//end TC_CSE_SEC_ACP_012_UPD
 	
 						testcase TC_CSE_SEC_ACP_012_RET() runs on CseTester system CseSystem { //Retrieve
-							f_CSE_SEC_ACP_012(m_retrieveResource("Temporary", "Temporary"), int62);	//TODO Fix p_acor
+							f_CSE_SEC_ACP_012(m_retrieveResource("Temporary", "Temporary"), int61);
 						}//end TC_CSE_SEC_ACP_012_RET
 	
 						testcase TC_CSE_SEC_ACP_012_DEL() runs on CseTester system CseSystem { //Delete
-							f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int62);	//TODO Fix p_acor
+							f_CSE_SEC_ACP_012(m_delete("Temporary", "Temporary"), int55);
 						}//end TC_CSE_SEC_ACP_012_DEL
 	
 						function f_CSE_SEC_ACP_012(template RequestPrimitive p_requestPrimitive, in AccessControlOperations p_acor) runs on CseTester {