From e3dd089380386f4a73e9d9e7d7f34477e88d1fb8 Mon Sep 17 00:00:00 2001
From: aahmad <ABBAS.AHMAD@eglobalmark.com>
Date: Fri, 9 Mar 2018 15:00:47 +0100
Subject: [PATCH] TP CSE/ESC/BV/001 corrected in the ATS. TC still has a TODO
on initial condition. Modified TC structure to run on CseSimu.
---
LibOneM2M/OneM2M_Templates.ttcn | 8 ++++----
OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/LibOneM2M/OneM2M_Templates.ttcn b/LibOneM2M/OneM2M_Templates.ttcn
index 45a2592..cffd3af 100644
--- a/LibOneM2M/OneM2M_Templates.ttcn
+++ b/LibOneM2M/OneM2M_Templates.ttcn
@@ -1360,10 +1360,10 @@ module OneM2M_Templates {
*/
template SecurityInfo mw_contentSecurityInfo (in SecurityInfoType p_securityInfoType, in XSD.Base64Binary p_escertkeMessage) := {
securityInfoType := p_securityInfoType,
- dasRequest := ?,
- dasResponse := ?,
- esprimRandObject := ?,
- esprimObject := ?,
+ dasRequest := *,
+ dasResponse := *,
+ esprimRandObject := *,
+ esprimObject := *,
escertkeMessage := p_escertkeMessage
}
diff --git a/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn b/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
index 4f6c2a0..b2991b6 100644
--- a/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
+++ b/OneM2M_Testcases_CSE_Release_2_SEC_STF531.ttcn
@@ -83,10 +83,10 @@ module OneM2M_Testcases_CSE_Release_2_SEC_STF531 {
testcase TC_CSE_ESC_BV_001() runs on CseSimu system CseSystem {
var MsgIn v_response;
- var template RequestPrimitive v_requestNotify := m_notify;
-
+ var RequestPrimitive v_requestNotify;
+ var PrimitiveContent v_primitiveContentResponse;
//Test component configuration
- f_cf02Up();
+ f_cf02UpCse1();
// Test adapter configuration
@@ -100,17 +100,17 @@ module OneM2M_Testcases_CSE_Release_2_SEC_STF531 {
v_requestNotify.primitiveContent := {securityInfo := m_contentSecurityInfo(int6)};
v_requestNotify.primitiveContent.securityInfo.escertkeMessage := str2oct("VExTIE1lc3NhZ2U6IENsaWVudCBIZWxsbw==");
-
+ v_primitiveContentResponse.securityInfo := mw_contentSecurityInfo(int6, str2oct("VExTIE1lc3NhZ2VzOiBTZXJ2ZXIgSGVsbG8sIENlcnRpZmljYXRlKiwgU2VydmVyS2V5RXhjaGFuZ2UqLCBDZXJ0aWZpY2F0ZVJlcXVlc3QqLCBTZXJ2ZXJIZWxsb0RvbmU="));
mccPort.send(m_request(v_requestNotify));
tc_ac.start;
alt {
- [] mccPort.receive(mw_response(mw_responsePrimitive(int2000, mw_contentSecurityInfo(int6, str2oct("VExTIE1lc3NhZ2VzOiBTZXJ2ZXIgSGVsbG8sIENlcnRpZmljYXRlKiwgU2VydmVyS2V5RXhjaGFuZ2UqLCBDZXJ0aWZpY2F0ZVJlcXVlc3QqLCBTZXJ2ZXJIZWxsb0RvbmU=")))))-> value v_response {
+ [] mccPort.receive(mw_response(mw_responsePrimitive(int2000,v_primitiveContentResponse)))-> value v_response {
tc_ac.stop;
setverdict(pass, __SCOPE__ & ": Message 2 received successfully");
}
[] mccPort.receive(mw_response(mw_responsePrimitiveOK)) -> value v_response {
tc_ac.stop;
- setverdict(fail, __SCOPE__ & ": Wrong Message received (Should be Message 2)");
+ setverdict(fail, __SCOPE__ & ": Wrong SecurityInfo (securityInfoType ¦¦ escertkeMessage ) Message received");
}
[] mccPort.receive(mw_response(mw_responsePrimitiveKO)) -> value v_response {
tc_ac.stop;
@@ -121,8 +121,8 @@ module OneM2M_Testcases_CSE_Release_2_SEC_STF531 {
}
}
- f_cse_postamble_deleteResources();
- f_cf02Down();
+ f_cse_postamble_deleteResourcesCSE();
+ f_cf02DownCseSimuMaster();
}
} // end of group ESCertKE
--
GitLab