From 66ce284758d4dd9d1ad75b1a7e1a7097410cf206 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Thu, 30 Mar 2017 15:41:48 +0200
Subject: [PATCH] Small corrections from TTCN-3 approval sessions

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
---
 LibOneM2M/OneM2M_Functions.ttcn | 10 ++++------
 OneM2M_Testcases.ttcn           | 10 +++++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 6a413f6..3b342be 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/LibOneM2M/OneM2M_Functions.ttcn $
- *              $Id: OneM2M_Functions.ttcn 247 2017-03-27 17:09:55Z reinaortega $
+ *              $Id: OneM2M_Functions.ttcn 248 2017-03-29 13:59:41Z reinaortega $
  *  @desc       Module containing functions for oneM2M
  *
  */
@@ -1788,7 +1788,6 @@ module OneM2M_Functions {
 					v_primitiveContent.any_1[0].Subscription_optional.subscriberURI := ?;
 				}
 			}
-			log("Etape0");
 			return v_primitiveContent;
 		}
 		
@@ -1797,10 +1796,9 @@ module OneM2M_Functions {
 			var PrimitiveContent v_response;
 			v_response := p_responsePrimitiveContent;
 			v_primitiveContent := f_getTemplateFromPrimitiveContent(p_requestPrimitiveContent);
-			log("Etape1");
-				if(not(match(v_response, v_primitiveContent))){
-					setverdict(inconc, "Preamble: Error resource incomplete, some attribute missing ");
-				}
+			if(not(match(v_response, v_primitiveContent))){
+				setverdict(inconc, "Preamble: Error resource incomplete, some attribute missing ");
+			}
 
 		}
 		
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 9b032c3..dc8a768 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
  *  
  *  @author     oneM2M
  *  @version    $URL: https://forge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- *              $Id: OneM2M_Testcases.ttcn 246 2017-03-27 17:07:30Z reinaortega $
+ *              $Id: OneM2M_Testcases.ttcn 248 2017-03-29 13:59:41Z reinaortega $
  *  @desc       Module containing test cases for oneM2M
  *
  */
@@ -1845,7 +1845,7 @@ module OneM2M_Testcases {
 						v_containerIndex := f_cse_createResource(int3, v_createRequest, v_aeIndex);
 					
 						// Test Body
-						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), "MyValue"), v_aeIndex);
+						v_request := f_getCreateRequestPrimitive(int4, m_createContentInstance(f_getResourceAddress(v_containerIndex), "MyValue"), v_containerIndex);
 					
 						mcaPort.send(m_request(v_request));
 						tc_ac.start;
@@ -2080,6 +2080,10 @@ module OneM2M_Testcases {
 								tc_ac.stop;
 								setverdict(pass, testcasename() & ": Not allowed to create a contentInstance resource named 'ol'");
 							}
+							[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
+								tc_ac.stop;
+								setverdict(fail, testcasename() & ": Rejected creation of contentInstance named 'ol' with wrong ResponseStatusCode");
+							}
 							[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
 								tc_ac.stop;
 								setverdict(fail, testcasename() & ": Accepted creation of contentInstance named 'ol'");
@@ -2858,7 +2862,7 @@ module OneM2M_Testcases {
 						var template RequestPrimitive v_createRequest := m_createContainerBase;
 						var ResponsePrimitive v_responsePrimitive;
 						
-						v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {PX_TESTER_ADDRESS & "/CseBaseTester"};
+						v_createRequest.primitiveContent.any_1[0].Container_optional.announceTo := {PX_TESTER_ADDRESS};
 					
 						f_CSE_DMR_CRE_BV_016(int3, v_createRequest, mw_createContainerAnnc);//Container
 					}
-- 
GitLab