Skip to content
Snippets Groups Projects
Commit e2415097 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Some enhancements and compilation errors fixed 


Signed-off-by: Miguel Angel Reina Ortega's avatarMiguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
parent 49a6dfce
No related branches found
No related tags found
2 merge requests!25Ae fixes,!16Stf531 dmr cre testcases
This commit is part of merge request !16. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
LibOneM2M/OneM2M_Templates.ttcn
+ 1
− 0
View file @ e2415097
......@@ -1816,6 +1816,7 @@ module OneM2M_Templates {
applicableCredIDs := omit,
allowedApp_IDs := omit,
allowedAEs := omit,
allowedRole_IDs := omit,
choice := omit //NP
};
}//end group ContentCreate
......
OneM2M_Testcases.ttcn
+ 29
− 132
View file @ e2415097
......@@ -1175,11 +1175,10 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;//TODO useless but need to be initialized see if we can remove it
v_createRequest.primitiveContent.container_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, {}, v_notifyHandler); //Container
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, -, v_notifyHandler); //Container
log(v_responsePrimitive);
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.container_optional.resourceName)){
......@@ -1193,11 +1192,10 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.group_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, {valueof(m_createAeAux(omit,omit))},v_notifyHandler);//Container
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, m_createAeAux(omit,omit),v_notifyHandler);//Container
log(v_responsePrimitive);
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.group_optional.resourceName)){
......@@ -1211,12 +1209,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createContainerBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, {valueof(m_createContainerBase)}, v_notifyHandler);//Container
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int3, v_createRequest, m_createContainerBase, v_notifyHandler);//Container
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1229,12 +1226,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, {}, v_notifyHandler);//Group
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, -, v_notifyHandler);//Group
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1247,12 +1243,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createGroupBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, {valueof(m_createAeAux(omit,omit))}, v_notifyHandler);//Group
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int9, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Group
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1265,12 +1260,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, {}, v_notifyHandler);//AccessControlPolicy
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, -, v_notifyHandler);//AccessControlPolicy
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1283,12 +1277,11 @@ module OneM2M_Testcases {
// Local variables
var template RequestPrimitive v_createRequest := m_createAcpBase;
var ResponsePrimitive v_responsePrimitive;
var integer v_sizeResourceTypeList;
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.accessControlPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, {valueof(m_createAeAux(omit,omit))}, v_notifyHandler);//AccessControlPolicy
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int1, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//AccessControlPolicy
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.accessControlPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1304,7 +1297,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, {}, v_notifyHandler);//Schedule
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, -, v_notifyHandler);//Schedule
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
......@@ -1321,7 +1314,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, {valueof(m_createAeAux(omit,omit))}, v_notifyHandler);//Schedule
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Schedule
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
......@@ -1338,7 +1331,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.schedule_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, {valueof(m_createSubscriptionBase)}, v_notifyHandler);//Schedule
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int18, v_createRequest, m_createSubscriptionBase, v_notifyHandler);//Schedule
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.schedule_optional.resourceName)){
......@@ -1357,7 +1350,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.pollingChannel_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int15, v_createRequest, {valueof(m_createAeAux(omit,omit))}, v_notifyHandler);//PollingChannel
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int15, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//PollingChannel
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.pollingChannel_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1373,7 +1366,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, -, v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1389,7 +1382,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {valueof(m_createAeAux(omit,omit))}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createAeAux(omit,omit), v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1405,7 +1398,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {valueof(m_createContainerBase)}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createContainerBase, v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1421,7 +1414,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {valueof(m_createAcpBase)}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createAcpBase, v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1436,7 +1429,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {valueof(m_createScheduleBase)}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createScheduleBase, v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1451,7 +1444,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.subscription_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, {valueof(m_createGroupBase)}, v_notifyHandler);//Subscription
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int23, v_createRequest, m_createGroupBase, v_notifyHandler);//Subscription
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.subscription_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1467,7 +1460,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.node_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int14, v_createRequest, {}, v_notifyHandler);//Node
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int14, v_createRequest, -, v_notifyHandler);//Node
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.node_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1483,7 +1476,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.mgmtResource_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int12, v_createRequest, {}, v_notifyHandler);//Management Command
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int12, v_createRequest, -, v_notifyHandler);//Management Command
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.mgmtResource_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1499,7 +1492,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.locationPolicy_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int10, v_createRequest, {}, v_notifyHandler);//Location Policy
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int10, v_createRequest, -, v_notifyHandler);//Location Policy
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.locationPolicy_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1516,7 +1509,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.statsConfig_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int22, v_createRequest, {}, v_notifyHandler);//Stats Config
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int22, v_createRequest, -, v_notifyHandler);//Stats Config
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.statsConfig_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1532,7 +1525,7 @@ module OneM2M_Testcases {
v_createRequest.primitiveContent.statsCollect_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int21, v_createRequest, {}, v_notifyHandler);//Stats Collect
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int21, v_createRequest, -, v_notifyHandler);//Stats Collect
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.statsCollect_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1548,7 +1541,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.m2mServiceSubscriptionProfile_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int11, v_createRequest, {}, v_notifyHandler);//Subscription Profile
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int11, v_createRequest, -, v_notifyHandler);//Subscription Profile
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.m2mServiceSubscriptionProfile_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1564,7 +1557,7 @@ module OneM2M_Testcases {
var CseTester v_notifyHandler := CseTester.create("NotifyHandler") alive;
v_createRequest.primitiveContent.serviceSubscribedAppRule_optional.resourceName := omit;
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int19, v_createRequest, {}, v_notifyHandler);//Service Subscribed App
v_responsePrimitive := f_CSE_DMR_CRE_BV_001(int19, v_createRequest, -, v_notifyHandler);//Service Subscribed App
if(getverdict == pass){
if(not ispresent(v_responsePrimitive.primitiveContent.serviceSubscribedAppRule_optional.resourceName)){
setverdict(fail, testcasename(), ": Error, resourceName attribute not provided");
......@@ -1573,7 +1566,7 @@ module OneM2M_Testcases {
}
function f_CSE_DMR_CRE_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitiveList p_requestPrimitiveList := omit, in CseTester p_notifyHandler) runs on CseTester return ResponsePrimitive {
function f_CSE_DMR_CRE_BV_001(ResourceType p_resourceType, template RequestPrimitive p_requestPrimitive, in template (omit) RequestPrimitive p_parentRequestPrimitive := omit, in CseTester p_notifyHandler) runs on CseTester return ResponsePrimitive {
// Local variables
var MsgIn v_response;
......@@ -1593,13 +1586,13 @@ module OneM2M_Testcases {
// Preamble
if(ispresent(p_requestPrimitiveList)) {
if(match(int23, p_requestPrimitiveList[0].resourceType)){
if(ispresent(p_parentRequestPrimitive)) {
if(match(int23, p_parentRequestPrimitive.resourceType)){
v_ae2Index := f_cse_createResource(int2, m_createAe(PX_APP_ID, -, PX_AE2_ID_STEM, "MyAe2", v_poaList), -1); // AE2 is registred
p_requestPrimitiveList[0].primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_parentRequestPrimitive.primitiveContent.subscription_optional.notificationURI := {f_getResourceAddress(v_ae2Index)};
p_notifyHandler.start(f_subscriptionVerificationHandler(f_getResourceAddress(v_parentIndex)));
}
v_parentIndex := f_cse_createResource(p_requestPrimitiveList[i].resourceType, p_requestPrimitiveList[i], v_parentIndex);
v_parentIndex := f_cse_createResource(valueof(p_parentRequestPrimitive.resourceType), p_parentRequestPrimitive, v_parentIndex);
}
// Test Body
......@@ -10543,19 +10536,11 @@ module OneM2M_Testcases {
group g_CSE_DIS_BV_001{
testcase TC_CSE_DIS_BV_001() runs on CseTester system CseSystem {
// Local variables
<<<<<<< HEAD
var MsgIn v_response;
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
=======
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
var integer v_childResourceIndex := -1;
>>>>>>> master
const ResourceType c_containerResourceType := int3;
// Test control
......@@ -10569,26 +10554,11 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
<<<<<<< HEAD
=======
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
>>>>>>> master
v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
<<<<<<< HEAD
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
if(not ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
setverdict(fail, testcasename() & ": URI List Representation not present");
}
else
{
setverdict(pass, testcasename() & ": URI List Representation available");
}
=======
[] mcaPort.receive(mw_response(mw_responseDiscovery)){
tc_ac.stop;
setverdict(pass, testcasename() & ": URI List Representation available");
......@@ -10596,7 +10566,6 @@ module OneM2M_Testcases {
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
>>>>>>> master
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
......@@ -10624,12 +10593,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
<<<<<<< HEAD
var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
=======
var integer v_childResourceIndex := -1;
>>>>>>> master
const ResourceType c_containerResourceType := int3;
// Test control
......@@ -10643,33 +10607,18 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
<<<<<<< HEAD
=======
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
>>>>>>> master
v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
<<<<<<< HEAD
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
if(not ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
=======
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
if(sizeof(v_response.primitive.responsePrimitive.primitiveContent.uRIList) == 0){
>>>>>>> master
setverdict(pass, testcasename() & ": No Content is present");
}
else
{
<<<<<<< HEAD
setverdict(fail, testcasename() & ": Content available");
}
}
=======
setverdict(fail, testcasename() & ": Wrong content available in URIList element");
}
}
......@@ -10677,7 +10626,6 @@ module OneM2M_Testcases {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
}
>>>>>>> master
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Error while retrieving resource");
......@@ -10703,12 +10651,7 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
<<<<<<< HEAD
var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
=======
var integer v_childResourceIndex := -1;
>>>>>>> master
const ResourceType c_containerResourceType := int3;
// Test control
......@@ -10722,27 +10665,11 @@ module OneM2M_Testcases {
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
<<<<<<< HEAD
=======
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
>>>>>>> master
v_request := valueof(m_retrieveResourceDiscResTypeFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int2, int1));
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
<<<<<<< HEAD
[] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
tc_ac.stop;
if(not ischosen(v_response.primitive.responsePrimitive.primitiveContent.uRIList)){
setverdict(fail, testcasename() & ": URI List Representation containing unstructured addresses not present");
}
else
{
setverdict(pass, testcasename() & ": URI List Representation containing unstructured addresses available");
}
}
=======
[] mcaPort.receive(mw_response(mw_responseDiscovery)) -> value v_response {
tc_ac.stop;
if (f_isNonHierarchical(v_response.primitive.responsePrimitive.primitiveContent.uRIList[0])) {
......@@ -10755,7 +10682,6 @@ module OneM2M_Testcases {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong responseStatusCode while retrieving resource");
}
>>>>>>> master
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Error while retrieving resource");
......@@ -10774,8 +10700,6 @@ module OneM2M_Testcases {
} //end group g_CSE_DIS_BV_004
<<<<<<< HEAD
=======
group g_CSE_DIS_BO_005{
testcase TC_CSE_DIS_BO_005() runs on CseTester system CseSystem {
// Local variables
......@@ -10834,7 +10758,6 @@ module OneM2M_Testcases {
} //end group g_CSE_DIS_BO_005
>>>>>>> master
group g_CSE_DIS_BO_006
{
testcase TC_CSE_DIS_BO_006() runs on CseTester system CseSystem {
......@@ -10843,14 +10766,8 @@ module OneM2M_Testcases {
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
var RequestPrimitive v_request;
<<<<<<< HEAD
var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
const ResourceType c_containerResourceType := int3;
=======
const ResourceType c_containerResourceType := int3;
var XSD.ID v_resourceId := "nonexisting";
>>>>>>> master
// Test control
......@@ -10861,10 +10778,6 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
<<<<<<< HEAD
v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex), int1));
=======
if(PX_ADDRESSING_METHOD == e_nonHierarchical and (PX_PRIMITIVE_SCOPE == e_cseRelative)) {
v_request := valueof(m_retrieveResourceFilterUsageOption(v_resourceId, f_getOriginator(v_aeIndex), int1));
......@@ -10872,7 +10785,6 @@ module OneM2M_Testcases {
v_request := valueof(m_retrieveResourceFilterUsageOption(f_getResourceAddress(v_aeIndex) & "/" & v_resourceId, f_getOriginator(v_resourceIndex), int1));
}
>>>>>>> master
mcaPort.send(m_request(v_request));
tc_ac.start;
alt {
......@@ -10883,15 +10795,11 @@ module OneM2M_Testcases {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
<<<<<<< HEAD
setverdict(fail, testcasename() & ": Error while retrieving resource");
=======
setverdict(fail, testcasename() & ": Wrong response status code while retrieving resource");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveOK)) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong response while retrieving resource");
>>>>>>> master
}
[] tc_ac.timeout {
setverdict(fail, testcasename() & ": No answer while retrieving resource");
......@@ -10917,10 +10825,7 @@ module OneM2M_Testcases {
var RequestPrimitive v_request;
var CseTester v_notifyHandler;
var integer v_ae2Index := -1;
<<<<<<< HEAD
=======
var integer v_childResourceIndex := -1;
>>>>>>> master
const ResourceType c_containerResourceType := int3;
// Test control
......@@ -10933,12 +10838,8 @@ module OneM2M_Testcases {
// Preamble
v_aeIndex := f_cse_preamble_registerAe();//AE1 is registred;
<<<<<<< HEAD
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
=======
v_resourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_aeIndex);
v_childResourceIndex := f_cse_createResource(c_containerResourceType, m_createContainerBase, v_resourceIndex);
>>>>>>> master
v_request := valueof(m_retrieveResourceInvalidFormatOption(f_getResourceAddress(v_resourceIndex), f_getOriginator(v_resourceIndex)));
mcaPort.send(m_request(v_request));
tc_ac.start;
......@@ -10950,15 +10851,11 @@ module OneM2M_Testcases {
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
<<<<<<< HEAD
setverdict(fail, testcasename() & ": Error while retrieving resource");
=======
setverdict(fail, testcasename() & ": Wrong response status code while retrieving resource");
}
[] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
tc_ac.stop;
setverdict(fail, testcasename() & ": Wrong response while retrieving resource");
>>>>>>> master
}
[] tc_ac.timeout {
setverdict(fail, testcasename() & ": No answer while retrieving resource");
......
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