[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/XML.as
From: |
Benjamin Wolsey |
Subject: |
[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/XML.as |
Date: |
Wed, 14 Nov 2007 12:08:12 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 07/11/14 12:08:12
Modified files:
. : ChangeLog
testsuite/actionscript.all: XML.as
Log message:
another test
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4856&r2=1.4857
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.47&r2=1.48
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4856
retrieving revision 1.4857
diff -u -b -r1.4856 -r1.4857
--- ChangeLog 14 Nov 2007 09:53:02 -0000 1.4856
+++ ChangeLog 14 Nov 2007 12:08:11 -0000 1.4857
@@ -1,5 +1,10 @@
2007-11-14 Benjamin Wolsey <address@hidden>
+ * testsuite/actionscript.all/XML.as: adapt and reinclude
+ test removed with last change.
+
+2007-11-14 Benjamin Wolsey <address@hidden>
+
* testsuite/actionscript.all/XML.as: adapt test for CDATA node;
add XML comments (which should be ignored).
* server/asobj/xml.cpp: (getXMLOptions) strip CDATA nodes
Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- testsuite/actionscript.all/XML.as 14 Nov 2007 09:53:03 -0000 1.47
+++ testsuite/actionscript.all/XML.as 14 Nov 2007 12:08:12 -0000 1.48
@@ -20,7 +20,7 @@
// compile this test case with Ming makeswf, and then
// execute it like this gnash -1 -r 0 -v out.swf
-rcsid="$Id: XML.as,v 1.47 2007/11/14 09:53:03 bwy Exp $";
+rcsid="$Id: XML.as,v 1.48 2007/11/14 12:08:12 bwy Exp $";
#include "check.as"
//#include "dejagnu.as"
@@ -277,9 +277,12 @@
// fail("XML::load() doesn't work");
// }
check(XML);
-// Use escaped " instead of ' so that it matches the return value of toString()
+
+// Use escaped " instead of ' so that it matches xml_out (comments and CDATA
tags stripped).
var xml_in = "<TOPNODE tna1=\"tna1val\" tna2=\"tna2val\"
tna3=\"tna3val\"><SUBNODE1 sna1=\"sna1val\" sna2=\"sna2val\"><SUBSUBNODE1
ssna1=\"ssna1val\" ssna2=\"ssna2val\"><!-- comment should be ignored-->sub sub1
node data 1</SUBSUBNODE1><SUBSUBNODE2><!--comment: cdata with illegal
characters --><![CDATA[sub /\sub1 <br>\"node data
2\"]]></SUBSUBNODE2></SUBNODE1><SUBNODE2><SUBSUBNODE1>sub sub2 node data
1</SUBSUBNODE1><SUBSUBNODE2>sub sub2 node data
2</SUBSUBNODE2></SUBNODE2></TOPNODE>";
-check(XML);
+// with comments stripped out.
+var xml_out = "<TOPNODE tna1=\"tna1val\" tna2=\"tna2val\"
tna3=\"tna3val\"><SUBNODE1 sna1=\"sna1val\" sna2=\"sna2val\"><SUBSUBNODE1
ssna1=\"ssna1val\" ssna2=\"ssna2val\">sub sub1 node data
1</SUBSUBNODE1><SUBSUBNODE2>sub /\sub1 \<br\>\"node data
2\"</SUBSUBNODE2></SUBNODE1><SUBNODE2><SUBSUBNODE1>sub sub2 node data
1</SUBSUBNODE1><SUBSUBNODE2>sub sub2 node data
2</SUBSUBNODE2></SUBNODE2></TOPNODE>";
+
check(XML);
tmp.checkParsed = function ()
@@ -438,9 +441,7 @@
tmp.checkParsed(); // onLoad won't be called
//note("Parsed XML: "+tmp.toString());
-// This should not be the same because comments and CDATA tags are
-// dropped.
-// check_equals(tmp.toString(), xml_in);
+check_equals(tmp.toString(), xml_out);
//------------------------------------------------
// Test XML editing