[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Inhe...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/17 11:36:46

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Inheritance.as 

Log message:
        fixed bug in testcase making the business more complex then it was.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5943&r2=1.5944
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Inheritance.as?cvsroot=gnash&r1=1.55&r2=1.56

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5943
retrieving revision 1.5944
diff -u -b -r1.5943 -r1.5944
--- ChangeLog   17 Mar 2008 09:36:16 -0000      1.5943
+++ ChangeLog   17 Mar 2008 11:36:45 -0000      1.5944
@@ -1,5 +1,10 @@
 2008-03-17 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/Inheritance.as: fixed bug in testcase
+         making the business more complex then it was.
+
+2008-03-17 Sandro Santilli <address@hidden>
+
        * libbase/log.{cpp,h}: decouple LogFile and RcInitFile.
          Add a LogFile::setLogFilename to specify a custom name
          for the log file.

Index: testsuite/actionscript.all/Inheritance.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Inheritance.as,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- testsuite/actionscript.all/Inheritance.as   15 Mar 2008 13:01:31 -0000      
1.55
+++ testsuite/actionscript.all/Inheritance.as   17 Mar 2008 11:36:46 -0000      
1.56
@@ -21,7 +21,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Inheritance.as,v 1.55 2008/03/15 13:01:31 strk Exp $";
+rcsid="$Id: Inheritance.as,v 1.56 2008/03/17 11:36:46 strk Exp $";
 #include "check.as"
 
 check_equals(typeof(Object.prototype.constructor), 'function');
@@ -267,8 +267,8 @@
 function F() { FctorCalls++; /*note("F ctor");*/ }
 F.prototype.myName = function() { return "F"; };
 A.prototype.__constructor__ = F; A.prototype.__proto__ = F.prototype;
-A.prototype.myName = function() { super(); return super.myName()+"A"; };
-C.prototype.myName = function() { super(); return super.myName()+"C"; };
+A.prototype.myName = function() { /*note("A.prototype.myName called");*/ 
super(); return super.myName()+"A"; };
+C.prototype.myName = function() { /*note("C.prototype.myName called");*/ 
super(); return super.myName()+"C"; };
 FctorCalls=0;
 BctorCalls=0;
 ActorCalls=0;
@@ -311,11 +311,13 @@
 #endif
 
 // Now test 'super' at the top of the inheritance chain
-F.prototype.myName = function() { super(); return super.myName()+"F"; };
+F.prototype.myName = function() { /*note("F.prototype.myName called");*/ 
super(); return super.myName()+"F"; };
 FctorCalls=0;
 BctorCalls=0;
 ActorCalls=0;
+//note("Calling co (instanceof C) myName method");
 n = co.myName();
+//note("Done calling co (instanceof C) myName method");
 #if OUTPUT_VERSION < 6 
  check_equals(n, "C"); // no super
  check_equals(FctorCalls, 0); // no super
@@ -323,15 +325,15 @@
  check_equals(ActorCalls, 0); // no super
 #endif
 #if OUTPUT_VERSION == 6 
- check_equals(co.myName(), "FFFC"); // super in C references F proto 
- check_equals(FctorCalls, 2); // and all ctors are called twice ?
- check_equals(BctorCalls, 2); 
- check_equals(ActorCalls, 2); 
+ check_equals(n, "FFFC"); // super in C references F proto 
+ check_equals(FctorCalls, 1); 
+ check_equals(BctorCalls, 1); 
+ check_equals(ActorCalls, 1); 
 #endif
 #if OUTPUT_VERSION > 6
- xcheck_equals(co.myName(), "undefinedFFC");  // gnash gives undefinedFC here
- xcheck_equals(FctorCalls, 2); // gnash gives 0 here
- xcheck_equals(BctorCalls, 2); // gnash gives 3 here
+ xcheck_equals(n, "undefinedFFC");  // gnash gives undefinedFC here
+ xcheck_equals(FctorCalls, 1); // gnash gives 0 here
+ check_equals(BctorCalls, 1); 
  check_equals(ActorCalls, 0); 
 #endif