[Gnash-commit] gnash ChangeLog testsuite/samples/gotoFrameOnKe...

[Zou Lunkai]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Zou Lunkai <zoulunkai>  07/08/13 08:40:22

Modified files:
        .              : ChangeLog 
        testsuite/samples: gotoFrameOnKeyEvent-TestRunner.cpp 

Log message:
        * testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp: finish the test 
runner.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4001&r2=1.4002
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4001
retrieving revision 1.4002
diff -u -b -r1.4001 -r1.4002
--- ChangeLog   13 Aug 2007 07:31:21 -0000      1.4001
+++ ChangeLog   13 Aug 2007 08:40:21 -0000      1.4002
@@ -3,6 +3,7 @@
        * server/sprite_instance.{h,cpp}: deprecate clone_display_object(), use 
          duplicateMovieClip() instead.
        * testsuite/actionscript.all/ops.as: more tests.
+       * testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp: finish the test 
runner.
 
 2007-08-12 Sandro Santilli <address@hidden>
 

Index: testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp        1 Jul 2007 
10:55:11 -0000       1.4
+++ testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp        13 Aug 2007 
08:40:22 -0000      1.5
@@ -69,14 +69,74 @@
        tester.advance();
        check_equals(root->get_current_frame(), 0);
 
+  // press key 1 four times
+  for(int i=1; i<=4; i++)
+  {
+    tester.pressKey(key::_1);
+    tester.releaseKey(key::_1);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
+  
+  // press key 0 four times
+  for(int i=3; i>=0; i--)
+  {
+    tester.pressKey(key::_0);
+    tester.releaseKey(key::_0);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
+
+  // press key 1 two times
+  for(int i=1; i<=2; i++)
+  {
        tester.pressKey(key::_1);
+    tester.releaseKey(key::_1);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
 
-       // TODO: check if it is correct to wait for next ::advance before 
expecting gotoFrame actions
-       //       execution !!
+  // press key DOWN two times
+  {
+    tester.pressKey(key::DOWN);
+    tester.releaseKey(key::DOWN);
+    check_equals(root->get_current_frame(), 5);
+    tester.advance();
+    check_equals(root->get_current_frame(), 5);
+
+    tester.pressKey(key::DOWN);
+    tester.releaseKey(key::DOWN);
+    check_equals(root->get_current_frame(), 6);
+    tester.advance();
+    check_equals(root->get_current_frame(), 6);
+  }
+
+  // press key UP two times
+  {
+    tester.pressKey(key::UP);
+    tester.releaseKey(key::UP);
+    check_equals(root->get_current_frame(), 5);
+    tester.advance();
+    check_equals(root->get_current_frame(), 5);
 
-       check_equals(root->get_current_frame(), 1);
+    tester.pressKey(key::UP);
+    tester.releaseKey(key::UP);
+    check_equals(root->get_current_frame(), 2);
        tester.advance();
-       check_equals(root->get_current_frame(), 1);
+    check_equals(root->get_current_frame(), 2);
+  }
 
+  // press key 0 two times, now should be back to the first frame
+  for(int i=1; i>=0; i--)
+  {
+    tester.pressKey(key::_0);
+    tester.releaseKey(key::_0);
+    check_equals(root->get_current_frame(), i);
+    tester.advance();
+    check_equals(root->get_current_frame(), i);
+  }
 }