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

OneM2M_Testcases.ttcn

@@ -967,7 +967,7 @@ module OneM2M_Testcases {
 					//Preambule
 					//vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
 					//TODO: create serviceSubscribedProfile, Node, and serviceSubscribedAppRule
-					v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
+					//v_cseBaseIndex := f_cse_preamble_createServiceSubscribedProfile({"C*"}); //c_CRUDNDi);
 					
 					//Test Body	
 					//v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));				
@@ -1173,11 +1173,12 @@ module OneM2M_Testcases {
 		  	  	
 					//Preambule
 					vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
+					vc_cseSimu.done;
 					
 					v_aeIndex := f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S-AE-ID-STEM"));
 					
 					vc_cseSimu.start(f_cse_resourceAnnouncementHandler());
-					
+					vc_cseSimu.done;
 					
 					//TODO Deregister
 					//f_cse_deleteResource(v_aeIndex);
@@ -1540,7 +1541,7 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT rejects the create request of <CSEBase> resource.
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_027() runs on InCseSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
 	
 					// Local variables
 					var RequestPrimitive v_request;
@@ -1550,23 +1551,23 @@ module OneM2M_Testcases {
 					// Test control
 
 					// Test component configuration
-					f_cf01UpCseSimuMaster();
+					f_cf02Up();
 
 					// Test adapter configuration
 
 					// Preamble
-					vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
+					vc_cseSimu.start(f_cse_registrationRemoteCse(mw_createRemoteCSEBase));
 
 					// Test Body
-					vc_aeSimu.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit)));
+					f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, omit));
 	
 					tc_ac.start;
 					alt {
-						[] mccPort.receive(mw_response(mw_responsePrimitive(int2001))) {
+						[] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ": AE creation successful.");
 						}
-						[] mccPort.receive {
+						[] mcaPort.receive {
 							tc_ac.stop;
 							setverdict(fail, __SCOPE__ & ": Error while creating AE");
 						}
@@ -1576,10 +1577,10 @@ module OneM2M_Testcases {
 					}	
 
 					// Postamble
-					f_cse_postamble_deleteResourcesCSE();
+					f_cse_postamble_deleteResources();
 
 					// Tear down
-					f_cf01DownCseSimuMaster();
+					f_cf02Down();
 
 				}//end TC_CSE_REG_CRE_027