Commit cfc21c69 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Removal of duplicated TC_AE_DMR_UPD_001 +


renaming of TC_AE_DMR_UPD_002 and TC_AE_DMR_UPD_003
Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 1f2ad48e
......@@ -1262,132 +1262,81 @@ module OneM2M_Testcases_AE {
group g_AE_DMR_UPD_001 {
/**
* @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the TARGET_RESOURCE_ADDRESS resource
*/
testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var template RequestPrimitive v_request := mw_createContainer;
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
f_AE_DMR_UPD_001(v_utRequest,v_request);
}
function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu {
var ResponsePrimitive v_responsePrimtive;
var MsgIn v_request;
//Test component configuration
f_cf03Up();
//send triggering primtive to SUT
f_sendUtPrimitive(p_utRequest);
//Test behavior
tc_ac.start;
alt{
//receive MsgIn requestPrimitive
[] mcaPort.receive(mw_request(p_request)) -> value v_request {
tc_ac.stop;
setverdict(pass, __SCOPE__, " : Container update request is accepted!!");
if (match(v_request.primitive.requestPrimitive.primitiveContent.container.labels,p_utRequest.primitiveContent.container.labels)){
setverdict(fail, __SCOPE__, " : Container update request didn't change the value of the attribute");
}else{
//set responseStatusCode back to SUT
v_responsePrimtive := valueof(m_responsePrimitive(int2004, "To_be_defined", omit));
//send back responsePrimitive
mcaPort.send(m_response(v_responsePrimtive));
}
}
[] mcaPort.receive {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
}
[] tc_ac.timeout{
setverdict(fail, __SCOPE__, " : Timeout due to no response received from requested SUT!");
}
}
// Postamble
f_cf03Down();
}
}
group g_AE_DMR_UPD_002 {
/**
* @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the AE resource
*/
testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_ET() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.expirationTime := "20301231T012345";
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_001_LBL() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.labels := {"UNINITIALIZED"};
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_APN() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_APN() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.appName := "UNINITIALIZED";
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_POA() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_POA() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.pointOfAccess := {"http://127.0.0.1:1400/monitor"};
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_OR() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_OR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.ontologyRef := "MyOntologyRef";
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_NL() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_NL() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.nodeLink := "/CSE_ID/S-AE-ID-STEM";
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_RR() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_RR() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequest := m_updateAeBase;
v_utRequest.primitiveContent.aE.requestReachability := true;
f_AE_DMR_UPD_002(v_utRequest);
f_AE_DMR_UPD_001(v_utRequest);
}
testcase TC_AE_DMR_UPD_002_CSZ() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_001_CSZ() runs on CseSimu system AeSystem {
var template UtTriggerPrimitive v_utRequestTestBody := m_updateAeBase;
v_utRequestTestBody.primitiveContent.aE.contentSerialization := {applicationxml};
f_AE_DMR_UPD_002(v_utRequestTestBody);
f_AE_DMR_UPD_001(v_utRequestTestBody);
}
function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequestTestBody) runs on CseSimu {
function f_AE_DMR_UPD_001(template UtTriggerPrimitive p_utRequestTestBody) runs on CseSimu {
//primitives for mcaPort
var MsgIn v_request;
......@@ -1434,15 +1383,15 @@ module OneM2M_Testcases_AE {
f_cf03Down();
}
}//End of subgroup AE_DMR_UPD_002
}//End of subgroup AE_DMR_UPD_001
group g_AE_DMR_UPD_003 {
group g_AE_DMR_UPD_002 {
/**
* @desc Check that the IUT sends an UPDATE Request with the value of the attribute ATTRIBUTE_NAME of the <container> resource
*/
testcase TC_AE_DMR_UPD_003_ET() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_002_ET() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
......@@ -1450,10 +1399,10 @@ module OneM2M_Testcases_AE {
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.expirationTime := "20301231T012345";
v_request.primitiveContent.container.expirationTime := ?;
f_AE_DMR_UPD_003(v_utRequest,v_request);
f_AE_DMR_UPD_002(v_utRequest,v_request);
}
testcase TC_AE_DMR_UPD_003_LBL() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_002_LBL() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
......@@ -1461,10 +1410,10 @@ module OneM2M_Testcases_AE {
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.labels := {"UNINITIALIZED"};
v_request.primitiveContent.container.labels := ?;
f_AE_DMR_UPD_003(v_utRequest,v_request);
f_AE_DMR_UPD_002(v_utRequest,v_request);
}
testcase TC_AE_DMR_UPD_003_MNI() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_002_MNI() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
......@@ -1472,10 +1421,10 @@ module OneM2M_Testcases_AE {
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxNrOfInstances := 1;
v_request.primitiveContent.container.maxNrOfInstances := ?;
f_AE_DMR_UPD_003(v_utRequest,v_request);
f_AE_DMR_UPD_002(v_utRequest,v_request);
}
testcase TC_AE_DMR_UPD_003_MBS() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_002_MBS() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
......@@ -1483,10 +1432,10 @@ module OneM2M_Testcases_AE {
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxByteSize := 1;
v_request.primitiveContent.container.maxByteSize := ?;
f_AE_DMR_UPD_003(v_utRequest,v_request);
f_AE_DMR_UPD_002(v_utRequest,v_request);
}
testcase TC_AE_DMR_UPD_003_MIA() runs on CseSimu system AeSystem {
testcase TC_AE_DMR_UPD_002_MIA() runs on CseSimu system AeSystem {
var integer v_auxInteger := f_setResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))),int2);
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
......@@ -1494,10 +1443,10 @@ module OneM2M_Testcases_AE {
v_utRequest.to_ := f_getResourceAddress(v_auxInteger);
v_utRequest.primitiveContent.container.maxInstanceAge := 1;
v_request.primitiveContent.container.maxInstanceAge := ?;
f_AE_DMR_UPD_003(v_utRequest,v_request);
f_AE_DMR_UPD_002(v_utRequest,v_request);
}
function f_AE_DMR_UPD_003(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu {
function f_AE_DMR_UPD_002(template UtTriggerPrimitive p_utRequest, template RequestPrimitive p_request) runs on CseSimu {
var ResponsePrimitive v_responsePrimtive;
......@@ -1537,7 +1486,7 @@ module OneM2M_Testcases_AE {
f_cf03Down();
}
}
}//End of subgroup AE_DMR_UPD_002
}//End of subgroup Update
......
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