From 00f34df469506f27923247657278c2d14f4e83cf Mon Sep 17 00:00:00 2001
From: Curtis D'Entremont
Date: Tue, 28 Mar 2006 00:04:08 +0000
Subject: 132251 New: NOT function on filters

---
 .../data/help/context/contexts.xml                 |  35 +-----
 .../data/help/context/contexts_expected.txt        |  30 ++++++
 .../context/contexts_serialized_linux_gtk_x86.txt  |  42 --------
 .../contexts_serialized_macosx_carbon_ppc.txt      |  42 --------
 .../contexts_serialized_win32_win32_x86.txt        |  42 --------
 .../data/help/producer/dynamic.xhtml               |  22 +++-
 .../data/help/producer/dynamicInZip_expected.txt   |  22 ++++
 .../data/help/producer/dynamicInZip_serialized.txt |  22 ----
 .../data/help/producer/dynamic_expected.txt        |  34 ++++++
 .../data/help/producer/dynamic_serialized.txt      |  20 ----
 .../data/help/toc/extraContent/toc2_expected.txt   |  61 +++++++++++
 .../data/help/toc/extraContent/toc2_serialized.txt |  61 -----------
 .../data/help/toc/extraContent/toc_expected.txt    |  49 +++++++++
 .../data/help/toc/extraContent/toc_serialized.txt  |  49 ---------
 .../data/help/toc/filteredToc/filter.xml           |  81 --------------
 .../data/help/toc/filteredToc/toc_expected.txt     |  69 ++++++++++++
 .../filteredToc/toc_serialized_linux_gtk_x86.txt   | 117 ---------------------
 .../toc_serialized_macosx_carbon_ppc.txt           | 117 ---------------------
 .../filteredToc/toc_serialized_win32_win32_x86.txt | 117 ---------------------
 19 files changed, 289 insertions(+), 743 deletions(-)
 create mode 100644 org.eclipse.ua.tests/data/help/context/contexts_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt
 create mode 100644 org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt
 create mode 100644 org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt
 create mode 100644 org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt
 create mode 100644 org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt
 create mode 100644 org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt
 delete mode 100644 org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt

(limited to 'org.eclipse.ua.tests/data/help')

diff --git a/org.eclipse.ua.tests/data/help/context/contexts.xml b/org.eclipse.ua.tests/data/help/context/contexts.xml
index ed1c0fe00..19963f40c 100644
--- a/org.eclipse.ua.tests/data/help/context/contexts.xml
+++ b/org.eclipse.ua.tests/data/help/context/contexts.xml
@@ -5,52 +5,23 @@
    <context id="test.id" >
       <description>This is a test context.</description>
 	  <topic label="This topic should always appear" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=win32" label="Your OS is win32" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=linux" label="Your OS is linux" href="data/help/context/simple_page.html"/>
-	  <topic filter="os=macosx" label="Your OS is macosx" href="data/help/context/simple_page.html"/>
 	  
 	  <!-- should never appear -->
 	  <topic filter="os=invalid" label="Your OS is invalid" href="data/help/context/simple_page.html"/>
-	  
-	  <topic filter="ws=win32" label="Your WS is win32" href="data/help/context/simple_page.html"/>
-	  <topic filter="ws=gtk" label="Your WS is gtk" href="data/help/context/simple_page.html"/>
-	  <topic filter="ws=carbon" label="Your WS is carbon" href="data/help/context/simple_page.html"/>
-	  
-	  <!-- should never appear -->
 	  <topic filter="ws=invalid" label="Your WS is invalid" href="data/help/context/simple_page.html"/>
-
-	  <topic filter="arch=x86" label="Your ARCH is x86" href="data/help/context/simple_page.html"/>
-	  <topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/context/simple_page.html"/>
-
-	  <!-- should never appear -->
 	  <topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/context/simple_page.html"/>
-	  
-	  <topic label="Your OS is win32 AND your WS is win32" href="data/help/context/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-	  </topic>
-
-	  <topic label="Your OS is linux AND your WS is gtk" href="data/help/context/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-	  </topic>
-
-	  <topic label="Your OS is macosx AND your WS is carbon" href="data/help/context/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-	  </topic>
-
-	  <!-- should never appear -->
 	  <topic label="Your OS is win32 AND your WS is invalid" href="data/help/context/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
 	  </topic>
 
 	  <topic filter="plugin=org.eclipse.help" label="The plugin org.eclipse.help is installed" href="data/help/context/simple_page.html"/>
+	  <topic filter="plugin!=org.eclipse.help" label="The plugin org.eclipse.help is NOT installed" href="data/help/context/simple_page.html"/>
 
       <!-- should never appear -->
-      <topic filter="plugin=invalid" label="The plugin invalid is installed" href="data/help/context/simple_page.html"/>
+      <topic filter="plugin=my.invalid.plugin.id.12345" label="The plugin my.invalid.plugin.id.12345 is installed" href="data/help/context/simple_page.html"/>
 
+      <topic filter="plugin!=my.invalid.plugin.id.12345d" label="The plugin my.invalid.plugin.id.12345 is NOT installed" href="data/help/context/simple_page.html"/>
       <topic filter="product=org.eclipse.sdk.ide" label="The product org.eclipse.sdk.ide is running" href="data/help/context/simple_page.html"/>
 
       <!-- should never appear -->
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_expected.txt b/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
new file mode 100644
index 000000000..fbd2fd71f
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/context/contexts_expected.txt
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<contexts>
+   <context id="test.id">
+      <description>This is a test context.<description>
+      <topic
+            label="This topic should always appear"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+      <topic
+            label="The plugin org.eclipse.help is installed"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+      <topic
+            label="The plugin my.invalid.plugin.id.12345 is NOT installed"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+      <topic
+            label="The product org.eclipse.sdk.ide is running"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+      <topic
+            label="The category org.eclipse.categories.developmentCategory is enabled"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+      <topic
+            label="The activity org.eclipse.javaDevelopment is enabled"
+            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
+      </topic>
+   </context>
+</contexts>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt b/org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt
deleted file mode 100644
index 1d86c68e4..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_linux_gtk_x86.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<contexts>
-   <context id="test.id">
-      <description>This is a test context.<description>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt b/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt
deleted file mode 100644
index 76f03d888..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_macosx_carbon_ppc.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<contexts>
-   <context id="test.id">
-      <description>This is a test context.<description>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt b/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt
deleted file mode 100644
index c61019fe6..000000000
--- a/org.eclipse.ua.tests/data/help/context/contexts_serialized_win32_win32_x86.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<contexts>
-   <context id="test.id">
-      <description>This is a test context.<description>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/context/simple_page.html">
-      </topic>
-   </context>
-</contexts>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml b/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
index c855300b7..17c02c356 100644
--- a/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic.xhtml
@@ -18,8 +18,28 @@
 This page contains filtered content.
 </p>
 <p filter="os=invalid">
-This paragraph should always be filtered out.
+This paragraph, which has filter attribute "os=invalid" should always be filtered out.
 </p>
+<p filter="os!=invalid">
+This paragraph, which has filter attribute "os!=invalid" should never be filtered out.
+</p>
+<p filter="plugin=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin=my.invalid.plugin.id.012345" should always be filtered out.
+</p>
+<p filter="plugin!=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345" should never be filtered out.
+</p>
+<p>
+   <filter name="plugin" value="my.invalid.plugin.id.012345"/>
+   This paragraph, which has filter element name="plugin", value="my.invalid.plugin.id.012345",
+   should always be filtered out.
+</p>
+<p>
+   <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>
+
 
 </body>
 </html>
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt b/org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt
new file mode 100644
index 000000000..4259491ce
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/producer/dynamicInZip_expected.txt
@@ -0,0 +1,22 @@
+<!--
+   This file is used to test whether or not the dynamic producer will be used
+   when loading an xhtml document from inside a doc.zip. The paragraph at the
+   bottom should always be filtered out by the producer.
+--><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+<title>dynamicInZip.xhtml</title>
+</head>
+<body>
+
+<h2>dynamicInZip.xhtml</h2>
+<p>
+This file is located in the doc.zip in the root of the test plugin. It is used to test whether
+or not dynamic content producers are being called properly for files in doc.zip. The paragraph
+below should always be filtered out by the dynamic content producer.
+</p>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt b/org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt
deleted file mode 100644
index c82bdaaa0..000000000
--- a/org.eclipse.ua.tests/data/help/producer/dynamicInZip_serialized.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-   This file is used to test whether or not the dynamic producer will be used
-   when loading an xhtml document from inside a doc.zip. The paragraph at the
-   bottom should always be filtered out by the producer.
---><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<title>dynamicInZip.xhtml</title>
-</head>
-<body>
-
-<h2>dynamicInZip.xhtml</h2>
-<p>
-This file is located in the doc.zip in the root of the test plugin. It is used to test whether
-or not dynamic content producers are being called properly for files in doc.zip. The paragraph
-below should always be filtered out by the dynamic content producer.
-</p>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
new file mode 100644
index 000000000..005f29040
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/producer/dynamic_expected.txt
@@ -0,0 +1,34 @@
+<!--
+   This file is used to test whether or not the dynamic producer will be used
+   when loading an xhtml document from outside a doc.zip. The paragraph at the
+   bottom should always be filtered out by the producer.
+--><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+
+<title>dynamic.xhtml</title>
+</head>
+<body>
+
+<h2>dynamic.xhtml</h2>
+<p>
+This page contains filtered content.
+</p>
+
+<p filter="os!=invalid">
+This paragraph, which has filter attribute "os!=invalid" should never be filtered out.
+</p>
+
+<p filter="plugin!=my.invalid.plugin.id.012345">
+This paragraph, which has filter attribute "plugin!=my.invalid.plugin.id.012345" should never be filtered out.
+</p>
+
+<p>
+   <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>
+
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt b/org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt
deleted file mode 100644
index f839440a4..000000000
--- a/org.eclipse.ua.tests/data/help/producer/dynamic_serialized.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-<!--
-   This file is used to test whether or not the dynamic producer will be used
-   when loading an xhtml document from outside a doc.zip. The paragraph at the
-   bottom should always be filtered out by the producer.
---><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<title>dynamic.xhtml</title>
-</head>
-<body>
-
-<h2>dynamic.xhtml</h2>
-<p>
-This page contains filtered content.
-</p>
-
-
-</body>
-</html>
\ 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
new file mode 100644
index 000000000..e7b25dca4
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_expected.txt
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<toc
+      label="Samples"
+      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/bats.htm">
+      <topic
+            label="Caring for your fruit bat FOR Version: 9.0; platform: z/OS; product: WAS"
+            href="/org.eclipse.ua.tests/batcaring.htm">
+      </topic>
+      <topic
+            label="Cleaning your fruit bat FOR Version: 8.0; platform: AIX; product: Happy Bats"
+            href="/org.eclipse.ua.tests/batcleaning.htm">
+      </topic>
+      <topic
+            label="Feeding your bat"
+            href="/org.eclipse.ua.tests/batfeeding.htm">
+      </topic>
+      <topic
+            label="Bat sonar"
+            href="/org.eclipse.ua.tests/batsonar.htm">
+      </topic>
+      <topic
+            label="Bat guano"
+            href="/org.eclipse.ua.tests/batguano.htm">
+      </topic>
+      <topic
+            label="Bat history"
+            href="/org.eclipse.ua.tests/bathistory.htm">
+      </topic>
+      <topic
+            label="Bat recycling"
+            href="/org.eclipse.ua.tests/batreuse.htm">
+      </topic>
+   </topic>
+   <topic
+         label="Bats FOR product: Happy Bats"
+         href="/org.eclipse.ua.tests/bats.htm#none">
+      <topic
+            label="Feeding your bat"
+            href="/org.eclipse.ua.tests/batfeeding.htm">
+      </topic>
+      <topic
+            label="Bat sonar"
+            href="/org.eclipse.ua.tests/batsonar.htm">
+      </topic>
+      <topic
+            label="Bat guano"
+            href="/org.eclipse.ua.tests/batguano.htm">
+      </topic>
+      <topic
+            label="Bat history"
+            href="/org.eclipse.ua.tests/bathistory.htm">
+      </topic>
+      <topic
+            label="Bat recycling"
+            href="/org.eclipse.ua.tests/batreuse.htm">
+      </topic>
+   </topic>
+</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt
deleted file mode 100644
index e7b25dca4..000000000
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc2_serialized.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="Samples"
-      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/bats.htm">
-      <topic
-            label="Caring for your fruit bat FOR Version: 9.0; platform: z/OS; product: WAS"
-            href="/org.eclipse.ua.tests/batcaring.htm">
-      </topic>
-      <topic
-            label="Cleaning your fruit bat FOR Version: 8.0; platform: AIX; product: Happy Bats"
-            href="/org.eclipse.ua.tests/batcleaning.htm">
-      </topic>
-      <topic
-            label="Feeding your bat"
-            href="/org.eclipse.ua.tests/batfeeding.htm">
-      </topic>
-      <topic
-            label="Bat sonar"
-            href="/org.eclipse.ua.tests/batsonar.htm">
-      </topic>
-      <topic
-            label="Bat guano"
-            href="/org.eclipse.ua.tests/batguano.htm">
-      </topic>
-      <topic
-            label="Bat history"
-            href="/org.eclipse.ua.tests/bathistory.htm">
-      </topic>
-      <topic
-            label="Bat recycling"
-            href="/org.eclipse.ua.tests/batreuse.htm">
-      </topic>
-   </topic>
-   <topic
-         label="Bats FOR product: Happy Bats"
-         href="/org.eclipse.ua.tests/bats.htm#none">
-      <topic
-            label="Feeding your bat"
-            href="/org.eclipse.ua.tests/batfeeding.htm">
-      </topic>
-      <topic
-            label="Bat sonar"
-            href="/org.eclipse.ua.tests/batsonar.htm">
-      </topic>
-      <topic
-            label="Bat guano"
-            href="/org.eclipse.ua.tests/batguano.htm">
-      </topic>
-      <topic
-            label="Bat history"
-            href="/org.eclipse.ua.tests/bathistory.htm">
-      </topic>
-      <topic
-            label="Bat recycling"
-            href="/org.eclipse.ua.tests/batreuse.htm">
-      </topic>
-   </topic>
-</toc>
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
new file mode 100644
index 000000000..e35bbb632
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_expected.txt
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<toc
+      label="TOC with extra elements"
+      href="/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml">
+   <topic
+         label="Getting started"
+         href="null">
+      <topic
+            label="test"
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+      </topic>
+   </topic>
+   <topic
+         label="Concepts"
+         href="null">
+      <topic
+            label="test"
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+      </topic>
+   </topic>
+   <topic
+         label="Tasks"
+         href="null">
+      <topic
+            label="test"
+            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+      </topic>
+   </topic>
+   <topic
+         label="Reference"
+         href="null">
+   </topic>
+   <topic
+         label="Tips and tricks"
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+   </topic>
+   <topic
+         label="What's new"
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html_page.html">
+   </topic>
+   <topic
+         label="Documentation Images"
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+   </topic>
+   <topic
+         label="Legal"
+         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
+   </topic>
+</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt b/org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt
deleted file mode 100644
index e35bbb632..000000000
--- a/org.eclipse.ua.tests/data/help/toc/extraContent/toc_serialized.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="TOC with extra elements"
-      href="/org.eclipse.ua.tests/data/help/toc/extraContent/toc.xml">
-   <topic
-         label="Getting started"
-         href="null">
-      <topic
-            label="test"
-            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-      </topic>
-   </topic>
-   <topic
-         label="Concepts"
-         href="null">
-      <topic
-            label="test"
-            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-      </topic>
-   </topic>
-   <topic
-         label="Tasks"
-         href="null">
-      <topic
-            label="test"
-            href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-      </topic>
-   </topic>
-   <topic
-         label="Reference"
-         href="null">
-   </topic>
-   <topic
-         label="Tips and tricks"
-         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-   </topic>
-   <topic
-         label="What's new"
-         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html_page.html">
-   </topic>
-   <topic
-         label="Documentation Images"
-         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-   </topic>
-   <topic
-         label="Legal"
-         href="/org.eclipse.ua.tests/data/help/toc/extraContent/simple_page.html">
-   </topic>
-</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml b/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
index 2d1115349..bcbfe497a 100644
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/filter.xml
@@ -8,67 +8,17 @@
 	<topic label="This topic should always appear" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-	<topic filter="os=win32" label="Your OS is win32" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="os=linux" label="Your OS is linux" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="os=macosx" label="Your OS is macosx" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
 
 	<!-- should never appear -->
 	<topic filter="os=invalid" label="Your OS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-
-	<topic filter="ws=win32" label="Your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="ws=gtk" label="Your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="ws=carbon" label="Your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic filter="ws=invalid" label="Your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-
-	<topic filter="arch=x86" label="Your ARCH is x86" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-	<topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/toc/filteredToc/simple_page.html">
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/toc/filteredToc/simple_page.html">
 		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
 	</topic>
-	
-	<topic label="Your OS is win32 AND your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<topic label="Your OS is linux AND your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<topic label="Your OS is macosx AND your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-		<link toc="data/help/toc/filteredToc/simple_toc.xml" />
-	</topic>
-
-	<!-- should never appear -->
 	<topic label="Your OS is win32 AND your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
@@ -115,42 +65,11 @@
 	<!-- Topics -->
 
 	<topic label="This topic should always appear" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=win32" label="Your OS is win32" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=linux" label="Your OS is linux" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="os=macosx" label="Your OS is macosx" href="data/help/toc/filteredToc/simple_page.html"/>
 
 	<!-- should never appear -->
 	<topic filter="os=invalid" label="Your OS is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<topic filter="ws=win32" label="Your WS is win32" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="ws=gtk" label="Your WS is gtk" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="ws=carbon" label="Your WS is carbon" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<!-- should never appear -->
 	<topic filter="ws=invalid" label="Your WS is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<topic filter="arch=x86" label="Your ARCH is x86" href="data/help/toc/filteredToc/simple_page.html"/>
-	<topic filter="arch=ppc" label="Your ARCH is ppc" href="data/help/toc/filteredToc/simple_page.html"/>
-
-	<!-- should never appear -->
 	<topic filter="arch=invalid" label="Your ARCH is invalid" href="data/help/toc/filteredToc/simple_page.html"/>
-	
-	<topic label="Your OS is win32 AND your WS is win32" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="win32"/>
-        <filter name="ws" value="win32"/>
-	</topic>
-
-	<topic label="Your OS is linux AND your WS is gtk" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="linux"/>
-        <filter name="ws" value="gtk"/>
-	</topic>
-
-	<topic label="Your OS is macosx AND your WS is carbon" href="data/help/toc/filteredToc/simple_page.html">
-	    <filter name="os" value="macosx"/>
-        <filter name="ws" value="carbon"/>
-	</topic>
-
-	<!-- should never appear -->
 	<topic label="Your OS is win32 AND your WS is invalid" href="data/help/toc/filteredToc/simple_page.html">
 	    <filter name="os" value="win32"/>
         <filter name="ws" value="invalid"/>
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
new file mode 100644
index 000000000..72cb7236f
--- /dev/null
+++ b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_expected.txt
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<toc
+      label="filteredToc"
+      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
+   <topic
+         label="filter.xml"
+         href="null">
+      <topic
+            label="This topic should always appear"
+            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">
+         </topic>
+      </topic>
+      <topic
+            label="The plugin org.eclipse.help is installed"
+            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">
+         </topic>
+      </topic>
+      <topic
+            label="The product org.eclipse.sdk.ide is running"
+            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">
+         </topic>
+      </topic>
+      <topic
+            label="The category org.eclipse.categories.developmentCategory is enabled"
+            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">
+         </topic>
+      </topic>
+      <topic
+            label="The activity org.eclipse.javaDevelopment is enabled"
+            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">
+         </topic>
+      </topic>
+      <topic
+            label="This topic should always appear"
+            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
+      </topic>
+      <topic
+            label="The plugin org.eclipse.help is installed"
+            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
+      </topic>
+      <topic
+            label="The product org.eclipse.sdk.ide is running"
+            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
+      </topic>
+      <topic
+            label="The category org.eclipse.categories.developmentCategory is enabled"
+            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
+      </topic>
+      <topic
+            label="The activity org.eclipse.javaDevelopment is enabled"
+            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
+      </topic>
+   </topic>
+</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt
deleted file mode 100644
index 70112dd80..000000000
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_linux_gtk_x86.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="filteredToc"
-      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
-   <topic
-         label="filter.xml"
-         href="null">
-      <topic
-            label="This topic should always appear"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is linux"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is linux AND your WS is gtk"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-   </topic>
-</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt
deleted file mode 100644
index a62416e5c..000000000
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_macosx_carbon_ppc.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="filteredToc"
-      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
-   <topic
-         label="filter.xml"
-         href="null">
-      <topic
-            label="This topic should always appear"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is ppc"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is macosx AND your WS is carbon"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-   </topic>
-</toc>
diff --git a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt b/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt
deleted file mode 100644
index 97066bf6e..000000000
--- a/org.eclipse.ua.tests/data/help/toc/filteredToc/toc_serialized_win32_win32_x86.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<toc
-      label="filteredToc"
-      href="/org.eclipse.ua.tests/data/help/toc/filteredToc/toc.xml">
-   <topic
-         label="filter.xml"
-         href="null">
-      <topic
-            label="This topic should always appear"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is win32"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your WS is win32"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            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">
-         </topic>
-      </topic>
-      <topic
-            label="This topic should always appear"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your ARCH is x86"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="Your OS is win32 AND your WS is win32"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The plugin org.eclipse.help is installed"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The product org.eclipse.sdk.ide is running"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The category org.eclipse.categories.developmentCategory is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-      <topic
-            label="The activity org.eclipse.javaDevelopment is enabled"
-            href="/org.eclipse.ua.tests/data/help/toc/filteredToc/simple_page.html">
-      </topic>
-   </topic>
-</toc>
-- 
cgit v1.2.3