Improving of f_AE_DMR_UPD_001 and f_AE_DMR_UPD_002

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 8fbea2dc
......@@ -604,7 +604,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentAe(m_contentCreateAe(omit, omit, omit, omit))), vc_cSEBaseIndex, int2);
v_resourceIndex := f_setLocalResource(v_localResource, int2, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
f_sendUtPrimitive(p_utRequest,p_action);
f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
......@@ -646,7 +646,7 @@ module OneM2M_PermutationFunctions {
v_localResource := f_generateLocalResource(valueof(m_primitiveContentContainer(m_contentCreateContainer)), vc_cSEBaseIndex, int3);
v_resourceIndex := f_setLocalResource(v_localResource, int3, vc_cSEBaseIndex);
p_utRequest.requestPrimitive.to_ := f_getLocalResourceAddress(v_resourceIndex);
f_sendUtPrimitive(p_utRequest,p_action);
f_sendUtPrimitive(p_utRequest,p_action & f_getLocalResourceAddress(v_resourceIndex));
//Test behavior
tc_ac.start;
......@@ -662,7 +662,7 @@ module OneM2M_PermutationFunctions {
mcaPortIn.send(f_getMsgOutPrimitive(m_response(v_responsePrimitive)));
}
[] mcaPortIn.receive {
[] mcaPortIn.receive(mw_request(?)) {
tc_ac.stop;
setverdict(fail, __SCOPE__, " : Container update request is rejected due to not including the attribute!");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
......@@ -714,7 +714,7 @@ module OneM2M_PermutationFunctions {
}
[] mcaPortIn.receive (mw_request(mw_retrieve(?))){
tc_ac.stop;
setverdict(fail, __SCOPE__, " : error while retrieving resource !");
setverdict(fail, __SCOPE__, " : Retrieve request for unexpected target");
mcaPortIn.send(f_getMsgOutPrimitive(m_response(valueof(m_responsePrimitive(int4004, v_request.primitive.requestPrimitive.requestIdentifier, omit)))));
}
[] tc_ac.timeout{
......
......@@ -1156,7 +1156,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_expectedUpdateRequestAe;
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime";
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute expirationTime to ";
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
......@@ -1175,7 +1175,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels";
var universal charstring v_action := "Please, send a valid UPDATE Request for AE updating attribute labels to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
......@@ -1195,7 +1195,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute appName to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
......@@ -1214,7 +1214,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute pointOfAccess to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
......@@ -1233,7 +1233,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute ontologyRef to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.aE.ontologyRef := "UNINITIALIZED";
......@@ -1251,7 +1251,7 @@ module OneM2M_Testcases_AE_Release_1 {
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute nodeLink to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.aE.nodeLink := "UNINITIALIZED";
......@@ -1268,7 +1268,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute requestReachability to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.aE.requestReachability := true;
......@@ -1286,7 +1286,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_expectedUpdateRequestAe;
var template UtTriggerPrimitive v_utRequest := m_utUpdateAe;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for AE updating attribute contentSerialization to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.aE.contentSerialization := {applicationxml};
......@@ -1312,7 +1312,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute expirationTime to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.expirationTime := "20301231T012345";
......@@ -1326,7 +1326,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute labels to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.labels := {"UNINITIALIZED"};
......@@ -1340,7 +1340,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxNrOfInstances to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxNrOfInstances := 1;
......@@ -1355,7 +1355,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxByteSize to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxByteSize := 1;
......@@ -1370,7 +1370,7 @@ module OneM2M_Testcases_AE_Release_1 {
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var template RequestPrimitive v_request := mw_updateContainer;
var template UtTriggerPrimitive v_utRequest := m_utUpdateContainer;
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge";
var universal charstring v_action := __SCOPE__ & ": Please, send a valid UPDATE Request for Container updating attribute maxInstanceAge to ";
v_cse1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_CSE1));
v_cse1.done;
v_utRequest.requestPrimitive.primitiveContent.container.maxInstanceAge := 1;
......
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