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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/23 04:48:49

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: DefineEditTextTest.c Makefile.am 
Added files:
        testsuite/misc-ming.all: DefineEditTextTest-Runner.cpp 

Log message:
                * testsuite/misc-ming.all/: DefineEditTextTest-Runner.cpp,
                  Makefile.am: skeleton for a MovieTester based runner.
                * testsuite/misc-ming.all/DefineEditTextTest.c: fixed expected
                  results.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3788&r2=1.3789
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest.c?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3788
retrieving revision 1.3789
diff -u -b -r1.3788 -r1.3789
--- ChangeLog   23 Jul 2007 04:36:19 -0000      1.3788
+++ ChangeLog   23 Jul 2007 04:48:49 -0000      1.3789
@@ -1,5 +1,9 @@
 2007-07-23 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: DefineEditTextTest-Runner.cpp,
+         Makefile.am: skeleton for a MovieTester based runner.
+       * testsuite/misc-ming.all/DefineEditTextTest.c: fixed expected
+         results.
        * autogen.sh: libtoolize is in the 'libtool' package.
        * plugin/plugin.h: remove unneeded include.
 

Index: testsuite/misc-ming.all/DefineEditTextTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DefineEditTextTest.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/misc-ming.all/DefineEditTextTest.c        20 Jul 2007 14:40:08 
-0000      1.21
+++ testsuite/misc-ming.all/DefineEditTextTest.c        23 Jul 2007 04:48:49 
-0000      1.22
@@ -161,9 +161,9 @@
   // checks after placing some swf defined TextField
   check(mo, "TextField.prototype.hasOwnProperty('background')");
   check(mo, "TextField.prototype.hasOwnProperty('backgroundColor')");
-  check(mo, "TextField.prototype.hasOwnProperty('text')");
+  xcheck(mo, "TextField.prototype.hasOwnProperty('text')");
   check(mo, "TextField.prototype.hasOwnProperty('textColor')");
-  check(mo, "TextField.prototype.hasOwnProperty('_alpha')");
+  //check(mo, "TextField.prototype.hasOwnProperty('_alpha')");
   
   check_equals(mo, "typeof(dtext1)", "'object'");
   check_equals(mo, "typeof(dtext1.text)", "'string'");
@@ -187,7 +187,7 @@
   xcheck_equals(mo, "dtext1.__proto__.hasOwnProperty('text')", "true");
   check_equals(mo, "dtext1.__proto__.hasOwnProperty('background')", "true");
   check_equals(mo, "dtext1.__proto__.hasOwnProperty('backgroundColor')", 
"true");
-  xcheck_equals(mo, "dtext1.__proto__.hasOwnProperty('textColor')", "true");
+  check_equals(mo, "dtext1.__proto__.hasOwnProperty('textColor')", "true");
   // Why _alpha is special???
   check_equals(mo, "dtext1.__proto__.hasOwnProperty('_alpha')", "false");
   
@@ -200,9 +200,9 @@
   check_equals(mo, "dtext1.backgroundColor", "0xffffff");
   check_equals(mo, "etext1.backgroundColor", "0xffffff");
   check_equals(mo, "dtext2.backgroundColor", "0xffffff");
-  xcheck_equals(mo, "dtext1.textColor", "0x000000");
-  xcheck_equals(mo, "etext1.textColor", "0x000000");
-  xcheck_equals(mo, "dtext2.textColor", "0x000000");
+  check_equals(mo, "dtext1.textColor", "0x000000");
+  check_equals(mo, "etext1.textColor", "0x000000");
+  check_equals(mo, "dtext2.textColor", "0x000000");
   check_equals(mo, "dtext1._alpha", "100");
   check_equals(mo, "etext1._alpha", "100");
   check_equals(mo, "dtext2._alpha", "100");
@@ -229,9 +229,9 @@
   check_equals(mo, "dtext1.backgroundColor", "0xff0000");
   check_equals(mo, "etext1.backgroundColor", "0x00ff00");
   check_equals(mo, "dtext2.backgroundColor", "0x0000ff");
-  xcheck_equals(mo, "dtext1.textColor", "0x00ffff");
-  xcheck_equals(mo, "etext1.textColor", "0xff00ff");
-  xcheck_equals(mo, "dtext2.textColor", "0xffff00");
+  check_equals(mo, "dtext1.textColor", "0x00ffff");
+  check_equals(mo, "etext1.textColor", "0xff00ff");
+  check_equals(mo, "dtext2.textColor", "0xffff00");
   SWFMovie_nextFrame(mo); 
   
   add_actions(mo, "dtext1._alpha = 0;"

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- testsuite/misc-ming.all/Makefile.am 18 Jul 2007 04:01:52 -0000      1.143
+++ testsuite/misc-ming.all/Makefile.am 23 Jul 2007 04:48:49 -0000      1.144
@@ -58,6 +58,7 @@
        SpriteButtonEventsTest \
        SpriteButtonEventsTest-Runner \
        DefineEditTextTest \
+       DefineEditTextTest-Runner \
        DefineEditTextVariableNameTest \
        DefineEditTextVariableNameTest-Runner \
        Dejagnu \
@@ -286,6 +287,20 @@
 DefineEditTextTest_SOURCES =  DefineEditTextTest.c
 DefineEditTextTest_LDADD = libgnashmingutils.la
 
+DefineEditTextTest_Runner_SOURCES = \
+       DefineEditTextTest-Runner.cpp \
+       $(NULL)
+DefineEditTextTest_Runner_CXXFLAGS = \
+       -DTGTDIR='"$(abs_builddir)"' \
+       $(NULL)
+DefineEditTextTest_Runner_LDADD = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       $(NULL)
+DefineEditTextTest_Runner_DEPENDENCIES = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       DefineEditTextTest.swf      \
+       $(NULL)
+
 DefineEditTextVariableNameTest_SOURCES =       \
        DefineEditTextVariableNameTest.c        \
        $(NULL)
@@ -1550,6 +1565,7 @@
 TEST_DRIVERS = ../simple.exp
 TEST_CASES = \
        DefineEditTextVariableNameTest-Runner \
+       DefineEditTextTest-Runner \
        RollOverOutTest-Runner \
        ButtonEventsTest-Runner \
        SpriteButtonEventsTest-Runner \

Index: testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
diff -N testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/DefineEditTextTest-Runner.cpp       23 Jul 2007 
04:48:49 -0000      1.1
@@ -0,0 +1,58 @@
+/* 
+ *   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
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "DefineEditTextTest.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);
+
+       sprite_instance* root = tester.getRootMovie();
+       assert(root);
+
+       check_equals(root->get_frame_count(), 4);
+       check_equals(root->get_play_state(), sprite_instance::PLAY);
+       check_equals(root->get_current_frame(), 0);
+
+       for (int i=0; i<30; ++i)
+               tester.advance();
+
+       // TODO: use check_pixel for checking bacground colors
+}
+