From: <ma...@us...> - 2011-10-03 23:00:50
|
Revision: 1204 http://scstudio.svn.sourceforge.net/scstudio/?rev=1204&view=rev Author: madzin Date: 2011-10-03 23:00:43 +0000 (Mon, 03 Oct 2011) Log Message: ----------- Add new test for diff algorithm Modified Paths: -------------- trunk/tests/diff/CMakeLists.txt Added Paths: ----------- trunk/tests/diff/flow10.mpr.result trunk/tests/diff/flow11.mpr trunk/tests/diff/spec11.mpr Modified: trunk/tests/diff/CMakeLists.txt =================================================================== --- trunk/tests/diff/CMakeLists.txt 2011-10-03 22:36:02 UTC (rev 1203) +++ trunk/tests/diff/CMakeLists.txt 2011-10-03 23:00:43 UTC (rev 1204) @@ -40,4 +40,7 @@ ADD_DIFF_TEST(spec08.mpr flow08_1.mpr 1) ADD_DIFF_TEST(spec09.mpr flow09_1.mpr 1) ADD_DIFF_TEST(spec10.mpr flow010.mpr 1) +ADD_DIFF_TEST(spec11.mpr flow011.mpr 1) +ADD_DIFF_TEST(spec12.mpr flow12_1.mpr 1) +ADD_DIFF_TEST(spec12.mpr flow12_2.mpr 1) Added: trunk/tests/diff/flow10.mpr.result =================================================================== --- trunk/tests/diff/flow10.mpr.result (rev 0) +++ trunk/tests/diff/flow10.mpr.result 2011-10-03 23:00:43 UTC (rev 1204) @@ -0,0 +1,40 @@ +OK: HMSC contains bMSC + +mscdocument msc_diff; +msc Page_1; +inst PC; +inst Router; +inst Server; +PC: instance; +out c,0 to Router; +/* REMOVED */ +/* REMOVED */ +out a,1 to Router; +out a,2 to Router; +in b,3 from Router; +out c,4 to Router; +endinstance; +Router: instance; +in c,0 from PC; +out a,5 to Server; +out b,6 to Server; +/* REMOVED */ +/* REMOVED */ +in a,1 from PC; +in b,7 from Server; +in a,2 from PC; +in b,8 from Server; +in a,9 from Server; +out b,3 to PC; +in a,10 from Server; +in c,4 from PC; +endinstance; +Server: instance; +in a,5 from Router; +in b,6 from Router; +out b,7 to Router; +out b,8 to Router; +out a,9 to Router; +out a,10 to Router; +endinstance; +endmsc; Added: trunk/tests/diff/flow11.mpr =================================================================== --- trunk/tests/diff/flow11.mpr (rev 0) +++ trunk/tests/diff/flow11.mpr 2011-10-03 23:00:43 UTC (rev 1204) @@ -0,0 +1,36 @@ +mscdocument bmsc_spec1.vsd; +msc Page_1; +inst PC; +inst Router; +inst Server; +PC: instance; +out c,0 to Router; +label e0; +out a,1 to Router; +in b,2 from Router; +label e1; +out c,3 to Router; +endinstance; +Router: instance; +in c,0 from PC; +label e2; +out a,4 to Server; +label e3; +out b,5 to Server; +in b,6 from Server; +in a,1 from PC; +in b,7 from Server; +in a,8 from Server; +out b,2 to PC; +in a,9 from Server; +in c,3 from PC; +endinstance; +Server: instance; +in a,4 from Router; +in b,5 from Router; +out b,6 to Router; +out b,7 to Router; +out a,8 to Router; +out a,9 to Router; +endinstance; +endmsc; Added: trunk/tests/diff/spec11.mpr =================================================================== --- trunk/tests/diff/spec11.mpr (rev 0) +++ trunk/tests/diff/spec11.mpr 2011-10-03 23:00:43 UTC (rev 1204) @@ -0,0 +1,35 @@ +mscdocument complete_pat6.vsd; +msc Page_1; +inst PC; +inst Router; +inst Server; +text 'Specification: complete.vsd Output: --------------------------------------------------------- Specification: bmsc_spec_absolute1.vsd Flow meets the specification Output: message -------------------------------------------------------- Specification: bmsc_spec_absolute2.vsd Flow meets the specification Output: message ------------------------------------------------------- Specification: bmsc_spec1.vsd Flow meets specification Output: message ------------------------------------------------------ Specification: bmsc_spec2.vsd Flow does not meet a matching with the specification Output: diff ----------------------------------------------------- Specification: bmsc_spec3.vsd'; +PC: instance; +out c,0 to Router; +out a,1 to Router; +out a,2 to Router; +in b,3 from Router; +out c,4 to Router; +endinstance; +Router: instance; +in c,0 from PC; +out a,5 to Server; +out b,6 to Server; +in a,1 from PC; +in b,7 from Server; +in a,2 from PC; +in b,8 from Server; +in a,9 from Server; +out b,3 to PC; +in a,10 from Server; +in c,4 from PC; +endinstance; +Server: instance; +in a,5 from Router; +in b,6 from Router; +out b,7 to Router; +out b,8 to Router; +out a,9 to Router; +out a,10 to Router; +endinstance; +endmsc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |