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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/28 00:20:26

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: root_stop_testrunner.cpp 

Log message:
        * testsuite/misc-ming.all/root_stop_testrunner.cpp: fixed wrong 
assumption, added more tests (no more expected failures).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2004&r2=1.2005
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/root_stop_testrunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2004
retrieving revision 1.2005
diff -u -b -r1.2004 -r1.2005
--- ChangeLog   28 Dec 2006 00:17:41 -0000      1.2004
+++ ChangeLog   28 Dec 2006 00:20:25 -0000      1.2005
@@ -1,7 +1,8 @@
 2006-12-28 Sandro Santilli <address@hidden>
 
        * testsuite/misc-ming.all/root_stop_testrunner.cpp:
-         carriage returns removed.
+         carriage returns removed; fixed wrong assumption,
+         added more tests (no more expected failures).
 
 2006-12-26 Sandro Santilli <address@hidden>
 

Index: testsuite/misc-ming.all/root_stop_testrunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/root_stop_testrunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/root_stop_testrunner.cpp    28 Dec 2006 00:17:41 
-0000      1.4
+++ testsuite/misc-ming.all/root_stop_testrunner.cpp    28 Dec 2006 00:20:26 
-0000      1.5
@@ -46,16 +46,56 @@
 
        check_equals(root->get_frame_count(), 2);
        check_equals(root->get_current_frame(), 0);
-       const character* mc = tester.findDisplayItemByName(*root, "mc_in_root");
+       check_equals(root->get_play_state(), sprite_instance::STOP);
+
+       const character* ch = tester.findDisplayItemByName(*root, "mc_in_root");
+       check(ch);
+       const sprite_instance* mc = dynamic_cast<const sprite_instance*>(ch);
        check(mc);
+       check_equals(mc->get_current_frame(), 0);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
        
-       check_equals(root->get_play_state(), sprite_instance::STOP);
        tester.advance();
-       xcheck_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(root->get_current_frame(), 0);  // we were in stop mode
+       check_equals(mc->get_current_frame(), 1); 
+       check_equals(root->get_play_state(), sprite_instance::STOP);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
        tester.advance();
+       check_equals(root->get_current_frame(), 0); // we were in stop mode
+       check_equals(mc->get_current_frame(), 2);  
        check_equals(root->get_play_state(), sprite_instance::STOP);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
+       tester.advance();
+       check_equals(root->get_current_frame(), 0); // we were in stop mode
+       check_equals(mc->get_current_frame(), 0); 
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
+       tester.advance();
+       check_equals(root->get_current_frame(), 1); 
+       check_equals(mc->get_current_frame(), 1); 
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
+       tester.advance();
+       check_equals(root->get_current_frame(), 0);  // looped
+       check_equals(mc->get_current_frame(), 2); 
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
+       tester.advance();
+       check_equals(root->get_current_frame(), 1); 
+       check_equals(mc->get_current_frame(), 0); 
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
+
        tester.advance();
+       check_equals(root->get_current_frame(), 0); // looped again
+       check_equals(mc->get_current_frame(), 1); 
        check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(mc->get_play_state(), sprite_instance::PLAY);
        
        return 0;
 }