Merge branch 'Test_architecture_improvement' of https://git.onem2m.org/TST/ATS...

Merge branch 'Test_architecture_improvement' of https://git.onem2m.org/TST/ATS into Test_architecture_improvement

LibOneM2M/OneM2M_Functions.ttcn

@@ -101,7 +101,7 @@ module OneM2M_Functions {
 			vc_aeSimu := AeSimu.create("AE1") alive;
 				
 			// Map
-			map(self:mccPort, system:mcaPort);
+			map(self:mccPort, system:mccPort);
 			map(vc_aeSimu:mcaPort, system:mcaPort);
 			map(self:acPort, system:acPort);
 			activate(a_default());
@@ -1367,7 +1367,7 @@ module OneM2M_Functions {
 
 				v_request := f_getCreateRequestPrimitive(int16, p_requestPrimitive, -1);
 
-				mcaPort.send(m_request(v_request));
+				mccPort.send(m_request(v_request));
 				tc_ac.start;
 				alt {
 					[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
@@ -2411,10 +2411,11 @@ module OneM2M_Functions {
 				f_cse_postamble_deleteResourcesCSE();
 				if(vc_config == e_cf03) {
 				  f_cf03Down();
+				  stop;
 			   } else if (vc_config ==e_cf04) {
 				  f_cf04Down();
+				  stop;
 			   }
-				 stop;
 			}
 		}
 		

OneM2M_Testcases.ttcn

@@ -873,7 +873,7 @@ module OneM2M_Testcases {
 					f_cf01Up();
 	                
 					//Preamble
-					v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"C-AE-ID-STEM"});//c_CRUDNDi);
+					v_cseBaseIndex := f_cse_preamble_createServiceSubscribedAppRule({"S-AE-ID-STEM"}); //c_CRUDNDi);
 					
 					//Test Body
 					v_request := valueof(m_createAe(PX_APP_ID, omit, omit));	
@@ -1251,6 +1251,7 @@ module OneM2M_Testcases {
 						v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
 	
 						v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
+						v_cse1.done;
 
 					}