Commit 89708191 authored by Pramod Kulkarni's avatar Pramod Kulkarni
Browse files

Aligning the TP numbers with TS00018 REG/CRE section


Signed-off-by: Pramod Kulkarni's avatarpkulkarni <pkulkarni75@gmail.com>
parent 7da9b134
......@@ -1243,34 +1243,34 @@ module OneM2M_Testcases_CSE {
}; //end TC_CSE_REG_CRE_010
group g_CSE_REG_CRE_013 {
group g_CSE_REG_CRE_012 {
testcase TC_CSE_REG_CRE_013_AE_LBL() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_012_AE_LBL() runs on AeSimu system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
m_create.primitiveContent.aE.labels := {"labels"};
}
testcase TC_CSE_REG_CRE_013_AE_APN() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_012_AE_APN() runs on AeSimu system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
m_create.primitiveContent.aE.appName := "AeAppName";
}
testcase TC_CSE_REG_CRE_013_AE_POA() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_012_AE_POA() runs on AeSimu system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
m_create.primitiveContent.aE.pointOfAccess := {PX_AE1_ADDRESS};
}
testcase TC_CSE_REG_CRE_013_AE_NL() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_012_AE_NL() runs on AeSimu system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
m_create.primitiveContent.aE.nodeLink := "http://127.0.0.1/";
}
testcase TC_CSE_REG_CRE_013_AE_OR() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_012_AE_OR() runs on AeSimu system CseSystem {
var template RequestPrimitive m_create := m_createAe(PX_APP_ID, omit, omit);
m_create.primitiveContent.aE.ontologyRef := "MyOntologyRef";
}
function TC_CSE_REG_CRE_013(in template RequestPrimitive p_createAe) runs on AeSimu {
function TC_CSE_REG_CRE_012(in template RequestPrimitive p_createAe) runs on AeSimu {
//Local variables
var MsgIn v_response;
......@@ -1313,13 +1313,13 @@ module OneM2M_Testcases_CSE {
}
group g_CSE_REG_CRE_016 {
group g_CSE_REG_CRE_013 {
/**
* @desc Check that the IUT accepts a create request of <remoteCSE> resource with OPTIONAL_ATTRIBUTE.
*
*/
testcase TC_CSE_REG_CRE_016_LBL() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_013_LBL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"labels", omit};
......@@ -1327,12 +1327,12 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.remoteCSE.labels := {"MyLabel"};
v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_016_CST() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_013_CST() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"cseType", omit};
......@@ -1340,11 +1340,11 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.remoteCSE.cseType := int1;
v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_016_POA() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_013_POA() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"pointOfAccess", omit};
......@@ -1352,12 +1352,12 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_016_NL() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_013_NL() runs on Tester system CseSystem {
// Local variables
var template RequestPrimitive v_createRequest := m_createRemoteCSEBase;
const AttributeAux c_optionalAttribute := {"nodeLink", omit};
......@@ -1365,12 +1365,12 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.remoteCSE.nodeLink := c_defaultNodeID;
v_cse1.start(f_CSE_REG_CRE_016(v_createRequest, c_optionalAttribute));
v_cse1.start(f_CSE_REG_CRE_013(v_createRequest, c_optionalAttribute));
v_cse1.done;
}
function f_CSE_REG_CRE_016(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
function f_CSE_REG_CRE_013(template RequestPrimitive p_requestPrimitive, in AttributeAux p_optionalAttribute) runs on CseSimu {
// Local variables
var MsgIn v_response;
......@@ -1422,15 +1422,15 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}//end f_CSE_REG_CRE_BV_016
}//end f_CSE_REG_CRE_BV_013
}// end group g_CSE_REG_CRE_BV_016
}// end group g_CSE_REG_CRE_BV_013
/**
* @desc Check that the IUT rejects an AE registration (not allowed App-ID)
*
*/
testcase TC_CSE_REG_CRE_019() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_016() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
......@@ -1476,8 +1476,8 @@ module OneM2M_Testcases_CSE {
* @desc Check that the IUT rejects a create request of <AE> resource that doesn’t include the MANDATORY_ATTRIBUTE
*
*/
group g_CSE_REG_CRE_021 {
testcase TC_CSE_REG_CRE_021_API() runs on Tester system CseSystem {
group g_CSE_REG_CRE_017 {
testcase TC_CSE_REG_CRE_017_API() runs on Tester system CseSystem {
//Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
......@@ -1485,11 +1485,11 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.aE.app_ID := omit; //Mandatory app_ID field is being set empty
v_ae1.start(f_CSE_REG_CRE_021(v_createRequest));
v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
v_ae1.done;
}//end TC_CSE_REG_CRE_021_API
testcase TC_CSE_REG_CRE_021_RR() runs on Tester system CseSystem {
}//end TC_CSE_REG_CRE_017_API
testcase TC_CSE_REG_CRE_017_RR() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;
......@@ -1497,12 +1497,12 @@ module OneM2M_Testcases_CSE {
v_createRequest.primitiveContent.aE.requestReachability := omit; //Mandatory requestReachability field is being set empty
v_ae1.start(f_CSE_REG_CRE_021(v_createRequest));
v_ae1.start(f_CSE_REG_CRE_017(v_createRequest));
v_ae1.done;
}//end TC_CSE_REG_CRE_021_RR
}//end TC_CSE_REG_CRE_017_RR
function f_CSE_REG_CRE_021(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
function f_CSE_REG_CRE_017(template RequestPrimitive p_createRequestPrimitive) runs on AeSimu {
//Local variables
var ResourceType v_resourceType := int2;
......@@ -1545,13 +1545,13 @@ module OneM2M_Testcases_CSE {
f_cf01Down();
}
}//end g_CSE_REG_CRE_021
}//end g_CSE_REG_CRE_017
/**
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1.
*
*/
testcase TC_CSE_REG_CRE_022() runs on CseSimu system CseSystem {
testcase TC_CSE_REG_CRE_018() runs on CseSimu system CseSystem {
// Local variables
var MsgIn v_response;
......@@ -1599,13 +1599,13 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_022
}//end TC_CSE_REG_CRE_018
/**
* @desc Check that the IUT accepts an create request of <remoteCSE> resource with attributes multiplicity equals to 1 without the preconfigured CSE-ID
*
*/
testcase TC_CSE_REG_CRE_023() runs on CseSimu system CseSystem {
testcase TC_CSE_REG_CRE_019() runs on CseSimu system CseSystem {
// Local variables
var MsgIn v_response;
......@@ -1649,13 +1649,13 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_023
}//end TC_CSE_REG_CRE_019
/**
* @desc Check that the IUT rejects the create request of <CSEBase> resource.
*
*/
testcase TC_CSE_REG_CRE_025() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_021() runs on AeSimu system CseSystem {
// Local variables
var MsgIn v_response;
......@@ -1699,12 +1699,12 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf01Down();
}//end TC_CSE_REG_CRE_025
}//end TC_CSE_REG_CRE_021
/**
* @desc Check that the IUT rejects the create request of <CSEBase> resource.
*
*/
testcase TC_CSE_REG_CRE_027() runs on AeSimu system CseSystem {
// Local variables
......@@ -1746,13 +1746,13 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf02Down();
}//end TC_CSE_REG_CRE_027
}end TC_CSE_REG_CRE_027*/
/**
* @desc Check that the IUT rejects registration of already registered AE (C-AE-ID-STEM provided by AE)
*
*/
testcase TC_CSE_REG_CRE_028() runs on AeSimu system CseSystem {
testcase TC_CSE_REG_CRE_023() runs on AeSimu system CseSystem {
var MsgIn v_response;
var RequestPrimitive v_request;
......@@ -1798,7 +1798,7 @@ module OneM2M_Testcases_CSE {
}
testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
/*testcase TC_CSE_REG_CRE_029() runs on CseSimu system CseSystem {
var MsgIn v_response;
......@@ -1837,52 +1837,14 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}
}*/
/**
* @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
*
*/
testcase TC_CSE_REG_CRE_030() runs on CseSimu system CseSystem {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
var RequestPrimitive v_request;
var template PrimitiveContent v_contentResponse;
// Test control
// Test component configuration
f_cf04Up();
// Test adapter configuration
// Preamble
v_request := valueof(m_createRemoteCSEBase);
v_contentResponse.remoteCSE := mw_contentRemoteCSEBase;
//Test Body
vc_remoteCseIndex := f_cse_registerRemoteCse(v_request, v_contentResponse);
//Check if the resource has been deleted or not
if(f_cse_isResourcePresent(vc_remoteCseIndex)) {
setverdict(pass, __SCOPE__ & ":INFO: Resource created");
} else {
setverdict(fail, __SCOPE__ & ":INFO: Resource not created");
}
// Postamble
f_cse_postamble_deleteResourcesCSE();
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_030
/**
* @desc Check that IUT accepts a CSE registration request with cseType attribute set to ‘MN_CSE’
*
*/
testcase TC_CSE_REG_CRE_033() runs on CseSimu system CseSystem {
testcase TC_CSE_REG_CRE_027() runs on CseSimu system CseSystem {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
var RequestPrimitive v_request;
......@@ -1917,15 +1879,15 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_033
}//end TC_CSE_REG_CRE_027
/**
* @desc Check that IUT accepts a CSE registration request with OPTIONAL_ATTRIBUTE attribute
*
*/
group g_CSE_REG_CRE_034 {
group g_CSE_REG_CRE_028 {
testcase TC_CSE_REG_CRE_034_RN() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_028_RN() runs on Tester system CseSystem {
//Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var RequestPrimitive v_request;
......@@ -1939,12 +1901,12 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.resourceName := c_defaultRemoteCSEResourceName;
v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_034_ET() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_028_ET() runs on Tester system CseSystem {
//Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var RequestPrimitive v_request;
......@@ -1958,12 +1920,12 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.expirationTime := "20301231T012345";
v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_034_LBL() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_028_LBL() runs on Tester system CseSystem {
//Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var RequestPrimitive v_request;
......@@ -1978,12 +1940,12 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.labels := v_labels_1;
v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_034_POA() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_028_POA() runs on Tester system CseSystem {
//Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var RequestPrimitive v_request;
......@@ -1997,12 +1959,12 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.pointOfAccess := {"http://" & PX_CSE1_ADDRESS & "/"};
v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
}
testcase TC_CSE_REG_CRE_034_NL() runs on Tester system CseSystem {
testcase TC_CSE_REG_CRE_028_NL() runs on Tester system CseSystem {
//Local variables
var CseSimu v_cse1 := CseSimu.create("CSE1") alive;
var RequestPrimitive v_request;
......@@ -2016,12 +1978,12 @@ module OneM2M_Testcases_CSE {
v_contentResponse.remoteCSE.cseType := int2; //MN_CSE
v_contentResponse.remoteCSE.nodeLink := c_defaultNodeID;
v_cse1.start(f_CSE_REG_CRE_034(v_request, v_contentResponse));
v_cse1.start(f_CSE_REG_CRE_028(v_request, v_contentResponse));
v_cse1.done;
}
function f_CSE_REG_CRE_034(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
function f_CSE_REG_CRE_028(RequestPrimitive p_request, template PrimitiveContent p_contentResponse) runs on CseSimu{ //system CseSystem {
//Local variables
var ResourceType v_resourceType := int16; //remoteCSE
// Test control
......@@ -2050,8 +2012,8 @@ module OneM2M_Testcases_CSE {
// Tear down
f_cf04Down();
}//end TC_CSE_REG_CRE_034
}//end g_CSE_REG_CRE_034
}//end TC_CSE_REG_CRE_028
}//end g_CSE_REG_CRE_028
} //end group Create
......
Markdown is supported
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