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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/07 13:06:21

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

Log message:
        * testsuite/misc-ming.all/: intervalTest.as, intervalTestRunner.cpp:
          Add test for 'super' in setInterval-set method call (comment #3
          in bug #23130).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6540&r2=1.6541
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/intervalTest.as?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/intervalTestRunner.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6540
retrieving revision 1.6541
diff -u -b -r1.6540 -r1.6541
--- ChangeLog   7 May 2008 10:38:06 -0000       1.6540
+++ ChangeLog   7 May 2008 13:06:20 -0000       1.6541
@@ -1,5 +1,11 @@
 2008-05-07 Sandro Santilli <address@hidden>
 
+       * testsuite/misc-ming.all/: intervalTest.as, intervalTestRunner.cpp:
+         Add test for 'super' in setInterval-set method call (comment #3
+         in bug #23130).
+
+2008-05-07 Sandro Santilli <address@hidden>
+
        * libbase/log.cpp: add pid in timestamp
        * server/asobj/flash/: external/ExternalInterface_as.cpp,
          filters/DisplacementMapFilter_as.cpp,

Index: testsuite/misc-ming.all/intervalTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/intervalTest.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/intervalTest.as     7 Dec 2007 08:34:42 -0000       
1.7
+++ testsuite/misc-ming.all/intervalTest.as     7 May 2008 13:06:21 -0000       
1.8
@@ -27,16 +27,30 @@
        var int = now-this_timer;
        this_timer = now;
        check(int >= this_ms, this_ms+" interval (this) called after " + int + 
" milliseconds [" + __FILE__ + ":" + __LINE__ + "]");
-       //note("Doing this "+this_counter+" after " + int + " milliseconds");
+       note("Doing this "+this_counter+" after " + int + " milliseconds");
        if ( this_counter > 3 )
        {
                clearInterval(this_interval);
                note("This interval cleared ");
                if ( this_counter > 4 )
                {
-                       totals(16, __FILE__ + ":" + __LINE__ );
+                       note('Setting another interval');
+                       A = function() {};
+                       A.prototype.name = 'A';
+                       A.prototype.test = function() { return 'Atest'; };
+                       B = function() {}; B.prototype = new A;
+                       B.prototype.test = function() {
+                               xcheck_equals(super.test(), 'Atest');
+                               xcheck_equals(super.name, 'A');
+                               totals(18, __FILE__ + ":" + __LINE__ );
                        test_completed = 1;
+                               clearInterval(method_interval);
                        loadMovie("fscommand:quit", _level0);
+
+                       };
+
+                       o = new B;
+                       method_interval = setInterval(o, 'test', 1); 
                }
        }
 };
@@ -86,4 +100,5 @@
 push_interval  = setInterval(push_args, 200, 8, 9, 10);
 check_equals(push_interval, 3);
 
+
 stop();

Index: testsuite/misc-ming.all/intervalTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/intervalTestRunner.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/misc-ming.all/intervalTestRunner.cpp      21 Jan 2008 23:26:51 
-0000      1.12
+++ testsuite/misc-ming.all/intervalTestRunner.cpp      7 May 2008 13:06:21 
-0000       1.13
@@ -127,6 +127,9 @@
        as_environment env; // needed for proper to_string()
        check_equals(tmp.to_string(), std::string("8,9,10"));
 
+       tester.advanceClock(100); // "sleep" another 100 milliseconds
+       tester.advance(); // run expired timers
+
        root->get_member(st.find("test_completed"), &tmp);
        check_equals(tmp.to_number(), 1);