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: Antonio Castillo Verdugo's avataracverdugo <acverdugo@at4wireless.com>
parent 71a5c3fa
...@@ -1612,7 +1612,7 @@ module OneM2M_Functions { ...@@ -1612,7 +1612,7 @@ module OneM2M_Functions {
setverdict(inconc, __SCOPE__&":INFO: Unexpected message received"); setverdict(inconc, __SCOPE__&":INFO: Unexpected message received");
} }
[] tc_ac.timeout { [] 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 { ...@@ -1672,7 +1672,8 @@ module OneM2M_Functions {
v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex); v_myResource.remoteCSE.resourceName := "remoteCSE" & int2char(v_resourceIndex);
} }
v_myResource.remoteCSE.resourceType := p_resourceType; 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.parentID := f_getResourceId(vc_localResourcesList[p_parentIndex].resource);
v_myResource.remoteCSE.creationTime := fx_generateTimestamp(); v_myResource.remoteCSE.creationTime := fx_generateTimestamp();
if(not(ispresent(p_resource.remoteCSE.expirationTime))) { if(not(ispresent(p_resource.remoteCSE.expirationTime))) {
......
...@@ -71,6 +71,7 @@ module OneM2M_TestSystem { ...@@ -71,6 +71,7 @@ module OneM2M_TestSystem {
port OneM2MPort mcaPort; port OneM2MPort mcaPort;
port OneM2MPort mcaPortIn; port OneM2MPort mcaPortIn;
port OneM2MPort mccPort; port OneM2MPort mccPort;
port OneM2MPort mccPortIn;
port AdapterControlPort acPort; port AdapterControlPort acPort;
} }
......
...@@ -1086,6 +1086,8 @@ module OneM2M_Testcases_CSE { ...@@ -1086,6 +1086,8 @@ module OneM2M_Testcases_CSE {
vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase); vc_remoteCseIndex := f_cse_registrationRemoteCse(mw_createRemoteCSEBase);
vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S"))); vc_ae1.start(f_cse_createResource(int2, m_createAe(PX_APP_ID, omit, "S")));
vc_ae1.done;
//TODO: //TODO:
//v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex))); //v_request := valueof(m_delete(f_getResourceAddress(v_aeIndex), f_getOriginator(v_aeIndex)));
//mcaPort.send(m_request(v_request)); //mcaPort.send(m_request(v_request));
...@@ -1245,29 +1247,49 @@ module OneM2M_Testcases_CSE { ...@@ -1245,29 +1247,49 @@ module OneM2M_Testcases_CSE {
group g_CSE_REG_CRE_012 { group g_CSE_REG_CRE_012 {
testcase TC_CSE_REG_CRE_012_AE_LBL() runs on AeSimu system CseSystem { testcase TC_CSE_REG_CRE_012_AE_LBL() runs on Tester system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit); var AeSimu v_ae1 := AeSimu.create("AE1") alive;
m_create.primitiveContent.aE.labels := {"labels"}; 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 { testcase TC_CSE_REG_CRE_012_AE_APN() runs on Tester system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit); var AeSimu v_ae1 := AeSimu.create("AE1") alive;
m_create.primitiveContent.aE.appName := "AeAppName"; 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 { testcase TC_CSE_REG_CRE_012_AE_POA() runs on Tester system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit); var AeSimu v_ae1 := AeSimu.create("AE1") alive;
m_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS}; 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 { testcase TC_CSE_REG_CRE_012_AE_NL() runs on Tester system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit); var AeSimu v_ae1 := AeSimu.create("AE1") alive;
m_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/"; 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 { testcase TC_CSE_REG_CRE_012_AE_OR() runs on Tester system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit); var AeSimu v_ae1 := AeSimu.create("AE1") alive;
m_create.primitiveContent.aE.ontologyRef := "MyOntologyRef"; 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 { function TC_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
...@@ -1409,7 +1431,7 @@ module OneM2M_Testcases_CSE { ...@@ -1409,7 +1431,7 @@ module OneM2M_Testcases_CSE {
} }
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response { [] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop; 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 { [] tc_ac.timeout {
setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE"); setverdict(fail, __SCOPE__ & ": No answer while creating resource type remoteCSE");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment