[Gnash-commit] gnash ChangeLog testsuite/misc-swfc.all/Makefil...

[Udo Giacomozzi]

CVSROOT:        /cvsroot/gnash
Module name:    gnash
Changes by:     Udo Giacomozzi <udog>   07/12/07 12:30:12

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfc.all: Makefile.am 
Added files:
        testsuite/misc-swfc.all: gotoFrameFromInterval2.sc 

Log message:
        new testcase for gotoAndPlay -> stop

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5104&r2=1.5105
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/gotoFrameFromInterval2.sc?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.5104
retrieving revision 1.5105
diff -u -b -r1.5104 -r1.5105
--- ChangeLog   7 Dec 2007 11:45:36 -0000       1.5104
+++ ChangeLog   7 Dec 2007 12:30:12 -0000       1.5105
@@ -1,3 +1,8 @@
+2007-12-07 Udo Giacomozzi <address@hidden>
+
+       * testsuite/misc-swfc.all/gotoFrameFromInterval2.sc:
+         new testcase for gotoAndPlay -> stop
+         
 2007-12-07 Sandro Santilli <address@hidden>
 
        * server/: Makefile.am, SystemClock.{cpp,h}, VirtualClock.cpp:

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/misc-swfc.all/Makefile.am 6 Dec 2007 15:19:11 -0000       1.20
+++ testsuite/misc-swfc.all/Makefile.am 7 Dec 2007 12:30:12 -0000       1.21
@@ -34,11 +34,12 @@
        opcode_guard_test2.sc \
        swf4opcode.sc \
        mouse_drag_test.sc \
+       gotoFrameFromInterval.sc \
+       gotoFrameFromInterval2.sc \
        $(NULL)
 
 # These ones are the ones for which consistency check fail 
 BOGO_SCTESTS = \
-       gotoFrameFromInterval.sc \
        $(NULL)
 
 # These will get compiled to SWFs just as above, but will not be executed as a 
test

Index: testsuite/misc-swfc.all/gotoFrameFromInterval2.sc
===================================================================
RCS file: testsuite/misc-swfc.all/gotoFrameFromInterval2.sc
diff -N testsuite/misc-swfc.all/gotoFrameFromInterval2.sc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/gotoFrameFromInterval2.sc   7 Dec 2007 12:30:12 
-0000       1.1
@@ -0,0 +1,86 @@
+// just like gotoFrameFromInterval, but using gotoAndPlay (and using 
+// onEnterFrame to catch the gotoAndPlay bug)
+
+.flash bbox=800x600 filename="gotoFrameFromInterval.swf" version=6 fps=10
+
+.frame 1
+    .action:
+#include "Dejagnu.sc"
+    asOrder = '0+';
+    .end
+
+.frame 2
+  .action:
+    stop();
+    
+    function local_whatever() {}
+    
+    intervalID = setInterval(
+       function() {
+          if (_currentframe != 2) return;
+          trace("jumping...");
+          gotoAndPlay(6);
+       }
+       ,0.0001);
+       
+      
+    _root.framecount = 0; 
+    
+    this.onEnterFrame = function() {
+      _root.framecount++;
+      
+      if (_root.framecount==10) {
+        check_equals(_root._currentframe, 6);
+        totals(2);
+      }
+    };
+       
+  .end
+
+.frame 6
+    .sprite mc1  // Define a sprite mc1
+        .action:
+            _parent.init_me(this);
+        .end
+    .end
+    
+    .action:
+        stop();
+
+        trace("Entering frame 6");
+        clearInterval( intervalID );
+        
+        function init_me(obj) {
+            // traces here are just for visual check, can be safely removed.
+            // Please don't use _root.note() here, we don't need extra 
function calls.
+            trace(obj);
+            trace(obj+" --> 1 =");
+            _root.asOrder += '1+';
+            trace(obj+" --> 2 ==");
+            _root.asOrder += '2+';
+            local_whatever();
+            trace(obj+" --> 3 ===");
+            _root.asOrder += '3+';
+            local_whatever();
+            trace(obj+" --> 4 ====");
+            _root.asOrder += '4+';
+        }
+    .end    
+    
+    .put clip1=mc1 // place a named sprite clip1
+    .put clip2=mc1 // place a named sprite clip2
+    .put clip3=mc1 // place a named sprite clip3
+    
+    .action:
+        xcheck_equals(asOrder, '0+1+2+3+4+1+2+3+4+1+2+3+4+');
+    .end
+    
+    
+.frame 7
+  .action:
+    stop();
+    note("Entering unreachable frame 7 !");
+  .end
+
+
+.end // end of file