Commit bec8fb18db205d983c5391171df2e6b57a79d8f0

Authored by Miguel Angel Reina Ortega
1 parent 6733eb0c

Fix TC_CSE_DMR_CRE_020_XXX and TC_CSE_DMR_UPD_022_XXX according to TDE-2019-0025

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -904,6 +904,8 @@ module OneM2M_Testcases_CSE_Release_2 {
904 904 v_ae1.done;
905 905  
906 906 v_contentResponse.container := mw_contentContainer_rc1;
  907 + //Provided attributes should not be returned unless modified
  908 + v_contentResponse.container.resourceName := omit;
907 909  
908 910 v_ae1.start(f_CSE_DMR_CRE_020(int3, m_createContainerBase, v_contentResponse));//Container
909 911 v_ae1.done;
... ... @@ -917,6 +919,10 @@ module OneM2M_Testcases_CSE_Release_2 {
917 919 v_ae1.done;
918 920  
919 921 v_contentResponse.group_ := mw_contentGroup_rc1;
  922 + //Provided attributes should not be returned unless modified
  923 + v_contentResponse.group_.resourceName := omit;
  924 + v_contentResponse.group_.maxNrOfMembers := omit;
  925 + v_contentResponse.group_.memberIDs := omit;
920 926  
921 927 v_ae1.start(f_CSE_DMR_CRE_020(int9, m_createGroupBase, v_contentResponse));//Group
922 928 v_ae1.done;
... ... @@ -930,7 +936,11 @@ module OneM2M_Testcases_CSE_Release_2 {
930 936 v_ae1.done;
931 937  
932 938 v_contentResponse.accessControlPolicy := mw_contentAcp_rc1;
933   -
  939 + //Provided attributes should not be returned unless modified
  940 + v_contentResponse.accessControlPolicy.resourceName := omit;
  941 + v_contentResponse.accessControlPolicy.privileges := omit;
  942 + v_contentResponse.accessControlPolicy.selfPrivileges := omit;
  943 +
934 944 v_ae1.start(f_CSE_DMR_CRE_020(int1, m_createAcpBase,v_contentResponse));//AccessControlPolicy
935 945 v_ae1.done;
936 946 }
... ... @@ -943,6 +953,9 @@ module OneM2M_Testcases_CSE_Release_2 {
943 953 v_ae1.done;
944 954  
945 955 v_contentResponse.subscription := mw_contentSubscription_rc1;
  956 + //Provided attributes should not be returned unless modified
  957 + v_contentResponse.subscription.resourceName := omit;
  958 + v_contentResponse.subscription.notificationURI := omit;
946 959  
947 960 v_ae1.start(f_CSE_DMR_CRE_020(int23, m_createSubscriptionBase, v_contentResponse));//Subscription
948 961 v_ae1.done;
... ... @@ -956,6 +969,8 @@ module OneM2M_Testcases_CSE_Release_2 {
956 969 v_ae1.done;
957 970  
958 971 v_contentResponse.pollingChannel := mw_contentPollingChannel_rc1;
  972 + //Provided attributes should not be returned unless modified
  973 + v_contentResponse.pollingChannel.resourceName := omit;
959 974  
960 975 v_ae1.start(f_CSE_DMR_CRE_020(int15, m_createPollingChannelBase, v_contentResponse));//PollingChannel
961 976 v_ae1.done;
... ... @@ -2378,7 +2393,8 @@ module OneM2M_Testcases_CSE_Release_2 {
2378 2393 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
2379 2394 v_ae1.done;
2380 2395 v_contentResponse.container := m_contentContainer_allOmit;
2381   - v_contentResponse.container.labels := ?;
  2396 + v_contentResponse.container.lastModifiedTime := ?;
  2397 + v_contentResponse.container.stateTag := ?;
2382 2398 v_updateRequest.primitiveContent.container.labels := {"VALUE_1"};
2383 2399  
2384 2400 v_ae1.start(f_CSE_DMR_UPD_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase, v_updateRequest));//Container
... ... @@ -2393,7 +2409,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2393 2409 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
2394 2410 v_ae1.done;
2395 2411 v_contentResponse.group_ := m_contentGroup_allOmit;
2396   - v_contentResponse.group_.labels := ?;
  2412 + v_contentResponse.group_.lastModifiedTime := ?;
2397 2413 v_updateRequest.primitiveContent.group_.labels := {"VALUE_1"};
2398 2414  
2399 2415 v_ae1.start(f_CSE_DMR_UPD_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//Group
... ... @@ -2409,7 +2425,7 @@ module OneM2M_Testcases_CSE_Release_2 {
2409 2425 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
2410 2426 v_ae1.done;
2411 2427 v_contentResponse.accessControlPolicy := m_contentAcp_allOmit;
2412   - v_contentResponse.accessControlPolicy.labels := ?;
  2428 + v_contentResponse.accessControlPolicy.lastModifiedTime := ?;
2413 2429 v_updateRequest.primitiveContent.accessControlPolicy.labels := {"VALUE_1"};
2414 2430  
2415 2431 v_ae1.start(f_CSE_DMR_UPD_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase, v_updateRequest));//AccessControlPolicy
... ...