From af650a87e5a2b69a4f3aade2498eee7fb72b3e16 Mon Sep 17 00:00:00 2001
From: Naum Spaseski <naum.spaseski@eglobalmark.com>
Date: Thu, 7 Jul 2016 10:23:57 +0200
Subject: [PATCH] Corrected test cases as demanded in the review
---
OneM2M_Testcases.ttcn | 72 ++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 46 deletions(-)
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index fcd769f..48924a8 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -114,7 +114,6 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var integer v_cseBaseIndex := -1;
var integer v_resourceIndex := -1;
-
var ResourceType v_resourceType := int2;
//Preambule
@@ -151,23 +150,18 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
+ var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- template RequestPrimitive v_requestPrimitive := m_createAe("APP_ID", omit , "C-AE-ID-STEM");
//Preambule
- template (value) AccessControlOperations v_allowedOperations := int63;
- v_aeIndex := f_preamble_prepareCSE({"C-AE-ID-STEM"}, v_allowedOperations);//c_CRUDNDi);
-
-
- v_resourceIndex := f_createResource(v_resourceType, v_requestPrimitive, v_aeIndex);
+ v_cseBaseIndex := f_preamble_prepareCSE({"C-AE-ID-STEM"});//c_CRUDNDi);
+
+ //Test Body
+ v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- // Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex)));
-
- v_request.resultContent := int0;//Nothing
+ v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -193,22 +187,17 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
+ var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- template RequestPrimitive v_requestPrimitive := m_createAe("APP_ID", omit, omit );
-
+
//Preambule
- template (value) AccessControlOperations v_allowedOperations := int63;
- v_aeIndex := f_preamble_prepareCSE( omit, v_allowedOperations);//c_CRUDNDi);
-
-
- v_resourceIndex := f_createResource(v_resourceType, v_requestPrimitive, v_aeIndex);
+ v_cseBaseIndex := f_preamble_prepareCSE(omit);//c_CRUDNDi);
// Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex)));
-
- v_request.resultContent := int0;//Nothing
+ v_request := valueof(m_createAe(PX_APP_ID, omit, omit));
+
+ v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -234,22 +223,17 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
+ var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- template RequestPrimitive v_requestPrimitive := m_createAe( "C-AE-ID-STEM", {"APP_ID"}, omit);
//Preambule
- template (value) AccessControlOperations v_allowedOperations := int63;
- v_aeIndex := f_preamble_prepareCSE(omit, v_allowedOperations);//c_CRUDNDi);
+ v_cseBaseIndex := f_preamble_prepareCSE(omit);//c_CRUDNDi);
-
- v_resourceIndex := f_createResource(v_resourceType, v_requestPrimitive, v_aeIndex);
+ //Test Body
+ v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- // Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex)));
-
- v_request.resultContent := int0;//Nothing
+ v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
+
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
@@ -275,26 +259,22 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response;
var RequestPrimitive v_request;
- var integer v_aeIndex := -1;
- var integer v_resourceIndex := -1;
+ var integer v_cseBaseIndex := -1;
var ResourceType v_resourceType := int2;
- template RequestPrimitive v_requestPrimitive := m_createAe( "APP_ID", omit, omit);
//Preambule
- template (value) AccessControlOperations v_allowedOperations := int63;
- v_aeIndex := f_preamble_prepareCSE({"S"}, v_allowedOperations);//c_CRUDNDi);
+ v_cseBaseIndex := f_preamble_prepareCSE({"S"});//c_CRUDNDi);
-
- v_resourceIndex := f_createResource(v_resourceType, v_requestPrimitive, v_aeIndex);
+ //Test Body
+ v_request := valueof(m_createAe(PX_APP_ID, omit, "C-AE-ID-STEM"));
- // Test Body
- v_request := valueof(m_retrieveResource(f_getResourceAddress(v_resourceIndex)));
+ v_request := f_getCreateRequestPrimitive(v_resourceType, omit, v_request, v_cseBaseIndex);
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
- [] mccPort.receive(mw_request(mw_createAEannc( omit, omit, "APP_ID"))) {
+ [] mccPort.receive(mw_request(mw_createAEannc(omit, omit, "APP_ID"))) {
tc_ac.stop;
setverdict(pass, testcasename() & ": AE creation redirected.");
}
--
GitLab