Commit 6d658030 authored by BenceJanosSzabo's avatar BenceJanosSzabo
Browse files

Merge github.com:eclipse/titan.core

parents 2bb9ca18 a1128524
......@@ -47,7 +47,7 @@ module Sem_220304_getreply_operation_008 {
alt
{
[] any from p.getreply(S:?) -> @index v_index {
[] any from p.getreply(S:{}) -> @index value v_index {
if(v_index == 1){ // no getreply call during evaluation, v_index remains equal to 1
setverdict(pass);
} else {
......
......@@ -47,7 +47,7 @@ module NegSem_220306_catch_operation_002 {
alt
{
[] any from p.catch(S, integer:?) -> @index v_index {
[] any from p.catch(S, integer:?) -> @index value v_index {
if(v_index[0] == 1){
setverdict(pass);
} else {
......
......@@ -47,7 +47,7 @@ module NegSem_220306_catch_operation_003 {
alt
{
[] any from p.catch(S, integer:?) -> @index v_index {
[] any from p.catch(S, integer:?) -> @index value v_index {
if(v_index == 1.0){
setverdict(pass);
} else {
......
......@@ -31,7 +31,7 @@ module NegSem_220306_catch_operation_004 {
{
for(var integer i := 0; i < c_portCount; i := i + 1) {
for(var integer j := 0; j < c_portCount; j := j + 1) {
p[i][j].getcall(S:?);
p[i][j].getcall(S:{});
if (i == 1 and j == 2 or i == 2 and j == 1) { p[i][j].raise(S, 10); }
}
}
......@@ -54,7 +54,7 @@ module NegSem_220306_catch_operation_004 {
alt
{
[] any from p.catch(S, integer:?) -> sender v_src @index v_index {
[] any from p.catch(S, integer:?) -> sender v_src @index value v_index {
if(v_index[0] == 1 and v_index[1] == 2){
setverdict(pass);
} else {
......
......@@ -31,7 +31,7 @@ module NegSem_220306_catch_operation_005 {
{
for(var integer i := 0; i < c_portCount; i := i + 1) {
for(var integer j := 0; j < c_portCount; j := j + 1) {
p[i][j].getcall(S:?);
p[i][j].getcall(S:{});
if (i == 1 and j == 2 or i == 2 and j == 1) { p[i][j].raise(S, 10); }
}
}
......@@ -53,7 +53,7 @@ module NegSem_220306_catch_operation_005 {
alt
{
[] any from p.catch(S, integer:?) -> @index v_index {
[] any from p.catch(S, integer:?) -> @index value v_index {
if(v_index == 1){
setverdict(pass);
} else {
......
......@@ -25,7 +25,7 @@ module NegSyn_220306_catch_operation_001 {
function f() runs on GeneralComp
{
p.getcall(S:?);
p.getcall(S:{});
p.raise(S, 20);
}
......@@ -38,7 +38,7 @@ module NegSyn_220306_catch_operation_001 {
v_ptc.done;
alt
{
[] p.catch -> @index v_index { setverdict(pass); }
[] p.catch -> @index value v_index { setverdict(pass); }
[else] { setverdict(fail, "The any from catch operation didn't match for some reason"); }
}
}
......
......@@ -26,7 +26,7 @@ module NegSyn_220306_catch_operation_002 {
function f() runs on GeneralComp
{
p.getcall(S:?);
p.getcall(S:{});
p.raise(S, 10);
}
......@@ -39,7 +39,7 @@ module NegSyn_220306_catch_operation_002 {
v_ptc.done;
alt
{
[] any port.catch -> @index v_index { setverdict(pass); }
[] any port.catch -> @index value v_index { setverdict(pass); }
[else] { setverdict(fail, "The any from catch operation didn't match for some reason"); }
}
}
......
......@@ -47,7 +47,7 @@ module Sem_220306_catch_operation_003 {
alt
{
[] any from p.catch(S, integer:(1..10)) -> @index v_index {
[] any from p.catch(S, integer:(1..10)) -> @index value v_index {
setverdict(fail, "The any from catch operation produced incorrect match");
}
[else] { setverdict(pass); }
......
......@@ -47,7 +47,7 @@ module Sem_220306_catch_operation_004 {
alt
{
[] any from p.catch(S, integer:(1..10)) -> @index v_index {
[] any from p.catch(S, integer:(1..10)) -> @index value v_index {
setverdict(fail, "The any from catch operation produced incorrect match");
}
[else] { setverdict(pass); }
......
......@@ -49,7 +49,7 @@ module Sem_220306_catch_operation_005 {
alt
{
[] any from p.catch(S, integer:(0..c_portCount)) -> value v_res @index v_index {
[] any from p.catch(S, integer:(0..c_portCount)) -> value v_res @index value v_index {
if(v_index == 1 and v_res == v_index + 1){
setverdict(pass);
} else {
......
......@@ -52,7 +52,7 @@ module Sem_220306_catch_operation_006 {
alt
{
[] any from p.catch(S, integer:?) -> sender v_src @index v_index {
[] any from p.catch(S, integer:?) -> sender v_src @index value v_index {
if(v_index[0] == 1 and v_index[1] == 2){
setverdict(pass);
} else {
......
......@@ -46,7 +46,7 @@ module Sem_220306_catch_operation_007 {
alt
{
[] any from p.catch(S, integer:?) -> @index v_index {
[] any from p.catch(S, integer:?) -> @index value v_index {
if(v_index == 1){ // no catch call during evaluation, v_index remains equal to 1
setverdict(pass);
} else {
......
......@@ -47,7 +47,7 @@ module Sem_220306_catch_operation_008 {
alt
{
[] any from p.catch(S, integer:?) -> @index v_index {
[] any from p.catch(S, integer:?) -> @index value v_index {
if(v_index == 1){ // no catch call during evaluation, v_index remains equal to 1
setverdict(pass);
} else {
......
......@@ -16,13 +16,13 @@ module Sem_2305_timer_running_005 {
testcase TC_Sem_2305_timer_running_005() runs on TComp {
var integer v_foundIndex[2];
for (var integer i := 0; i < lengthof(t_TimerArray); i := i + 1) {
for (var integer j := 0; j < lengthof(t_TimerArray[i]); j := j + 1) {
for (var integer i := 0; i < sizeof(t_TimerArray); i := i + 1) {
for (var integer j := 0; j < sizeof(t_TimerArray[i]); j := j + 1) {
t_TimerArray[i][j].start;
}
}
t_TimerArray[0][0].stop;
if (any from t_TimerArray.running -> @index v_foundIndex and v_foundIndex[0] == 0 and v_foundIndex[1] == 1) {
if (any from t_TimerArray.running -> @index value v_foundIndex and v_foundIndex[0] == 0 and v_foundIndex[1] == 1) {
setverdict(pass);
} else {
setverdict(fail, "wrong number of timers running");
......
/***************************************************
** @author STF 470, corrected by STF 487
/******************************************************************************
* Copyright (C) 2016 ETSI All Rights Reserved.
*
* Adrien Kirjak
*
** @version 0.0.1
** @purpose 1:23.6, Ensure that timeout of a timer from a timer array works correctly
** @verdict pass accept, ttcn3verdict:pass
......@@ -12,15 +15,15 @@ module Sem_2306_timer_timeout_008 {
testcase TC_Sem_2306_timer_timeout_008() runs on TComp{
var integer v_foundIndex[2];
for (var integer i := 0; i < lengthof(t_TimerArray); i := i + 1) {
for (var integer j := 0; j < lengthof(t_TimerArray[i]); j := j + 1) {
for (var integer i := 0; i < sizeof(t_TimerArray); i := i + 1) {
for (var integer j := 0; j < sizeof(t_TimerArray[i]); j := j + 1) {
t_TimerArray[i][j].start;
}
}
t_TimerArray[0][0].stop;
any from t_TimerArray.timeout -> @index v_foundIndex;
any from t_TimerArray.timeout -> @index value v_foundIndex;
if(v_foundIndex[0] == 0 and v_foundIndex[1] == 1){
setverdict(pass);
} else {
......
......@@ -992,6 +992,9 @@ Sem_220202_ReceiveOperation_013.control
Sem_220202_ReceiveOperation_014.control
Sem_220202_ReceiveOperation_015.control
Sem_220202_ReceiveOperation_017.control
Sem_220202_ReceiveOperation_019.control
Sem_220202_ReceiveOperation_020.control
Sem_220202_ReceiveOperation_021.control
Sem_220202_ReceiveOperation_022.control
Sem_220203_TriggerOperation_001.control
Sem_220203_TriggerOperation_002.control
......@@ -1006,6 +1009,9 @@ Sem_220203_TriggerOperation_013.control
Sem_220203_TriggerOperation_014.control
Sem_220203_TriggerOperation_015.control
Sem_220203_TriggerOperation_017.control
Sem_220203_TriggerOperation_019.control
Sem_220203_TriggerOperation_020.control
Sem_220203_TriggerOperation_021.control
Sem_220203_TriggerOperation_022.control
Sem_220301_CallOperation_001.control
Sem_220301_CallOperation_002.control
......@@ -1016,11 +1022,25 @@ Sem_220302_GetcallOperation_001.control
Sem_220302_GetcallOperation_002.control
Sem_220302_GetcallOperation_003.control
Sem_220302_GetcallOperation_004.control
Sem_220302_GetcallOperation_006.control
Sem_220302_GetcallOperation_007.control
Sem_220302_GetcallOperation_008.control
Sem_220302_GetcallOperation_009.control
Sem_220302_GetcallOperation_010.control
Sem_220302_GetcallOperation_011.control
Sem_220302_GetcallOperation_012.control
Sem_220302_GetcallOperation_014.control
Sem_220302_GetcallOperation_015.control
Sem_220302_GetcallOperation_016.control
Sem_220302_GetcallOperation_017.control
Sem_220302_GetcallOperation_018.control
Sem_220304_getreply_operation_001.control
Sem_220304_getreply_operation_002.control
Sem_220304_getreply_operation_003.control
Sem_220304_getreply_operation_004.control
Sem_220304_getreply_operation_005.control
Sem_220304_getreply_operation_006.control
Sem_220304_getreply_operation_007.control
Sem_220304_getreply_operation_009.control
Sem_220304_getreply_operation_010.control
Sem_220304_getreply_operation_011.control
......@@ -1033,6 +1053,13 @@ Sem_220304_getreply_operation_018.control
Sem_220304_getreply_operation_019.control
Sem_220305_raise_operation_001.control
Sem_220305_raise_operation_002.control
Sem_220306_catch_operation_001.control
Sem_220306_catch_operation_002.control
Sem_220306_catch_operation_003.control
Sem_220306_catch_operation_004.control
Sem_220306_catch_operation_005.control
Sem_220306_catch_operation_006.control
Sem_220306_catch_operation_007.control
Sem_220306_catch_operation_009.control
Sem_220306_catch_operation_010.control
Sem_220306_catch_operation_011.control
......@@ -1130,6 +1157,7 @@ Sem_2305_timer_running_001.control
Sem_2305_timer_running_002.control
Sem_2305_timer_running_003.control
Sem_2305_timer_running_004.control
Sem_2305_timer_running_005.control
Sem_2306_timer_timeout_001.control
Sem_2306_timer_timeout_002.control
Sem_2306_timer_timeout_003.control
......@@ -1137,6 +1165,7 @@ Sem_2306_timer_timeout_004.control
Sem_2306_timer_timeout_005.control
Sem_2306_timer_timeout_006.control
Sem_2306_timer_timeout_007.control
Sem_2306_timer_timeout_008.control
Sem_2306_timer_timeout_009.control
Sem_2401_GlobalVerdict_001.control
Sem_2401_GlobalVerdict_004.control
......
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment