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());
@@ -1365,7 +1365,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 {
@@ -2409,12 +2409,13 @@ module OneM2M_Functions {
 				f_cse_postamble_deleteResourcesCSE();
 				if(vc_config == e_cf03) {
 				  f_cf03Down();
+				  stop;
 			   } else if (vc_config ==e_cf04) {
 				  f_cf04Down();
-			   }
 				  stop;
 			   }
 			}
+		}
 		
 		/**
 		 * @desc Sending of an Adapter Control primitive

OneM2M_TestControl.ttcn

@@ -40,7 +40,7 @@ module OneM2M_TestControl {
 		execute(TC_CSE_REG_CRE_016_CST());
 		execute(TC_CSE_REG_CRE_016_POA());
 		execute(TC_CSE_REG_CRE_016_NL());
-		execute(TC_CSE_REG_CRE_018());
+		execute(TC_CSE_REG_CRE_019());
 		execute(TC_CSE_REG_CRE_022());
 		execute(TC_CSE_REG_CRE_023());
 		execute(TC_CSE_REG_CRE_025());

OneM2M_Testcases.ttcn

@@ -1249,6 +1249,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;
 
 					}
 					
@@ -1325,7 +1326,7 @@ module OneM2M_Testcases {
 				 * @desc Check that the IUT rejects an AE registration (not allowed App-ID) 
 				 * 
 				 */
-				testcase TC_CSE_REG_CRE_018() runs on AeSimu system CseSystem {
+				testcase TC_CSE_REG_CRE_019() runs on AeSimu system CseSystem {
 		  	  	
 					var MsgIn v_response;
 					var RequestPrimitive v_request;