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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/09 14:42:00

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am intervalTest.as 
Added files:
        testsuite/misc-ming.all: intervalTestRunner.cpp 

Log message:
                * testsuite/misc-ming.all/: Makefile.am, intervalTest.as,
                  intervalTestRunner.cpp: add test *runner* for intervalTest.swf

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2289&r2=1.2290
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/intervalTest.as?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/intervalTestRunner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2289
retrieving revision 1.2290
diff -u -b -r1.2289 -r1.2290
--- ChangeLog   9 Feb 2007 14:27:33 -0000       1.2289
+++ ChangeLog   9 Feb 2007 14:42:00 -0000       1.2290
@@ -1,5 +1,10 @@
 2007-02-09 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: Makefile.am, intervalTest.as,
+         intervalTestRunner.cpp: add test *runner* for intervalTest.swf
+
+2007-02-09 Sandro Santilli <address@hidden>
+
        * testsuite/MovieTester.cpp: advance the movie_root, not
          the topmost sprite ! This properly run interval timers.
        * server/movie_root.{cpp,h}: Store Timer objects

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- testsuite/misc-ming.all/Makefile.am 9 Feb 2007 13:38:50 -0000       1.63
+++ testsuite/misc-ming.all/Makefile.am 9 Feb 2007 14:42:00 -0000       1.64
@@ -82,6 +82,7 @@
        KeyTest-Runner \
        loadMovieTest \
        loadMovieTestRunner \
+       intervalTestRunner \
        $(NULL)
 
 check_SCRIPTS = \
@@ -480,6 +481,20 @@
 
 intervalTest.swf: $(srcdir)/../media/green.swf ../Dejagnu.swf 
$(srcdir)/intervalTest.as 
        $(MAKESWF) -o $@ ../Dejagnu.swf $(srcdir)/intervalTest.as
+intervalTestRunner_SOURCES = \
+       intervalTestRunner.cpp \
+       $(NULL)
+intervalTestRunner_CXXFLAGS = \
+       -DSRCDIR='"$(srcdir)"' \
+       -DTGTDIR='"$(abs_builddir)"' \
+       $(NULL)
+intervalTestRunner_LDADD = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       $(NULL)
+intervalTestRunner_DEPENDENCIES = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       intervalTest.swf        \
+       $(NULL)
 
 # This will only work with Ming-0.4.0beta2 (support for prebuilt clips 
inclusion)
 # Uses a low frame rate to test immediate redraw on key event
@@ -534,6 +549,7 @@
        simple_loop_testrunner \
        KeyTest-Runner \
        loadMovieTestRunner \
+       intervalTestRunner \
        $(NULL)
 
 

Index: testsuite/misc-ming.all/intervalTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/intervalTest.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/intervalTest.as     9 Feb 2007 13:38:50 -0000       
1.1
+++ testsuite/misc-ming.all/intervalTest.as     9 Feb 2007 14:42:00 -0000       
1.2
@@ -32,6 +32,7 @@
                if ( this_counter > 4 )
                {
                        totals();
+                       test_completed = 1;
                }
        }
 };

Index: testsuite/misc-ming.all/intervalTestRunner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/intervalTestRunner.cpp
diff -N testsuite/misc-ming.all/intervalTestRunner.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/intervalTestRunner.cpp      9 Feb 2007 14:42:00 
-0000       1.1
@@ -0,0 +1,120 @@
+/* 
+ *   Copyright (C) 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 2 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
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "intervalTest.swf"
+
+#include "MovieTester.h"
+#include "sprite_instance.h"
+#include "character.h"
+#include "dlist.h"
+#include "container.h"
+#include "log.h"
+
+#include "check.h"
+#include <string>
+#include <cassert>
+
+using namespace gnash;
+using namespace std;
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+       string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
+       MovieTester tester(filename);
+
+       gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+       dbglogfile.setVerbosity(1);
+
+       as_value tmp;
+
+       sprite_instance* root = tester.getRootMovie();
+       assert(root);
+
+       check_equals(root->get_frame_count(), 2);
+       check_equals(root->get_current_frame(), 0);
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+
+       tester.advance(); // execute actions in second frame frame
+
+       check_equals(root->get_current_frame(), 1);
+       check_equals(root->get_play_state(), sprite_instance::STOP);
+
+       // Now timers are set and counters initialized
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 0);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 0);
+
+       usleep(500000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 1);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 0);
+
+       usleep(500000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 2);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 1);
+
+       usleep(500000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 3);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 1);
+
+       usleep(500000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 4);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 2);
+
+       usleep(1000000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 4);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 3);
+
+       usleep(1000000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 4);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 4);
+
+       usleep(500000); tester.advance(); // run expired timers
+
+       root->get_member("this_counter", &tmp);
+       check_equals(tmp.to_number(), 5);
+       root->get_member("that_counter", &tmp);
+       check_equals(tmp.to_number(), 4);
+
+       root->get_member("test_completed", &tmp);
+       check_equals(tmp.to_number(), 1);
+
+
+}
+