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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/02/05 15:58:48

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

Log message:
        Update test, remove duplicate ChangeLog entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5562&r2=1.5563
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/String.as?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5562
retrieving revision 1.5563
diff -u -b -r1.5562 -r1.5563
--- ChangeLog   5 Feb 2008 15:34:40 -0000       1.5562
+++ ChangeLog   5 Feb 2008 15:58:47 -0000       1.5563
@@ -4,6 +4,7 @@
          to wstring for string operations (length, slice, split, substr,
          indexOf, fromCharCode, charCodeAt, charAt, ord, chr). Fixes
          bug #21400.
+       * testsuite/actionscript.all/String.as: tests should now pass.
 
 2008-02-05 Sandro Santilli <address@hidden>
 
@@ -14,10 +15,6 @@
 
        * testsuite/actionscript.all/String.as: add failing tests for
          string methods on multi-byte characters.
-       * server/asobj/string.cpp, server/vm/ASHandlers.cpp: convert strings
-         to wstring for string operations (length, slice, split, substr,
-         indexOf, fromCharCode, charCodeAt, charAt, ord, chr). Fixes
-         bug #21400.
 
 2008-02-05 Benjamin Wolsey <address@hidden>
 

Index: testsuite/actionscript.all/String.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/String.as,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- testsuite/actionscript.all/String.as        5 Feb 2008 14:21:55 -0000       
1.36
+++ testsuite/actionscript.all/String.as        5 Feb 2008 15:58:48 -0000       
1.37
@@ -16,7 +16,7 @@
 
 // Original author: Mike Carlson - June 19th, 2006
 
-rcsid="$Id: String.as,v 1.36 2008/02/05 14:21:55 bwy Exp $";
+rcsid="$Id: String.as,v 1.37 2008/02/05 15:58:48 bwy Exp $";
 
 #include "check.as"
 
@@ -281,17 +281,23 @@
 var b = new String("1234");
 check_equals ( b.substring(3, 6), "4");
 
+#if OUTPUT_VERSION > 5
+
 //-------------------------------------------
 // Check multi-byte chars with all functions
 //-------------------------------------------
 
+// These tests are only correct with SWF6 and above.
+
 var a = new String("Längere Wörter");
-xcheck_equals (a.length, 14);
-xcheck_equals (a.substring(2,4), "ng");
-xcheck_equals (a.charAt(1), "ä");
-xcheck_equals (a.charAt(2), "n");
-xcheck_equals (a.slice(3,5), "ge");
-xcheck_equals (a.charCodeAt(9), 246);
+check_equals (a.length, 14);
+check_equals (a.substring(2,4), "ng");
+check_equals (a.charAt(1), "ä");
+check_equals (a.charAt(2), "n");
+check_equals (a.slice(3,5), "ge");
+check_equals (a.charCodeAt(9), 246);
+
+#endif
 
 // see check.as
 #ifdef MING_SUPPORTS_ASM
@@ -494,7 +500,7 @@
 check_equals(r, "s:");
 
 #if OUTPUT_VERSION < 6
- check_totals(181);
+ check_totals(175);
 #else
  check_totals(209);
 #endif