From 8ab57dac54562acfaf2477a6c5dbbfc04e5d20d9 Mon Sep 17 00:00:00 2001
From: acverdugo <acverdugo@at4wireless.com>
Date: Tue, 21 Nov 2017 14:40:21 +0100
Subject: [PATCH] Log typo in f_cse_registrationRemoteCse function Error en
f_cse_generateLocalResource function Component CseSystem did not declare
mccPortIn port vc_ae1.done missing in test case TC_CSE_REG_CRE_008 Preamble
of TC_CSE_REG_CRE_012 permutations was not being done properly Log typo in
TC_CSE_REG_CRE_013
Signed-off-by: acverdugo <acverdugo@at4wireless.com>
---
LibOneM2M/OneM2M_Functions.ttcn | 5 +--
LibOneM2M/OneM2M_TestSystem.ttcn | 1 +
OneM2M_Testcases_CSE.ttcn | 54 ++++++++++++++++++++++----------
3 files changed, 42 insertions(+), 18 deletions(-)
diff --git a/LibOneM2M/OneM2M_Functions.ttcn b/LibOneM2M/OneM2M_Functions.ttcn
index db4c845..00ca8d5 100644
--- a/LibOneM2M/OneM2M_Functions.ttcn
+++ b/LibOneM2M/OneM2M_Functions.ttcn
@@ -1612,7 +1612,7 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
}
[] tc_ac.timeout {
- setverdict(inconc, __SCOPE__&":INFO: No answer while creating resource type RemoteCSE");
+ setverdict(inconc, __SCOPE__&":INFO: No request received for creating resource type RemoteCSE");
}
}
@@ -1672,7 +1672,8 @@ module OneM2M_Functions {
v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
}
v_myResource.remoteCSE.resourceType := p_resourceType;
- v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+ //v_myResource.remoteCSE.resourceID := "remoteCSE" & int2char(v_resourceIndex);
+ v_myResource.remoteCSE.resourceID := "remoteCSE";
v_myResource.remoteCSE.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
diff --git a/LibOneM2M/OneM2M_TestSystem.ttcn b/LibOneM2M/OneM2M_TestSystem.ttcn
index eeef3e7..08bd6f5 100644
--- a/LibOneM2M/OneM2M_TestSystem.ttcn
+++ b/LibOneM2M/OneM2M_TestSystem.ttcn
@@ -71,6 +71,7 @@ module OneM2M_TestSystem {
port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn;
port OneM2MPort mccPort;
+ port OneM2MPort mccPortIn;
port AdapterControlPort acPort;
}
diff --git a/OneM2M_Testcases_CSE.ttcn b/OneM2M_Testcases_CSE.ttcn
index 9de06d8..72c91d9 100644
--- a/OneM2M_Testcases_CSE.ttcn
+++ b/OneM2M_Testcases_CSE.ttcn
@@ -1086,6 +1086,8 @@ module OneM2M_Testcases_CSE {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
+ vc_ae1.done;
+
//TODO:
//v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
//mcaPort.send(m_request(v_request));
@@ -1245,29 +1247,49 @@ module OneM2M_Testcases_CSE {
group g_CSE_REG_CRE_012 {
- testcase TC_CSE_REG_CRE_012_AE_LBL() runs on AeSimu system CseSystem {
- var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
- m_create.primitiveContent.aE.labels := {"labels"};
+ testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+
+ v_create.primitiveContent.aE.labels := {"labels"};
+ v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+ v_ae1.done;
}
- testcase TC_CSE_REG_CRE_012_AE_APN() runs on AeSimu system CseSystem {
- var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
- m_create.primitiveContent.aE.appName := "AeAppName";
+ testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+
+ v_create.primitiveContent.aE.appName := "AeAppName";
+ v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+ v_ae1.done;
}
- testcase TC_CSE_REG_CRE_012_AE_POA() runs on AeSimu system CseSystem {
- var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
- m_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
+ testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+
+ v_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
+ v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+ v_ae1.done;
}
- testcase TC_CSE_REG_CRE_012_AE_NL() runs on AeSimu system CseSystem {
- var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
- m_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+ testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+
+ v_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
+ v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+ v_ae1.done;
}
- testcase TC_CSE_REG_CRE_012_AE_OR() runs on AeSimu system CseSystem {
- var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
- m_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+ testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
+ var AeSimu v_ae1 := AeSimu.create("AE1") alive;
+ var template RequestPrimitive v_create := m_createAe(PX_APP_ID, omit, omit);
+
+ v_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
+ v_ae1.start(TC_CSE_REG_CRE_012(v_create));
+ v_ae1.done;
}
function TC_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
@@ -1409,7 +1431,7 @@ module OneM2M_Testcases_CSE {
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute" & p_optionalAttribute.name);
+ setverdict(fail, __SCOPE__ & ": Rejected creation of resource type remoteCSE containing attribute " & p_optionalAttribute.name);
}
[] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
--
GitLab