From 46ac8857057bb6fcb6f5117c7bfef7d9b4355532 Mon Sep 17 00:00:00 2001
From: Curtis D'Entremont
Date: Wed, 26 Apr 2006 17:18:16 +0000
Subject: 138646 Test failures on 5.0 JRE

---
 .../base/org/eclipse/ua/tests/util/XHTMLUtil.java         | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'org.eclipse.ua.tests/base/org/eclipse/ua/tests')

diff --git a/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java b/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
index b4dda1b26..efca75dd5 100644
--- a/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
+++ b/org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java
@@ -22,11 +22,24 @@ public class XHTMLUtil {
 	 * serializations.
 	 */
 	public static String removeEnvironmentSpecificContent(String xhtml) {
+		/*
+		 * Remove the space between the last attribute value of a tag and
+		 * the closing part "/>". The Sun 1.5 JDK's XML DOM serializer will
+		 * always remove it, and 1.4 will always add it, so need to pick one
+		 * and adapt all documents to it.
+		 * 
+		 * For example:
+		 * <myElement myAttribute="myValue" />
+		 * becomes:
+		 * <myElement myAttribute="myValue"/>
+		 */
+		xhtml = xhtml.replaceAll(" />", "/>");
+
 		/*
 		 * The base tag is added before showing in browser. It contains an
 		 * absolute path in filesystem.
 		 */
-		xhtml = xhtml.replaceAll("<base href=\".*\" />", "");
+		xhtml = xhtml.replaceAll("<base href=\".*\"/>", "");
 
 		/*
 		 * The order of the params for the meta tag comes out differently on
-- 
cgit v1.2.3