diff --git a/LibOneM2M/OneM2M_Types.ttcn b/LibOneM2M/OneM2M_Types.ttcn index 87dec8482a52efb82d80da3e38a3ba5359856e95..b5f0565a1d0dee29d49896e7f6382afddb12aa54 100644 --- a/LibOneM2M/OneM2M_Types.ttcn +++ b/LibOneM2M/OneM2M_Types.ttcn @@ -7073,6 +7073,6 @@ with { encode "XML"; variant "namespace as 'http://www.onem2m.org/xml/protocols' prefix 'm2m'"; variant "controlNamespace 'http://www.w3.org/2001/XMLSchema-instance' prefix 'xsi'"; - extension "anytype ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid" + extension "anytype AggregatedResponse, ServiceSubscribedAppRule_optional, charstring, AnyURI, AttributeList, AE, AccessControlPolicy, AccessControlPolicy_optional, ACP_update_invalid, AE_optional, AE_update_invalid,AEAnnc_optional, Container_optional, CSEBase_optional, Container_update_invalid, ContentInstance_optional, Group_optional, Group_update_invalid, Schedule_optional, Schedule_update_invalid, Subscription_optional, Subscription_update_invalid, PollingChannel_optional, PollingChannel_update_invalid, LocationPolicy_optional, LocationPolicy_update_invalid" } diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn index 33581eb9440009030a16af061ffbd4ec552b5617..d5559640346d767ef5ae2e42539c1d65b175a2f4 100644 --- a/OneM2M_Testcases.ttcn +++ b/OneM2M_Testcases.ttcn @@ -5074,7 +5074,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress2, c_memberResourceAddress2}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress2, c_memberResourceAddress2}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -5174,7 +5174,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(1, {c_memberResourceAddress2}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(1, {c_memberResourceAddress2}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -5280,7 +5280,7 @@ module OneM2M_Testcases { // MEMBER_RESOURCE_ADDRESS_2 v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -5387,7 +5387,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -5499,7 +5499,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(2, {c_memberResourceAddress1, c_memberResourceAddress2}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start; @@ -5587,7 +5587,7 @@ module OneM2M_Testcases { //Test Body v_request := f_getUpdateRequestPrimitive(c_ResourceTypeGroup, v_groupIndex, v_updateRequest); v_request.to_ := c_targetResourceAddress; - v_request.primitiveContent.any_1[0].Group_optional := m_contentCreateGroup(3, {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3}, omit); + v_request.primitiveContent.any_1[0].Group_optional := valueof(m_contentCreateGroup(3, {c_memberResourceAddress1, c_memberResourceAddress2, c_memberResourceAddress3}, omit)); mcaPort.send(m_request(v_request)); tc_ac.start;