From 5b68654d46ea26436c30e14c165f3a6ffa6a6552 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Wed, 1 Apr 2020 12:30:18 +0200
Subject: [PATCH] Use of checkComponentDoneAndGetVerdict(p_component) functions
instead of p_component.done
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
LibOneM2M/OneM2M_Functions.ttcn | 4 ----
OneM2M_PermutationFunctions.ttcn | 28 ++++++++++++++--------------
OneM2M_Testcases_CSE_Release_1.ttcn | 14 +++++++-------
OneM2M_Testcases_CSE_Release_2.ttcn | 6 +++---
4 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index ffe032f..d6a3488 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -2755,10 +2755,6 @@ module OneM2M_Functions {
tc_ac.stop;
setverdict(inconc, __SCOPE__&":INFO: Error while creating resource type remoteCSE");
}
- [] mccPort.receive {
- tc_ac.stop;
- setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
- }
[] tc_ac.timeout {
setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type remoteCSE");
}
diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index c9abdac..6134fea 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -2352,7 +2352,7 @@ module OneM2M_PermutationFunctions {
v_remoteCseIndex := f_cse_registerRemoteCse(m_createRemoteCSE_poa(-, -, -, -, {f_getCompletePoA()}));
vc_ae1.start(f_cse_preamble_registerAe());
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
//Creating resource in Hosting CSE
v_targetResourceIndex := f_generateAndSetLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
@@ -3765,7 +3765,7 @@ module OneM2M_PermutationFunctions {
f_send(e_mca_port, m_request(v_request));
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
// Postamble
f_cse_postamble_deleteResources();
@@ -3800,11 +3800,11 @@ module OneM2M_PermutationFunctions {
}else if (PX_IN_CSE) {
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
}
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler());
v_resourceIndex := f_cse_createResource(int2, m_createAe(PX_TS_AE1.appId, omit, omit));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
if(p_resourceType == int4) {
v_containerIndex := f_cse_createResource(int3, m_createContainerBase, v_parentIndex);
@@ -3816,7 +3816,7 @@ module OneM2M_PermutationFunctions {
vc_cse1.start(f_cse_receiveCreateRequest_cseSimu(p_requestAnnc));
f_send(e_mca_port, m_request(v_request));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_request.primitive.requestPrimitive := f_getRequestPrimitive(vc_cse1);
@@ -4284,7 +4284,7 @@ module OneM2M_PermutationFunctions {
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
@@ -4379,7 +4379,7 @@ module OneM2M_PermutationFunctions {
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
@@ -4454,7 +4454,7 @@ module OneM2M_PermutationFunctions {
} else {
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4535,7 +4535,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4615,7 +4615,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4696,7 +4696,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -4773,7 +4773,7 @@ module OneM2M_PermutationFunctions {
}else{
vc_cse1.start(f_cse_registerRemoteCse(p_requestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -5884,7 +5884,7 @@ module OneM2M_PermutationFunctions {
v_resourceIndex := f_cse_createResource(p_resourceType, p_createRequestPrimitive);//under the CSEBase resource
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
@@ -5968,7 +5968,7 @@ module OneM2M_PermutationFunctions {
}
} else { //ResourceType = RemoteCSE
vc_cse1.start(f_cse_registerRemoteCse(p_createRequestPrimitive));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_resourceIndex := f_getRemoteCseResource(vc_cse1);
}
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index ac3c4d6..7810da9 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -628,7 +628,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -695,7 +695,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_ae1.done;
+ f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
// Postamble
f_cse_postamble_deleteResourcesCSE();
@@ -739,8 +739,8 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
-
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
v_requestPrimitive := mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/S", -, -, v_link);
vc_cse1.start(f_cse_announcementProcedure_createHandler(v_requestPrimitive));
@@ -759,7 +759,7 @@ module OneM2M_Testcases_CSE_Release_1 {
}
}
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
v_aeAnncIndex := f_getLatestLocalResource(vc_cse1);
//continue to test the content
@@ -972,7 +972,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler());
@@ -2129,7 +2129,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Preamble
vc_cse1.start(f_cse_registrationRemoteCse(mw_createRemoteCSE));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
vc_cse1.start(f_cse_announcementProcedure_createHandler(mw_createAEAnnc_s_ae_id(PX_CSE_ID & "/" & PX_ALLOWED_S_AE_IDS[0], -, -, -)));
diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index e58d4b6..ab0e2ce 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -3463,7 +3463,7 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
f_cse_createAccessControlPolicyAux();
@@ -3571,8 +3571,8 @@ module OneM2M_Testcases_CSE_Release_2 {
// Preamble
vc_cse1.start(f_cse_registerRemoteCse(m_createRemoteCSEBase));
- vc_cse1.done;
-
+ f_aeSimu_checkComponentDoneAndGetVerdict(vc_cse1);
+
f_cse_createAccessControlPolicyAux();
v_aeIndex := f_cse_preamble_registerAe({f_getResourceId(vc_resourcesList[vc_acpIndex].resource)}, -);//AE1 is registred;
--
GitLab