diff --git a/OneM2M_Testcases_CSE_Release_2.ttcn b/OneM2M_Testcases_CSE_Release_2.ttcn
index 091fbe9995cdb1989287736c85ca7879786a0870..73f5eb0f17f21692ec62e368b0d3df690de38fae 100644
--- a/OneM2M_Testcases_CSE_Release_2.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2.ttcn
@@ -956,46 +956,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
} // end g_CSE_DMR_CRE_017
-
- group g_CSE_DMR_CRE_018 {
-
- /**
- * @desc Check that the IUT rejects a CREATE request when the ResultContent is set to RESULT_CONTENT
- *
- */
- testcase TC_CSE_DMR_CRE_018_RCN_4() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_018(int4));//ResultContent = 4 (attributes and child resources)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_CRE_018_RCN_5() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_018(int5));//ResultContent = 5 (attributes and child resources references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_CRE_018_RCN_6() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_018(int6));//ResultContent = 6 (child resources references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_CRE_018_RCN_8() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- v_ae1.start(f_CSE_DMR_CRE_018(int8));//ResultContent = 8 (child resources)
- v_ae1.done;
- }
- } // end g_CSE_DMR_CRE_018
-
+
group g_CSE_DMR_CRE_019 {
/**
* @desc Check that the IUT returns successfully only attributes of TARGET_RESOURCE_ADDRESS resource when the ResultContent set to 1 (Attributes)
@@ -1258,226 +1219,6 @@ module OneM2M_Testcases_CSE_Release_2 {
}
} // end g_CSE_DMR_RET_021
-
- group g_CSE_DMR_RET_022 {
-
- /**
- * @desc Check that the IUT returns successfully only attributes and child resources of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 4 (attributes and child resources)
- *
- */
- testcase TC_CSE_DMR_RET_022_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc4;
-
- v_ae1.start(f_CSE_DMR_RET_022(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_022_GRP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc4;
-
- v_ae1.start(f_CSE_DMR_RET_022(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_022_ACP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc4;
-
- v_ae1.start(f_CSE_DMR_RET_022(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_022_PCH() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-
- v_ae1.start(f_CSE_DMR_RET_022(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_022_SUB() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc4;
-
- v_ae1.start(f_CSE_DMR_RET_022(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
- v_ae1.done;
- }
-
- } // end g_CSE_DMR_RET_022
-
- group g_CSE_DMR_RET_023 {
-
- /**
- * @desc Check that the IUT returns successfully only attributes and child resource references of TARGET_RESOURCE_ADDRESS resource when the Result Content is set to 5 (attributes and child resource references)
- *
- */
- testcase TC_CSE_DMR_RET_023_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc5;
-
- v_ae1.start(f_CSE_DMR_RET_023(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_023_GRP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc5;
-
- v_ae1.start(f_CSE_DMR_RET_023(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_023_ACP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
-
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc5;
-
- v_ae1.start(f_CSE_DMR_RET_023(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_023_PCH() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.pollingChannel := mw_contentPollingChannelBase;
-
- v_ae1.start(f_CSE_DMR_RET_023(int15, m_createPollingChannelBase, v_contentResponse, omit, omit));//PollingChannel
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_023_SUB() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc5;
-
- v_ae1.start(f_CSE_DMR_RET_023(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
- v_ae1.done;
- }
-
- } // end g_CSE_DMR_RET_023
-
- group g_CSE_DMR_RET_024 {
-
- /**
- * @desc Check that the IUT returns successfully only child resource references of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 6 (child resource references)
- *
- */
- testcase TC_CSE_DMR_RET_024_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc6;
-
- v_ae1.start(f_CSE_DMR_RET_024(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_024_GRP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc6;
-
- v_ae1.start(f_CSE_DMR_RET_024(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_024_ACP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc6;
-
- v_ae1.start(f_CSE_DMR_RET_024(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_024_SUB() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc6;
-
- v_ae1.start(f_CSE_DMR_RET_024(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
- v_ae1.done;
- }
-
- } // end g_CSE_DMR_RET_024
-
- group g_CSE_DMR_RET_025 {
-
- /**
- * @desc Check that the IUT returns successfully only child resources of TARGET_RESOURCE_ADDRESS resource when Result Content is set to 8 (child resources)
- *
- */
- testcase TC_CSE_DMR_RET_025_CNT() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.container := mw_contentContainer_rc8;
-
- v_ae1.start(f_CSE_DMR_RET_025(int3, m_createContainerBase, v_contentResponse, int3, m_createContainerBase));//Container
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_025_GRP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.group_ := mw_contentGroup_rc8;
-
- v_ae1.start(f_CSE_DMR_RET_025(int9, m_createGroupBase, v_contentResponse, int23, m_createSubscriptionBase));//Group
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_025_ACP() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.accessControlPolicy := mw_contentAcp_rc8;
-
- v_ae1.start(f_CSE_DMR_RET_025(int1, m_createAcpBase,v_contentResponse, int23, m_createSubscriptionBase));//AccessControlPolicy
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_RET_025_SUB() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- var template PrimitiveContent v_contentResponse;
- v_contentResponse.subscription := mw_contentSubscription_rc8;
-
- v_ae1.start(f_CSE_DMR_RET_025(int23, m_createSubscriptionBase, v_contentResponse, int18, m_createScheduleBase));//Subscription
- v_ae1.done;
- }
-
- } // end g_CSE_DMR_RET_025
}//end group Retrieve
@@ -2216,40 +1957,6 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.done;
}
- testcase TC_CSE_DMR_UPD_019_RCN_4() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_UPD_019_RCN_5() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_UPD_019_RCN_6() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_UPD_019_RCN_7() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_UPD_019_RCN_8() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_UPD_019(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources)
- v_ae1.done;
- }
} // end g_CSE_DMR_UPD_019
group g_CSE_DMR_UPD_020 {
@@ -2428,42 +2135,7 @@ module OneM2M_Testcases_CSE_Release_2 {
v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int3));//ResultContent = 3 (attributes and hierarchichal address)
v_ae1.done;
}
-
- testcase TC_CSE_DMR_DEL_011_RCN_4() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int4));//ResultContent = 4 (attributes and child resources)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_DEL_011_RCN_5() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int5));//ResultContent = 5 (attributes and child resource references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_DEL_011_RCN_6() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int6));//ResultContent = 6 (child resource references)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_DEL_011_RCN_7() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int7));//ResultContent = 7 (original resource)
- v_ae1.done;
- }
-
- testcase TC_CSE_DMR_DEL_011_RCN_8() runs on Tester system CseSystem {
- // Local variables
- var AeSimu v_ae1 := AeSimu.create("AE1") alive;
- v_ae1.start(f_CSE_DMR_DEL_011(int3, m_createContainerBase, int8));//ResultContent = 8 (child resources)
- v_ae1.done;
- }
-
+
testcase TC_CSE_DMR_DEL_011_RCN_9() runs on Tester system CseSystem {
// Local variables
var AeSimu v_ae1 := AeSimu.create("AE1") alive;