From 43f6e14ba0967ea33f151b9b55b05b3f1ff2af01 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 16 Sep 2020 07:12:48 +0200
Subject: [PATCH] Restructuring of RET announcement test cases
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 2 ++
OneM2M_PermutationFunctions.ttcn | 26 ++++++++++++++------------
2 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index 5bdb697..64d0511 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -3904,6 +3904,8 @@ module OneM2M_Functions {
v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentAe(m_contentCreateAe(omit, -, PX_TS_AE1.appId, omit)), -, int2);
} else if (p_resourceType == int10003) {
v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContainer(m_contentCreateContainer), -, int3);
+ } else if (p_resourceType == int10004) {
+ v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentContentInstance(m_contentCreateContentInstance), -, int4);
} else if (p_resourceType == int10009) {
v_originalResourceIndex := f_generateAndSetLocalResource(m_primitiveContentGroup(m_contentCreateGroup(1, {"NotInitialized"}, omit, -, -, -, -, -)), -, int9);
} else if (p_resourceType == int10029) {
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 589e2d9..3f74115 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -10027,6 +10027,7 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
// Register the CSE
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
+ v_parentIndex := vc_localRemoteCseIndex;
//Preamble
vc_ae1.start(f_cse_createResource(int2,v_create));
@@ -10130,8 +10131,7 @@ module OneM2M_PermutationFunctions {
//Test adapter configuration
// Register the CSE
vc_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(vc_cseSimuDesc.cseId, -, -, -, -, {f_getLocalPoA()}));
-
- f_checkCseSimuStatus();
+ v_parentIndex := vc_localRemoteCseIndex;
vc_ae1.start(f_cse_createResource(int2,v_create));
f_cse_announcementProcedure_createHandler(mw_createAEAnnc(-, -, -));
@@ -10232,9 +10232,14 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
//Preamble
+ v_aeIndex := f_cse_createResource(int2,v_createAE);
+
+ v_acpIndex := f_cse_createResource(int1, v_createAcp, -); // AE child resource
+
v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
+
//Register the CSE
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_remoteCSEIndex := f_getLatestResourceIndex(vc_cse1);
@@ -10247,10 +10252,6 @@ module OneM2M_PermutationFunctions {
v_originalResourceIndex := f_getLatestLocalResource(vc_cse1);
- v_aeIndex := f_cse_createResource(int2,v_createAE);
-
- v_acpIndex := f_cse_createResource(int1, v_createAcp, -); // AE child resource
-
if((p_resourceType == int3) or (p_resourceType == int9) or (p_resourceType == int29)) {
p_createRequestAnnc := f_setAcpId(p_createRequestAnnc, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)});
}
@@ -10312,17 +10313,18 @@ module OneM2M_PermutationFunctions {
// Test adapter configuration
//Preamble
+ v_aeIndex := f_cse_createResource(int2,v_createAE);
+
+ v_acpIndex := f_cse_createResource(int1, v_createAcp, -); // AE child resource
+
v_cseBaseIndex := f_getLatestLocalResourceIndex(vc_cse1);
+
//Register the CSE
- vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, -, {f_getLocalPoA()})));
+ vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)}, -, -, -, {f_getLocalPoA()})));
f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_remoteCSEIndex := f_getLatestResourceIndex(vc_cse1);
- v_aeIndex := f_cse_createResource(int2,v_createAE);
-
- v_acpIndex := f_cse_createResource(int1, v_createAcp, -); // AE child resource
-
if((p_resourceType == int3) or (p_resourceType == int9) or (p_resourceType == int29)) {
p_createRequestAnnc := f_setAcpId(p_createRequestAnnc, {f_getResourceId(vc_resourcesList[v_acpIndex].resource)});
}
--
GitLab