Revision: 6122 Author: jlaba...@google.com Date: Fri Sep 11 14:37:27 2009 Log: Merging trunk/@6056:6057 into this branch - Fixes a broken XMLTest in Safari 4.
svn merge -r6056:6057 https://google-web-toolkit.googlecode.com/svn/trunk/ . Review by: fabbott (TBR) http://code.google.com/p/google-web-toolkit/source/detail?r=6122 Modified: /releases/1.7/branch-info.txt /releases/1.7/user/src/com/google/gwt/xml/client/Node.java /releases/1.7/user/test/com/google/gwt/xml/client/XMLTest.java ======================================= --- /releases/1.7/branch-info.txt Thu Jul 2 10:49:58 2009 +++ /releases/1.7/branch-info.txt Fri Sep 11 14:37:27 2009 @@ -6,6 +6,8 @@ /releases/1.7/ was created (r5660) as a straight copy from /releases/1...@r5659, because adding ie8 was deemed a minor version bump. Merges: +/trunk/@6056:6057 was merged into this branch to fix XMLTest + The next merge into trunk will be: svn merge -r5660:???? https://google-web-toolkit.googlecode.com/svn/releases/1.7 . ======================================= --- /releases/1.7/user/src/com/google/gwt/xml/client/Node.java Tue Jan 29 15:05:28 2008 +++ /releases/1.7/user/src/com/google/gwt/xml/client/Node.java Fri Sep 11 14:37:27 2009 @@ -215,7 +215,8 @@ /** * This method may collapse adjacent text nodes into one text node, depending - * on the implementation. + * on the implementation. Safari 4.0 and Chrome will also merge CDATA nodes + * into text nodes, even though they support CDATA nodes as distinct nodes. */ void normalize(); ======================================= --- /releases/1.7/user/test/com/google/gwt/xml/client/XMLTest.java Mon Oct 27 09:03:27 2008 +++ /releases/1.7/user/test/com/google/gwt/xml/client/XMLTest.java Fri Sep 11 14:37:27 2009 @@ -122,13 +122,16 @@ top.getFirstChild().getFirstChild().appendChild(deep2); top.appendChild(d.createTextNode("0123456789")); - top.appendChild(d.createCDATASection("abcdefghij")); + top.appendChild(d.createTextNode("abcdefghij")); + top.appendChild(d.createElement("e4")); + top.appendChild(d.createCDATASection("klmnopqrst")); return d; } /** * Returns the module name for GWT unit test running. */ + @Override public String getModuleName() { return "com.google.gwt.xml.XML"; } @@ -165,18 +168,18 @@ createProcessingInstruction, createTextNode}); for (int i = 0; i < canHaveChildren.size(); i++) { - Node parent = (Node) canHaveChildren.get(i); + Node parent = canHaveChildren.get(i); Node cloneParent = parent.cloneNode(false); if (canBeChildren.contains(parent)) { d.appendChild(cloneParent); } for (int j = 0; j < canBeChildren.size(); j++) { - Node child = (Node) canBeChildren.get(j); + Node child = canBeChildren.get(j); cloneParent.appendChild(child.cloneNode(false)); } for (int j = 0; j < canBeChildren.size(); j++) { Node clonedChild = cloneParent.getChildNodes().item(j); - Node hopefullySameChild = (Node) canBeChildren.get(j); + Node hopefullySameChild = canBeChildren.get(j); assertEquals(hopefullySameChild.cloneNode(false).toString(), clonedChild.toString()); } @@ -426,22 +429,17 @@ assertEquals("t data", t.getData(), "01234"); assertEquals("LeftT data", rightT.getData(), "56789"); CDATASection cd = (CDATASection) d.getDocumentElement().getChildNodes().item( - 5); + 7); Text rightCD = cd.splitText(5); assertEquals("cd and leftCd parent equality", cd.getParentNode(), rightCD.getParentNode()); assertEquals("leftCD.getPreviousSibling", rightCD.getPreviousSibling(), cd); assertEquals("cd length", cd.getData().length(), 5); assertEquals("leftCD.length", rightCD.getData().length(), 5); - assertEquals("cd data", cd.getData(), "abcde"); - assertEquals("leftCD data", rightCD.getData(), "fghij"); + assertEquals("cd data", cd.getData(), "klmno"); + assertEquals("leftCD data", rightCD.getData(), "pqrst"); d.getDocumentElement().normalize(); - if (XMLParser.supportsCDATASection()) { - assertEquals("normalized t", d.getDocumentElement().getChildNodes().item( - 3).toString(), "0123456789"); - } else { - assertEquals("normalized t", d.getDocumentElement().getChildNodes().item( - 3).toString(), "0123456789abcdefghij"); - } + assertEquals("normalized t", d.getDocumentElement().getChildNodes().item( + 3).toString(), "0123456789abcdefghij"); } } --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
