[Scstudio-commits] SF.net SVN: scstudio:[518] trunk/tests/time_constraints

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 518
          http://scstudio.svn.sourceforge.net/scstudio/?rev=518&view=rev
Author:   lkorenciak
Date:     2009-12-11 22:22:34 +0000 (Fri, 11 Dec 2009)

Log Message:
-----------
fixed results for negative tests

Modified Paths:
--------------
    trunk/tests/time_constraints/proper_neg14.mpr.result
    trunk/tests/time_constraints/proper_neg15.mpr.result
    trunk/tests/time_constraints/proper_neg16.mpr.result
    trunk/tests/time_constraints/proper_neg17.mpr.result
    trunk/tests/time_constraints/proper_neg18.mpr.result
    trunk/tests/time_constraints/proper_neg19.mpr.result
    trunk/tests/time_constraints/proper_neg21.mpr.result
    trunk/tests/time_constraints/proper_neg22.mpr.result
    trunk/tests/time_constraints/proper_neg23.mpr.result
    trunk/tests/time_constraints/proper_neg24.mpr.result
    trunk/tests/time_constraints/proper_neg25.mpr.result
    trunk/tests/time_constraints/proper_neg26.mpr.result
    trunk/tests/time_constraints/proper_neg27.mpr.result

Modified: trunk/tests/time_constraints/proper_neg14.mpr.result
===================================================================

--- trunk/tests/time_constraints/proper_neg14.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg14.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -5,6 +5,7 @@
 mscdocument counter_example;
 msc HMSC;
 initial connect L0, L1;
+/* MARKED */
 L0: reference HMSC connect L2;
 /* MARKED */
 L1: reference NAME connect L2;

Modified: trunk/tests/time_constraints/proper_neg15.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg15.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg15.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -11,6 +11,7 @@
 endmsc;
 msc A;
 initial connect L0, L1;
+/* MARKED */
 L0: reference A time [0,inf);
 /* MARKED */
  top top L1 [0,inf)/* MARKED */

Modified: trunk/tests/time_constraints/proper_neg16.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg16.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg16.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -10,6 +10,7 @@
 endmsc;
 msc A;
 initial connect L0, L1;
+/* MARKED */
 L0: reference A connect L2;
 /* MARKED */
 L1: reference NAME/* MARKED */

Modified: trunk/tests/time_constraints/proper_neg17.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg17.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg17.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -4,8 +4,19 @@
 Correct Time Constraint Syntax violated
 OK: proper_neg17 violated Correct Time Constraint Syntax, should be violated
 mscdocument counter_example;
+msc HMSC;
+initial connect L0, L1;
+/* MARKED */
+L0: reference A time [0,inf);
+ connect L2;
+/* MARKED */
+L1: reference HMSC time [0,inf);
+ connect L2;
+L2: final;
+endmsc;
 msc A;
 initial connect L0, L1;
+/* MARKED */
 L0: reference A time [0,inf);
  connect L2;
 /* MARKED */

Modified: trunk/tests/time_constraints/proper_neg18.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg18.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg18.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -4,28 +4,35 @@
 Correct Time Constraint Syntax violated
 OK: proper_neg18 violated Correct Time Constraint Syntax, should be violated
 mscdocument counter_example;
-msc A;
+msc HMSC;
 initial connect L0, L1;
+/* MARKED */
 L0: reference A time [0,inf);
  connect L2;
 /* MARKED */
-L1: reference NAME time [0,inf);
+L1: reference HMSC time [0,inf);
  connect L2;
 L2: final;
 endmsc;
+msc A;
+initial connect L0, L1;
+/* MARKED */
+L0: reference A time [0,inf);
+ connect L2;
+L1: reference NAME/* MARKED */
+ bottom top L0 [0,inf);
+ connect L2;
+L2: final;
+endmsc;
 msc NAME;
 inst a;
 inst b;
 inst c;
 a: instance;
-label e0;
 in NAME,0 from c;
 endinstance;
 b: instance;
-label e1;
 in NAME,1 from c;
-/* MARKED */
-time e0 [0,inf);
 endinstance;
 c: instance;
 out NAME,1 to b;

Modified: trunk/tests/time_constraints/proper_neg19.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg19.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg19.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -1,3 +1,33 @@
 Warning 31: Infinite recursion at node: L1
 Warning 31: Infinite recursion at node: L2
 Warning 31: Infinite recursion at node: L0
+Correct Time Constraint Syntax violated
+OK: proper_neg19 violated Correct Time Constraint Syntax, should be violated
+mscdocument counter_example;
+msc HMSC;
+initial connect L0;
+/* MARKED */
+L0: reference A connect L1;
+L1: final;
+endmsc;
+msc A;
+initial connect L0;
+/* MARKED */
+L0: reference A time [0,inf);
+ connect L1;
+/* MARKED */
+L1: reference NAME connect L2;
+L2: final;
+endmsc;
+msc NAME;
+initial connect L0;
+/* MARKED */
+L0: reference A/* MARKED */
+ top bottom L1 [0,inf);
+ connect L1, L2;
+/* MARKED */
+L1: reference NAME connect L3;
+/* MARKED */
+L2: reference NAME connect L3;
+L3: final;
+endmsc;

Modified: trunk/tests/time_constraints/proper_neg21.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg21.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg21.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -7,6 +7,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A/* MARKED */
  top top L1 [0,inf)/* MARKED */
 , bottom L2 [0,inf);
@@ -24,6 +25,7 @@
  connect L6;
 L5: condition  connect L2;
 L6: final;
+/* MARKED */
 L2: reference A connect L0, L7;
 L7: connect L5, L3;
 endmsc;

Modified: trunk/tests/time_constraints/proper_neg22.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg22.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg22.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf)/* MARKED */
 , top L2 [0,inf);
  connect L2, L3;

Modified: trunk/tests/time_constraints/proper_neg23.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg23.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg23.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf)/* MARKED */
 , top L2 [0,inf);
  connect L2, L3;

Modified: trunk/tests/time_constraints/proper_neg24.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg24.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg24.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf)/* MARKED */
 , top L2 [0,inf);
  connect L2, L3;

Modified: trunk/tests/time_constraints/proper_neg25.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg25.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg25.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf);
  connect L2, L3;
 L2: reference NAME time [0,inf);
@@ -16,6 +17,7 @@
 L1: reference NAME time [0,inf);
  connect L5, L4;
 L5: final;
+/* MARKED */
 L4: reference A connect L5;
 endmsc;
 msc NAME;

Modified: trunk/tests/time_constraints/proper_neg26.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg26.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg26.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf);
  connect L2, L3;
 /* MARKED */
@@ -16,6 +17,7 @@
 L1: reference NAME time [0,inf);
  connect L4, L5;
 L4: final;
+/* MARKED */
 L5: reference B connect L4;
 endmsc;
 msc NAME;
@@ -39,6 +41,7 @@
 endmsc;
 msc B;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf);
  connect L2, L3;
 /* MARKED */
@@ -49,5 +52,6 @@
 L1: reference NAME time [0,inf);
  connect L4, L5;
 L4: final;
+/* MARKED */
 L5: reference B connect L4;
 endmsc;

Modified: trunk/tests/time_constraints/proper_neg27.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg27.mpr.result	2009-12-11 21:50:17 UTC (rev 517)
+++ trunk/tests/time_constraints/proper_neg27.mpr.result	2009-12-11 22:22:34 UTC (rev 518)
@@ -6,6 +6,7 @@
 mscdocument counter_example;
 msc A;
 initial connect L0;
+/* MARKED */
 L0: reference A bottom top L1 [0,inf);
  connect L2, L3;
 /* MARKED */
@@ -16,6 +17,7 @@
 L1: reference NAME time [0,inf);
  connect L4, L5;
 L4: final;
+/* MARKED */
 L5: reference B connect L4;
 endmsc;
 msc NAME;
@@ -39,11 +41,13 @@
 endmsc;
 msc B;
 initial connect L0;
+/* MARKED */
 L0: reference A top bottom L1 [0,inf);
  connect L2, L3;
 /* MARKED */
 L2: reference NAME connect L3;
 L3: connect L2, L1;
+/* MARKED */
 L1: reference B connect L4;
 L4: final;
 endmsc;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


