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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/02/20 14:58:34

Modified files:
        .              : ChangeLog 
        testsuite/misc-ming.all: Makefile.am 
Added files:
        testsuite/misc-ming.all: DrawingApiTest.as 
                                 DrawingApiTestRunner.cpp 
Removed files:
        testsuite/misc-ming.all: DrawingApi.as 

Log message:
                * testsuite/misc-ming.all/: DrawingApi.as => DrawingApiTest.as,
                  DrawingApiTestRunner.cpp, Makefile.am:
                  Add a runner for DrawingApi test (failing).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2407&r2=1.2408
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApi.as?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2407
retrieving revision 1.2408
diff -u -b -r1.2407 -r1.2408
--- ChangeLog   20 Feb 2007 14:23:55 -0000      1.2407
+++ ChangeLog   20 Feb 2007 14:58:34 -0000      1.2408
@@ -1,5 +1,11 @@
 2007-02-20 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: DrawingApi.as => DrawingApiTest.as,
+         DrawingApiTestRunner.cpp, Makefile.am:
+         Add a runner for DrawingApi test (failing).
+
+2007-02-20 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/: Makefile.am,
          RollOverOutTest-Runner.cpp, root_stop_testrunner.cpp:
          Allow run of test runners from external dirs.

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- testsuite/misc-ming.all/Makefile.am 20 Feb 2007 14:23:56 -0000      1.69
+++ testsuite/misc-ming.all/Makefile.am 20 Feb 2007 14:58:34 -0000      1.70
@@ -32,7 +32,8 @@
       testrun.log
 
 EXTRA_DIST = VarAndCharClashTest.as \
-       KeyTest.as
+       KeyTest.as \
+       DrawingApiTest.as
 
 
 AM_CPPFLAGS = -I.. \
@@ -86,6 +87,7 @@
        loadMovieTest \
        loadMovieTestRunner \
        intervalTestRunner \
+       DrawingApiTestRunner \
        $(NULL)
 
 check_SCRIPTS = \
@@ -570,6 +572,24 @@
        KeyTest.swf     \
        $(NULL)
 
+DrawingApiTest.swf: $(srcdir)/DrawingApiTest.as 
+       $(MAKESWF) -o $@ $(srcdir)/DrawingApiTest.as
+
+DrawingApiTestRunner_SOURCES = \
+       DrawingApiTestRunner.cpp \
+       $(NULL)
+DrawingApiTestRunner_CXXFLAGS = \
+       -DSRCDIR='"$(srcdir)"' \
+       -DTGTDIR='"$(abs_builddir)"' \
+       $(NULL)
+DrawingApiTestRunner_LDADD = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       $(NULL)
+DrawingApiTestRunner_DEPENDENCIES = \
+       $(top_builddir)/testsuite/libtestsuite.la \
+       DrawingApi.swf  \
+       $(NULL)
+
 Dejagnu_SOURCES =      \
        Dejagnu.c       \
        ming_utils.h                            \
@@ -607,6 +627,7 @@
        KeyTest-Runner \
        loadMovieTestRunner \
        intervalTestRunner \
+       DrawingApiTestRunner \
        $(NULL)
 
 

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: testsuite/misc-ming.all/DrawingApiTest.as
diff -N testsuite/misc-ming.all/DrawingApiTest.as
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/DrawingApiTest.as   20 Feb 2007 14:58:34 -0000      
1.1
@@ -0,0 +1,69 @@
+//
+// Some tests for the Drawing API
+// Build with:
+//     makeswf -o DrawingApi.swf DrawingApi.as
+// Run with:
+//     firefox DrawingApi.swf
+// Or:
+//     gnash DrawingApi.swf
+//
+
+// Can draw both on a dynamically-created movie...
+createEmptyMovieClip("a", 10);
+// ... or on a statically-created one
+//a = _root;
+
+with (a)
+{
+       clear();
+       lineStyle(20, 0xFF0000, 100);
+       moveTo(100, 100);
+       lineTo(200, 200);
+       moveTo(100, 200);
+       lineStyle(5, 0xFF00FF, 50);
+       lineTo(200, 250);
+       lineStyle(10, 0xFFFF00, 100);
+       lineTo(400, 200);
+       lineStyle(8, 0x00FF00, 100);
+       curveTo(400, 120, 300, 100);
+       lineStyle();
+       lineTo(80, 100);
+       lineStyle(20);
+       lineTo(80, 150);
+
+       moveTo(80, 180);
+       lineStyle(2, 0xFF0000);
+       beginFill(0x0000FF, 100);
+       lineTo(50, 180);
+       curveTo(20, 200, 50, 250);
+       lineTo(100, 250);
+       lineTo(80, 180);
+       endFill();
+       lineTo(50, 150);
+
+       // clockwise
+       moveTo(200, 100);
+       lineStyle(1, 0x00FF00);
+       beginFill(0x00FFFF, 100);
+       lineTo(200, 120);
+       lineTo(180, 120);
+       lineTo(180, 100);
+       lineTo(200, 100);
+       endFill();
+
+       // counter-clockwise
+       moveTo(230, 100);
+       lineStyle(1, 0x00FFFF);
+       beginFill(0x00FF00, 50);
+       lineTo(210, 100);
+       lineTo(210, 120);
+       lineTo(230, 120);
+       lineTo(230, 100);
+       endFill();
+
+}
+
+// Make the MovieClip "active" (grabbing mouse events)
+// This allows testing of fill styles and "thick" lines
+a.onRollOver = function() {};
+

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
diff -N testsuite/misc-ming.all/DrawingApiTestRunner.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp    20 Feb 2007 14:58:34 
-0000      1.1
@@ -0,0 +1,71 @@
+/* 
+ *   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 "DrawingApi.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(), 1);
+       check_equals(root->get_current_frame(), 0);
+
+       tester.advance();
+
+       // Out of any drawing
+       tester.movePointerTo(50, 50);
+       check(!tester.isMouseOverMouseEntity());
+
+       // Inside bottom-left blue fill
+       tester.movePointerTo(60, 215);
+       xcheck(tester.isMouseOverMouseEntity());
+
+       // Inside cyan clockwise fill
+       tester.movePointerTo(190, 112);
+       xcheck(tester.isMouseOverMouseEntity());
+
+       // Inside green counterclockwise fill
+       tester.movePointerTo(220, 112);
+       xcheck(tester.isMouseOverMouseEntity());
+
+
+}
+

Index: testsuite/misc-ming.all/DrawingApi.as
===================================================================
RCS file: testsuite/misc-ming.all/DrawingApi.as
diff -N testsuite/misc-ming.all/DrawingApi.as
--- testsuite/misc-ming.all/DrawingApi.as       19 Feb 2007 21:40:32 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,64 +0,0 @@
-//
-// Some tests for the Drawing API
-// Build with:
-//     makeswf -o DrawingApi.swf DrawingApi.as
-// Run with:
-//     firefox DrawingApi.swf
-// Or:
-//     gnash DrawingApi.swf
-//
-
-// Can draw both on a dynamically-created movie...
-//createEmptyMovieClip("a", 10);
-// ... or on a statically-created one
-a = _root;
-
-with (a)
-{
-       clear();
-       lineStyle(20, 0xFF0000, 100);
-       moveTo(100, 100);
-       lineTo(200, 200);
-       moveTo(100, 200);
-       lineStyle(5, 0xFF00FF, 50);
-       lineTo(200, 250);
-       lineStyle(10, 0xFFFF00, 100);
-       lineTo(400, 200);
-       lineStyle(8, 0x00FF00, 100);
-       curveTo(400, 120, 300, 100);
-       lineStyle();
-       lineTo(80, 100);
-       lineStyle(20);
-       lineTo(80, 150);
-
-       moveTo(80, 180);
-       lineStyle(2, 0xFF0000);
-       beginFill(0x0000FF, 100);
-       lineTo(50, 180);
-       curveTo(20, 200, 50, 250);
-       lineTo(100, 250);
-       lineTo(80, 180);
-       endFill();
-       lineTo(50, 150);
-
-       // clockwise
-       moveTo(200, 100);
-       lineStyle(1, 0x00FF00);
-       beginFill(0x00FFFF, 100);
-       lineTo(200, 120);
-       lineTo(180, 120);
-       lineTo(180, 100);
-       lineTo(200, 100);
-       endFill();
-
-       // counter-clockwise
-       moveTo(230, 100);
-       lineStyle(1, 0x00FFFF);
-       beginFill(0x00FF00, 50);
-       lineTo(210, 100);
-       lineTo(210, 120);
-       lineTo(230, 120);
-       lineTo(230, 100);
-       endFill();
-}
-