From 0aeaa92936f87cc229618d5eb243aac04d8fb486 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 19 Mar 2018 14:41:19 +0100
Subject: [PATCH] Fix #38
---
OneM2M_PermutationFunctions.ttcn | 17 ++++++++++++++---
OneM2M_Testcases_AE_Release_1.ttcn | 20 +++++++++++++++++---
2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 5eec7ff..9bf7e82 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -191,8 +191,9 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
- v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), -1, int3);
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_auxInteger := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_auxInteger, e_hierarchical, p_primitiveScope);
v_utRequest.from_ := "UNINITIALIZED";
f_sendUtPrimitive(v_utRequest,v_action);
@@ -425,7 +426,7 @@ module OneM2M_PermutationFunctions {
group Create {
- function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_response, in universal charstring p_action) runs on CseSimu {
+ function f_AE_REG_CRE_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
//primitives for mcaPortIn
var MsgIn v_request;
@@ -434,12 +435,14 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//Send Trigger Message
+ p_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(p_response)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
@@ -476,12 +479,18 @@ module OneM2M_PermutationFunctions {
function f_AE_DMR_CRE_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request, in universal charstring p_action) runs on CseSimu {
var MsgIn v_request;
+ var PrimitiveContent v_localResource;
+ var integer v_containerIndex := -1;
var ResponsePrimitive v_responsePrimitive;
//Test component configuration
f_cf03Up();
//send triggering primitive to SUT
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_containerIndex := f_setLocalResource(v_localResource, int3);
+ p_utRequest.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ p_request.to_ := p_utRequest.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
@@ -521,6 +530,8 @@ module OneM2M_PermutationFunctions {
f_cf03Up();
//send triggering primitive to SUT
+ p_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
+ p_request.to_ := p_utRequest.to_;
f_sendUtPrimitive(p_utRequest,p_action);
//Test behavior
diff --git a/OneM2M_Testcases_AE_Release_1.ttcn b/OneM2M_Testcases_AE_Release_1.ttcn
index 432b740..cd59ea2 100644
--- a/OneM2M_Testcases_AE_Release_1.ttcn
+++ b/OneM2M_Testcases_AE_Release_1.ttcn
@@ -383,21 +383,25 @@ module OneM2M_Testcases_AE_Release_1 {
//primitives for utPort
var template UtTriggerPrimitive v_utRequest := m_createAe("UNINITIALIZED");
+
//primitives for mcaPortIn
var MsgIn v_request;
+ var template RequestPrimitive v_requestPrimitive := mw_createAe;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid AE CREATE Registration Request";
f_cf03Up();
//Send Trigger Message
+ v_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.to_;
f_sendUtPrimitive(v_utRequest, v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_createAe)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : AE registration request is accepted!!");
//v_responsePrimitive := valueof(m_responsePrimitiveTemp(int2000, omit));
@@ -593,18 +597,21 @@ module OneM2M_Testcases_AE_Release_1 {
//variables
var template UtTriggerPrimitive v_utRequest := m_utCreateContainer;
var MsgIn v_request;
+ var template RequestPrimitive v_requestPrimitive := mw_createContainer;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for container";
f_cf03Up();
//send triggering primitive to SUT
+ v_utRequest.to_ := f_getLocalResourceAddress(-, -, -);
+ v_requestPrimitive.to_ := v_utRequest.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
tc_ac.start;
alt{
- [] mcaPortIn.receive(mw_request(mw_createContainer)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container creation request is accepted!");
@@ -635,6 +642,9 @@ module OneM2M_Testcases_AE_Release_1 {
var template UtTriggerPrimitive v_utRequest := m_utCreateContentInstance;
var MsgIn v_request;
+ var PrimitiveContent v_localResource;
+ var integer v_containerIndex := -1;
+ var template RequestPrimitive v_requestPrimitive := mw_createContentInstance;
var ResponsePrimitive v_responsePrimitive;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid CREATE Request for ContentInstance";
@@ -642,6 +652,10 @@ module OneM2M_Testcases_AE_Release_1 {
f_cf03Up();
//send triggering primitive to SUT
+ v_localResource := f_ae_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
+ v_containerIndex := f_setLocalResource(v_localResource, int3);
+ v_utRequest.to_ := f_getLocalResourceAddress(v_containerIndex, -, -);
+ v_requestPrimitive.to_ := v_utRequest.to_;
f_sendUtPrimitive(v_utRequest,v_action);
//Test behavior
@@ -649,7 +663,7 @@ module OneM2M_Testcases_AE_Release_1 {
alt{
//receive MsgIn requestPrimitive
- [] mcaPortIn.receive(mw_request(mw_createContentInstance)) -> value v_request {
+ [] mcaPortIn.receive(mw_request(v_requestPrimitive)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : ContentInstance creation request is accepted!!");
--
GitLab