From c77a63e5eb8498b252f29ec2094fe4e8afc50f9d Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 2 Oct 2019 15:00:00 +0200
Subject: [PATCH] Review of TC_CSE_DIS_005 according to TDE-2019-0147R01

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
 OneM2M_Testcases_CSE_Release_1.ttcn | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 806a9f3..5dbfc9d 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -9985,7 +9985,6 @@ module OneM2M_Testcases_CSE_Release_1 {
 				var integer v_aeIndex := -1;
 				var integer v_resourceIndex := -1;
 				var RequestPrimitive v_request;
-				var integer v_childResourceIndex := -1;
 				var integer v_acpAuxIndex := -1;
 				const ResourceType c_containerResourceType := int3; 
 				
@@ -10008,22 +10007,27 @@ module OneM2M_Testcases_CSE_Release_1 {
 				v_requestPrimitive := f_setAcpId(v_requestPrimitive, {f_getResourceId(vc_resourcesList[v_acpAuxIndex].resource)});
 				
 				v_resourceIndex := f_cse_createResource(c_containerResourceType, v_requestPrimitive, v_aeIndex);
-				v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
 				v_request := valueof(m_retrieveFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
 				f_send(e_mca_port, m_request(v_request));
 				tc_ac.start;
 				alt {
-					[] mcaPort.receive(mw_response(mw_responsePrimitive(int4103))) {
+					[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
 						tc_ac.stop;
-						setverdict(pass, __SCOPE__ & ": Access denied to discovery operation for resource " & f_getResourceAddress(v_resourceIndex));
+						if(lengthof(v_response.primitive.responsePrimitive.primitiveContent.uRIList) == 0){
+						  setverdict(pass, __SCOPE__ & ": Discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges and no content");	
+						}
+						else
+						{
+						  setverdict(fail, __SCOPE__ & ": Wrong content available in URIList element");
+						}
 					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) { 
 						tc_ac.stop;
 						setverdict(fail, __SCOPE__ & ": Wrong response status code");
 					}
-					[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
+					[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) { 
 						tc_ac.stop;
-						setverdict(fail, __SCOPE__ & ": Discovering " & f_getResourceAddress(v_resourceIndex) & " without having privileges");
+						setverdict(fail, __SCOPE__ & ": Error while discovering on resource when no discovery access privileges");
 					}
 					[] tc_ac.timeout {
 						setverdict(fail, __SCOPE__ & ": No answer while discovering resource");
-- 
GitLab