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

Construction of CREATE request for BV_008_2, BV_011 and BV_012 modified according to the other TCs

parent 231d4ada
...@@ -3956,13 +3956,7 @@ module OneM2M_Testcases { ...@@ -3956,13 +3956,7 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response; var M2MResponsePrimitive v_response;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := m_createGroupBase; var template RequestPrimitive v_createRequest := m_createGroupBase;
// Test control // Test control
...@@ -3974,14 +3968,10 @@ module OneM2M_Testcases { ...@@ -3974,14 +3968,10 @@ module OneM2M_Testcases {
// Preamble // Preamble
v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi
v_createRequest.from_ := f_getOriginator(v_aeIndex); v_createRequest := f_getCreateRequestPrimitive(int9, omit, v_createRequest, v_aeIndex);
v_createRequest.to_ := f_addPrefix(f_getResourceAddress(v_aeIndex));
v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress, c_memberRessourceAddress}, omit); v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress, c_memberRessourceAddress}, omit);
mcaPort.send(m_request(valueof(v_createRequest))); mcaPort.send(m_request(valueof(v_createRequest)));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -4177,7 +4167,6 @@ module OneM2M_Testcases { ...@@ -4177,7 +4167,6 @@ module OneM2M_Testcases {
testcase TC_CSE_GMG_BV_011() runs on M2M system M2MSystem testcase TC_CSE_GMG_BV_011() runs on M2M system M2MSystem
{ {
// TODO: use right values for c_RessourceType1 and c_RessourceType2 and c_memberRessourceAddress1 and c_memberRessourceAddress2 // TODO: use right values for c_RessourceType1 and c_RessourceType2 and c_memberRessourceAddress1 and c_memberRessourceAddress2
var MemberType c_RessourceType1 := int1; var MemberType c_RessourceType1 := int1;
var MemberType c_RessourceType2 := int2; var MemberType c_RessourceType2 := int2;
...@@ -4188,11 +4177,8 @@ module OneM2M_Testcases { ...@@ -4188,11 +4177,8 @@ module OneM2M_Testcases {
var M2MResponsePrimitive v_response; var M2MResponsePrimitive v_response;
var integer v_aeIndex := -1; var integer v_aeIndex := -1;
var integer v_resourceIndex := -1; var integer v_resourceIndex := -1;
var template RequestPrimitive v_createRequest := m_createGroupBase; var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive.primitiveContent v_responsePrimitive; var ResponsePrimitive.primitiveContent v_responsePrimitive;
// Test control // Test control
...@@ -4204,20 +4190,10 @@ module OneM2M_Testcases { ...@@ -4204,20 +4190,10 @@ module OneM2M_Testcases {
// Preamble // Preamble
v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi
v_createRequest := f_getCreateRequestPrimitive(int9, omit, v_createRequest, v_aeIndex);
v_createRequest.from_ := f_getOriginator(v_aeIndex);
v_createRequest.to_ := f_addPrefix(f_getResourceAddress(v_aeIndex));
v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress1, c_memberRessourceAddress2}, omit);
v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_RessourceType1; v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_RessourceType1;
v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := int1; // ABANDON_MEMBER v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := int1; // ABANDON_MEMBER
mcaPort.send(m_request(valueof(v_createRequest))); mcaPort.send(m_request(valueof(v_createRequest)));
tc_ac.start; tc_ac.start;
alt { alt {
...@@ -4294,16 +4270,10 @@ module OneM2M_Testcases { ...@@ -4294,16 +4270,10 @@ module OneM2M_Testcases {
// Preamble // Preamble
v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi v_aeIndex := f_preamble_registerAe(); //c_CRUDNDi
v_createRequest.from_ := f_getOriginator(v_aeIndex); v_createRequest := f_getCreateRequestPrimitive(int9, omit, v_createRequest, v_aeIndex);
v_createRequest.to_ := f_addPrefix(f_getResourceAddress(v_aeIndex));
v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress1, c_memberRessourceAddress2}, omit); v_createRequest.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup (1, {c_memberRessourceAddress1, c_memberRessourceAddress2}, omit);
v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_RessourceType1; v_createRequest.primitiveContent.any_1[0].Group_optional.memberType := c_RessourceType1;
v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := int2; // ABANDON_GROUP v_createRequest.primitiveContent.any_1[0].Group_optional.consistencyStrategy := int2; // ABANDON_GROUP
mcaPort.send(m_request(valueof(v_createRequest))); mcaPort.send(m_request(valueof(v_createRequest)));
tc_ac.start; tc_ac.start;
......
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