[Scstudio-commits] SF.net SVN: scstudio:[393] trunk

[<got...@us...>]

Revision: 393
          http://scstudio.svn.sourceforge.net/scstudio/?rev=393&view=rev
Author:   gotthardp
Date:     2009-10-02 19:25:03 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
Fixed Visual Studio warning.
Test for directed and non-directed time constraint added.

Modified Paths:
--------------
    trunk/src/data/Z120/Context.cpp
    trunk/tests/z120_test/CMakeLists.txt

Added Paths:
-----------
    trunk/tests/z120_test/z120_time06.mpr
    trunk/tests/z120_test/z120_time06.mpr.result

Modified: trunk/src/data/Z120/Context.cpp
===================================================================
--- trunk/src/data/Z120/Context.cpp	2009-10-02 16:03:11 UTC (rev 392)
+++ trunk/src/data/Z120/Context.cpp	2009-10-02 19:25:03 UTC (rev 393)
@@ -1094,7 +1094,7 @@
         return ;
       }
 
-      relation->glue_ref_nodes(kind, node.get(), context->time_relation_type, node2.get());
+      relation->glue_ref_nodes(kind == bottom, node.get(), context->time_relation_type == bottom, node2.get());
     }
     else
     {

Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt	2009-10-02 16:03:11 UTC (rev 392)
+++ trunk/tests/z120_test/CMakeLists.txt	2009-10-02 19:25:03 UTC (rev 393)
@@ -92,6 +92,7 @@
 ADD_Z120_TEST(z120_time03.mpr 1)
 ADD_Z120_TEST(z120_time04.mpr 1)
 ADD_Z120_TEST(z120_time05.mpr 1)
+ADD_Z120_TEST(z120_time06.mpr 1)
 
 
 # $Id$

Added: trunk/tests/z120_test/z120_time06.mpr
===================================================================
--- trunk/tests/z120_test/z120_time06.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time06.mpr	2009-10-02 19:25:03 UTC (rev 393)
@@ -0,0 +1,31 @@
+/* Mixed directed and non-directed constraints (keyword "origin")
+ */
+mscdocument z120_time06;
+msc Process;
+initial connect L0;
+L0: reference Event top top L1 [3];
+ bottom bottom L1 origin [4];
+ connect L1;
+L1: reference Event connect L2;
+L2: final;
+endmsc;
+msc Event;
+inst Client;
+inst Server;
+Client: instance;
+label e0;
+out INVITE,0 to Server;
+time e1 [1];
+label e1;
+in 200_OK,1 from Server;
+out ACK,2 to Server;
+endinstance;
+Server: instance;
+label e2;
+in INVITE,0 from Client;
+time e3 origin [2];
+out 200_OK,1 to Client;
+label e3;
+in ACK,2 from Client;
+endinstance;
+endmsc;


Property changes on: trunk/tests/z120_test/z120_time06.mpr
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/tests/z120_test/z120_time06.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time06.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time06.mpr.result	2009-10-02 19:25:03 UTC (rev 393)
@@ -0,0 +1,31 @@
+OK: z120_time05 is correct, should be correct
+
+mscdocument z120_time06;
+msc Process;
+initial connect L0;
+L0: reference Event top top L1 [3];
+ bottom bottom L1 origin [4];
+ connect L1;
+L1: reference Event connect L2;
+L2: final;
+endmsc;
+msc Event;
+inst Client;
+inst Server;
+Client: instance;
+label e0;
+out INVITE,0 to Server;
+time e1 [1];
+label e1;
+in 200_OK,1 from Server;
+out ACK,2 to Server;
+endinstance;
+Server: instance;
+label e2;
+in INVITE,0 from Client;
+time e3 origin [2];
+out 200_OK,1 to Client;
+label e3;
+in ACK,2 from Client;
+endinstance;
+endmsc;


Property changes on: trunk/tests/z120_test/z120_time06.mpr.result
___________________________________________________________________
Added: svn:eol-style
   + native


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