diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 083b737180a37c539c57e615aff7fef73e2fa511..9b7ba6723402d87d916a7be746c3f4d09cd9030e 100644
--- a/OneM2M_TestControl.ttcn
+++ b/OneM2M_TestControl.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_TestControl.ttcn $
- * $Id: OneM2M_TestControl.ttcn 319 2017-07-14 15:20:23Z reinaortega $
+ * $Id: OneM2M_TestControl.ttcn 320 2017-07-14 16:03:52Z reinaortega $
* @desc Test control module for oneM2M
*
*/
@@ -245,12 +245,12 @@ module OneM2M_TestControl {
execute(TC_CSE_GMG_004_UPD());
execute(TC_CSE_GMG_004_RET());
execute(TC_CSE_GMG_004_DEL());
- execute(TC_CSE_DIS_BV_001());
- execute(TC_CSE_DIS_BV_003());
- execute(TC_CSE_DIS_BV_004());
- execute(TC_CSE_DIS_BO_005());
- execute(TC_CSE_DIS_BO_006());
- execute(TC_CSE_DIS_BI_007());
+ execute(TC_CSE_DIS_001());
+ execute(TC_CSE_DIS_003());
+ execute(TC_CSE_DIS_004());
+ execute(TC_CSE_DIS_005());
+ execute(TC_CSE_DIS_006());
+ execute(TC_CSE_DIS_007());
execute(TC_CSE_SUB_CRE_001_SUB());
execute(TC_CSE_SUB_CRE_001_SUB());
execute(TC_CSE_SUB_CRE_002());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 365765f551b6f400a029a083267c3759f80ff0f8..2dff10acce952b6ca74d410d2d5f9356aa922047 100644
--- a/OneM2M_Testcases.ttcn
+++ b/OneM2M_Testcases.ttcn
@@ -7,7 +7,7 @@
*
* @author oneM2M
* @version $URL: https://oldforge.etsi.org/svn/oneM2M/trunk/ttcn/OneM2M_Testcases.ttcn $
- * $Id: OneM2M_Testcases.ttcn 319 2017-07-14 15:20:23Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 320 2017-07-14 16:03:52Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -11858,8 +11858,12 @@ module OneM2M_Testcases {
group Discovery {
- group g_CSE_DIS_BV_001{
- testcase TC_CSE_DIS_BV_001() runs on CseTester system CseSystem {
+ group g_CSE_DIS_001{
+ /**
+ * @desc Check that the IUT returns successfully a list all discovered resource addresses
+ *
+ */
+ testcase TC_CSE_DIS_001() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -11906,13 +11910,18 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BV_001
+ } // end TC_CSE_DIS_001
- } //end group g_CSE_DIS_BV_001
+ } //end group g_CSE_DIS_001
- group g_CSE_DIS_BV_003
+ group g_CSE_DIS_003
{
- testcase TC_CSE_DIS_BV_003() runs on CseTester system CseSystem {
+
+ /**
+ * @desc Check that the IUT returns the empty address list when no result matching with filter criteria is discovered
+ *
+ */
+ testcase TC_CSE_DIS_003() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -11965,12 +11974,16 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BV_003
- } //end group g_CSE_DIS_BV_003
+ } // end TC_CSE_DIS_003
+ } //end group g_CSE_DIS_003
- group g_CSE_DIS_BV_004
+ group g_CSE_DIS_004
{
- testcase TC_CSE_DIS_BV_004() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT returns successfully a list of discovered resource addresses with Non-hierarchical addressing form when the Discovery Result Type is provided in the request
+ *
+ */
+ testcase TC_CSE_DIS_004() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -12021,12 +12034,17 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BV_004
+ } // end TC_CSE_DIS_004
- } //end group g_CSE_DIS_BV_004
+ } //end group g_CSE_DIS_004
- group g_CSE_DIS_BO_005{
- testcase TC_CSE_DIS_BO_005() runs on CseTester system CseSystem {
+ group g_CSE_DIS_005{
+
+ /**
+ * @desc Check that the IUT rejects the discovery requests to the resource TARGET_RESOURCE_ADDRESS when AE has no privilege to perform the discovery request for the resource TARGET_RESOURCE_ADDRESS
+ *
+ */
+ testcase TC_CSE_DIS_005() runs on CseTester system CseSystem {
// Local variables
var integer v_aeIndex := -1;
var integer v_resourceIndex := -1;
@@ -12079,13 +12097,18 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BO_005
+ } // end TC_CSE_DIS_005
- } //end group g_CSE_DIS_BO_005
+ } //end group g_CSE_DIS_005
- group g_CSE_DIS_BO_006
+ group g_CSE_DIS_006
{
- testcase TC_CSE_DIS_BO_006() runs on CseTester system CseSystem {
+
+ /**
+ * @desc Check that the IUT responds with an error when the AE sends requests to discover the resource TARGET_RESOURCE_ADDRESS which does not exist in the Hosting CSE
+ *
+ */
+ testcase TC_CSE_DIS_006() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -12136,13 +12159,17 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BO_006
+ } // end TC_CSE_DIS_006
- } //end group g_CSE_DIS_BO_006
+ } //end group g_CSE_DIS_006
- group g_CSE_DIS_BI_007
+ group g_CSE_DIS_007
{
- testcase TC_CSE_DIS_BI_007() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT responds the originator with an error when the originator sends a request including an invalid format of filter criteria to discover the resource TARGET_RESOURCE_ADDRESS
+ *
+ */
+ testcase TC_CSE_DIS_007() runs on CseTester system CseSystem {
// Local variables
var MsgIn v_response;
var integer v_aeIndex := -1;
@@ -12192,8 +12219,8 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- } // end TC_CSE_DIS_BI_007
- } //end group g_CSE_DIS_BI_007
+ } // end TC_CSE_DIS_007
+ } //end group g_CSE_DIS_007
} //end group Group Discovery