Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCurtis D'Entremont2006-04-26 17:18:16 +0000
committerCurtis D'Entremont2006-04-26 17:18:16 +0000
commit46ac8857057bb6fcb6f5117c7bfef7d9b4355532 (patch)
treeda47a59e790e9b0852d883802f1d4c5f9e29ba96
parent479dfa4ec39187dd1fe6b9e19408ed904bca39ee (diff)
downloadeclipse.platform.ua-46ac8857057bb6fcb6f5117c7bfef7d9b4355532.tar.gz
eclipse.platform.ua-46ac8857057bb6fcb6f5117c7bfef7d9b4355532.tar.xz
eclipse.platform.ua-46ac8857057bb6fcb6f5117c7bfef7d9b4355532.zip
138646 Test failures on 5.0 JRE
-rw-r--r--org.eclipse.ua.tests/base/org/eclipse/ua/tests/util/XHTMLUtil.java15
-rw-r--r--org.eclipse.ua.tests/data/help/producer/dynamic2_expected.txt2
-rw-r--r--org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt2
-rw-r--r--org.eclipse.ua.tests/data/intro/dynamicXHTML/content/anchor_expected.txt8
4 files changed, 20 insertions, 7 deletions
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
@@ -23,10 +23,23 @@ public class XHTMLUtil {
*/
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
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic2_expected.txt b/org.eclipse.ua.tests/data/help/producer/dynamic2_expected.txt
index 3a390f500..dd7e2e62b 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamic2_expected.txt
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic2_expected.txt
@@ -23,7 +23,7 @@ This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345"
</p>
<p>
- <filter name="plugin" value="!my.invalid.plugin.id.012345" />
+ <filter name="plugin" value="!my.invalid.plugin.id.012345"/>
This paragraph, which has filter element name="plugin", value="!my.invalid.plugin.id.012345",
should never be filtered out.
</p>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
index ce3d3b927..0f1f2f5cc 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
@@ -24,7 +24,7 @@ This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345"
</p>
<p>
- <filter name="plugin" value="!my.invalid.plugin.id.012345" />
+ <filter name="plugin" value="!my.invalid.plugin.id.012345"/>
This paragraph, which has filter element name="plugin", value="!my.invalid.plugin.id.012345",
should never be filtered out.
</p>
diff --git a/org.eclipse.ua.tests/data/intro/dynamicXHTML/content/anchor_expected.txt b/org.eclipse.ua.tests/data/intro/dynamicXHTML/content/anchor_expected.txt
index 380e0aa7f..c61fda3ae 100644
--- a/org.eclipse.ua.tests/data/intro/dynamicXHTML/content/anchor_expected.txt
+++ b/org.eclipse.ua.tests/data/intro/dynamicXHTML/content/anchor_expected.txt
@@ -11,7 +11,7 @@
</p>
<small>[begin anchor 1]</small>
-<hr />
+<hr/>
<p id="paragraph.1">
This is the first paragraph in anchor2.xhtml.
</p><p id="paragraph.2">
@@ -19,7 +19,7 @@ This is the second paragraph in anchor2.xhtml.
</p><p id="paragraph.3">
This is the third paragraph in anchor2.xhtml.
</p>
-<hr />
+<hr/>
<small>[end anchor 1]</small>
<p>
@@ -27,11 +27,11 @@ This is the third paragraph in anchor2.xhtml.
</p>
<small>[begin anchor 2]</small>
-<hr />
+<hr/>
<p id="paragraph.2">
This is the second paragraph in anchor2.xhtml.
</p>
-<hr />
+<hr/>
<small>[end anchor 2]</small>
</body>

Back to the top