Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
TST
ATS
Commits
000df39a
Commit
000df39a
authored
Feb 19, 2018
by
Miguel Angel Reina Ortega
Browse files
Proposed changes implemented. Closing
#23
Signed-off-by:
reinaortega
<
miguelangel.reinaortega@etsi.org
>
parent
6f9d5d9c
Changes
3
Hide whitespace changes
Inline
Side-by-side
OneM2M_TestControl_IN_profile.ttcn
View file @
000df39a
...
...
@@ -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
());}
...
...
OneM2M_TestControl_MN_profile.ttcn
View file @
000df39a
...
...
@@ -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
());}
...
...
OneM2M_Testcases_CSE_Release_1.ttcn
View file @
000df39a
...
...
@@ -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
:=
{{
"
expir
ation
Time
"
,
omit
}};
v_nullFields
:=
{{
"
notific
ation
URI
"
,
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"
)
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment