diff --git a/OneM2M_TestControl.ttcn b/OneM2M_TestControl.ttcn
index 9b7ba6723402d87d916a7be746c3f4d09cd9030e..6071774e3099338b1ea3454b8b826fa20b3e75ea 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 320 2017-07-14 16:03:52Z reinaortega $
+ * $Id: OneM2M_TestControl.ttcn 321 2017-07-14 18:16:07Z reinaortega $
* @desc Test control module for oneM2M
*
*/
@@ -17,6 +17,18 @@ module OneM2M_TestControl {
import from OneM2M_Testcases all;
control {
+ execute(TC_CSE_GEN_CRE_001_CSR());
+ execute(TC_CSE_GEN_CRE_001_SPR());
+ execute(TC_CSE_GEN_CRE_001_ABS());
+ execute(TC_CSE_GEN_RET_001_CSR());
+ execute(TC_CSE_GEN_RET_001_SPR());
+ execute(TC_CSE_GEN_RET_001_ABS());
+ execute(TC_CSE_GEN_UPD_001_CSR());
+ execute(TC_CSE_GEN_UPD_001_SPR());
+ execute(TC_CSE_GEN_UPD_001_ABS());
+ execute(TC_CSE_GEN_DEL_001_CSR());
+ execute(TC_CSE_GEN_DEL_001_SPR());
+ execute(TC_CSE_GEN_DEL_001_ABS());
execute(TC_CSE_REG_BV_001());
execute(TC_CSE_REG_BV_002());
execute(TC_CSE_REG_BV_003());
diff --git a/OneM2M_Testcases.ttcn b/OneM2M_Testcases.ttcn
index 2dff10acce952b6ca74d410d2d5f9356aa922047..94b2300b0c7102b24fa9c9fe7195e6aa0690fb1b 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 320 2017-07-14 16:03:52Z reinaortega $
+ * $Id: OneM2M_Testcases.ttcn 321 2017-07-14 18:16:07Z reinaortega $
* @desc Module containing test cases for oneM2M
*
*/
@@ -84,27 +84,31 @@ module OneM2M_Testcases {
group Generic {
group Create {
- group g_CSE_GEN_CRE_BV_001 {
+ group g_CSE_GEN_CRE_001 {
- testcase TC_CSE_GEN_CRE_BV_001_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the creation of a resource using unstructured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_CRE_001_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_001(e_cseRelative);
+ f_CSE_GEN_CRE_001(e_cseRelative);
}
- testcase TC_CSE_GEN_CRE_BV_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_001_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_001(e_spRelative);
+ f_CSE_GEN_CRE_001(e_spRelative);
}
- testcase TC_CSE_GEN_CRE_BV_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_001_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_001(e_absolute);
+ f_CSE_GEN_CRE_001(e_absolute);
}
- function f_CSE_GEN_CRE_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_CRE_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_request;
@@ -161,32 +165,36 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_CRE_BV_001
+ }//end f_CSE_GEN_CRE_001
- } // end of group g_CSE_GEN_CRE_BV_001
+ } // end of group g_CSE_GEN_CRE_001
- group g_CSE_GEN_CRE_BV_002 {
+ group g_CSE_GEN_CRE_002 {
- testcase TC_CSE_GEN_CRE_BV_002_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the creation of a resource using structured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_CRE_002_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_002(e_cseRelative);
+ f_CSE_GEN_CRE_002(e_cseRelative);
}
- testcase TC_CSE_GEN_CRE_BV_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_002_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_002(e_spRelative);
+ f_CSE_GEN_CRE_002(e_spRelative);
}
- testcase TC_CSE_GEN_CRE_BV_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_CRE_002_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_CRE_BV_002(e_absolute);
+ f_CSE_GEN_CRE_002(e_absolute);
}
- function f_CSE_GEN_CRE_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_CRE_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_request;
@@ -243,35 +251,39 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_CRE_BV_002
+ }//end f_CSE_GEN_CRE_002
- } // end of group g_CSE_GEN_CRE_BV_002
+ } // end of group g_CSE_GEN_CRE_002
} // end of group Create
group Retrieve {
- group g_CSE_GEN_RET_BV_001 {
+ group g_CSE_GEN_RET_001 {
- testcase TC_CSE_GEN_RET_BV_001_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the retrieval of a <container> resource using unstructured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_RET_001_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_001(e_cseRelative);
+ f_CSE_GEN_RET_001(e_cseRelative);
}
- testcase TC_CSE_GEN_RET_BV_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_001_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_001(e_spRelative);
+ f_CSE_GEN_RET_001(e_spRelative);
}
- testcase TC_CSE_GEN_RET_BV_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_001_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_001(e_absolute);
+ f_CSE_GEN_RET_001(e_absolute);
}
- function f_CSE_GEN_RET_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_RET_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var integer v_aeIndex := -1;
@@ -326,32 +338,36 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_RET_BV_001
+ }//end f_CSE_GEN_RET_001
- } // end of group g_CSE_GEN_RET_BV_001
+ } // end of group g_CSE_GEN_RET_001
- group g_CSE_GEN_RET_BV_002 {
+ group g_CSE_GEN_RET_002 {
- testcase TC_CSE_GEN_RET_BV_002_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the retrieval of a <container> resource using structured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_RET_002_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_002(e_cseRelative);
+ f_CSE_GEN_RET_002(e_cseRelative);
}
- testcase TC_CSE_GEN_RET_BV_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_002_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_002(e_spRelative);
+ f_CSE_GEN_RET_002(e_spRelative);
}
- testcase TC_CSE_GEN_RET_BV_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_RET_002_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_RET_BV_002(e_absolute);
+ f_CSE_GEN_RET_002(e_absolute);
}
- function f_CSE_GEN_RET_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_RET_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var integer v_aeIndex := -1;
@@ -405,34 +421,38 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_RET_BV_002
+ }//end f_CSE_GEN_RET_002
- } // end of group g_CSE_GEN_RET_BV_002
+ } // end of group g_CSE_GEN_RET_002
} // end of group Retrieve
group Update {
- group g_CSE_GEN_UPD_BV_001 {
+ group g_CSE_GEN_UPD_001 {
- testcase TC_CSE_GEN_UPD_BV_001_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the update of a <container> resource using unstructured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_UPD_001_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_001(e_cseRelative);
+ f_CSE_GEN_UPD_001(e_cseRelative);
}
- testcase TC_CSE_GEN_UPD_BV_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_001_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_001(e_spRelative);
+ f_CSE_GEN_UPD_001(e_spRelative);
}
- testcase TC_CSE_GEN_UPD_BV_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_001_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_001(e_absolute);
+ f_CSE_GEN_UPD_001(e_absolute);
}
- function f_CSE_GEN_UPD_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_UPD_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -492,31 +512,35 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_UPD_BV_001
+ }//end f_CSE_GEN_UPD_001
- } // end of group g_CSE_GEN_UPD_BV_001
+ } // end of group g_CSE_GEN_UPD_001
- group g_CSE_GEN_UPD_BV_002 {
+ group g_CSE_GEN_UPD_002 {
- testcase TC_CSE_GEN_UPD_BV_002_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the update of a <container> resource using structured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_UPD_002_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_002(e_cseRelative);
+ f_CSE_GEN_UPD_002(e_cseRelative);
}
- testcase TC_CSE_GEN_UPD_BV_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_002_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_002(e_spRelative);
+ f_CSE_GEN_UPD_002(e_spRelative);
}
- testcase TC_CSE_GEN_UPD_BV_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_UPD_002_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_UPD_BV_002(e_absolute);
+ f_CSE_GEN_UPD_002(e_absolute);
}
- function f_CSE_GEN_UPD_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_UPD_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_updateRequest := valueof(m_updateContainerBase);
@@ -576,35 +600,39 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_UPD_BV_002
+ }//end f_CSE_GEN_UPD_002
- } // end of group g_CSE_GEN_UPD_BV_002
+ } // end of group g_CSE_GEN_UPD_002
} // end of group Update
group Delete {
- group g_CSE_GEN_DEL_BV_001 {
+ group g_CSE_GEN_DEL_001 {
- testcase TC_CSE_GEN_DEL_BV_001_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the deletion of a <container> resource using unstructured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_DEL_001_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_001(e_cseRelative);
+ f_CSE_GEN_DEL_001(e_cseRelative);
}
- testcase TC_CSE_GEN_DEL_BV_001_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_001_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_001(e_spRelative);
+ f_CSE_GEN_DEL_001(e_spRelative);
}
- testcase TC_CSE_GEN_DEL_BV_001_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_001_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_001(e_absolute);
+ f_CSE_GEN_DEL_001(e_absolute);
}
- function f_CSE_GEN_DEL_BV_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_DEL_001(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_request;
@@ -662,32 +690,36 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_DEL_BV_001
+ }//end f_CSE_GEN_DEL_001
- } // end of group g_CSE_GEN_DEL_BV_001
+ } // end of group g_CSE_GEN_DEL_001
- group g_CSE_GEN_DEL_BV_002 {
+ group g_CSE_GEN_DEL_002 {
- testcase TC_CSE_GEN_DEL_BV_002_CSR() runs on CseTester system CseSystem {
+ /**
+ * @desc Check that the IUT accepts the deletion of a <container> resource using structured resource identifier
+ *
+ */
+ testcase TC_CSE_GEN_DEL_002_CSR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_002(e_cseRelative);
+ f_CSE_GEN_DEL_002(e_cseRelative);
}
- testcase TC_CSE_GEN_DEL_BV_002_SPR() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_002_SPR() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_002(e_spRelative);
+ f_CSE_GEN_DEL_002(e_spRelative);
}
- testcase TC_CSE_GEN_DEL_BV_002_ABS() runs on CseTester system CseSystem {
+ testcase TC_CSE_GEN_DEL_002_ABS() runs on CseTester system CseSystem {
// Local variables
- f_CSE_GEN_DEL_BV_002(e_absolute);
+ f_CSE_GEN_DEL_002(e_absolute);
}
- function f_CSE_GEN_DEL_BV_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
+ function f_CSE_GEN_DEL_002(in PrimitiveScope p_primitiveScope) runs on CseTester {
// Local variables
var RequestPrimitive v_request;
@@ -745,10 +777,10 @@ module OneM2M_Testcases {
// Tear down
f_cf01Down();
- }//end f_CSE_GEN_DEL_BV_002
+ }//end f_CSE_GEN_DEL_002
- } // end of group g_CSE_GEN_DEL_BV_002
+ } // end of group g_CSE_GEN_DEL_002
} // end of group Delete