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

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/09/04 05:43:57

Modified files:
        .              : ChangeLog 
        testsuite/misc-swfc.all: Makefile.am 
                                 movieclip_destruction_test1.sc 
Added files:
        testsuite/misc-swfc.all: movieclip_destruction_test3.sc 
                                 movieclip_destruction_test4.sc 

Log message:
        * testsuite/misc-swfc.all/movieclip_destruction_test{1,3,4}.sc: more 
tests.
        * testsuite/misc-swfc.all/Makefile.am: enable new tests.
        
        test3 is for nested movieclips, test4 is for catching the abortion we 
found yestoday(no abortion with cvs-head).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4209&r2=1.4210
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test3.sc?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-swfc.all/movieclip_destruction_test4.sc?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4209
retrieving revision 1.4210
diff -u -b -r1.4209 -r1.4210
--- ChangeLog   4 Sep 2007 02:12:54 -0000       1.4209
+++ ChangeLog   4 Sep 2007 05:43:56 -0000       1.4210
@@ -1,3 +1,8 @@
+2007-09-04 Zou Lunkai <address@hidden>
+
+       * testsuite/misc-swfc.all/movieclip_destruction_test{1,3,4}.sc: more 
tests.
+       * testsuite/misc-swfc.all/Makefile.am: enable new tests.
+       
 2007-09-04 Chad Musick <address@hidden>
 
        * backend/render_handler_tri.cpp: Enabling focal gradient fills on

Index: testsuite/misc-swfc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-swfc.all/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-swfc.all/Makefile.am 2 Sep 2007 07:23:52 -0000       1.8
+++ testsuite/misc-swfc.all/Makefile.am 4 Sep 2007 05:43:56 -0000       1.9
@@ -25,6 +25,8 @@
        soft_reference_test1.sc \
        movieclip_destruction_test1.sc \
        movieclip_destruction_test2.sc \
+       movieclip_destruction_test3.sc \
+       movieclip_destruction_test4.sc \
        action_execution_order_test10.sc \
        $(NULL)
 

Index: testsuite/misc-swfc.all/movieclip_destruction_test1.sc
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-swfc.all/movieclip_destruction_test1.sc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-swfc.all/movieclip_destruction_test1.sc      4 Sep 2007 
02:10:09 -0000       1.6
+++ testsuite/misc-swfc.all/movieclip_destruction_test1.sc      4 Sep 2007 
05:43:56 -0000       1.7
@@ -150,7 +150,8 @@
     
     check_equals(_root.testvar1, 100);
     check_equals(_root.testvar2, 200);
-    check_equals(typeof(_root.mc4), 'undefined');  
+    check_equals(typeof(_root.mc4Ref), 'movieclip');  
+    check_equals(_root.mc4Ref.valueOf(), undefined);
   .end
 
 //

Index: testsuite/misc-swfc.all/movieclip_destruction_test3.sc
===================================================================
RCS file: testsuite/misc-swfc.all/movieclip_destruction_test3.sc
diff -N testsuite/misc-swfc.all/movieclip_destruction_test3.sc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/movieclip_destruction_test3.sc      4 Sep 2007 
05:43:56 -0000       1.1
@@ -0,0 +1,119 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, address@hidden
+ * 
+ * Test destruction of nested movieClips.
+ *
+ * Description:
+ *   frame2: Define a nested movieclip mc1(mc1.mc11.mc111.mc111)
+ *   frame3: attach the nested movieclip to stage with a name 'nestedMovieClip'
+ *   frame10: nestedMovieClip get removed by one of its child(mc111)
+ *   
+ * Expected behaviour:
+ *   TODO: add it here.
+ * 
+ */
+
+
+.flash  bbox=800x600 filename="movieclip_destruction_test3.swf" 
background=white version=7 fps=12
+
+.frame 1
+  .action:
+   #include "Dejagnu.sc"
+   _root.as_order = '0+';
+  .end
+  
+  // Define 3 shapes(b1, b2, b3)
+  .box green_square fill=green width=100 height=100  
+
+.frame 2
+  
+  .sprite mc1111 
+    .frame 1 
+      .put green_square x=300 y=300
+    .frame 8
+      .action:
+        _root.x = 400;
+        _root.as_order += '1+';
+      .end
+  .end 
+  
+  .sprite mc111 
+    .frame 1  
+      .put mc1111 
+    .frame 8
+      .action:
+        _root.note("nestedMovieClip removed at frame " + _root._currentframe);
+        _root.x = 300;
+        _root.as_order += '2+';
+        _parent._parent['removeMovieClip']();
+        _root.note("actions here should not be executed");
+         _root.x = 'as_should_be_discarded';
+      .end
+  .end
+  
+  .sprite mc11
+    .frame 1  
+      .put mc111 
+    .frame 8
+      .action:
+        _root.x = 200;
+        _root.as_order += '3+';
+      .end
+    
+  .end
+  
+  .sprite mc1
+    .frame 1 
+      .put mc11 
+    .frame 8
+      .action:
+        _root.x = 100;
+        _root.as_order += '4+';
+      .end
+  .end
+  
+  
+.frame 3
+  .action:
+    _root.attachMovie("mc1", "nestedMovieClip", 10);
+    check_equals(typeof(nestedMovieClip), 'movieclip');
+    check_equals(nestedMovieClip.getDepth(), 10);
+    check_equals(typeof(nestedMovieClip.mc11), 'movieclip');
+    check_equals(typeof(nestedMovieClip.mc11.mc111), 'movieclip');
+    check_equals(typeof(nestedMovieClip.mc11.mc111.mc1111), 'movieclip');
+    
+    // Define onUnload(for deduction)
+    // nestedMovieClip.onUnload = function () {};
+    // nestedMovieClip.mc11.mc111.mc1111 = function () {};
+  .end
+
+.frame 20
+  .action:  
+    xcheck_equals(_root.x, 300);
+    check_equals(typeof(nestedMovieClip), 'undefined');
+    xcheck_equals(_root.as_order, "0+1+2+");
+    stop();
+    totals();
+  .end
+
+
+.end
+

Index: testsuite/misc-swfc.all/movieclip_destruction_test4.sc
===================================================================
RCS file: testsuite/misc-swfc.all/movieclip_destruction_test4.sc
diff -N testsuite/misc-swfc.all/movieclip_destruction_test4.sc
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-swfc.all/movieclip_destruction_test4.sc      4 Sep 2007 
05:43:57 -0000       1.1
@@ -0,0 +1,88 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, address@hidden
+ * 
+ * Test destruction of brother movieClips.
+ *
+ * Description:
+ *   frame2: Define three brother movieclips: mc1, mc2, mc3
+ *   frame3: attach them to the main timeline
+ *   frame6: brother1 and brother3 get removed by brother2
+ *   
+ * Expected behaviour:
+ *   TODO: add it here.
+ * 
+ */
+
+
+.flash  bbox=800x600 filename="movieclip_destruction_test4.swf" 
background=white version=7 fps=12
+
+.frame 1
+  .action:
+   #include "Dejagnu.sc"
+   _root.as_order = '0+';
+  .end
+  
+  // Define 3 shapes(b1, b2, b3)
+  .box green_square fill=green width=100 height=100  
+  .box red_square fill=red width=100 height=100 
+  .box blue_square fill=blue width=100 height=100 
+
+.frame 2
+ 
+  .sprite mc1
+    .frame 1 
+      .put green_square x=300 y=200
+  .end 
+   
+  .sprite mc2
+    .frame 1 
+      .put red_square x=300 y=300
+    .frame 3
+      .action:
+        _root.brother1['removeMovieClip']();
+        _root.brother3['removeMovieClip']();
+      .end
+  .end 
+  
+  .sprite mc3
+    .frame 1 
+      .put blue_square x=300 y=400
+  .end 
+  
+  
+.frame 3
+  .action:
+    _root.attachMovie("mc1", "brother1", 10);
+    _root.attachMovie("mc2", "brother2", 20);
+    _root.attachMovie("mc3", "brother3", 30);
+  .end
+
+.frame 10
+  .action:  
+    check_equals(typeof(brother1), 'undefined');
+    check_equals(typeof(brother2), 'movieclip');
+    check_equals(typeof(brother3), 'undefined');
+    stop();
+    totals();
+  .end
+
+.end
+