Skip to content
Snippets Groups Projects
Commit a8e6d1b9 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Small compilation errors fixed

parent 2efc0c27
No related branches found
No related tags found
1 merge request!25Ae fixes
......@@ -1904,7 +1904,7 @@ module OneM2M_Functions {
var template ListOfURIs v_defaultListOfURIs := {"NotInitialized"};
var template AcpType v_defaultAcpIDs := {"NotInitialized"};
p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
if(p_resourceType != int2) {
if(p_resourceType == int16) {
......@@ -2029,7 +2029,7 @@ module OneM2M_Functions {
*/
function f_getUpdateRequestPrimitive(in ResourceType p_resourceType, integer p_resourceIndex, template RequestPrimitive p_request) runs on Tester return RequestPrimitive {
p_request.requestIdentifier := p_request.requestIdentifier & f_rnd(1, 1000000);
p_request.requestIdentifier := valueof(p_request.requestIdentifier) & f_rnd(1, 1000000);
p_request.from_ := f_getOriginator(p_resourceIndex);
......
......@@ -28,7 +28,7 @@ module OneM2M_TestSystem {
port UpperTesterPort utPort;
//timers
timer tc_ac := PX_TAC;
timer tc_wait;
timer tc_wait := PX_TWAIT;
//global variables
var Configurations vc_config;
var MyResourcesList vc_resourcesList;
......
......@@ -14,7 +14,7 @@
module OneM2M_TestControl {
import from OneM2M_Testcases all;
import from OneM2M_Testcases_CSE all;
control {
execute(TC_CSE_GEN_CRE_001_CSR());
......@@ -259,11 +259,14 @@ module OneM2M_TestControl {
execute(TC_CSE_GMG_CRE_005());
execute(TC_CSE_GMG_CRE_006());
execute(TC_CSE_GMG_CRE_007());
execute(TC_CSE_GMG_CRE_008_CRE());
execute(TC_CSE_GMG_CRE_008_UPD());
execute(TC_CSE_GMG_CRE_008_RET());
execute(TC_CSE_GMG_CRE_008_DEL());
execute(TC_CSE_GMG_CRE_009());
execute(TC_CSE_GMG_005_CRE());
execute(TC_CSE_GMG_005_UPD());
execute(TC_CSE_GMG_005_RET());
execute(TC_CSE_GMG_005_DEL());
execute(TC_CSE_GMG_006_CRE());
execute(TC_CSE_GMG_006_UPD());
execute(TC_CSE_GMG_006_RET());
execute(TC_CSE_GMG_006_DEL());
execute(TC_CSE_GMG_UPD_001());
execute(TC_CSE_GMG_UPD_002());
execute(TC_CSE_GMG_UPD_003());
......
......@@ -15617,7 +15617,7 @@ module OneM2M_Testcases_CSE {
var template RequestPrimitive v_createAcp := m_createAcp("NotInitialized", "MyACP", -, -);
var template PrimitiveContent v_contentResponse;
var XSD.AnyURI v_fanoutPointAddress;
var RequestPrimitive v_containerRequestPrimitive := m_createContainer_noResourceName;
var RequestPrimitive v_containerRequestPrimitive := valueof(m_createContainer_noResourceName);
v_contentResponse.contentInstance := mw_contentContentInstanceBase;
......@@ -16597,7 +16597,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
......@@ -16713,7 +16713,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
......@@ -16819,7 +16819,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
......@@ -16935,7 +16935,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_groupIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
......@@ -17046,7 +17046,7 @@ module OneM2M_Testcases_CSE {
p_requestPrimitive.to_ := f_getResourceAddress(v_groupIndex) & "/fopt";
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
// Test Body
......@@ -19476,7 +19476,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
......@@ -19588,7 +19588,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
......@@ -19685,7 +19685,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "testDomain";
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
......@@ -19798,7 +19798,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_aeIndex);
p_requestPrimitive.from_ := "UnknowOriginator";
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
......@@ -19888,7 +19888,7 @@ module OneM2M_Testcases_CSE {
// Test Body
p_requestPrimitive.to_ := f_getResourceAddress(v_containerIndex);
p_requestPrimitive.from_ := f_getOriginator(v_aeIndex);
p_requestPrimitive.requestIdentifier := p_requestPrimitive.requestIdentifier & f_rnd(1, 1000000);
p_requestPrimitive.requestIdentifier := valueof(p_requestPrimitive.requestIdentifier) & f_rnd(1, 1000000);
mcaPort.send(m_request(valueof(p_requestPrimitive)));
tc_ac.start;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment