diff --git a/OneM2M_TestControl_IN_profile.ttcn b/OneM2M_TestControl_IN_profile.ttcn
index be9f03b3b4b9c72cb4cb510f40e4882e31090b49..ca83bff7498b5a5f818f535cd459ad26d1d39e1e 100644
--- a/OneM2M_TestControl_IN_profile.ttcn
+++ b/OneM2M_TestControl_IN_profile.ttcn
@@ -128,7 +128,6 @@ module OneM2M_TestControl_IN_profile {
if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_010 ());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
@@ -186,7 +185,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
if(PICS_SUB_LBL and PICS_SUB_EXC) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_009_SUB_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
@@ -218,7 +217,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
if(PICS_ACP_AT and PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_ACP_PVS());}
if(true) {execute (TC_CSE_DMR_UPD_009_ACP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_PV());}
@@ -336,7 +335,7 @@ module OneM2M_TestControl_IN_profile {
if(PICS_GRP_GN and PICS_GRP_LBL) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_GRP_MNM());}
if(true) {execute (TC_CSE_DMR_UPD_009_GRP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
diff --git a/OneM2M_TestControl_MN_profile.ttcn b/OneM2M_TestControl_MN_profile.ttcn
index 4516fc0e594446a45ef0c05fdacc8aeba7bc3fc0..ed1cf99b746e364320faa08d0e3a43aab57b2e33 100644
--- a/OneM2M_TestControl_MN_profile.ttcn
+++ b/OneM2M_TestControl_MN_profile.ttcn
@@ -151,7 +151,6 @@ module OneM2M_TestControl_MN_profile {
if(PICS_CNT_MNI and PICS_CNT_LBL) {execute (TC_CSE_DMR_UPD_004_CNT_ET_MNI_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_005());}
if(true) {execute (TC_CSE_DMR_UPD_007_CNT_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_CNT_ET());}
if(true) {execute (TC_CSE_DMR_UPD_009_CNT_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_010());}
if(true) {execute (TC_CSE_DMR_UPD_016_CNT_ET());}
@@ -209,7 +208,7 @@ module OneM2M_TestControl_MN_profile {
if(PICS_SUB_LBL) {execute (TC_CSE_DMR_UPD_003_SUB_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_004_SUB_ET_LBL_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_007_SUB_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_SUB_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_SUB_NU());}
if(true) {execute (TC_CSE_DMR_UPD_009_SUB_MNI());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_SUB_NU());}
@@ -241,7 +240,7 @@ module OneM2M_TestControl_MN_profile {
if(PICS_ACP_LBL) {execute (TC_CSE_DMR_UPD_003_ACP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_004_ACP_PV_AT_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_ACP_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_ACP_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_ACP_PVS());}
if(true) {execute (TC_CSE_DMR_UPD_009_ACP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_ACP_PV());}
@@ -358,7 +357,7 @@ module OneM2M_TestControl_MN_profile {
if(true) {execute (TC_CSE_DMR_UPD_004_GRP_ET_GN_LBL());}
if(PICS_ACP_SUPPORT) {execute (TC_CSE_DMR_UPD_006_GRP_LBL());}
if(true) {execute (TC_CSE_DMR_UPD_007_GRP_CT());}
- if(true) {execute (TC_CSE_DMR_UPD_008_GRP_ET());}
+ if(true) {execute (TC_CSE_DMR_UPD_008_GRP_MNM());}
if(true) {execute (TC_CSE_DMR_UPD_009_GRP_EXC());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_ET());}
if(true) {execute (TC_CSE_DMR_UPD_016_GRP_MNM());}
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 8910dd66d2d99ea28ee02bad0b4bf59bdc369720..0d231d1d4d79f054c0c8d62034a62cd5e3a2e7ae 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -5424,43 +5424,17 @@ module OneM2M_Testcases_CSE_Release_1 {
* @desc Check that the IUT responds with an error when the AE tries to delete a mandatory RW attribute ATTRIBUTE_NAME of a TARGET_RESOURCE_ADDRESS resource
*
*/
- testcase TC_CSE_DMR_UPD_008_CNT_ET() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
- var template RequestPrimitive v_updateRequest := m_updateContainerBase;
- var AttributeAux_list v_nullFields;
- var PrimitiveContent v_primitiveContentRetrieveResource;
-
- v_nullFields := {{"expirationTime", omit}};
-
- v_updateRequest.primitiveContent.container.expirationTime := v_expirationTime;
-
- v_ae1.start(f_CSE_DMR_UPD_008(int3, m_createContainerBase, v_updateRequest, v_nullFields));//Container
- v_ae1.done;
-
- if(getverdict == pass){
- v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.container)) {
- if(v_primitiveContentRetrieveResource.container.expirationTime == v_expirationTime){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
- }
- }
- }
- }
- testcase TC_CSE_DMR_UPD_008_GRP_ET() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_GRP_MNM() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_nullFields := {{"expirationTime", omit}};
+ v_nullFields := {{"maxNrOfMembers", omit}};
- v_updateRequest.primitiveContent.group_.expirationTime := v_expirationTime;
+ v_updateRequest.primitiveContent.group_.maxNrOfMembers := 1;
v_ae1.start(f_CSE_DMR_UPD_008(int9, m_createGroupBase, v_updateRequest, v_nullFields));//Group
v_ae1.done;
@@ -5469,50 +5443,49 @@ module OneM2M_Testcases_CSE_Release_1 {
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.expirationTime == v_expirationTime){
+ if(v_primitiveContentRetrieveResource.group_.maxNrOfMembers == 0){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
}
}
}
}
- testcase TC_CSE_DMR_UPD_008_ACP_ET() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_ACP_PVS() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var SetOfAcrs v_selfPrivileges:= {{valueof(m_createAcr({"all"}, int63))}};
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_nullFields := {{"expirationTime", omit}};
+ v_nullFields := {{"selfPrivileges", omit}};
- v_updateRequest.primitiveContent.accessControlPolicy.expirationTime := v_expirationTime;
+ v_updateRequest.primitiveContent.accessControlPolicy.selfPrivileges := v_selfPrivileges;
v_ae1.start(f_CSE_DMR_UPD_008(int1, m_createAcpBase, v_updateRequest, v_nullFields));//AccessControlPolicy
v_ae1.done;
if(getverdict == pass){
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
- //Check that the resource has NOT been udpated
- if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
- if(v_primitiveContentRetrieveResource.accessControlPolicy.expirationTime == v_expirationTime){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ //Check that the resource has NOT been udpated
+ if(ischosen(v_primitiveContentRetrieveResource.accessControlPolicy)) {
+ if(v_primitiveContentRetrieveResource.accessControlPolicy.selfPrivileges == v_selfPrivileges) {
+ setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
}
- }
+ }
}
}
- testcase TC_CSE_DMR_UPD_008_SUB_ET() runs on Tester system CseSystem {
+ testcase TC_CSE_DMR_UPD_008_SUB_NU() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var AttributeAux_list v_nullFields;
var PrimitiveContent v_primitiveContentRetrieveResource;
- v_nullFields := {{"expirationTime", omit}};
+ v_nullFields := {{"notificationURI", omit}};
- v_updateRequest.primitiveContent.subscription.expirationTime := v_expirationTime;
+ v_updateRequest.primitiveContent.subscription.notificationURI := {"NullTarget"};
v_ae1.start(f_CSE_DMR_UPD_008(int23, m_createSubscriptionBase, v_updateRequest, v_nullFields));//Subscription
v_ae1.done;
@@ -5521,7 +5494,7 @@ module OneM2M_Testcases_CSE_Release_1 {
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//Check that the resource has NOT been udpated
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
- if(v_primitiveContentRetrieveResource.subscription.expirationTime == v_expirationTime){
+ if(v_primitiveContentRetrieveResource.subscription.notificationURI == {"NullTarget"}){
setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
}
}