Changing format of the PICS control to be consistent with the rest of ATS

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>

OneM2M_Testcases_CSE_Release_2.ttcn

@@ -5347,11 +5347,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var MsgIn v_response;
 				var LocationSource v_locationSource		:= int2;//Device-based
 				var integer v_resourceIndex := -1;
-				//Test component configuration
-				f_cf01Up();
 				
+				//Test control
+				if(not(PICS_ASN_CSE)) {
+					setverdict(inconc, __SCOPE__ & ": IUT shall support ASN-CSE to run this test case. Set PX_ASN_CSE to true to run this test case");
+					stop;
+				}
 				
-				if(PX_ASN_CSE){
+				//Test component configuration
+				f_cf01Up();
      	     	
  	     		//Preamble
 				v_aeAuxIndex := f_cse_preamble_registerAe();
@@ -5393,9 +5397,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 			  // Postamble
 				f_cse_postamble_deleteResources();	 
     				
-				} else {
-					setverdict(inconc, __SCOPE__ & ": Test case only enabled for ASN-CSE. Set PX_IUT_IS_ASN_CSE to true to run this test case.");
-				}
 				// Tear down
 				f_cf01Down(); 		      
 		      
@@ -5414,12 +5415,15 @@ module OneM2M_Testcases_CSE_Release_2 {
 				var MsgIn v_response;
 				var integer v_resourceIndex := -1;
      	     	
+     	     	//Test control
+				if(not(PICS_MN_CSE)) {
+					setverdict(inconc, __SCOPE__ & ": IUT shall support MN-CSE to run this test case. Set PX_MN_CSE to true to run this test case");
+					stop;
+				}
+				
 				//Test component configuration
 				f_cf01Up();
  	     	      	     	    
-     	     	
-				if(PX_MN_CSE){
-     	     	      	     	    
 				//Preamble
 				v_aeAuxIndex := f_cse_preamble_registerAe();
 				//Set requestPrimitive
@@ -5460,9 +5464,6 @@ module OneM2M_Testcases_CSE_Release_2 {
 				//Postamble
 				f_cse_postamble_deleteResources();	 
 				
-				} else {
-					setverdict(inconc, __SCOPE__ & ": Test case only enabled for MN-CSE. Set PX_IUT_IS_MN_CSE to true to run this test case.")
-				}
 				// Tear down
 				f_cf01Down();