remove some runtime warnings and make tests more resilient to changes

7 files changed, 39 insertions, 39 deletions

diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml b/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml
index 286bdadf5..151d7e8ed 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml
@@ -26,7 +26,7 @@ be able to tolerate this.
 		<link toc="data/help/toc/extraContent/data/help/toc/extraContent/simple_page.html" />
 	</topic>
 	<topic label="Tips and tricks" href="data/help/toc/extraContent/simple_page.html"/>
-	<topic label="What's new" href="data/help/toc/extraContent/simple_page.html_page.html"/>
+	<topic label="What's new" href="data/help/toc/extraContent/simple_page.html"/>
 	<topic label="Documentation Images" href="data/help/toc/extraContent/simple_page.html"/>
 	<topic label="Legal" aegraerg="aerger" href="data/help/toc/extraContent/simple_page.html"/>
 </toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2.xml b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2.xml
index 8e9f82afa..f8bcefd31 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2.xml
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2.xml
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?NLS  TYPE="org.eclipse.help.toc"?>
-<toc label="Samples" topic="samples.htm">
-   <topic label="Bats FOR product: Happy Bats, WAS; version: 9.0,8.0 ; platform: z/OS;AIX" href="simple_page.html">
+<toc label="Samples" topic="data/help/toc/extraContent/simple_page.html">
+   <topic label="Bats FOR product: Happy Bats, WAS; version: 9.0,8.0 ; platform: z/OS;AIX" href="data/help/toc/extraContent/simple_page.html">
    	  <criteria name="prodname" value="Happy Bats" />
    	  <criteria name="prodname" value="WAS" />
    	  <criteria name="version" value="9.0" />
 	  <criteria name="version" value="8.0" />
    	  <criteria name="platform" value="z/OS" />
    	  <criteria name="platform" value="AIX" />
-      <topic label="Caring for your fruit bat FOR Version: 9.0; platform: z/OS; product: WAS" href="simple_page.html">
+      <topic label="Caring for your fruit bat FOR Version: 9.0; platform: z/OS; product: WAS" href="data/help/toc/extraContent/simple_page.html">
 	  	<criteria name="version" value="9.0" />
    	  	<criteria name="platform" value="z/OS" />
    	  	<criteria name="prodname" value="WAS" />
 	  </topic>
-      <topic label="Cleaning your fruit bat FOR Version: 8.0; platform: AIX; product: Happy Bats" href="simple_page.html">
+      <topic label="Cleaning your fruit bat FOR Version: 8.0; platform: AIX; product: Happy Bats" href="data/help/toc/extraContent/simple_page.html">
    	  	<criteria name="platform" value="AIX" />
 	  	<criteria name="version" value="8.0" />
 	  	<criteria name="prodname" value="Happy Bats" />
    	  </topic>
-      <topic label="Feeding your bat" href="simple_page.html"/>
-      <topic label="Bat sonar" href="simple_page.html"/>
-      <topic label="Bat guano" href="simple_page.html"/>
-      <topic label="Bat history" href="simple_page.html"/>
-      <topic label="Bat recycling" href="simple_page.html"/>
+      <topic label="Feeding your bat" href="data/help/toc/extraContent/simple_page.html"/>
+      <topic label="Bat sonar" href="data/help/toc/extraContent/simple_page.html"/>
+      <topic label="Bat guano" href="data/help/toc/extraContent/simple_page.html"/>
+      <topic label="Bat history" href="data/help/toc/extraContent/simple_page.html"/>
+      <topic label="Bat recycling" href="data/help/toc/extraContent/simple_page.html"/>
   </topic>
-	<topic label="Bats FOR product: Happy Bats" href="simple_page.html">
+	<topic label="Bats FOR product: Happy Bats" href="data/help/toc/extraContent/simple_page.html">
 		  <criteria name="prodname" value="Happy Bats" />
-	      <topic label="Feeding your bat" href="simple_page.html"/>
-	      <topic label="Bat sonar" href="simple_page.html"/>
-	      <topic label="Bat guano" href="simple_page.html"/>
-	      <topic label="Bat history" href="simple_page.html"/>
-	      <topic label="Bat recycling" href="simple_page.html"/>
+	      <topic label="Feeding your bat" href="data/help/toc/extraContent/simple_page.html"/>
+	      <topic label="Bat sonar" href="data/help/toc/extraContent/simple_page.html"/>
+	      <topic label="Bat guano" href="data/help/toc/extraContent/simple_page.html"/>
+	      <topic label="Bat history" href="data/help/toc/extraContent/simple_page.html"/>
+	      <topic label="Bat recycling" href="data/help/toc/extraContent/simple_page.html"/>
 	</topic>
 </toc>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
index fe477d653..ef416106b 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
@@ -4,58 +4,58 @@
       href="/org.eclipse.ua.tests/data/help/toc/extraContent/toc2.xml">
    <topic
          label="Bats FOR product: Happy Bats, WAS; version: 9.0,8.0 ; platform: z/OS;AIX"
-         href="/org.eclipse.ua.tests/simple_page.html">
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       <topic
             label="Caring for your fruit bat FOR Version: 9.0; platform: z/OS; product: WAS"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Cleaning your fruit bat FOR Version: 8.0; platform: AIX; product: Happy Bats"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Feeding your bat"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat sonar"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat guano"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat history"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat recycling"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
    </topic>
    <topic
          label="Bats FOR product: Happy Bats"
-         href="/org.eclipse.ua.tests/simple_page.html">
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       <topic
             label="Feeding your bat"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat sonar"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat guano"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat history"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
       <topic
             label="Bat recycling"
-            href="/org.eclipse.ua.tests/simple_page.html">
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
       </topic>
    </topic>
 </toc>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
index 4c81d6c62..46ce1adb4 100644
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
@@ -36,7 +36,7 @@
    </topic>
    <topic
          label="What's new"
-         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html_page.html">
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
    </topic>
    <topic
          label="Documentation Images"
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_toc.xml b/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_toc.xml
index ef7cc49c3..ce52ebfe5 100644
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_toc.xml
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_toc.xml
@@ -2,5 +2,5 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 
 <toc label="test">
-	<topic label="test" href="data/help/filteredTOC/simple_page.html"/>
+	<topic label="test" href="data/help/toc/filteredTOC/simple_page.html"/>
 </toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
index 45be796f3..58824f502 100644
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
@@ -10,7 +10,7 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
                label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
+               href="/org.eclipse.ua.tests/data/help/toc/filteredTOC/simple_page.html">
          </topic>
       </topic>
       <topic
@@ -18,7 +18,7 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
                label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
+               href="/org.eclipse.ua.tests/data/help/toc/filteredTOC/simple_page.html">
          </topic>
       </topic>
       <topic
@@ -26,7 +26,7 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
                label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
+               href="/org.eclipse.ua.tests/data/help/toc/filteredTOC/simple_page.html">
          </topic>
       </topic>
       <topic
@@ -34,7 +34,7 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
                label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
+               href="/org.eclipse.ua.tests/data/help/toc/filteredTOC/simple_page.html">
          </topic>
       </topic>
       <topic
@@ -42,7 +42,7 @@
             href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
          <topic
                label="test"
-               href="/org.eclipse.ua.tests/data/help/filteredTOC/simple_page.html">
+               href="/org.eclipse.ua.tests/data/help/toc/filteredTOC/simple_page.html">
          </topic>
       </topic>
       <topic
diff --git a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/producer/XHTMLContentDescriberTest.java b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/producer/XHTMLContentDescriberTest.java
index 78196ea99..9d0aa7a11 100644
--- a/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/producer/XHTMLContentDescriberTest.java
+++ b/org.eclipse.ua.tests/help/org/eclipse/ua/tests/help/producer/XHTMLContentDescriberTest.java
@@ -34,7 +34,7 @@ public class XHTMLContentDescriberTest extends TestCase {
 	}
 	
 	public void testValidXHTML() throws IOException {
-		URL[] urls = ResourceFinder.findFiles(UserAssistanceTestPlugin.getDefault(), "data/help/producer/xhtml/valid", "", true);
+		URL[] urls = ResourceFinder.findFiles(UserAssistanceTestPlugin.getDefault(), "data/help/producer/xhtml/valid", "html", true);
 		for (int i=0;i<urls.length;++i) {
 			InputStream in = urls[i].openStream();
 			String url = urls[i].toExternalForm();
@@ -46,7 +46,7 @@ public class XHTMLContentDescriberTest extends TestCase {
 	}
 
 	public void testInvalidXHTML() throws IOException {
-		URL[] urls = ResourceFinder.findFiles(UserAssistanceTestPlugin.getDefault(), "data/help/producer/xhtml/invalid", "", true);
+		URL[] urls = ResourceFinder.findFiles(UserAssistanceTestPlugin.getDefault(), "data/help/producer/xhtml/invalid", "html", true);
 		for (int i=0;i<urls.length;++i) {
 			InputStream in = urls[i].openStream();
 			String url = urls[i].toExternalForm();