Renaming of invalid types to maintain the original type name plus the suffix "_invalid"

Signed-off-by: Miguel Angel Reina Ortega's avatarreinaortega <miguelangel.reinaortega@etsi.org>
parent 83602d0d
......@@ -707,7 +707,7 @@ module OneM2M_Templates {
template (value) RequestPrimitive m_createContainerBaseInvalid modifies m_create := {
requestIdentifier := testcasename() & "-m_createContainer",
resourceType := int3,
primitiveContent := {container_update_invalid := m_contentCreateContainerInvalid}
primitiveContent := {container_invalid := m_contentCreateContainerInvalid}
};
/**
......@@ -1956,7 +1956,7 @@ module OneM2M_Templates {
* @desc Base primitiveContent for invalid CREATE operation for Container resource (using Container_update_invalid)
* @param p_name Resource name
*/
template (value) Container_update_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
template (value) Container_invalid m_contentCreateContainerInvalid (in template (omit) XSD.String p_name := c_defaultContainerResourceName):= {
resourceName := p_name,//O
resourceType := omit,//NP
resourceID := omit,//NP
......@@ -3630,7 +3630,7 @@ module OneM2M_Templates {
choice := *//NP
};
template (value) AE_update_invalid m_contentUpdateAe_invalid := {
template (value) AE_invalid m_contentUpdateAe_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3654,7 +3654,7 @@ module OneM2M_Templates {
choice := omit//O
};
template (value) ACP_update_invalid m_contentUpdateAcp_invalid := {
template (value) AccessControlPolicy_invalid m_contentUpdateAcp_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3671,7 +3671,7 @@ module OneM2M_Templates {
choice := omit//O
};
template (value) Group_update_invalid m_contentUpdateGroup_invalid := {
template (value) Group_invalid m_contentUpdateGroup_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3696,7 +3696,7 @@ module OneM2M_Templates {
choice := omit//O
};
template (value) PollingChannel_update_invalid m_contentUpdatePollingChannel_invalid := {
template (value) PollingChannel_invalid m_contentUpdatePollingChannel_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3708,7 +3708,7 @@ module OneM2M_Templates {
expirationTime := omit//M
};
template (value) Schedule_update_invalid m_contentUpdateSchedule_invalid := {
template (value) Schedule_invalid m_contentUpdateSchedule_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3724,7 +3724,7 @@ module OneM2M_Templates {
choice := omit//O
};
template (value) Subscription_update_invalid m_contentUpdateSubscription_invalid := {
template (value) Subscription_invalid m_contentUpdateSubscription_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......@@ -3753,7 +3753,7 @@ module OneM2M_Templates {
choice := omit//O
};
template (value) Container_update_invalid m_contentUpdateContainer_invalid := {
template (value) Container_invalid m_contentUpdateContainer_invalid := {
resourceName := omit,//M
resourceType := omit,//M
resourceID := omit,//M
......
......@@ -1131,14 +1131,14 @@ module OneM2M_Types {
URI uRI,
DebugInfo debugInfo,
//Invalid types
AE_update_invalid aE_update_invalid,
ACP_update_invalid aCP_update_invalid,
Container_update_invalid container_update_invalid,
Group_update_invalid group_update_invalid,
PollingChannel_update_invalid pollingChannel_update_invalid,
Schedule_update_invalid schedule_update_invalid,
Subscription_update_invalid subscription_update_invalid,
LocationPolicy_update_invalid locationPolicy_update_invalid
AE_invalid aE_invalid,
AccessControlPolicy_invalid accessControlPolicy_invalid,
Container_invalid container_invalid,
Group_invalid group_invalid,
PollingChannel_invalid pollingChannel_invalid,
Schedule_invalid schedule_invalid,
Subscription_invalid subscription_invalid,
LocationPolicy_invalid locationPolicy_invalid
}
......@@ -5310,7 +5310,7 @@ group optionalResourceTypes {
group invalidTypes {
type record AE_update_invalid
type record AE_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5360,7 +5360,7 @@ group invalidTypes {
variant (choice.choice_list[-].group_) "name as 'group'";
};
type record ACP_update_invalid {
type record AccessControlPolicy_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
XSD.ID resourceID optional,
......@@ -5391,7 +5391,7 @@ group invalidTypes {
variant (choice.subscription_list[-]) "name as 'subscription'";
};
type record Container_update_invalid {
type record Container_invalid {
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5435,7 +5435,7 @@ group invalidTypes {
variant (choice.choice_list[-]) "untagged";
};
type record Group_update_invalid
type record Group_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5478,7 +5478,7 @@ group invalidTypes {
variant (choice.subscription_list[-]) "name as 'subscription'";
};
type record PollingChannel_update_invalid
type record PollingChannel_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5496,7 +5496,7 @@ group invalidTypes {
variant (resourceName) "attribute";
};
type record Schedule_update_invalid
type record Schedule_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5529,7 +5529,7 @@ group invalidTypes {
variant (choice.choice_list[-]) "untagged";
};
type record Subscription_update_invalid
type record Subscription_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......@@ -5570,7 +5570,7 @@ group invalidTypes {
variant (choice) "untagged";
};
type record LocationPolicy_update_invalid
type record LocationPolicy_invalid
{
ResourceName resourceName optional,
ResourceType resourceType optional,
......
This diff is collapsed.
......@@ -3817,8 +3817,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.creationTime := v_creationTime;
v_updateRequest.primitiveContent := {schedule_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int18, m_createScheduleBase, v_updateRequest));//Schedule
v_ae1.done;
......@@ -3826,8 +3826,8 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.schedule_update_invalid)) {
if(v_primitiveContentRetrieveResource.schedule_update_invalid.creationTime == v_creationTime){
if(ischosen(v_primitiveContentRetrieveResource.schedule_invalid)) {
if(v_primitiveContentRetrieveResource.schedule_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
......@@ -3842,8 +3842,8 @@ module OneM2M_Testcases_CSE_Release_2 {
var PrimitiveContent v_primitiveContentRetrieveResource;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.creationTime := v_creationTime;
v_updateRequest.primitiveContent := {pollingChannel_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_invalid.creationTime := v_creationTime;
v_ae1.start(f_CSE_DMR_UPD_007(int15, m_createPollingChannelBase, v_updateRequest));//PollingChannel
v_ae1.done;
......@@ -3851,8 +3851,8 @@ module OneM2M_Testcases_CSE_Release_2 {
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_update_invalid)) {
if(v_primitiveContentRetrieveResource.pollingChannel_update_invalid.creationTime == v_creationTime){
if(ischosen(v_primitiveContentRetrieveResource.pollingChannel_invalid)) {
if(v_primitiveContentRetrieveResource.pollingChannel_invalid.creationTime == v_creationTime){
setverdict(fail, __SCOPE__ & ": Error: Creation Time attribute updated")
}
}
......@@ -3937,9 +3937,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updateScheduleBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent := {schedule_update_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent := {schedule_invalid := m_contentUpdateSchedule_invalid};
v_updateRequest.primitiveContent.schedule_update_invalid.expirationCounter := v_expirationCounter;
v_updateRequest.primitiveContent.schedule_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int18, v_createRequest, v_updateRequest));//Schedule
v_ae1.done;
......@@ -3953,9 +3953,9 @@ module OneM2M_Testcases_CSE_Release_2 {
var template RequestPrimitive v_updateRequest := m_updatePollingChannelBase;
v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
v_ae1.done;
v_updateRequest.primitiveContent := {pollingChannel_update_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent := {pollingChannel_invalid := m_contentUpdatePollingChannel_invalid};
v_updateRequest.primitiveContent.pollingChannel_update_invalid.expirationCounter := v_expirationCounter;
v_updateRequest.primitiveContent.pollingChannel_invalid.expirationCounter := v_expirationCounter;
v_ae1.start(f_CSE_DMR_UPD_009(int15, v_createRequest, v_updateRequest));//PollingChannel
v_ae1.done;
......
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