Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[300] trunk
|
From: <ma...@us...> - 2009-09-10 09:52:41
|
Revision: 300
http://scstudio.svn.sourceforge.net/scstudio/?rev=300&view=rev
Author: madzin
Date: 2009-09-10 09:52:26 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Increase automatical tests with results
Modified Paths:
--------------
trunk/src/data/Z120/Context.cpp
trunk/tests/z120_test/CMakeLists.txt
trunk/tests/z120_test/z120_test03.mpr
trunk/tests/z120_test/z120_test04.mpr
trunk/tests/z120_test/z120_test05.mpr
trunk/tests/z120_test/z120_test06.mpr
trunk/tests/z120_test/z120_test07.mpr
trunk/tests/z120_test/z120_test08.mpr
trunk/tests/z120_test/z120_test09.mpr
trunk/tests/z120_test/z120_test10.mpr
trunk/tests/z120_test/z120_test11.mpr
trunk/tests/z120_test/z120_test12.mpr
trunk/tests/z120_test/z120_test13.mpr
trunk/tests/z120_test/z120_test14.mpr
trunk/tests/z120_test/z120_test15.mpr
trunk/tests/z120_test/z120_test16.mpr
trunk/tests/z120_test/z120_test17.mpr
trunk/tests/z120_test/z120_test18.mpr
trunk/tests/z120_test/z120_test19.mpr
trunk/tests/z120_test/z120_test20.mpr
trunk/tests/z120_test/z120_test21.mpr
trunk/tests/z120_test/z120_test22.mpr
trunk/tests/z120_test/z120_test23.mpr
trunk/tests/z120_test/z120_test24.mpr
trunk/tests/z120_test/z120_test26.mpr
trunk/tests/z120_test/z120_test27.mpr
trunk/tests/z120_test/z120_test28.mpr
trunk/tests/z120_test/z120_test29.mpr
trunk/tests/z120_test/z120_test30.mpr
trunk/tests/z120_test/z120_test31.mpr
trunk/tests/z120_test/z120_test32.mpr
trunk/tests/z120_test/z120_test33.mpr
trunk/tests/z120_test/z120_test34.mpr
trunk/tests/z120_test/z120_test35.mpr
trunk/tests/z120_test/z120_test37.mpr
trunk/tests/z120_test/z120_test38.mpr
trunk/tests/z120_test/z120_test39.mpr
trunk/tests/z120_test/z120_test40.mpr
Added Paths:
-----------
trunk/tests/z120_test/z120_diff.py
trunk/tests/z120_test/z120_test00.mpr.result
trunk/tests/z120_test/z120_test01.mpr.result
trunk/tests/z120_test/z120_test02.mpr.result
trunk/tests/z120_test/z120_test03.mpr.result
trunk/tests/z120_test/z120_test04.mpr.result
trunk/tests/z120_test/z120_test05.mpr.result
trunk/tests/z120_test/z120_test06.mpr.result
trunk/tests/z120_test/z120_test07.mpr.result
trunk/tests/z120_test/z120_test08.mpr.result
trunk/tests/z120_test/z120_test09.mpr.result
trunk/tests/z120_test/z120_test10.mpr.result
trunk/tests/z120_test/z120_test11.mpr.result
trunk/tests/z120_test/z120_test12.mpr.result
trunk/tests/z120_test/z120_test13.mpr.result
trunk/tests/z120_test/z120_test14.mpr.result
trunk/tests/z120_test/z120_test15.mpr.result
trunk/tests/z120_test/z120_test16.mpr.result
trunk/tests/z120_test/z120_test17.mpr.result
trunk/tests/z120_test/z120_test18.mpr.result
trunk/tests/z120_test/z120_test19.mpr.result
trunk/tests/z120_test/z120_test20.mpr.result
trunk/tests/z120_test/z120_test21.mpr.result
trunk/tests/z120_test/z120_test22.mpr.result
trunk/tests/z120_test/z120_test23.mpr.result
trunk/tests/z120_test/z120_test24.mpr.result
trunk/tests/z120_test/z120_test25.mpr.result
trunk/tests/z120_test/z120_test26.mpr.result
trunk/tests/z120_test/z120_test27.mpr.result
trunk/tests/z120_test/z120_test28.mpr.result
trunk/tests/z120_test/z120_test29.mpr.result
trunk/tests/z120_test/z120_test30.mpr.result
trunk/tests/z120_test/z120_test31.mpr.result
trunk/tests/z120_test/z120_test32.mpr.result
trunk/tests/z120_test/z120_test33.mpr.result
trunk/tests/z120_test/z120_test34.mpr.result
trunk/tests/z120_test/z120_test35.mpr.result
trunk/tests/z120_test/z120_test36.mpr.result
trunk/tests/z120_test/z120_test37.mpr.result
trunk/tests/z120_test/z120_test38.mpr.result
trunk/tests/z120_test/z120_test39.mpr.result
trunk/tests/z120_test/z120_test40.mpr.result
trunk/tests/z120_test/z120_test41.mpr
trunk/tests/z120_test/z120_test41.mpr.result
Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/src/data/Z120/Context.cpp 2009-09-10 09:52:26 UTC (rev 300)
@@ -157,7 +157,6 @@
if(context->nonpointed.size() < 1 && context->mscs.size() > 0)
{
context->z->print_report(RS_ERROR, L"Error 03: There is no MSC without reference\n");
- return NULL;
}
s_Msc** result;
@@ -192,8 +191,8 @@
}
}
result[position] = NULL;
+//printf("pocet msc %d\n", position -1);
}
-
return result;
}
Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/CMakeLists.txt 2009-09-10 09:52:26 UTC (rev 300)
@@ -8,7 +8,7 @@
SET(Z120_SEQUENCE 0)
MACRO(ADD_Z120_TEST FILE SATISFIED)
ADD_TEST("z120_test-${Z120_SEQUENCE}"
- ${EXECUTABLE_OUTPUT_PATH}/z120_test ${FILE} ${SATISFIED})
+ ${EXECUTABLE_OUTPUT_PATH}/z120_diff.py ${FILE} ${SATISFIED})
MATH(EXPR Z120_SEQUENCE ${Z120_SEQUENCE}+1)
ENDMACRO(ADD_Z120_TEST)
@@ -43,12 +43,16 @@
ADD_Z120_TEST(z120_test28.mpr 1)
ADD_Z120_TEST(z120_test29.mpr 1)
ADD_Z120_TEST(z120_test30.mpr 1)
-ADD_Z120_TEST(z120_test31.mpr 0)
+ADD_Z120_TEST(z120_test31.mpr 1)
ADD_Z120_TEST(z120_test32.mpr 1)
ADD_Z120_TEST(z120_test33.mpr 1)
ADD_Z120_TEST(z120_test34.mpr 1)
ADD_Z120_TEST(z120_test35.mpr 1)
ADD_Z120_TEST(z120_test36.mpr 1)
ADD_Z120_TEST(z120_test37.mpr 1)
+ADD_Z120_TEST(z120_test38.mpr 1)
+ADD_Z120_TEST(z120_test39.mpr 1)
+ADD_Z120_TEST(z120_test40.mpr 1)
+ADD_Z120_TEST(z120_test41.mpr 1)
# $Id$
Added: trunk/tests/z120_test/z120_diff.py
===================================================================
--- trunk/tests/z120_test/z120_diff.py (rev 0)
+++ trunk/tests/z120_test/z120_diff.py 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+import subprocess
+import difflib
+import sys
+
+p = subprocess.Popen(["./z120_test" , sys.argv[1], sys.argv[2]], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+f = open(sys.argv[1] + ".result", "r+")
+
+result = difflib.unified_diff(f.readlines(), p.stderr.readlines()+ p.stdout.readlines())
+
+error = False
+for line in result:
+ print line
+ error = True
+
+sys.exit(error)
+
+
+
+#diff = ndiff(
Property changes on: trunk/tests/z120_test/z120_diff.py
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/tests/z120_test/z120_test00.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test00.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test00.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,21 @@
+OK: z120_test00.mpr is correct, should be correct
+
+mscdocument z120_test00;
+msc pok2;
+inst A;
+inst B;
+A: instance;
+in A,0 from found;
+out jedna,1 to B;
+concurrent;
+label e0; out B1,2 to B;
+label e1; out B,3 to lost;
+endconcurrent;
+in jedna,4 from B;
+endinstance;
+B: instance;
+in jedna,1 from A;
+in B1,2 from A;
+out jedna,4 to A;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test01.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test01.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test01.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,27 @@
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+Warning: The file is breaking the ITU-T Z120 standard
+OK: z120_test01.mpr is correct, should be correct
+
+mscdocument z120_test01;
+msc z120_test01;
+inst ONE;
+inst TWO;
+ONE: instance;
+in LEFT,0 from found;
+out NAME,1 to TWO;
+out NAME,2 to TWO;
+endinstance;
+TWO: instance;
+out LOOPBACK,3 to TWO;
+out RIGHT,4 to lost;
+in NAME,2 from ONE;
+in NAME,1 from ONE;
+in LOOPBACK,3 from TWO;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test02.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test02.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test02.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,26 @@
+Warning: The file is breaking the ITU-T Z120 standard
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test02.mpr is correct, should be correct
+
+mscdocument z120_test02;
+msc z120_test02;
+initial connect L0;
+L0: connect L1, L2;
+L1: condition STATE1 connect L3;
+L2: condition STATE2 connect L4;
+L3: reference ACTION1 connect L5;
+L4: reference ACTION2 connect L6, L7;
+L5: final;
+L6: reference ACTION3A connect L0;
+L7: reference ACTION3B connect L8;
+L8: final;
+endmsc;
+msc ACTION1;
+endmsc;
+msc ACTION2;
+endmsc;
+msc ACTION3A;
+endmsc;
+msc ACTION3B;
+endmsc;
Modified: trunk/tests/z120_test/z120_test03.mpr
===================================================================
--- trunk/tests/z120_test/z120_test03.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test03.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,6 @@
/*****************************************************
Simple test of bmsc (event driven notification)
-Anticipated result:
-
-mscdocument z120_test03;
-msc pok2;
-inst A;
-inst B;
-A: instance;
-in A,0 from found;
-out jedna,1 to B;
-concurrent;
-label e0; out B1,2 to B;
-label e1; out B,3 to lost;
-endconcurrent;
-endinstance;
-B: instance;
-in jedna,1 from A;
-in B1,2 from A;
-endinstance;
-endmsc;
-
******************************************************/
mscdocument bbb;
Added: trunk/tests/z120_test/z120_test03.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test03.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test03.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+OK: z120_test03.mpr is correct, should be correct
+
+mscdocument z120_test03;
+msc pok2;
+inst A;
+inst B;
+A: instance;
+in A,0 from found;
+out jedna,1 to B;
+concurrent;
+label e0; out B1,2 to B;
+label e1; out B,3 to lost;
+endconcurrent;
+endinstance;
+B: instance;
+in jedna,1 from A;
+in B1,2 from A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test04.mpr
===================================================================
--- trunk/tests/z120_test/z120_test04.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test04.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,23 +1,5 @@
/*************************************************
Simple test of HMSC
-
-Anticipated result:
-
-Warning 09: There is reference to nonexisted MSC
-
-mscdocument z120_test04;
-msc Stranka1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference NAME connect L2;
-L2: reference NAME1 connect L3;
-L3: final;
-endmsc;
-msc NAME;
-endmsc;
-msc NAME1;
-endmsc;
-
**************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test04.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test04.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test04.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,16 @@
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test04.mpr is correct, should be correct
+
+mscdocument z120_test04;
+msc Stranka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference NAME connect L2;
+L2: reference NAME1 connect L3;
+L3: final;
+endmsc;
+msc NAME;
+endmsc;
+msc NAME1;
+endmsc;
Modified: trunk/tests/z120_test/z120_test05.mpr
===================================================================
--- trunk/tests/z120_test/z120_test05.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test05.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,22 +1,5 @@
/***********************************************
Simple test of bMSC (event driven notification)
-
-Anticipated result:
-
-mscdocument z120_test05;
-msc pok2;
-inst p1;
-inst p2;
-p1: instance;
-out a,0 to p2;
-in a,1 from p2;
-endinstance;
-p2: instance;
-in a,0 from p1;
-out a,1 to p1;
-endinstance;
-endmsc;
-
***********************************************/
msc pok2;
Added: trunk/tests/z120_test/z120_test05.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test05.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test05.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,15 @@
+OK: z120_test05.mpr is correct, should be correct
+
+mscdocument z120_test05;
+msc pok2;
+inst p1;
+inst p2;
+p1: instance;
+out a,0 to p2;
+in a,1 from p2;
+endinstance;
+p2: instance;
+in a,0 from p1;
+out a,1 to p1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test06.mpr
===================================================================
--- trunk/tests/z120_test/z120_test06.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test06.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,22 +1,5 @@
/*********************************************
Simple bMSC (event driven notification)
-
-Anticipated result:
-
-mscdocument z120_test06;
-msc Strnka1;
-inst I1;
-inst I2;
-I1: instance;
-out M1,0 to I2;
-out M1,1 to I2;
-endinstance;
-I2: instance;
-in M1,0 from I1;
-in M1,1 from I1;
-endinstance;
-endmsc;
-
*********************************************/
msc Strnka1;
Added: trunk/tests/z120_test/z120_test06.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test06.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test06.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,15 @@
+OK: z120_test06.mpr is correct, should be correct
+
+mscdocument z120_test06;
+msc Strnka1;
+inst I1;
+inst I2;
+I1: instance;
+out M1,0 to I2;
+out M1,1 to I2;
+endinstance;
+I2: instance;
+in M1,0 from I1;
+in M1,1 from I1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test07.mpr
===================================================================
--- trunk/tests/z120_test/z120_test07.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test07.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,22 +1,5 @@
/************************************************
Simple example of bMSC (instance driven notification)
-
-Anticipated result:
-
-mscdocument z120_test07;
-msc pok2;
-inst A;
-inst B;
-A: instance;
-out M1,0 to B;
-out M2,1 to B;
-endinstance;
-B: instance;
-in M1,0 from A;
-in M2,1 from A;
-endinstance;
-endmsc;
-
************************************************/
msc pok2;
Added: trunk/tests/z120_test/z120_test07.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test07.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test07.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,15 @@
+OK: z120_test07.mpr is correct, should be correct
+
+mscdocument z120_test07;
+msc pok2;
+inst A;
+inst B;
+A: instance;
+out M1,0 to B;
+out M2,1 to B;
+endinstance;
+B: instance;
+in M1,0 from A;
+in M2,1 from A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test08.mpr
===================================================================
--- trunk/tests/z120_test/z120_test08.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test08.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,24 +1,5 @@
/***********************************************
Example of bMsc with coregion (instance driven notification)
-
-Anticipated result:
-
-mscdocument z120_test08;
-msc Stranka1;
-inst NAME1;
-inst NAME2;
-NAME1: instance;
-concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
-endconcurrent;
-endinstance;
-NAME2: instance;
-out a,1 to NAME1;
-in b,0 from NAME1;
-endinstance;
-endmsc;
-
***********************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test08.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test08.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test08.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,17 @@
+OK: z120_test08.mpr is correct, should be correct
+
+mscdocument z120_test08;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0; out b,0 to NAME2 before e1;
+label e1; in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test09.mpr
===================================================================
--- trunk/tests/z120_test/z120_test09.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test09.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,19 +1,5 @@
/*************************************************
Exampe of bMsc where are 2 instances with the same name.
-
-Anticipated result:
-
-mscdocument z120_test09;
-msc Stranka1;
-inst NAME;
-inst NAME;
-NAME: instance;
-endinstance;
-NAME: instance;
-endinstance;
-endmsc;
-
-
*************************************************/
mscdocument Vykres1;
Added: trunk/tests/z120_test/z120_test09.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test09.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test09.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,13 @@
+Warning 16: Instance with the same name (NAME) has been created
+
+OK: z120_test09.mpr is correct, should be correct
+
+mscdocument z120_test09;
+msc Stranka1;
+inst NAME;
+inst NAME;
+NAME: instance;
+endinstance;
+NAME: instance;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test10.mpr
===================================================================
--- trunk/tests/z120_test/z120_test10.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test10.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,24 +1,5 @@
/***************************************************
Example of bMSC with mesages with the same name.
-
-Anticipated result:
-
-mscdocument z120_test10;
-msc Stranka1;
-inst W;
-inst Q;
-W: instance;
-out a,0 to Q;
-out a,1 to Q;
-out a,2 to Q;
-endinstance;
-Q: instance;
-in a,0 from W;
-in a,1 from W;
-in a,2 from W;
-endinstance;
-endmsc;
-
***************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test10.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test10.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test10.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,17 @@
+OK: z120_test10.mpr is correct, should be correct
+
+mscdocument z120_test10;
+msc Stranka1;
+inst W;
+inst Q;
+W: instance;
+out a,0 to Q;
+out a,1 to Q;
+out a,2 to Q;
+endinstance;
+Q: instance;
+in a,0 from W;
+in a,1 from W;
+in a,2 from W;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test11.mpr
===================================================================
--- trunk/tests/z120_test/z120_test11.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test11.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,32 +1,5 @@
/*************************************************
Example of bMSC with coregion (used '_' sign)
-
-Anticipated result:
-
-mscdocument z120_test11;
-msc Strnka1;
-inst PC;
-inst Server;
-PC: instance;
-out SYN,0 to Server;
-in SYNACK,1 from Server;
-out ACK,2 to Server;
-out request_a,3 to Server;
-out request_b,4 to Server;
-in result,5 from Server;
-endinstance;
-Server: instance;
-in SYN,0 from PC;
-out SYNACK,1 to PC;
-in ACK,2 from PC;
-concurrent;
-label e0; in request_a,3 from PC before e1;
-label e2; in request_b,4 from PC;
-label e1; out result,5 to PC;
-endconcurrent;
-endinstance;
-endmsc;
-
*************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test11.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test11.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test11.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,25 @@
+OK: z120_test11.mpr is correct, should be correct
+
+mscdocument z120_test11;
+msc Strnka1;
+inst PC;
+inst Server;
+PC: instance;
+out SYN,0 to Server;
+in SYNACK,1 from Server;
+out ACK,2 to Server;
+out request_a,3 to Server;
+out request_b,4 to Server;
+in result,5 from Server;
+endinstance;
+Server: instance;
+in SYN,0 from PC;
+out SYNACK,1 to PC;
+in ACK,2 from PC;
+concurrent;
+label e0; in request_a,3 from PC before e1;
+label e2; in request_b,4 from PC;
+label e1; out result,5 to PC;
+endconcurrent;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test12.mpr
===================================================================
--- trunk/tests/z120_test/z120_test12.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test12.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,40 +1,5 @@
/*************************************************
Example of bMSC with two coretions on instances
-
-Anticipated result:
-
-mscdocument z120_test12;
-msc Strnka1;
-inst A;
-inst B;
-A: instance;
-concurrent;
-label e0; out ano,0 to B;
-label e1; out ano,1 to B;
-label e2; in nie,2 from B;
-endconcurrent;
-concurrent;
-label e3; out micron,3 to B;
-label e4; out rad,4 to lost;
-endconcurrent;
-in dan,5 from B;
-in track,6 from B;
-endinstance;
-B: instance;
-concurrent;
-label e5; in ano,1 from A;
-label e6; out nie,2 to A;
-label e7; in ano,0 from A;
-endconcurrent;
-in micron,3 from A;
-concurrent;
-label e8; out dan,5 to A;
-endconcurrent;
-out track,6 to A;
-in rad,7 from found;
-endinstance;
-endmsc;
-
*************************************************/
mscdocument test11.vsd;
Added: trunk/tests/z120_test/z120_test12.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test12.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test12.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,33 @@
+OK: z120_test12.mpr is correct, should be correct
+
+mscdocument z120_test12;
+msc Strnka1;
+inst A;
+inst B;
+A: instance;
+concurrent;
+label e0; out ano,0 to B;
+label e1; out ano,1 to B;
+label e2; in nie,2 from B;
+endconcurrent;
+concurrent;
+label e3; out micron,3 to B;
+label e4; out rad,4 to lost;
+endconcurrent;
+in dan,5 from B;
+in track,6 from B;
+endinstance;
+B: instance;
+concurrent;
+label e5; in ano,1 from A;
+label e6; out nie,2 to A;
+label e7; in ano,0 from A;
+endconcurrent;
+in micron,3 from A;
+concurrent;
+label e8; out dan,5 to A;
+endconcurrent;
+out track,6 to A;
+in rad,7 from found;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test13.mpr
===================================================================
--- trunk/tests/z120_test/z120_test13.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test13.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,32 +1,5 @@
/************************************************
Example of bMSC with before, after relation between messages.
-
-Anticipated result:
-
-mscdocument z120_test13;
-msc Strnka1;
-inst PC;
-inst Server;
-PC: instance;
-out SYN,0 to Server;
-in SYNACK,1 from Server;
-out ACK,2 to Server;
-out request_a,3 to Server;
-out request_b,4 to Server;
-in result,5 from Server;
-endinstance;
-Server: instance;
-in SYN,0 from PC;
-out SYNACK,1 to PC;
-in ACK,2 from PC;
-concurrent;
-label e0; out result,5 to PC before e1;
-label e2; in request_b,4 from PC;
-label e1; in request_a,3 from PC;
-endconcurrent;
-endinstance;
-endmsc;
-
************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test13.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test13.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test13.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,25 @@
+OK: z120_test13.mpr is correct, should be correct
+
+mscdocument z120_test13;
+msc Strnka1;
+inst PC;
+inst Server;
+PC: instance;
+out SYN,0 to Server;
+in SYNACK,1 from Server;
+out ACK,2 to Server;
+out request_a,3 to Server;
+out request_b,4 to Server;
+in result,5 from Server;
+endinstance;
+Server: instance;
+in SYN,0 from PC;
+out SYNACK,1 to PC;
+in ACK,2 from PC;
+concurrent;
+label e0; out result,5 to PC before e1;
+label e2; in request_b,4 from PC;
+label e1; in request_a,3 from PC;
+endconcurrent;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test14.mpr
===================================================================
--- trunk/tests/z120_test/z120_test14.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test14.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,37 +1,5 @@
/***********************************************
Example of bMSC
-
-Anticipated result:
-
-mscdocument z120_test14;
-msc Strnka1;
-inst A;
-inst B;
-A: instance;
-concurrent;
-label e0; out ano,0 to B;
-label e1; in nie,1 from B;
-endconcurrent;
-concurrent;
-label e2; out micron,2 to B;
-endconcurrent;
-in dan,3 from B;
-in track,4 from B;
-endinstance;
-B: instance;
-concurrent;
-label e3; out nie,1 to A;
-label e4; in ano,0 from A;
-endconcurrent;
-in micron,2 from A;
-concurrent;
-label e5; out dan,3 to A;
-endconcurrent;
-out track,4 to A;
-in rad,5 from found;
-endinstance;
-endmsc;
-
***********************************************/
mscdocument test11.vsd;
msc Strnka1;
Added: trunk/tests/z120_test/z120_test14.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test14.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test14.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,30 @@
+OK: z120_test14.mpr is correct, should be correct
+
+mscdocument z120_test14;
+msc Strnka1;
+inst A;
+inst B;
+A: instance;
+concurrent;
+label e0; out ano,0 to B;
+label e1; in nie,1 from B;
+endconcurrent;
+concurrent;
+label e2; out micron,2 to B;
+endconcurrent;
+in dan,3 from B;
+in track,4 from B;
+endinstance;
+B: instance;
+concurrent;
+label e3; out nie,1 to A;
+label e4; in ano,0 from A;
+endconcurrent;
+in micron,2 from A;
+concurrent;
+label e5; out dan,3 to A;
+endconcurrent;
+out track,4 to A;
+in rad,5 from found;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test15.mpr
===================================================================
--- trunk/tests/z120_test/z120_test15.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test15.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,34 +1,5 @@
/***********************************************
Example of bMSC
-
-Anticipated result:
-
-mscdocument z120_test15;
-msc Strnka1;
-inst client;
-inst server;
-client: instance;
-concurrent;
-label e0; out no,0 to server;
-label e1; in know,1 from server;
-endconcurrent;
-out yes,2 to lost;
-concurrent;
-label e2; in tric,3 from server;
-endconcurrent;
-in tric,4 from found;
-endinstance;
-server: instance;
-in no,0 from client;
-concurrent;
-label e3; out know,1 to client;
-endconcurrent;
-concurrent;
-label e4; out tric,3 to client;
-endconcurrent;
-endinstance;
-endmsc;
-
***********************************************/
mscdocument Vkres2;
Added: trunk/tests/z120_test/z120_test15.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test15.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test15.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,27 @@
+OK: z120_test15.mpr is correct, should be correct
+
+mscdocument z120_test15;
+msc Strnka1;
+inst client;
+inst server;
+client: instance;
+concurrent;
+label e0; out no,0 to server;
+label e1; in know,1 from server;
+endconcurrent;
+out yes,2 to lost;
+concurrent;
+label e2; in tric,3 from server;
+endconcurrent;
+in tric,4 from found;
+endinstance;
+server: instance;
+in no,0 from client;
+concurrent;
+label e3; out know,1 to client;
+endconcurrent;
+concurrent;
+label e4; out tric,3 to client;
+endconcurrent;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test16.mpr
===================================================================
--- trunk/tests/z120_test/z120_test16.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test16.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,50 +1,5 @@
/***********************************************
Example of HMSC with references to bMSC.
-
-Anticipated result:
-
-mscdocument z120_test16;
-msc Strnka1;
-initial connect L0;
-L0: reference bmsc1 connect L1;
-L1: condition true connect L2, L3;
-L2: reference bmsc2 connect L4;
-L3: reference bmsc3 connect L4;
-L4: final;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-out yes,0 to B;
-endinstance;
-B: instance;
-in yes,0 from A;
-endinstance;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-endinstance;
-B: instance;
-out no,0 to A;
-endinstance;
-endmsc;
-msc bmsc3;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-out ok,1 to B;
-endinstance;
-B: instance;
-out no,0 to A;
-in ok,1 from A;
-endinstance;
-endmsc;
-
***********************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test16.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test16.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test16.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,43 @@
+OK: z120_test16.mpr is correct, should be correct
+
+mscdocument z120_test16;
+msc Strnka1;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: condition true connect L2, L3;
+L2: reference bmsc2 connect L4;
+L3: reference bmsc3 connect L4;
+L4: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test17.mpr
===================================================================
--- trunk/tests/z120_test/z120_test17.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test17.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,50 +1,5 @@
/*************************************************
Example of HMSC with references to bMSC (unordered bMSC definitions)
-
-Anticipated result:
-
-mscdocument z120_test17;
-msc Strnka1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference bmsc2 connect L3;
-L2: reference bmsc1 connect L3;
-L3: reference bmsc3 connect L4;
-L4: final;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-endinstance;
-B: instance;
-out no,0 to A;
-endinstance;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-out yes,0 to B;
-endinstance;
-B: instance;
-in yes,0 from A;
-endinstance;
-endmsc;
-msc bmsc3;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-out ok,1 to B;
-endinstance;
-B: instance;
-out no,0 to A;
-in ok,1 from A;
-endinstance;
-endmsc;
-
*************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test17.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test17.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test17.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,43 @@
+OK: z120_test17.mpr is correct, should be correct
+
+mscdocument z120_test17;
+msc Strnka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference bmsc2 connect L3;
+L2: reference bmsc1 connect L3;
+L3: reference bmsc3 connect L4;
+L4: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test18.mpr
===================================================================
--- trunk/tests/z120_test/z120_test18.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test18.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,3 +1,7 @@
+/*************************************************************
+Example of MSC where HMSC has non-available node (L1).
+*************************************************************/
+
mscdocument Vkres1;
msc bmsc3;
Added: trunk/tests/z120_test/z120_test18.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test18.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test18.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,42 @@
+Warning 02: There are more unreferenced MSC
+
+OK: z120_test18.mpr is correct, should be correct
+
+mscdocument z120_test18;
+msc Strnka1;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: final;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test19.mpr
===================================================================
--- trunk/tests/z120_test/z120_test19.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test19.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,50 +1,5 @@
/******************************************************
Example of HMSC with references to bMSC (HMSC is defined at the end of the file)
-
-Anticipated result:
-
-mscdocument z120_test19;
-msc Strnka1;
-initial connect L0;
-L0: reference bmsc1 connect L1;
-L1: condition true connect L2, L3;
-L2: reference bmsc2 connect L4;
-L3: reference bmsc3 connect L4;
-L4: final;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-out yes,0 to B;
-endinstance;
-B: instance;
-in yes,0 from A;
-endinstance;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-endinstance;
-B: instance;
-out no,0 to A;
-endinstance;
-endmsc;
-msc bmsc3;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-out ok,1 to B;
-endinstance;
-B: instance;
-out no,0 to A;
-in ok,1 from A;
-endinstance;
-endmsc;
-
******************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test19.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test19.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test19.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,43 @@
+OK: z120_test19.mpr is correct, should be correct
+
+mscdocument z120_test19;
+msc Strnka1;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: condition true connect L2, L3;
+L2: reference bmsc2 connect L4;
+L3: reference bmsc3 connect L4;
+L4: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test20.mpr
===================================================================
--- trunk/tests/z120_test/z120_test20.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test20.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,36 +1,5 @@
/**************************************************
Example of HMSC with references to bMSC and loop (L0->L1->L0)
-
-Anticipated result:
-
-mscdocument z120_test20;
-msc Strnka1;
-initial connect L0;
-L0: reference bmsc1 connect L1;
-L1: reference bmsc2 connect L0, L2;
-L2: final;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-out yes,0 to B;
-endinstance;
-B: instance;
-in yes,0 from A;
-endinstance;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-endinstance;
-B: instance;
-out no,0 to A;
-endinstance;
-endmsc;
-
**************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test20.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test20.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test20.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,29 @@
+OK: z120_test20.mpr is correct, should be correct
+
+mscdocument z120_test20;
+msc Strnka1;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: reference bmsc2 connect L0, L2;
+L2: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test21.mpr
===================================================================
--- trunk/tests/z120_test/z120_test21.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test21.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,38 +1,5 @@
/****************************************************
Example of HMSC with references to bMSC. Final node is not defined at the end of HMSC definition.
-
-Anticipated result:
-
-Warning 02: There are more unreferenced MSC
-
-mscdocument z120_test21;
-msc Strnka1;
-initial connect L0;
-L0: reference bmsc1 connect L1;
-L1: reference bmsc2 connect L0, L2;
-L2: final;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-out yes,0 to B;
-endinstance;
-B: instance;
-in yes,0 from A;
-endinstance;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-in no,0 from B;
-endinstance;
-B: instance;
-out no,0 to A;
-endinstance;
-endmsc;
-
****************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test21.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test21.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test21.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,43 @@
+Warning 02: There are more unreferenced MSC
+
+OK: z120_test21.mpr is correct, should be correct
+
+mscdocument z120_test21;
+msc Strnka1;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: reference bmsc2 connect L0, L2;
+L2: final;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+out ok,1 to B;
+endinstance;
+B: instance;
+out no,0 to A;
+in ok,1 from A;
+endinstance;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+out yes,0 to B;
+endinstance;
+B: instance;
+in yes,0 from A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+in no,0 from B;
+endinstance;
+B: instance;
+out no,0 to A;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test22.mpr
===================================================================
--- trunk/tests/z120_test/z120_test22.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test22.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,23 +1,5 @@
/****************************************************
Example of HMSC (notification according to Z120_1999 standard)
-
-Anticipated result:
-
-mscdocument z120_test22;
-msc setup_attach;
-initial connect L0;
-L0: condition disconnected connect L1;
-L1: connect L2, L3;
-L2: reference failure connect L0;
-L3: reference connection connect L4;
-L4: condition connected connect L5;
-L5: final;
-endmsc;
-msc failure;
-endmsc;
-msc connection;
-endmsc;
-
****************************************************/
msc setup_attach;
initial connect L1;
Added: trunk/tests/z120_test/z120_test22.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test22.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test22.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,16 @@
+OK: z120_test22.mpr is correct, should be correct
+
+mscdocument z120_test22;
+msc setup_attach;
+initial connect L0;
+L0: condition disconnected connect L1;
+L1: connect L2, L3;
+L2: reference failure connect L0;
+L3: reference connection connect L4;
+L4: condition connected connect L5;
+L5: final;
+endmsc;
+msc connection;
+endmsc;
+msc failure;
+endmsc;
Modified: trunk/tests/z120_test/z120_test23.mpr
===================================================================
--- trunk/tests/z120_test/z120_test23.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test23.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,16 +1,5 @@
/**************************************************
Example of bMSC with commnet and definition of parameter after message identification
-
-Anticipated result:
-
-mscdocument z120_test23;
-msc test01;
-inst ONE;
-ONE: instance;
-in LEFT,0 from found;
-endinstance;
-endmsc;
-
**************************************************/
mscdocument z120;
Added: trunk/tests/z120_test/z120_test23.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test23.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test23.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,9 @@
+OK: z120_test23.mpr is correct, should be correct
+
+mscdocument z120_test23;
+msc test01;
+inst ONE;
+ONE: instance;
+in LEFT,0 from found;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test24.mpr
===================================================================
--- trunk/tests/z120_test/z120_test24.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test24.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,5 @@
/**************************************************
Example of bMSC where two instances have the same name
-
-Anticipated result:
-
-Warning 16: Instance with the same name has been created
-
-mscdocument z120_test24;
-msc Stranka1;
-inst NAME;
-inst NAME;
-NAME: instance;
-out a,0 to NAME;
-out a,1 to NAME;
-out a,2 to NAME;
-in a,0 from NAME;
-in a,1 from NAME;
-in a,2 from NAME;
-endinstance;
-NAME: instance;
-endinstance;
-endmsc;
-
**************************************************/
mscdocument z120_test09;
Added: trunk/tests/z120_test/z120_test24.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test24.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test24.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+Warning 16: Instance with the same name (NAME) has been created
+
+OK: z120_test24.mpr is correct, should be correct
+
+mscdocument z120_test24;
+msc Stranka1;
+inst NAME;
+inst NAME;
+NAME: instance;
+out a,0 to NAME;
+out a,1 to NAME;
+out a,2 to NAME;
+in a,0 from NAME;
+in a,1 from NAME;
+in a,2 from NAME;
+endinstance;
+NAME: instance;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test25.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test25.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test25.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,38 @@
+Warning 16: Instance with the same name (NAME) has been created
+
+Warning 18: Two mscs have the same name (Stranka_1)
+
+OK: z120_test25.mpr is correct, should be correct
+
+mscdocument z120_test25;
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+msc One;
+initial connect L0;
+L0: condition access connect L1;
+L1: final;
+endmsc;
+msc Trick;
+inst NAME;
+inst NAME;
+NAME: instance;
+out NAME,0 to NAME;
+in NAME,0 from NAME;
+endinstance;
+NAME: instance;
+endinstance;
+endmsc;
+msc Two;
+inst Second;
+inst First;
+Second: instance;
+out true,0 to First;
+endinstance;
+First: instance;
+in true,0 from Second;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test26.mpr
===================================================================
--- trunk/tests/z120_test/z120_test26.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test26.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,31 +1,5 @@
/**********************************************
Example of HMSC with reference to HMSC
-
-Anticipated result:
-
-mscdocument z120_test26;
-msc Stranka_1;
-initial connect L0;
-L0: reference One connect L1;
-L1: reference Two connect L2;
-L2: final;
-endmsc;
-msc One;
-initial connect L0;
-L0: condition access connect L1;
-L1: final;
-endmsc;
-msc Two;
-inst Second;
-inst First;
-Second: instance;
-out true,0 to First;
-endinstance;
-First: instance;
-in true,0 from Second;
-endinstance;
-endmsc;
-
**********************************************/
mscdocument Vykres2;
Added: trunk/tests/z120_test/z120_test26.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test26.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test26.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,24 @@
+OK: z120_test26.mpr is correct, should be correct
+
+mscdocument z120_test26;
+msc Stranka_1;
+initial connect L0;
+L0: reference One connect L1;
+L1: reference Two connect L2;
+L2: final;
+endmsc;
+msc One;
+initial connect L0;
+L0: condition access connect L1;
+L1: final;
+endmsc;
+msc Two;
+inst Second;
+inst First;
+Second: instance;
+out true,0 to First;
+endinstance;
+First: instance;
+in true,0 from Second;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test27.mpr
===================================================================
--- trunk/tests/z120_test/z120_test27.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test27.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,27 +1,5 @@
/*****************************************************
Example of MSC where two instances have the same name (NAME)
-
-Anticipated result:
-
-Warning 16: Instance with the same name (NAME) has been created
-
-mscdocument z120_test27;
-msc Stranka_1;
-initial connect L0;
-L0: reference Trick connect L1;
-L1: final;
-endmsc;
-msc Trick;
-inst NAME;
-inst NAME;
-NAME: instance;
-out NAME,0 to NAME;
-in NAME,0 from NAME;
-endinstance;
-NAME: instance;
-endinstance;
-endmsc;
-
*****************************************************/
msc Trick;
Added: trunk/tests/z120_test/z120_test27.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test27.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test27.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,20 @@
+Warning 16: Instance with the same name (NAME) has been created
+
+OK: z120_test27.mpr is correct, should be correct
+
+mscdocument z120_test27;
+msc Stranka_1;
+initial connect L0;
+L0: reference Trick connect L1;
+L1: final;
+endmsc;
+msc Trick;
+inst NAME;
+inst NAME;
+NAME: instance;
+out NAME,0 to NAME;
+in NAME,0 from NAME;
+endinstance;
+NAME: instance;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test28.mpr
===================================================================
--- trunk/tests/z120_test/z120_test28.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test28.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,25 +1,5 @@
/******************************************
Example of HMSC with two nodes with the same name (condition node)
-
-Anticipated result:
-
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
-mscdocument z120_test28;
-msc Stranka1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference NAME connect L2;
-L2: reference NAME1 connect L3;
-L3: final;
-endmsc;
-msc NAME;
-endmsc;
-msc NAME1;
-endmsc;
-
*******************************************/
msc Stranka1;
initial connect L0;
Added: trunk/tests/z120_test/z120_test28.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test28.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test28.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,18 @@
+Warning 15: The node L1 has been created
+
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test28.mpr is correct, should be correct
+
+mscdocument z120_test28;
+msc Stranka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference NAME connect L2;
+L2: reference NAME1 connect L3;
+L3: final;
+endmsc;
+msc NAME;
+endmsc;
+msc NAME1;
+endmsc;
Modified: trunk/tests/z120_test/z120_test29.mpr
===================================================================
--- trunk/tests/z120_test/z120_test29.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test29.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,25 +1,5 @@
/******************************************
Example of HMSC with two nodes with the same name (connection node)
-
-Anticipated result:
-
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
-mscdocument z120_test29;
-msc Stranka1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference NAME connect L2;
-L2: reference NAME1 connect L3;
-L3: final;
-endmsc;
-msc NAME;
-endmsc;
-msc NAME1;
-endmsc;
-
*******************************************/
msc Stranka1;
initial connect L0;
Added: trunk/tests/z120_test/z120_test29.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test29.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test29.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,18 @@
+Warning 15: The node L1 has been created
+
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test29.mpr is correct, should be correct
+
+mscdocument z120_test29;
+msc Stranka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference NAME connect L2;
+L2: reference NAME1 connect L3;
+L3: final;
+endmsc;
+msc NAME;
+endmsc;
+msc NAME1;
+endmsc;
Modified: trunk/tests/z120_test/z120_test30.mpr
===================================================================
--- trunk/tests/z120_test/z120_test30.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test30.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,25 +1,5 @@
/******************************************
Example of HMSC with two nodes with the same name (reference node)
-
-Anticipated result:
-
-Warning 15: The node L1 has been created
-
-Warning 09: There is reference to nonexisted MSC
-
-mscdocument z120_test30;
-msc Stranka1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference NAME connect L2;
-L2: reference NAME1 connect L3;
-L3: final;
-endmsc;
-msc NAME;
-endmsc;
-msc NAME1;
-endmsc;
-
*******************************************/
msc Stranka1;
initial connect L0;
Added: trunk/tests/z120_test/z120_test30.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test30.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test30.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,18 @@
+Warning 15: The node L1 has been created
+
+Warning 09: There is reference to nonexisted MSC
+
+OK: z120_test30.mpr is correct, should be correct
+
+mscdocument z120_test30;
+msc Stranka1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference NAME connect L2;
+L2: reference NAME1 connect L3;
+L3: final;
+endmsc;
+msc NAME;
+endmsc;
+msc NAME1;
+endmsc;
Modified: trunk/tests/z120_test/z120_test31.mpr
===================================================================
--- trunk/tests/z120_test/z120_test31.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test31.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,12 +1,5 @@
/**************************************************
Example of HMSC where is recursive loop
-
-Anticipated result:
-
-Warning 09: There is reference to nonexisted MSC
-
-Error 03: There is no MSC without reference
-
**************************************************/
mscdocument Vkres1;
Added: trunk/tests/z120_test/z120_test31.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test31.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test31.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,15 @@
+Warning 09: There is reference to nonexisted MSC
+
+Error 03: There is no MSC without reference
+
+OK: z120_test31.mpr is correct, should be correct
+
+mscdocument z120_test31;
+msc out_iha;
+initial connect L0;
+L0: reference bmsc1 connect L1;
+L1: reference out_iha connect L0, L2;
+L2: final;
+endmsc;
+msc bmsc1;
+endmsc;
Modified: trunk/tests/z120_test/z120_test32.mpr
===================================================================
--- trunk/tests/z120_test/z120_test32.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test32.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,5 @@
/******************************************************
Example of bMSC where two events have the same name (output message)
-
-Anticipated result:
-
-Warning 17: Event with the same name (e1) has been created
-
-mscdocument z120_test32;
-msc Stranka1;
-inst NAME1;
-inst NAME2;
-NAME1: instance;
-concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
-endconcurrent;
-endinstance;
-NAME2: instance;
-out a,1 to NAME1;
-in b,0 from NAME1;
-endinstance;
-endmsc;
-
******************************************************/
msc Stranka1;
inst NAME1;
Added: trunk/tests/z120_test/z120_test32.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test32.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test32.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+Warning 17: Event with the same name (e1) has been created
+
+OK: z120_test32.mpr is correct, should be correct
+
+mscdocument z120_test32;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0; out b,0 to NAME2 before e1;
+label e1; in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test33.mpr
===================================================================
--- trunk/tests/z120_test/z120_test33.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test33.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,5 @@
/******************************************************
Example of bMSC where two events have the same name (input message)
-
-Anticipated result:
-
-Warning 17: Event with the same name (e0) has been created
-
-mscdocument z120_test33;
-msc Stranka1;
-inst NAME1;
-inst NAME2;
-NAME1: instance;
-concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
-endconcurrent;
-endinstance;
-NAME2: instance;
-out a,1 to NAME1;
-in b,0 from NAME1;
-endinstance;
-endmsc;
-
******************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test33.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test33.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test33.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+Warning 17: Event with the same name (e0) has been created
+
+OK: z120_test33.mpr is correct, should be correct
+
+mscdocument z120_test33;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0; out b,0 to NAME2 before e1;
+label e1; in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test34.mpr
===================================================================
--- trunk/tests/z120_test/z120_test34.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test34.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,5 @@
/******************************************************
Example of bMSC where two events have the same name (incomplete output message)
-
-Anticipated result:
-
-Warning 17: Event with the same name (e1) has been created
-
-mscdocument z120_test34;
-msc Stranka1;
-inst NAME1;
-inst NAME2;
-NAME1: instance;
-concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
-endconcurrent;
-endinstance;
-NAME2: instance;
-out a,1 to NAME1;
-in b,0 from NAME1;
-endinstance;
-endmsc;
-
******************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test34.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test34.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test34.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+Warning 17: Event with the same name (e1) has been created
+
+OK: z120_test34.mpr is correct, should be correct
+
+mscdocument z120_test34;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0; out b,0 to NAME2 before e1;
+label e1; in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Modified: trunk/tests/z120_test/z120_test35.mpr
===================================================================
--- trunk/tests/z120_test/z120_test35.mpr 2009-09-10 09:52:12 UTC (rev 299)
+++ trunk/tests/z120_test/z120_test35.mpr 2009-09-10 09:52:26 UTC (rev 300)
@@ -1,26 +1,5 @@
/******************************************************
Example of bMSC where two events have the same name (incomplete input message)
-
-Anticipated result:
-
-Warning 17: Event with the same name (e0) has been created
-
-mscdocument z120_test35;
-msc Stranka1;
-inst NAME1;
-inst NAME2;
-NAME1: instance;
-concurrent;
-label e0; out b,0 to NAME2 before e1;
-label e1; in a,1 from NAME2;
-endconcurrent;
-endinstance;
-NAME2: instance;
-out a,1 to NAME1;
-in b,0 from NAME1;
-endinstance;
-endmsc;
-
******************************************************/
msc Stranka1;
Added: trunk/tests/z120_test/z120_test35.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test35.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test35.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,19 @@
+Warning 17: Event with the same name (e0) has been created
+
+OK: z120_test35.mpr is correct, should be correct
+
+mscdocument z120_test35;
+msc Stranka1;
+inst NAME1;
+inst NAME2;
+NAME1: instance;
+concurrent;
+label e0; out b,0 to NAME2 before e1;
+label e1; in a,1 from NAME2;
+endconcurrent;
+endinstance;
+NAME2: instance;
+out a,1 to NAME1;
+in b,0 from NAME1;
+endinstance;
+endmsc;
Added: trunk/tests/z120_test/z120_test36.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_test36.mpr.result (rev 0)
+++ trunk/tests/z120_test/z120_test36.mpr.result 2009-09-10 09:52:26 UTC (rev 300)
@@ -0,0 +1,21 @@
+OK: z120_test36.mpr is c...
[truncated message content] |
