[Gnash-commit] gnash ChangeLog testsuite/media/square.flv test... [release-0-8-0]

[Tomas Groth]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release-0-8-0
Changes by:     Tomas Groth <tgc>       07/06/05 14:45:44

Modified files:
        .              : ChangeLog 
        testsuite/media: square.flv 
        testsuite/misc-ming.all: Video-EmbedSquareTestRunner.cpp 

Log message:
                * testsuite/media/square.flv: Changed the movements in the 
movie to
                  be more fluent so that testing is easier.
                * testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: 
Check if
                  the video really does play.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.3451.2.7&r2=1.3451.2.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/square.flv?cvsroot=gnash&only_with_tag=release-0-8-0&rev=1.1.4.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp?cvsroot=gnash&only_with_tag=release-0-8-0&r1=1.2&r2=1.2.4.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3451.2.7
retrieving revision 1.3451.2.8
diff -u -b -r1.3451.2.7 -r1.3451.2.8
--- ChangeLog   5 Jun 2007 14:35:13 -0000       1.3451.2.7
+++ ChangeLog   5 Jun 2007 14:45:42 -0000       1.3451.2.8
@@ -1,3 +1,10 @@
+2007-06-05 Tomas Groth Christensen <address@hidden>
+
+       * testsuite/media/square.flv: Changed the movements in the movie to
+         be more fluent so that testing is easier.
+       * testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp: Check if
+         the video really does play.
+
 2007-06-05 Ann Barcomb <address@hidden>
 
        * doc/C/usermanual/installation/building.xml: mention that

Index: testsuite/media/square.flv
===================================================================
RCS file: /sources/gnash/gnash/testsuite/media/square.flv,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -b -r1.1 -r1.1.4.1
Binary files /tmp/cvsN35A8L and /tmp/cvskUPdBD differ

Index: testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp
===================================================================
RCS file: 
/sources/gnash/gnash/testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -b -r1.2 -r1.2.4.1
--- testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp     28 May 2007 
15:41:12 -0000      1.2
+++ testsuite/misc-ming.all/Video-EmbedSquareTestRunner.cpp     5 Jun 2007 
14:45:43 -0000       1.2.4.1
@@ -46,15 +46,52 @@
        sprite_instance* root = tester.getRootMovie();
        assert(root);
 
+       rgba red(255,0,0,255);
+       rgba yellow(255,255,0,255);
+
+       // TODO: change the scaling of the window/canvas
+       int scale_x = 1;
+       int scale_y = 1;
+       
        // Just loop twice, so to catch crashes...
-       // TODO: lots of more tests :)
+       for (int j = 0; j < 2; ++j) {
+               // Frame 1
+
+               // Check the color in (1,1) - should be red
+               check_pixel(1, 1, 1, red, 5);
+
+               // Check the color in (30,1) - should be yellow
+               check_pixel(35*scale_x, 1, 1, yellow, 5);
+
+               // Check the color in (1,30) - should be yellow
+               check_pixel(1, 35*scale_y, 1, yellow, 5);
+
        size_t framecount = root->get_frame_count();
-       for (size_t i=0; i<framecount*2; ++i)
-       {
-               check_equals(root->get_current_frame(), i%framecount);
+               int frame = 1;
+               int i = 0;
+               while (frame++ < framecount) {
+                       // Frame X
                tester.advance();
+
+                       // Check the color in (9+i,1) - should be yellow
+                       check_pixel((5 + i)*scale_x, 1, 1, yellow, 5);
+
+                       // Check the color in (25+i,1) - should be red
+                       check_pixel((25 + i)*scale_x, 1, 1, red, 5);
+
+                       // Check the color in (25+i,30) - should be yellow
+                       check_pixel((25 + i)*scale_x, 35*scale_y, 1, yellow, 5);
+
+                       // The video is 128x96 so we don't want to check beyond 
that
+                       if (45+i <= 128) {
+                               // Check the color in (40+i,1) - should be 
yellow
+                               check_pixel((45 + i)*scale_x, 1, 1, yellow, 5);
        }
 
+                       i += 10;
+               }
+               tester.advance();
+       }
 
 }