[Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/key_eve...

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/05/29 05:19:06

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: key_event_test2.c 
                                 key_event_test2runner.cpp 
        server         : movie_root.cpp 

Log message:
        more tests and comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3386&r2=1.3387
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_test2.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_test2runner.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3386
retrieving revision 1.3387
diff -u -b -r1.3386 -r1.3387
--- ChangeLog   29 May 2007 01:10:48 -0000      1.3386
+++ ChangeLog   29 May 2007 05:19:05 -0000      1.3387
@@ -1,3 +1,9 @@
+2007-05-29 Zou Lunkai <address@hidden>
+
+       * testsuite/misc-ming.all/key_event_test2.c, 
+         key_event_test2runner.cpp: add more tests.
+       * server/movie_root.cpp: add comments for ::cleanup_key_listeners().
+         
 2007-05-29 Martin Guy <address@hidden>
 
        * server/asobj/NetStreamFfmpeg.cpp: Fix sign/unsign compiler warning

Index: testsuite/misc-ming.all/key_event_test2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_test2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/key_event_test2.c   28 May 2007 09:35:35 -0000      
1.1
+++ testsuite/misc-ming.all/key_event_test2.c   29 May 2007 05:19:05 -0000      
1.2
@@ -18,10 +18,12 @@
 
 /*
  *  frame1: set _root.x1 to zero;
- *  frame2: 
+ *  frame2: check that _root.x1 is still zero;
+ *  frame3: 
  *    place a static movieclip "mc" at depth 20 with a onClipKeyDown event 
handler;
  *    increases _root.x1;
- *  frame3: nothing
+ *
+ *  KeyDown events are provided by the testrunner.
  */
 
 #include <stdlib.h>
@@ -70,12 +72,15 @@
   Ming_init();
   mo = newSWFMovieWithVersion(OUTPUT_VERSION);
   SWFMovie_setDimension(mo, 800, 600);
-  SWFMovie_setRate (mo, 12.0);
+  SWFMovie_setRate (mo, 1.0);
 
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 
800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
   add_actions(mo, "x1=0;");
-  SWFMovie_nextFrame(mo);  /* 1st frame */
+  SWFMovie_nextFrame(mo);  // 1st frame 
+  
+  check_equals(mo, "x1", "0");
+  SWFMovie_nextFrame(mo);  // 2nd frame 
 
   // place a static movieclip "mc" at depth 20
   it = add_static_mc(mo, "mc", 20);
@@ -84,12 +89,9 @@
   SWFDisplayItem_addAction(it,
     newSWFAction(" _root.note('onClipKeyDown triggered'); "
                  " _root.x1++; "
-                 // TODO: enable this self-contained check after fix
-                 // " _root.check_equals(_root.x1, 1);"
                 ), 
     SWFACTION_KEYDOWN);    
-    
-  SWFMovie_nextFrame(mo); /* 2nd frame */
+  SWFMovie_nextFrame(mo); // 3rd frame
   
   
   //Output movie

Index: testsuite/misc-ming.all/key_event_test2runner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/key_event_test2runner.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/key_event_test2runner.cpp   28 May 2007 15:41:12 
-0000      1.2
+++ testsuite/misc-ming.all/key_event_test2runner.cpp   29 May 2007 05:19:05 
-0000      1.3
@@ -10,8 +10,7 @@
  * 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
+ * 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
  *
@@ -46,12 +45,15 @@
   sprite_instance* root = tester.getRootMovie();
   assert(root);
 
-  check_equals(root->get_frame_count(), 2);
+  check_equals(root->get_frame_count(), 3);
   check_equals(root->get_current_frame(), 0);
 
   tester.advance();
   check_equals(root->get_current_frame(), 1);
 
+  tester.advance();
+  check_equals(root->get_current_frame(), 2);
+
   character* mc = const_cast<character*>(tester.findDisplayItemByName(*root, 
"mc"));
   check(mc);
 
@@ -70,13 +72,15 @@
   
   tester.advance(); // loop back to frame1
   // press key 'A' and checks
-  // tester.pressKey(key::A);
-  // tester.releaseKey(key::A);
+   tester.pressKey(key::A);
+   tester.releaseKey(key::A);
   // check that no KeyDown was triggered(no key event handler at frame1);
-  // check(root->get_member("x1", &tmp));
-  // xcheck_equals(tmp.to_number(), 0);
+  check(root->get_member("x1", &tmp));
+  check_equals(tmp.to_number(), 0);
+
   tester.advance(); // advance to frame2
-  check_equals(root->get_current_frame(), 1);
+  tester.advance(); // advance to frame3
+  check_equals(root->get_current_frame(), 2);
 
   // press key 'A' and checks
   tester.pressKey(key::A);
@@ -88,15 +92,17 @@
   // and get added to the list again;
   check_equals(tmp.to_number(), 1); 
 
-  tester.advance(); // loop back to frame1
+  tester.advance(); // loop back to frame1 again
   // press key 'A' and checks
-  // tester.pressKey(key::A);
-  // tester.releaseKey(key::A);
+  tester.pressKey(key::A);
+  tester.releaseKey(key::A);
   // check that no KeyDown was triggered(no key event handler at frame1);
-  // check(root->get_member("x1", &tmp));
-  // xcheck_equals(tmp.to_number(), 0);
+  check(root->get_member("x1", &tmp));
+  check_equals(tmp.to_number(), 0);
+
   tester.advance(); // advance to frame2
-  check_equals(root->get_current_frame(), 1);
+  tester.advance(); // advance to frame3
+  check_equals(root->get_current_frame(), 2);
 
   // press key 'A' and checks
   tester.pressKey(key::A);

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/movie_root.cpp       14 May 2007 09:44:22 -0000      1.61
+++ server/movie_root.cpp       29 May 2007 05:19:05 -0000      1.62
@@ -571,6 +571,8 @@
        }
 
        // Cleanup key listeners (remove unloaded characters)
+       // FIXME: not all key listeners could be cleaned here!
+       // (eg. characters unloaded by loop-back won't be cleared until next 
advancement)
        cleanup_key_listeners();
 
        // random should go continuously that: