Ae fixes

This branch contains fixes (based on master) for the AE tests using the UpperTester. Minor issues and changed all tests to use setLocalResource and getLocalResourceAddress.

LibOneM2M/OneM2M_Functions.ttcn

@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 340 2017-08-07 12:08:41Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 345 2017-08-07 14:45:26Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -595,15 +595,24 @@ module OneM2M_Functions {
 			 * @param p_requestPrimitive
 			 * @verdict 
 			 */
-			function f_cse_deleteResource(in RequestPrimitive p_requestPrimitive) runs on CseTester {
+			function f_cse_deleteResource(in integer p_index, in template (omit) RequestPrimitive p_requestPrimitive := omit) runs on CseTester {
+				var RequestPrimitive v_request;
 				
-				mcaPort.send(m_request(p_requestPrimitive));
+				if(not isbound(p_requestPrimitive)) {
+					v_request := valueof(m_deleteRequest(f_getResourceAddress(p_index)));
+				} else {
+					v_request := p_requestPrimitive;
+				}
+				
+				mcaPort.send(m_request(v_request));
 						
 				tc_ac.start;
 				alt {
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__&"INFO: Resource" & p_requestPrimitive.to_ & " deleted");
+						setverdict(pass, __SCOPE__&"INFO: Resource " & p_requestPrimitive.to_ & " deleted");
+						
+						f_removeElementFromList(vc_resourcesIndexToBeDeleted, p_index);
 					}
 					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
 						tc_ac.stop;
@@ -2033,11 +2042,11 @@ module OneM2M_Functions {
 			}
 		}
 		
-		function f_removeElementFromList (inout IntegerList p_list, in integer index) {
+		function f_removeElementFromList (inout IntegerList p_list, in integer p_valueToBeDeleted) {
 			var IntegerList result := {};
 			var integer i;
 			for(i := 0; i < lengthof(p_list); i := i+1){
-				if(i != index){
+				if(p_list[i] != p_valueToBeDeleted){
 					result := result & {p_list[i]};
 				}
 			}