From 463183227d3a2b0919e520657ca003b4bfc12da1 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Fri, 8 Apr 2022 08:04:21 +0200
Subject: [PATCH] Fix in DMR_UPD test cases to get the last useful request
Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
---
OneM2M_Testcases_CSE_Release_1.ttcn | 50 +++++++++++++++++------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/OneM2M_Testcases_CSE_Release_1.ttcn b/OneM2M_Testcases_CSE_Release_1.ttcn
index 1f4a1e7..79d8dec 100644
--- a/OneM2M_Testcases_CSE_Release_1.ttcn
+++ b/OneM2M_Testcases_CSE_Release_1.ttcn
@@ -6220,8 +6220,8 @@ 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_.maxNrOfMembers == 0){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ if(not ispresent(v_primitiveContentRetrieveResource.group_.maxNrOfMembers)){
+ setverdict(fail, __SCOPE__ & ": Error: maxNrOfMembers attribute deleted")
}
}
}
@@ -6246,8 +6246,8 @@ module OneM2M_Testcases_CSE_Release_1 {
v_primitiveContentRetrieveResource := f_getPrimitiveContentRetrievedResource(v_ae1);
//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")
+ if(not ispresent(v_primitiveContentRetrieveResource.accessControlPolicy.selfPrivileges)) {
+ setverdict(fail, __SCOPE__ & ": Error: selfPrivileges attribute deleted")
}
}
}
@@ -6271,8 +6271,8 @@ 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.notificationURI == {"NullTarget"}){
- setverdict(fail, __SCOPE__ & ": Error: Expiration time attribute updated")
+ if(not ispresent(v_primitiveContentRetrieveResource.subscription.notificationURI)){
+ setverdict(fail, __SCOPE__ & ": Error: notificationURI attribute deleted")
}
}
}
@@ -6618,6 +6618,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var AcpType v_accessControlPolicyIDs_1 := {"NotInitialized_1"};
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
+ var RequestPrimitive v_requestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var template RequestPrimitive v_createRequest := m_createContainerBase;
@@ -6631,10 +6632,11 @@ module OneM2M_Testcases_CSE_Release_1 {
if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.container)) {
- if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+ if(v_responsePrimitive.primitiveContent.container.accessControlPolicyIDs != v_requestPrimitive.primitiveContent.container.accessControlPolicyIDs){
setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
}
}
@@ -6770,6 +6772,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AcpType v_accessControlPolicyIDs_2 := {"NotInitialized_2"};
var template RequestPrimitive v_createRequest := m_createSubscriptionBase;
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+ var RequestPrimitive v_requestPrimitive;
var ResponsePrimitive v_responsePrimitive;
v_createRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_1;
v_updateRequest.primitiveContent.subscription.accessControlPolicyIDs := v_accessControlPolicyIDs_2;
@@ -6780,10 +6783,11 @@ module OneM2M_Testcases_CSE_Release_1 {
if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_requestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
- if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_accessControlPolicyIDs_2){
+ if(v_responsePrimitive.primitiveContent.subscription.accessControlPolicyIDs != v_requestPrimitive.primitiveContent.subscription.accessControlPolicyIDs){
setverdict(fail, __SCOPE__ & ": Error: AccessControlPolicyIDs attribute not updated correctly")
}
}
@@ -7410,6 +7414,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var ListOfURIs v_membersAccessControlPolicyIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
+ var RequestPrimitive v_updateRequestPrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.membersAccessControlPolicyIDs := v_membersAccessControlPolicyIDs;
v_ae1.start(f_CSE_DMR_UPD_015(int9, m_createGroupBase, v_updateRequest, true));//Group
@@ -7418,10 +7423,11 @@ module OneM2M_Testcases_CSE_Release_1 {
if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
- if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
+ if(v_responsePrimitive.primitiveContent.group_.membersAccessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
}
}
@@ -7430,7 +7436,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.membersAccessControlPolicyIDs != v_membersAccessControlPolicyIDs){
+ if(v_primitiveContentRetrieveResource.group_.membersAccessControlPolicyIDs != valueof(v_updateRequestPrimitive.primitiveContent.group_.membersAccessControlPolicyIDs)){
setverdict(fail, __SCOPE__ & ": Error: Members Access Control Policy IDs attribute not updated correctly")
}
}
@@ -7480,7 +7486,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_CSR_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateRemoteCSEBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7546,7 +7552,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_AE_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateAeBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7614,7 +7620,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_CNT_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateContainerBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7648,7 +7654,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_ACP_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateAcpBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7748,7 +7754,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_SUB_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7785,6 +7791,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_notificationURI := {"NotReachableNotificationURI"};
var template RequestPrimitive v_updateRequest := m_updateSubscriptionBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7796,10 +7803,11 @@ module OneM2M_Testcases_CSE_Release_1 {
if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.subscription)) {
- if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_notificationURI){
+ if(v_responsePrimitive.primitiveContent.subscription.notificationURI != v_updateRequestPrimitive.primitiveContent.subscription.notificationURI){
setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
}
}
@@ -7808,7 +7816,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.subscription)) {
- if(v_primitiveContentRetrieveResource.subscription.notificationURI != v_notificationURI){
+ if(v_primitiveContentRetrieveResource.subscription.notificationURI != v_updateRequestPrimitive.primitiveContent.subscription.notificationURI){
setverdict(fail, __SCOPE__ & ": Error: Notification URI attribute not updated correctly")
}
}
@@ -7852,7 +7860,7 @@ module OneM2M_Testcases_CSE_Release_1 {
testcase TC_CSE_DMR_UPD_016_GRP_ET() runs on Tester system CseSystem {
var verdicttype v_verdict;
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var Timestamp v_expirationTime := "21001231T012345";
+ var Timestamp v_expirationTime := "20301231T012345";
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
@@ -7922,6 +7930,7 @@ module OneM2M_Testcases_CSE_Release_1 {
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
var ListOfURIs v_memberIDs := {"NotInitialized"};
var template RequestPrimitive v_updateRequest := m_updateGroupBase;
+ var RequestPrimitive v_updateRequestPrimitive;
var ResponsePrimitive v_responsePrimitive;
var PrimitiveContent v_primitiveContentRetrieveResource;
v_updateRequest.primitiveContent.group_.memberIDs := v_memberIDs;
@@ -7932,10 +7941,11 @@ module OneM2M_Testcases_CSE_Release_1 {
if(v_verdict == pass){ v_responsePrimitive := f_getResponsePrimitive(v_ae1);
+ v_updateRequestPrimitive := f_getRequestPrimitive(v_ae1);
//Check attribute 1
if(ispresent(v_responsePrimitive.primitiveContent)) {
if(ischosen(v_responsePrimitive.primitiveContent.group_)) {
- if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_memberIDs){
+ if(v_responsePrimitive.primitiveContent.group_.memberIDs != v_updateRequestPrimitive.primitiveContent.group_.memberIDs){
setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
}
}
@@ -7944,7 +7954,7 @@ module OneM2M_Testcases_CSE_Release_1 {
//Check that the resource has been udpated correctly
if(ischosen(v_primitiveContentRetrieveResource.group_)) {
- if(v_primitiveContentRetrieveResource.group_.memberIDs != v_memberIDs){
+ if(v_primitiveContentRetrieveResource.group_.memberIDs != v_updateRequestPrimitive.primitiveContent.group_.memberIDs){
setverdict(fail, __SCOPE__ & ": Error: Member IDs attribute not updated correctly")
}
}
--
GitLab