This commit was manufactured by cvs2svn to create tag 'v201204260055'.
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/.classpath b/tests/org.eclipse.wst.xml.xpath.core.tests/.classpath
deleted file mode 100644
index 1055890..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/xml/xpath/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/.project b/tests/org.eclipse.wst.xml.xpath.core.tests/.project
deleted file mode 100644
index 68dbbd9..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.xpath.core.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.xpath.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1f414fd..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue Apr 22 15:35:02 GMT-05:00 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.xpath.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index ed23940..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.xpath.core.tests
-Bundle-Version: 1.1.0.qualifier
-Bundle-Activator: org.eclipse.wst.xml.xpath.core.tests.XPathCoreTestPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.wst.xml.xpath.core;bundle-version="[1.3.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %vendorName
-Export-Package: org.eclipse.wst.xml.xpath.core.tests;uses:="org.osgi.framework,junit.framework,org.eclipse.core.runtime",
- org.eclipse.wst.xsl.internal.core.xpath.tests;x-internal:=true
-Bundle-Localization: plugin
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/about.html b/tests/org.eclipse.wst.xml.xpath.core.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/build.properties b/tests/org.eclipse.wst.xml.xpath.core.tests/build.properties
deleted file mode 100644
index 03e0d38..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- bin/,\
- about.html,\
- plugin.properties
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/plugin.properties b/tests/org.eclipse.wst.xml.xpath.core.tests/plugin.properties
deleted file mode 100644
index c52c3a2..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xml.xpath.core.tests
-vendorName = Eclipse Web Tools Platform
-pluginName = XPath Tests Plug-in
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTestPlugin.java b/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTestPlugin.java
deleted file mode 100644
index eacf634..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTestPlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.eclipse.wst.xml.xpath.core.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XPathCoreTestPlugin extends Plugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.xml.xpath.core.tests";
-
- // The shared instance
- private static XPathCoreTestPlugin plugin;
-
- /**
- * The constructor
- */
- public XPathCoreTestPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
- */
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static XPathCoreTestPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTests.java b/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTests.java
deleted file mode 100644
index e4eb7a4..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xml/xpath/core/tests/XPathCoreTests.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.wst.xml.xpath.core.tests;
-
-import org.eclipse.wst.xsl.internal.core.xpath.tests.TestXPath20Helper;
-import org.eclipse.wst.xsl.internal.core.xpath.tests.TestXSLXPathHelper;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class XPathCoreTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.wst.xml.xpath.core.tests");
- //$JUnit-BEGIN$
- suite.addTestSuite(TestXSLXPathHelper.class);
- suite.addTestSuite(TestXPath20Helper.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXPath20Helper.java b/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXPath20Helper.java
deleted file mode 100644
index 7c03e86..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXPath20Helper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Jesper Steen Moller and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen Moller - bug 348737 - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsl.internal.core.xpath.tests;
-
-import java.util.Collections;
-import java.util.Iterator;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.wst.xml.xpath.core.util.XPath20Helper;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TestXPath20Helper extends TestCase {
-
- public void testInvalidXPath() {
- try {
- XPath20Helper.compile("starts-with('123', '123', '123)");
- fail("Compiled successfully");
- } catch (XPathExpressionException ex) {
-
- }
- }
-
- public void testValidXPath() throws Exception {
- try {
- XPath20Helper.compile("concat('123', '123')");
- } catch (XPathExpressionException ex) {
- fail("Failed to compile.");
- throw new Exception(ex.getMessage());
- }
- }
-
-
- public void testEvalXPath() throws Exception {
- try {
- XPath20Helper.XPath2Engine xpath2Engine = new XPath20Helper.XPath2Engine();
- xpath2Engine.setNamespaceContext(new NamespaceContext() {
-
- public Iterator getPrefixes(String namespaceURI) {
- return Collections.EMPTY_LIST.iterator();
- }
-
- public String getPrefix(String namespaceURI) {
- if (namespaceURI.equals(""))
- return XMLConstants.DEFAULT_NS_PREFIX;
- else
- return null;
- }
-
- public String getNamespaceURI(String prefix) {
- if (prefix.equals(XMLConstants.DEFAULT_NS_PREFIX))
- return "urn:test";
- else
- return null;
- }
- });
- xpath2Engine.parse("//testNode1");
-
- DOMImplementation domImpl = createDOMImpl();
- Document document = domImpl.createDocument("urn:test", "test", null);
- Element rootelem = document.getDocumentElement();
- Element elem1 = document.createElementNS("urn:test", "testNode1");
- Element elem2 = document.createElementNS("urn:test", "testNode1");
- rootelem.appendChild(elem1);
- rootelem.appendChild(elem2);
- Attr attribute = document.createAttribute("attr");
- attribute.setValue("some value");
- elem2.setAttributeNode(attribute);
-
- assertEquals(2, xpath2Engine.execute(document).getLength());
- } catch (XPathExpressionException ex) {
- fail("Failed to compile.");
- throw new Exception(ex.getMessage());
- }
- }
-
- private DOMImplementation createDOMImpl()
- throws ParserConfigurationException {
- DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = documentFactory.newDocumentBuilder();
- DOMImplementation domImpl = builder.getDOMImplementation();
- return domImpl;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXSLXPathHelper.java b/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXSLXPathHelper.java
deleted file mode 100644
index 7f28aa4..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/src/org/eclipse/wst/xsl/internal/core/xpath/tests/TestXSLXPathHelper.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.wst.xsl.internal.core.xpath.tests;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.XPathExpressionException;
-
-import junit.framework.TestCase;
-import org.eclipse.wst.xml.xpath.core.util.XSLTXPathHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class TestXSLXPathHelper extends TestCase {
-
- public void testInvalidXPath() {
- try {
- XSLTXPathHelper.compile("starts-with('123', '123', '123)");
- fail("Compiled successfully");
- } catch (XPathExpressionException ex) {
-
- }
- }
-
- public void testValidXPath() throws Exception {
- try {
- XSLTXPathHelper.compile("concat('123', '123')");
- } catch (XPathExpressionException ex) {
- fail("Failed to compile.");
- throw new Exception(ex.getMessage());
- }
- }
-
- public void testcreateXPathFromNode() throws Exception {
- DOMImplementation domImpl = createDOMImpl();
- Document document = domImpl.createDocument(null, "test", null);
- assertEquals("Unexpected XPath value", "/test", XSLTXPathHelper.calculateXPathToNode(document.getFirstChild()));
- }
-
- private DOMImplementation createDOMImpl()
- throws ParserConfigurationException {
- DocumentBuilderFactory documentFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder builder = documentFactory.newDocumentBuilder();
- DOMImplementation domImpl = builder.getDOMImplementation();
- return domImpl;
- }
-
- public void testCreateXPathFromNodeMultiple() throws Exception {
- DOMImplementation domImpl = createDOMImpl();
- Document document = domImpl.createDocument(null, "test", null);
- Element rootelem = document.getDocumentElement();
- Element elem1 = document.createElement("testNode1");
- Element elem2 = document.createElement("testNode1");
- rootelem.appendChild(elem1);
- rootelem.appendChild(elem2);
- assertEquals("Unexepected XPath value", "/test/testNode1[2]", XSLTXPathHelper.calculateXPathToNode(elem2));
- }
-
- public void testCreateXPathFromNodeAttribute() throws Exception {
- DOMImplementation domImpl = createDOMImpl();
- Document document = domImpl.createDocument(null, "test", null);
- Element rootelem = document.getDocumentElement();
- Element elem1 = document.createElement("testNode1");
- Element elem2 = document.createElement("testNode1");
- rootelem.appendChild(elem1);
- rootelem.appendChild(elem2);
- Attr attribute = document.createAttribute("attr");
- attribute.setValue("some value");
- elem2.setAttributeNode(attribute);
- assertEquals("Unexpected XPath value", "/test/testNode1[2]/@attr", XSLTXPathHelper.calculateXPathToNode(attribute));
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.core.tests/test.xml b/tests/org.eclipse.wst.xml.xpath.core.tests/test.xml
deleted file mode 100644
index 38c7793..0000000
--- a/tests/org.eclipse.wst.xml.xpath.core.tests/test.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
- name="testsuite"
- default="run"
- basedir=".">
-
- <!-- The following properties should be passed into this script -->
- <!-- ${eclipse-home} -->
- <!-- ${buildDirectory} -->
- <!-- ${buildLabel} -->
-
- <!-- should be little need to change what's above -->
-
- <property
- name="plugin-name"
- value="org.eclipse.wst.xml.xpath.core.tests" />
- <property
- name="classname"
- value="org.eclipse.wst.xml.xpath.core.tests.XPathCoreTests" />
- <property
- name="testType"
- value="core-test" />
-
- <!-- should be little need to change what's below -->
-
- <echo message="basedir: ${basedir}" />
- <echo message="eclipse-home: ${eclipse-home}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="plugin-name: ${plugin-name}" />
- <echo message="classname: ${classname}" />
- <echo message="testType ${testType}" />
-
-
- <property
- name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" />
- <property
- name="workspace"
- value="${eclipse-home}/junitworkspaces/${plugin-name}" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset
- dir="${eclipse-home}"
- includes="${plugin-name}.*xml" />
- </delete>
- <!-- make directory, in case path doesn't exist yet -->
- <mkdir dir="${workspace}" />
- <!-- but delete to make sure fresh contents-->
- <delete
- dir="${workspace}"
- quiet="true" />
-
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
-
- <ant
- target="${testType}"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="data-dir"
- value="${workspace}" />
- <property
- name="plugin-name"
- value="${plugin-name}" />
- <property
- name="classname"
- value="${classname}" />
- <property
- name="plugin-path"
- value="${eclipse-home}/plugins/${plugin-name}" />
- </ant>
-
- <copy
- failonerror="false"
- file="${workspace}/.metadata/.log"
- tofile="${buildDirectory}/${buildLabel}/testResults/consolelogs/${plugin-name}.consolelog.txt" />
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <!-- usually no need to delete workspace until next run, and leaving it allows inspection -->
- <!-- <delete dir="${workspace}" quiet="true" /> -->
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target
- name="run"
- depends="init,suite,cleanup">
- <ant
- target="collect"
- antfile="${library-file}"
- dir="${eclipse-home}">
- <property
- name="includes"
- value="${plugin-name}.*xml" />
- <property
- name="output-file"
- value="${plugin-name}.xml" />
- </ant>
- </target>
-
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/.classpath b/tests/org.eclipse.wst.xml.xpath.ui.tests/.classpath
deleted file mode 100644
index 284d84e..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="**/wst/xml/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/.project b/tests/org.eclipse.wst.xml.xpath.ui.tests/.project
deleted file mode 100644
index 1bba0ae..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.xpath.ui.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.xpath.ui.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f0e3baf..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Fri Dec 25 13:16:14 GMT-05:00 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.xpath.ui.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 9214bba..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wst.xml.xpath.ui.tests
-Bundle-Version: 1.0.100.qualifier
-Bundle-Activator: org.eclipse.wst.xml.xpath.ui.tests.XPathUITestPlugin
-Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.wst.xml.xpath.core;bundle-version="1.1.100",
- org.eclipse.wst.xml.xpath.ui;bundle-version="1.1.100",
- org.eclipse.core.runtime,
- org.junit;bundle-version="3.8.2",
- org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.xml.xpath2;bundle-version="1.1.0",
- org.eclipse.core.runtime.compatibility;bundle-version="3.2.0",
- org.eclipse.wst.sse.core;bundle-version="1.1.500"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.wst.xml.xpath.ui.internal.hander.tests;x-internal:=true,
- org.eclipse.wst.xml.xpath.ui.tests
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.xml.xpath.ui.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index dcd3380..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xml.xpath.ui.tests
-Bundle-Name = XPath UI Tests
-Bundle-Vendor = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/about.html b/tests/org.eclipse.wst.xml.xpath.ui.tests/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/build.properties b/tests/org.eclipse.wst.xml.xpath.ui.tests/build.properties
deleted file mode 100644
index 0565497..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- about.html,\
- OSGI-INF/
-src.includes = about.html
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/StubXPathProcessorHandler.java b/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/StubXPathProcessorHandler.java
deleted file mode 100644
index be222d3..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/StubXPathProcessorHandler.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver - initial API based off wst.xml.ui.CustomTemplateProposal
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath.ui.internal.hander.tests;
-
-import org.eclipse.wst.xml.xpath.ui.internal.handler.XPathProcessorHandler;
-
-/**
- * This is a stub that exposes the protected toggle state method from the
- * supper class for testing purposes.
- *
- * @author dcarver
- *
- */
-public class StubXPathProcessorHandler extends XPathProcessorHandler {
-
- @Override
- public void toggleState(String xpathState) {
- super.toggleState(xpathState);
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/TestXPathProcessorHandler.java b/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/TestXPathProcessorHandler.java
deleted file mode 100644
index ff4eaca..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/hander/tests/TestXPathProcessorHandler.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver - initial API based off wst.xml.ui.CustomTemplateProposal
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath.ui.internal.hander.tests;
-
-import org.eclipse.wst.xml.xpath.core.XPathProcessorPreferences;
-import org.eclipse.wst.xml.xpath.core.util.XPathCoreHelper;
-import org.osgi.service.prefs.Preferences;
-
-import junit.framework.TestCase;
-
-public class TestXPathProcessorHandler extends TestCase {
-
- Preferences prefs = null;
- StubXPathProcessorHandler handler = null;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prefs = XPathCoreHelper.getPreferences();
- prefs.putBoolean(XPathProcessorPreferences.XPATH_1_0_PROCESSOR, false);
- prefs.putBoolean(XPathProcessorPreferences.XPATH_2_0_PROCESSOR, false);
- prefs.flush();
- handler = new StubXPathProcessorHandler();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- prefs = null;
- handler = null;
- }
-
- public void testToggleStateXpath10() throws Exception {
- handler.toggleState("xpath10");
- prefs = XPathCoreHelper.getPreferences();
- assertTrue("XPath 1.0 preference state not set", prefs.getBoolean(XPathProcessorPreferences.XPATH_1_0_PROCESSOR, false));
- }
-
- public void testToggleStateXpath2() throws Exception {
- handler.toggleState("xpath2");
- prefs = XPathCoreHelper.getPreferences();
- assertTrue("XPath 2.0 preference state not set", prefs.getBoolean(XPathProcessorPreferences.XPATH_2_0_PROCESSOR, false));
- }
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/views/tests/TestXPathComputer.java b/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/views/tests/TestXPathComputer.java
deleted file mode 100644
index eab3da0..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/internal/views/tests/TestXPathComputer.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010,2011 Jesper Steen Moller - jesper@selskabet.org
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Jesper Steen Moller - initial API and implementation
- * Jesper Steen Moller - bug 323448 - XPath view doesn't show runtime error information well (or at all)
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath.ui.internal.views.tests;
-
-import java.lang.reflect.InvocationTargetException;
-
-import javax.xml.xpath.XPathExpressionException;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IKeyBindingService;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
-import org.eclipse.wst.xml.core.internal.document.DOMModelImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.xpath.core.XPathProcessorPreferences;
-import org.eclipse.wst.xml.xpath.core.util.XPathCoreHelper;
-import org.eclipse.wst.xml.xpath.ui.internal.hander.tests.StubXPathProcessorHandler;
-import org.eclipse.wst.xml.xpath.ui.internal.views.XPathComputer;
-import org.eclipse.wst.xml.xpath.ui.internal.views.XPathView;
-import org.osgi.service.prefs.Preferences;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-@SuppressWarnings("deprecation")
-public class TestXPathComputer extends TestCase {
-
- private final class MockXPathView extends XPathView {
-
- private NodeList lastList = null;
-
- public NodeList getLastList() {
- return lastList;
- }
-
- protected void xpathRecomputed(NodeList nodeList, final IStatus error) {
- this.lastList = nodeList;
- }
-
- @Override
- public IWorkbenchPartSite getSite() {
- return new IWorkbenchPartSite() {
-
- public boolean hasService(Class api) { return IWorkbenchSiteProgressService.class.equals(api);}
-
- public Object getService(Class api) {
- if (IWorkbenchSiteProgressService.class.equals(api)) {
- return new IWorkbenchSiteProgressService() {
-
- public int getLongOperationTime() { return 0; }
-
- public void registerIconForFamily(
- ImageDescriptor icon, Object family) { }
-
- public void runInUI(IRunnableContext context,
- IRunnableWithProgress runnable,
- ISchedulingRule rule)
- throws InvocationTargetException,
- InterruptedException { runnable.run(new NullProgressMonitor()); }
-
- public Image getIconFor(Job job) { return null; }
-
- public void busyCursorWhile(
- IRunnableWithProgress runnable)
- throws InvocationTargetException,
- InterruptedException { }
-
- public void run(boolean fork, boolean cancelable,
- IRunnableWithProgress runnable)
- throws InvocationTargetException,
- InterruptedException { runnable.run(new NullProgressMonitor()); }
-
- public void showInDialog(Shell shell, Job job) { }
-
- public void schedule(Job job, long delay,
- boolean useHalfBusyCursor) {
- this.schedule(job, delay);
- }
-
- public void schedule(Job job, long delay) {
- job.schedule(delay);
- try {
- job.join();
- } catch (InterruptedException e) {
- }
- }
-
- public void schedule(Job job) { job.schedule(); }
-
- public void showBusyForFamily(Object family) { }
-
- public void warnOfContentChange() { }
-
- public void incrementBusy() { }
-
- public void decrementBusy() { }
-
- };
- } else return null;
- }
-
- public Object getAdapter(Class adapter) { return null; }
- public void setSelectionProvider(ISelectionProvider provider) { }
- public IWorkbenchWindow getWorkbenchWindow() { return null; }
- public Shell getShell() { return null; }
- public ISelectionProvider getSelectionProvider() { return null; }
- public IWorkbenchPage getPage() { return null; }
- public void registerContextMenu(String menuId, MenuManager menuManager,
- ISelectionProvider selectionProvider) { }
- public void registerContextMenu(MenuManager menuManager,
- ISelectionProvider selectionProvider) { }
- public String getRegisteredName() { return null; }
- public String getPluginId() { return null; }
- public IWorkbenchPart getPart() { return null; }
- @SuppressWarnings("deprecation")
- public IKeyBindingService getKeyBindingService() { return null; }
- public String getId() { return null; }
- };
- }
- }
-
- Preferences prefs = null;
- StubXPathProcessorHandler handler = null;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- prefs = XPathCoreHelper.getPreferences();
- prefs.putBoolean(XPathProcessorPreferences.XPATH_1_0_PROCESSOR, false);
- prefs.putBoolean(XPathProcessorPreferences.XPATH_2_0_PROCESSOR, false);
- prefs.flush();
- handler = new StubXPathProcessorHandler();
- }
-
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- prefs = null;
- handler = null;
- }
-
-
- public Document createSimpleDocument() throws Exception {
- IDOMModel domImpl = new DOMModelImpl();
- domImpl.setId("dummy");
- Document document = domImpl.getDocument();
- document.appendChild(document.createElement("test"));
-
- Element rootelem = document.getDocumentElement();
- Element elem1 = document.createElement("testNode1");
- Element elem2 = document.createElement("testNode1");
- rootelem.appendChild(elem1);
- rootelem.appendChild(elem2);
-
- return document;
- }
-
- public void testComputeNodeXpath10() throws Exception {
- handler.toggleState("xpath10");
-
- NodeList nl = computeXPathInView("string(count(//*)) < '04'", createSimpleDocument());
- assertEquals(1, nl.getLength());
- assertEquals("true", ((Text)nl.item(0)).getTextContent());
- }
-
- public void testComputeNodeXpath2() throws Exception {
- handler.toggleState("xpath2");
-
- NodeList nl = computeXPathInView("'2' > '04'", createSimpleDocument());
- assertEquals(1, nl.getLength());
- assertEquals("true", ((Text)nl.item(0)).getTextContent());
- }
-
- private NodeList computeXPathInView(String xpathExpression, Node node) throws Exception, XPathExpressionException {
- MockXPathView myMockView = new MockXPathView();
- XPathComputer pathComputer = new XPathComputer(myMockView);
- pathComputer.setSelectedNode(node);
- pathComputer.setText(xpathExpression);
- pathComputer.compute();
- NodeList nl = myMockView.getLastList();
- return nl;
- }
-
- public void testToggleStateXpath2() throws Exception {
- handler.toggleState("xpath2");
-
- }
-}
diff --git a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/tests/XPathUITestPlugin.java b/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/tests/XPathUITestPlugin.java
deleted file mode 100644
index b7a5092..0000000
--- a/tests/org.eclipse.wst.xml.xpath.ui.tests/src/org/eclipse/wst/xml/xpath/ui/tests/XPathUITestPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.wst.xml.xpath.ui.tests;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class XPathUITestPlugin extends AbstractUIPlugin {
-
- // The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.wst.xml.xpath.ui.tests"; //$NON-NLS-1$
-
- // The shared instance
- private static XPathUITestPlugin plugin;
-
- /**
- * The constructor
- */
- public XPathUITestPlugin() {
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- /**
- * Returns the shared instance
- *
- * @return the shared instance
- */
- public static XPathUITestPlugin getDefault() {
- return plugin;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.classpath b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.classpath
deleted file mode 100644
index 7283e14..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
- <accessrules>
- <accessrule kind="accessible" pattern="org/eclipse/wst/xml/xpath2/processor/**"/>
- </accessrules>
- </classpathentry>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="lib/xmlunit-1.2.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.cvsignore b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.cvsignore
deleted file mode 100644
index cb1a77b..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-.byecycle
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.project b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.project
deleted file mode 100644
index aea4b6a..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.wst.xml.xpath2.wtptypes.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/.api_filters b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/.api_filters
deleted file mode 100644
index 64569fc..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/.api_filters
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.wst.xml.xpath2.processor.tests" version="2">
- <resource path="src/org/eclipse/wst/xml/xpath2/processor/testsuite/userdefined/XercesFloatUserDefined.java" type="org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesFloatUserDefined">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="XSFloat"/>
- <message_argument value="XercesFloatUserDefined"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/wst/xml/xpath2/processor/testsuite/userdefined/XercesIntegerUserDefined.java" type="org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesIntegerUserDefined">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="XSInteger"/>
- <message_argument value="XercesIntegerUserDefined"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/wst/xml/xpath2/processor/testsuite/userdefined/XercesQNameUserDefined.java" type="org.eclipse.wst.xml.xpath2.processor.testsuite.userdefined.XercesQNameUserDefined">
- <filter id="576720909">
- <message_arguments>
- <message_argument value="QName"/>
- <message_argument value="XercesQNameUserDefined"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a120dee..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Sun Jun 27 01:34:11 CEST 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 2064e9b..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wst.xml.xpath2.wtptypes.tests;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.wst.xml.xpath2.processor;bundle-version="[2.0,3.0.0)",
- org.eclipse.wst.xml.xpath2.wtptypes;bundle-version="[2.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.junit;bundle-version="3.8.2",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.w3c.xqts.testsuite
-Export-Package: org.eclipse.wst.xml.xpath2.wtptypes.test
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- lib/xmlunit-1.2.jar
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/OSGI-INF/l10n/bundle.properties b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index e51d747..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.xml.xpath2.wtptypes.tests
-Bundle-Vendor = Eclipse.org
-Bundle-Name = XPath 2 Processor Tests for WTP XML DOMs
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/ReadMe.txt b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/ReadMe.txt
deleted file mode 100644
index f31dcbd..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/ReadMe.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This plugin contains the tests resources and generated Junit tests for
-testing the PsychoPath XPath 2.0 processor for compliance to the XPath
-2.0 test suite provided by the W3C.
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/about.html b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/about.html
deleted file mode 100644
index ed30003..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>August, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xml
deleted file mode 100644
index 974077f..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Example xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="attrNodeTest.xsd">
- <x mesg="hello" />
- <x mesg="world" />
- <x mesg="test" />
- <y intAttr="42"/>
-</Example>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xsd b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xsd
deleted file mode 100644
index e6f2358..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/attrNodeTest.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="Example">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="x" type="x_Type" maxOccurs="unbounded" />
- <xs:element name="y" type="y_Type" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:complexType name="x_Type">
- <xs:attribute name="mesg" type="mesg_Type" />
- </xs:complexType>
-
- <xs:complexType name="y_Type">
- <xs:attribute name="intAttr" type="xs:integer" />
- </xs:complexType>
-
- <xs:simpleType name="mesg_Type">
- <xs:restriction base="xs:string">
- <xs:enumeration value="hello" />
- <xs:enumeration value="world" />
- <xs:enumeration value="test" />
- </xs:restriction>
- </xs:simpleType>
-
-</xs:schema>
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/bug273719.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/bug273719.xml
deleted file mode 100644
index 5fb2082..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/bugTestFiles/bug273719.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<x>abc xyz</x>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties
deleted file mode 100644
index e6de9a0..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- bin/,\
- about.html,\
- OSGI-INF/
-src.includes = about.html
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/lib/xmlunit-1.2.jar b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/lib/xmlunit-1.2.jar
deleted file mode 100644
index e61df62..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/lib/xmlunit-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
deleted file mode 100644
index 4b065f0..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.eclipse.wst.xml.xpath2</groupId>
- <artifactId>org.eclipse.wst.xml.xpath2-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <relativePath>../../development/athena/org.eclipse.wst.xml.xpath2.releng</relativePath>
- </parent>
-
- <artifactId>org.eclipse.wst.xml.xpath2.wtptypes.tests</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
- <name>PsychoPath XPath 2.0 Processor: Tests for WTP type support</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.tycho</groupId>
- <artifactId>maven-osgi-test-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <testSuite>org.eclipse.wst.xml.xpath2.wtptypes.tests</testSuite>
- <testClass>org.eclipse.wst.xml.xpath2.wtptypes.test.AllXPath2TestsForWTP</testClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AbstractPsychoPathWTPTest.java b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AbstractPsychoPathWTPTest.java
deleted file mode 100644
index d4280b9..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AbstractPsychoPathWTPTest.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver (STAR) - initial API and implementation
- * Jin Mingjan - bug 262765 - extractXPathExpression and getExpectedResults
- * Jesper S Moller - bug 283214 - fix IF THEN ELSE parsing and update grammars
- * Jesper S Moller - bug 283214 - fix XML result serialization
- * Jesper S Moller - bug 283404 - fixed locale
- * Jesper S Moller - bug 281159 - fix document URIs and also filter XML namespace
- * Jesper S Moller - bug 275610 - Avoid big time and memory overhead for externals
- * Jesper Steen Moeller - bug 282096 - make test harness handle all string encoding
- * Jesper Steen Moller - bug 280555 - Add pluggable collation support
- * Mukul Gandhi - bug 338494 - prohibiting xpath expressions starting with / or // to be parsed.
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath2.wtptypes.test;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.xml.XMLConstants;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-
-import junit.framework.TestCase;
-
-import org.apache.xerces.jaxp.validation.XSGrammarPoolContainer;
-import org.apache.xerces.xni.grammars.Grammar;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.grammars.XMLGrammarPool;
-import org.apache.xerces.xni.grammars.XSGrammar;
-import org.apache.xerces.xs.ElementPSVI;
-import org.apache.xerces.xs.XSConstants;
-import org.apache.xerces.xs.XSModel;
-import org.apache.xerces.xs.XSNamedMap;
-import org.apache.xerces.xs.XSObject;
-import org.apache.xerces.xs.XSSimpleTypeDefinition;
-import org.custommonkey.xmlunit.XMLTestCase;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.xpath2.api.typesystem.TypeModel;
-import org.eclipse.wst.xml.xpath2.processor.DOMLoader;
-import org.eclipse.wst.xml.xpath2.processor.DOMLoaderException;
-import org.eclipse.wst.xml.xpath2.processor.DefaultDynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;
-import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DynamicError;
-import org.eclipse.wst.xml.xpath2.processor.Evaluator;
-import org.eclipse.wst.xml.xpath2.processor.JFlexCupParser;
-import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
-import org.eclipse.wst.xml.xpath2.processor.StaticChecker;
-import org.eclipse.wst.xml.xpath2.processor.StaticError;
-import org.eclipse.wst.xml.xpath2.processor.StaticNameResolver;
-import org.eclipse.wst.xml.xpath2.processor.XPathParser;
-import org.eclipse.wst.xml.xpath2.processor.XPathParserException;
-import org.eclipse.wst.xml.xpath2.processor.XercesLoader;
-import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
-import org.eclipse.wst.xml.xpath2.processor.function.FnFunctionLibrary;
-import org.eclipse.wst.xml.xpath2.processor.function.XSCtrLibrary;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.DocType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.NodeType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.QName;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.XSBoolean;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.userdefined.UserDefinedCtrLibrary;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.xerces.XercesTypeModel;
-import org.osgi.framework.Bundle;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ls.DOMImplementationLS;
-import org.w3c.dom.ls.LSOutput;
-import org.w3c.dom.ls.LSSerializer;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.EntityResolver2;
-
-public class AbstractPsychoPathWTPTest extends XMLTestCase {
-
- protected Document domDoc = null;
- protected Document domDoc2 = null;
- protected Bundle bundle = null;
-
- IDOMModel model = null;
-
- private DynamicContext dynamicContext = null;
-
- private static final String INPUT_CONTEXT = "input-context";
- private static final String INPUT_CONTEXT1 = "input-context1";
- private static final String INPUT_CONTEXT2 = "input-context2";
- // private static final String S_COMMENT1 = "(:";
- private static final String S_COMMENT2 = ":)";
- private static final String DECLARE_NAMESPACE = "declare namespace";
- private static final String IMPORT_SCHEMA_NAMESPACE = "import schema namespace";
- private static final String REGEX_DN = " namespace\\s+(\\w[-_\\w]*)\\s*=\\s*['\"]([^;]*)['\"];";
-
- private static HashMap inputMap = new HashMap(3);
-
- protected void setUp() throws Exception {
- super.setUp();
- bundle = Platform
- .getBundle("org.w3c.xqts.testsuite");
-
-
- if (bundle == null) {
- System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl");
- }
- System.setProperty("javax.xml.validation.SchemaFactory:http://www.w3.org/2001/XMLSchema","org.apache.xerces.jaxp.validation.XMLSchemaFactory");
- }
-
- protected void loadDOMDocument(URL fileURL) throws IOException,
- DOMLoaderException {
- InputStream is = testResolve(fileURL);
- DOMLoader domloader = new XercesLoader();
- domloader.set_validating(false);
- domDoc = domloader.load(is);
- domDoc.setDocumentURI(fileURL.toString());
- }
-
- private InputStream testResolve(URL url) throws IOException {
- if (url.getProtocol().equals("http")) {
- return AbstractPsychoPathWTPTest.class.getResourceAsStream("/org/eclipse/wst/xml/xpath2/processor/test/" + url.getFile());
- } else {
- return url.openStream();
- }
- }
-
- protected InputSource getTestSource(String systemId) {
- if (systemId.startsWith("http://")) {
- try {
- URL u = new URL(systemId);
- InputSource inputSource = new InputSource(testResolve(u));
- inputSource.setSystemId(systemId);
- return inputSource;
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- return new InputSource(systemId);
- }
-
- protected EntityResolver makeTestResolver() {
- return new EntityResolver2() {
-
- public InputSource resolveEntity(String publicId, String systemId) {
- if (systemId.startsWith("http://")) {
- URL u;
- try {
- u = new URL(systemId);
- return new InputSource(testResolve(u));
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- return new InputSource(systemId);
- }
-
- public InputSource getExternalSubset(String publicId, String systemId)
- throws SAXException, IOException {
- return resolveEntity(publicId, systemId);
- }
-
- public InputSource resolveEntity(String name,
- String publicId,
- String baseURI,
- String systemId) throws SAXException, IOException {
- return resolveEntity(publicId, systemId);
- }
-
- };
- }
-
- protected void loadDOMDocument(URL fileURL, Schema schema) throws IOException, DOMLoaderException {
- InputStream is = testResolve(fileURL);
- DOMLoader domloader = new XercesLoader(schema);
- domloader.set_validating(false);
- domDoc = domloader.load(is);
- domDoc.setDocumentURI(fileURL.toString());
-
- }
-
- protected void load2DOMDocument(URL fileURL, URL fileURL2) throws IOException,
- DOMLoaderException {
- InputStream is = testResolve(fileURL);
- InputStream is2 = testResolve(fileURL2);
-
- DOMLoader domloader = new XercesLoader();
- domloader.set_validating(false);
- domDoc = domloader.load(is);
- domDoc.setDocumentURI(fileURL.toString());
- domDoc2 = domloader.load(is2);
- domDoc2.setDocumentURI(fileURL2.toString());
- is.close();
- is2.close();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- domDoc = null;
- domDoc2 = null;
- dynamicContext = null;
- if (model != null) {
- model.releaseFromRead();
- }
- }
-
- protected XSModel getGrammar() {
- ElementPSVI rootPSVI = (ElementPSVI) domDoc.getDocumentElement();
- XSModel schema = rootPSVI.getSchemaInformation();
- return schema;
- }
-
- protected void loadDOMDocument(URL fileURL, URL schemaURL)
- throws IOException, DOMLoaderException, SAXException {
- InputStream is = testResolve(fileURL);
- InputStream schemaIs = testResolve(schemaURL);
- Schema jaxpSchema = getSchema(schemaIs);
- DOMLoader domloader = new XercesLoader(jaxpSchema);
- domloader.set_validating(false);
- domDoc = domloader.load(is);
- }
-
-
-
- private Schema getSchema(InputStream schemaIs) throws SAXException {
- SchemaFactory sf = SchemaFactory
- .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = sf.newSchema(new StreamSource(schemaIs));
- return schema;
- }
-
- protected XSModel getGrammar(URL schemaURL) throws IOException,
- SAXException {
- InputStream schemaIs = testResolve(schemaURL);
- SchemaFactory sf = SchemaFactory
- .newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
- Schema schema = sf.newSchema(new StreamSource(schemaIs));
- XSGrammarPoolContainer poolContainer = (XSGrammarPoolContainer) schema;
- XMLGrammarPool pool = poolContainer.getGrammarPool();
- Grammar[] grammars = pool
- .retrieveInitialGrammarSet(XMLGrammarDescription.XML_SCHEMA);
-
- XSGrammar[] xsGrammars = new XSGrammar[grammars.length];
- System.arraycopy(grammars, 0, xsGrammars, 0, grammars.length);
-
- return xsGrammars[0].toXSModel(xsGrammars);
- }
-
- protected DefaultDynamicContext setupDynamicContext(XSModel schema) {
- XercesTypeModel typeModel = schema != null ? new XercesTypeModel(schema) : null;
- DefaultDynamicContext dc = new DefaultDynamicContext(typeModel);
-// DefaultDynamicContext dc = new DefaultDynamicContext(schema, domDoc);
- dynamicContext = dc;
-
- dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema");
- dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema");
- dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions");
- dc.add_namespace("xml", "http://www.w3.org/XML/1998/namespace");
-
- dc.add_function_library(new FnFunctionLibrary());
- dc.add_function_library(new XSCtrLibrary());
- setupVariables(dc);
- return dc;
- }
-
- protected DefaultDynamicContext setupDynamicContext2(TypeModel model) {
- DefaultDynamicContext dc = new DefaultDynamicContext(model);
- dynamicContext = dc;
-
- dc.add_namespace("xs", "http://www.w3.org/2001/XMLSchema");
- dc.add_namespace("xsd", "http://www.w3.org/2001/XMLSchema");
- dc.add_namespace("fn", "http://www.w3.org/2005/xpath-functions");
- dc.add_namespace("xml", "http://www.w3.org/XML/1998/namespace");
-
- dc.add_function_library(new FnFunctionLibrary());
- dc.add_function_library(new XSCtrLibrary());
- setupVariables(dc);
- return dc;
- }
-
- protected void addXPathDefaultNamespace(String uri) {
- dynamicContext.add_namespace(null, uri);
- }
-
- protected XPath compileXPath(DynamicContext dc, String xpath) throws XPathParserException, StaticError {
- XPathParser xpp = new JFlexCupParser();
- XPath path = xpp.parse(xpath);
-
- StaticChecker name_check = new StaticNameResolver(dc);
- name_check.check(path);
- return path;
- }
-
- protected XPath compileXPath(DynamicContext dc, String xpath, boolean isRootlessAccess) throws XPathParserException, StaticError {
- XPathParser xpp = new JFlexCupParser();
- XPath path = null;
- if (isRootlessAccess) {
- path = xpp.parse(xpath, isRootlessAccess);
- }
- else {
- path = xpp.parse(xpath);
- }
-
- StaticChecker name_check = new StaticNameResolver(dc);
- name_check.check(path);
- return path;
- }
-
- protected String getExpectedResult(String xqFile) {
- return getExpectedResult(xqFile, true);
- }
-
- protected String getExpectedResultNoEscape(String xqFile) {
- return getExpectedResult(xqFile, false);
- }
-
- protected String getExpectedResult(String xqFile, boolean unescape) {
- String resultFile = xqFile;
- //
- if (resultFile.length() < 10) { // <9 enough? like XPST0001
- return resultFile;
- }
- String content = "";
- //
- InputStream isrf;
- try {
- isrf = bundle.getEntry(resultFile).openStream();
- BufferedReader rfreader = new BufferedReader(new InputStreamReader(
- isrf, "UTF-8"));
- // XXX:assume char buffer 2048 is long enough;1024 maybe enough
- // Exception: Axes085, NodeTest003/04/05,...
- int bufferLength = 2048;
- if ((resultFile.indexOf("Axes085") != -1)
- || (resultFile.indexOf("NodeTest003") != -1)
- || (resultFile.indexOf("NodeTest004") != -1)
- || (resultFile.indexOf("NodeTest005") != -1)) {
- bufferLength = 40000;
- } else if (resultFile.indexOf("ForExpr013") != -1) {
- bufferLength = 433500;
- } else if (resultFile.indexOf("ForExpr016") != -1
- || (resultFile.indexOf("ReturnExpr011") != -1)
- || (resultFile.indexOf("sgml-queries-results-q1") != -1)
- || (resultFile.indexOf("sgml-queries-results-q2") != -1)) {
- bufferLength = 10240;
- }
- char[] cbuf = new char[bufferLength];
- int nByte = rfreader.read(cbuf);
- assertTrue(resultFile, nByte < bufferLength);// assert nice buffer
- // length
-
- content = new String(cbuf).trim();
- rfreader.close();
- isrf.close();
-
- } catch (IOException e) {
- throw new RuntimeException("Can't load expected result from : " + xqFile, e);
- }
- if (unescape && content.contains("&")) return resolveCharacterReferences(content);
- return content;
- }
-
- public String unwrapResult(String expectedResult, String elemName) {
- return trimSurrounding(expectedResult, "<"+ elemName + ">", "</" + elemName + ">");
- }
-
- protected String getExpectedResult(String resultFile, String elemName) {
- return unwrapResult(getExpectedResult(resultFile), elemName);
- }
-
- public String extractXPathExpressionNoEscape(String xqFile, String inputFile) {
- return extractXPathExpression(xqFile, inputFile, false);
- }
-
- public String extractXPathExpression(String xqFile, String inputFile) {
- return extractXPathExpression(xqFile, inputFile, true);
- }
-
- public String extractXPathExpression(String xqFile, String inputFile, boolean unescape) {
- // get the xpath2 expr from xq file, first
- char[] cbuf = new char[2048];//
- String content = null;
- String xpath2Expr = null;
-
- try {
- URL entryUrl = bundle.getEntry(xqFile);
- InputStream isxq = testResolve(entryUrl);
- if (dynamicContext.base_uri().string_value() == null)
- dynamicContext.set_base_uri(entryUrl.toString());
- BufferedReader xqreader = new BufferedReader(new InputStreamReader(
- isxq, Charset.forName("UTF-8")));
- int nByte = xqreader.read(cbuf);
- assertTrue(xqFile, nByte < 2048);
- content = new String(cbuf).trim();
- //
- if (content.indexOf(INPUT_CONTEXT) != -1
- && content.indexOf(INPUT_CONTEXT1) == -1
- && content.indexOf(INPUT_CONTEXT2) == -1) {
- inputMap.put(INPUT_CONTEXT, inputFile);
- } else if (content.indexOf(INPUT_CONTEXT1) == -1) {
- inputMap.put(INPUT_CONTEXT1, inputFile);
- } else if (content.indexOf(INPUT_CONTEXT2) != -1) {
- inputMap.put(INPUT_CONTEXT2, inputFile);
- }
- //
- if (content.indexOf(DECLARE_NAMESPACE) != -1 || content.indexOf(IMPORT_SCHEMA_NAMESPACE) != -1) {
- setupNamespace(content);
- }
- //
- assertTrue(content.lastIndexOf(S_COMMENT2) != -1);// assert to get
- xpath2Expr = content.substring(content.lastIndexOf(S_COMMENT2) + 2)
- .trim();
- xqreader.close();
- isxq.close();
- } catch (IOException e) {
- throw new RuntimeException("Can't extract XPath expression from XQuery file : " + xqFile, e);
- }
- if (unescape && xpath2Expr.contains("&")) {
- return resolveCharacterReferences(xpath2Expr);
- } else {
- return xpath2Expr;
- }
- }
-
- protected String extractXPathExpression(String xqFile, String inputFile,
- String tagName) {
- return unwrapQuery(extractXPathExpression(xqFile, inputFile), tagName);
- }
-
- protected String unwrapQuery(String xpath2Expr, String tag) {
- String str = "<" + tag + ">";
- String endStr = "</" + tag + ">";
- String withoutTag = trimSurrounding(xpath2Expr, str, endStr);
- if (withoutTag != xpath2Expr) {
- // also trim off the braces { }
- xpath2Expr = trimSurrounding(withoutTag, "{", "}");
- }
- return xpath2Expr;
- }
-
- protected String trimSurrounding(String xpath2Expr, String str, String endStr) {
- int indexOfStart = xpath2Expr.indexOf(str);
- int indexOfEnd = xpath2Expr.indexOf(endStr);
- if (indexOfStart >= 0 && indexOfEnd >= 0) {
- xpath2Expr = xpath2Expr.substring(indexOfStart + str.length(), indexOfEnd).trim();
- }
- return xpath2Expr;
- }
-
- protected void setupNamespace(String content) {
- if (dynamicContext == null) return; // Can't set it up if nonexistent
- Pattern p = Pattern.compile(REGEX_DN);
- Matcher m = p.matcher(content);
- while (m.find()) {
- assertTrue(m.groupCount() == 2);//
- dynamicContext.add_namespace(m.group(1), m.group(2));
- }
-
- }
-
- protected DynamicContext setupVariables(DynamicContext dc) {
- dc.add_variable(new QName("x"));
- dc.add_variable(new QName("var"));
-
- if (domDoc != null) {
- AnyType docType = new DocType(domDoc, dc.getTypeModel(domDoc));
- dc.set_variable(new QName("input-context1"), docType);
- dc.set_variable(new QName("input-context"), docType);
- if (domDoc2 == null) {
- dc.set_variable(new QName("input-context2"), docType);
- } else {
- dc.set_variable(new QName("input-context2"), (AnyType) new DocType(domDoc2, dc.getTypeModel(domDoc2)));
- }
- }
- return dc;
- }
-
- protected String buildResultString(ResultSequence rs) {
- String actual = new String();
- Iterator iterator = rs.iterator();
- while (iterator.hasNext()) {
- AnyType anyType = (AnyType)iterator.next();
-
- actual = actual + anyType.string_value() + " ";
- }
-
- return actual.trim();
- }
-
- protected String buildXMLResultString(ResultSequence rs) throws Exception {
- DOMImplementationLS domLS = (DOMImplementationLS) domDoc.getImplementation().getFeature("LS", "3.0");
- LSOutput outputText = domLS.createLSOutput();
- LSSerializer serializer = domLS.createLSSerializer();
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
- outputText.setByteStream(outputStream);
-
- String actual = new String();
- Iterator iterator = rs.iterator();
- boolean queueSpace = false;
- while (iterator.hasNext()) {
- AnyType aat = (AnyType)iterator.next();
- if (aat instanceof NodeType) {
- NodeType nodeType = (NodeType) aat;
- Node node = nodeType.node_value();
- serializer.write(node, outputText);
- queueSpace = false;
- } else {
- if (queueSpace) outputText.getByteStream().write(32);
- outputText.getByteStream().write(aat.string_value().getBytes("UTF-8"));
- queueSpace = true;
- }
- }
-
- actual = outputStream.toString("UTF-8");
- actual = actual.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "");
- actual = actual.replace("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>", "");
- outputStream.close();
- return actual.trim();
- }
-
- protected String formatResultString(String resultFile) throws Exception {
- DOMLoader domloader = new XercesLoader(null);
- domloader.set_validating(false);
- InputStream is = bundle.getEntry(resultFile).openStream();
- Document resultDoc = domloader.load(is);
-
- DOMImplementationLS domLS = (DOMImplementationLS) resultDoc.getImplementation().getFeature("LS", "3.0");
- LSSerializer serializer = domLS.createLSSerializer();
-
- String actual = serializer.writeToString(resultDoc.getDocumentElement());
-
- actual = actual.replace("<?xml version=\"1.0\" encoding=\"UTF-16\"?>", "");
- return actual.trim();
- }
-
- public Document load(java.net.URL url) throws Exception {
- IModelManager modelManager = StructuredModelManager.getModelManager();
- InputStream inStream = url.openStream();
- if (inStream == null)
- throw new FileNotFoundException("Can't file resource stream "
- + url.getFile());
- model = (IDOMModel) modelManager.getModelForRead(url.toString(),
- inStream, null);
-
- return model.getDocument();
- }
-
- protected String removeIrrelevantNamespaces(String expectedResult) {
- expectedResult = expectedResult.replaceAll(" xmlns:xml=\"http://www.w3.org/XML/1998/namespace\"", "");
- expectedResult = expectedResult.replaceAll(" xmlns:foo=\"http://www.example.com/foo\"", "");
- expectedResult = expectedResult.replaceAll(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"", "");
- return expectedResult;
- }
-
- protected String resolveCharacterReferences(String xpath) {
- String docText = "<doc>" + xpath + "</doc>";
- InputStream is;
- try {
- is = new ByteArrayInputStream(docText.getBytes("UTF-8"));
- DOMLoader domloader = new XercesLoader();
- domloader.set_validating(false);
- Document temp = domloader.load(is);
- return temp.getDocumentElement().getFirstChild().getTextContent();
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- } catch (DOMLoaderException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected void assertXPathTrue(String xpath, DynamicContext dc, Document domDoc) {
- XSBoolean result = evaluateBoolXPath(xpath, dc, domDoc);
- assertEquals(true, result.value());
- }
-
- protected XSBoolean evaluateBoolXPath(String xpath, DynamicContext dc, Document doc) {
- return (XSBoolean) evaluateSimpleXPath(xpath, dc, doc, XSBoolean.class);
- }
-
- protected AnyType evaluateSimpleXPath(String xpath, DynamicContext dc, Document doc, Class resultClass) {
- XPath path;
- try {
- path = compileXPath(dc, xpath);
- }
- catch (XPathParserException e) {
- throw new RuntimeException("XPath parse: " + e.getMessage(), e);
- }
- catch (StaticError e) {
- throw new RuntimeException("Static error: " + e.getMessage(), e);
- }
-
- Evaluator eval = new DefaultEvaluator(dc, doc);
- ResultSequence rs;
- try {
- rs = eval.evaluate(path);
- }
- catch (DynamicError e) {
- throw new RuntimeException("Evaluation error: " + e.getMessage(), e);
- }
- assertEquals("Expected single result from \'" + xpath + "\'", 1, rs.size());
-
- AnyType result = rs.first();
- assertTrue("Exected XPath result instanceof class " + resultClass.getSimpleName() + " from \'" + xpath + "\', got " + result.getClass(), resultClass.isInstance(result));
-
- return result;
- }
-
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AllXPath2TestsForWTP.java b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AllXPath2TestsForWTP.java
deleted file mode 100644
index d2117c3..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/AllXPath2TestsForWTP.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Standards for Technology in Automotive Retail and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver - initial API and implementation
- * Mukul Ghandi - bug 273719
- * Jesper Moller - bug 281028 - Added test suites for min/max/sum/avg
- *******************************************************************************/
-package org.eclipse.wst.xml.xpath2.wtptypes.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllXPath2TestsForWTP {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(
- "Test for org.eclipse.wst.xml.xpath2.wtptypes.test");
- //$JUnit-BEGIN$
- suite.addTestSuite(TestWTPDOMXPath2.class);
- //$JUnit-END$
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/TestWTPDOMXPath2.java b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/TestWTPDOMXPath2.java
deleted file mode 100644
index ef04234..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/TestWTPDOMXPath2.java
+++ /dev/null
@@ -1,2789 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2010 Standards for Technology in Automotive Retail and others
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * David Carver (STAR) - initial API and implementation
- * Mukul Gandhi - bug 280798 - PsychoPath support for JDK 1.4
- *******************************************************************************/
-
-package org.eclipse.wst.xml.xpath2.wtptypes.test;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import org.apache.xerces.xs.XSModel;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.xpath2.processor.DefaultEvaluator;
-import org.eclipse.wst.xml.xpath2.processor.DynamicContext;
-import org.eclipse.wst.xml.xpath2.processor.DynamicError;
-import org.eclipse.wst.xml.xpath2.processor.Evaluator;
-import org.eclipse.wst.xml.xpath2.processor.ResultSequence;
-import org.eclipse.wst.xml.xpath2.processor.StaticError;
-import org.eclipse.wst.xml.xpath2.processor.XPathParserException;
-import org.eclipse.wst.xml.xpath2.processor.ast.XPath;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.AnyType;
-import org.eclipse.wst.xml.xpath2.processor.internal.types.NodeType;
-import org.eclipse.wst.xml.xpath2.wtptypes.XsdDOMTypeProvider;
-
-public class TestWTPDOMXPath2 extends AbstractPsychoPathWTPTest {
-
- public void testSimpleWTPDOM() throws Exception {
- // Test for the fix, for xpathDefaultNamespace
- bundle = Platform
- .getBundle("org.eclipse.wst.xml.xpath2.wtptypes.tests");
-
- URL fileURL = bundle.getEntry("/bugTestFiles/bug273719.xml");
- super.domDoc = load(fileURL);
-
- // set up XPath default namespace in Dynamic Context
- DynamicContext dc = setupDynamicContext(null);
-
- String xpath = "string-length(x) > 2";
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- AnyType result = rs.first();
-
- String actual = result.string_value();
-
- assertEquals("true", actual);
- }
-
- {
-// DefaultTypeProviderRegistry.getInstance().register(DOMModelImpl.class, new XsdDOMTypeProvider());
- }
-
- public void testWTPDOMWithTypes() throws Exception {
- // Test for the fix, for xpathDefaultNamespace
- bundle = Platform
- .getBundle("org.eclipse.wst.xml.xpath2.wtptypes.tests");
-
- URL fileURL = bundle.getEntry("/bugTestFiles/attrNodeTest.xml");
- super.domDoc = load(fileURL);
-
- // set up XPath default namespace in Dynamic Context
- DynamicContext dc = setupDynamicContext2(new XsdDOMTypeProvider.XsdTypeModel((IDOMDocument)domDoc));
-
- assertXPathTrue("/Example/x[1] instance of element(*, x_Type)", dc, domDoc);
- assertXPathTrue("not (/Example/x[1] instance of element(*, y_Type))", dc, domDoc);
- assertXPathTrue("/Example/x instance of x_Type+", dc, domDoc);
- assertXPathTrue("/Example/x instance of element(x, x_Type)+", dc, domDoc);
- assertXPathTrue("not (/Example/x instance of element(z, x_Type)+)", dc, domDoc);
- assertXPathTrue("/Example/x[2]/@mesg instance of mesg_Type", dc, domDoc);
- assertXPathTrue("/Example/x[2]/@mesg instance of attribute(mesg, mesg_Type)", dc, domDoc);
- assertXPathTrue("not (/Example/x[2]/@mesg instance of attribute(mesg, xs:integer))", dc, domDoc);
- assertXPathTrue("not (/Example/x[2]/@mesg instance of attribute(cesc, mesg_Type))", dc, domDoc);
- assertXPathTrue("/Example/y/@intAttr instance of attribute(intAttr, xs:integer)", dc, domDoc);
- }
-
- public void test_ForExpr005() throws Exception {
- String inputFile = "/TestSources/fsx.xml";
- String xqFile = "/Queries/XQuery/Expressions/FLWORExpr/ForExpr/ForExpr005.xq";
- String resultFile = "/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr005.xml";
- String expectedResult = getExpectedResult(resultFile);
-
- URL fileURL = bundle.getEntry(inputFile);
- super.domDoc = load(fileURL);
- DynamicContext dc = setupDynamicContext(null);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Type declaration containing multiple 'as' keywords.
- public void test_ForExprType013() throws Exception {
- String inputFile = "/TestSources/orderData.xml";
- String xqFile = "/Queries/XQuery/Expressions/FLWORExpr/ForExprType/ForExprType013.xq";
- String expectedResult = "XPST0003";
- URL fileURL = bundle.getEntry(inputFile);
- super.domDoc = load(fileURL);
-
- DynamicContext dc = setupDynamicContext(null);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children for child::*.
- public void test_Axes001_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes001.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes001-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- super.domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Simple filter using data query from xml source and the "gt" operator.
- public void test_filterexpressionhc1() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/SeqExpr/FilterExpr/filterexpressionhc1.xq";
- String resultFile = "/ExpectedTestResults/Expressions/SeqExpr/FilterExpr/filterexpressionhc1.txt";
- String expectedResult = "<result>" + getExpectedResult(resultFile)
- + "</result>";
- URL fileURL = bundle.getEntry(inputFile);
- super.domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = "<result>" + buildXMLResultString(rs) + "</result>";
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children, child::name gets none.
- public void test_Axes002_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes002.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes002-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates abbreviated syntax, "hours". Selects the "hours" element
- // children of the context node.
- public void test_abbreviatedSyntax_1() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-1.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates abbreviated syntax, "text()". Selects all text node children of
- // the context node.
- public void test_abbreviatedSyntax_2() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-2.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates abbreviated syntax, "@name". Selects the name attribute of the
- // context node.
- public void test_abbreviatedSyntax_3() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-3.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-3.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates abbreviated syntax, "employee[1]". Selects the first employee
- // child of the context node.
- public void test_abbreviatedSyntax_5() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-5.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/AbbrAxes/abbreviatedSyntax-5.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: empty Sequence is Single Node Element.
- public void test_nodeexpression3() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeSame/nodeexpression3.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeSame/nodeexpression3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: empty Sequence is Sequence of single Element Node.
- public void test_nodeexpression4() throws Exception {
- String inputFile = "/TestSources/staff.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeSame/nodeexpression4.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeSame/nodeexpression4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: Single Node Element is empty Sequence.
- public void test_nodeexpression9() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeSame/nodeexpression9.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeSame/nodeexpression9.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: Single Node Element is Single Node Element.
- public void test_nodeexpression11() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeSame/nodeexpression11.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeSame/nodeexpression11.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate with a "true" value (uses "fn:true").
- public void test_predicates_1() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-1.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate with a "false" value (uses "fn:false").
- // Use "fn:count" to avoid empty file.
- public void test_predicates_2() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-2.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate with a "true" value (uses "fn:true" and
- // fn:not()).
- public void test_predicates_3() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-3.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate set to a boolean expression ("and"
- // operator), returns true.
- public void test_predicates_4() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-4.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate set to a boolean expression ("or"
- // operator), return true.
- public void test_predicates_5() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-5.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-5.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a simple predicate set to a boolean expression ("and"
- // operator), returns false. Use "fn:count" to avoid empty file.
- public void test_predicates_6() throws Exception {
- String inputFile = "/TestSources/atomicns.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Predicates/predicates-6.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Predicates/predicates-6.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children of any kind, elem//child::* gets none.
- public void test_Axes074_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes074.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes074-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::* gets nothing when no element children.
- public void test_Axes074_2() throws Exception {
- String inputFile = "/TestSources/Tree1Text.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes074.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes074-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::* gets 1 child element.
- public void test_Axes074_3() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes074.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes074-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::* gets several nodes.
- public void test_Axes074_4() throws Exception {
- String inputFile = "/TestSources/TreeRepeat.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes074.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes074-4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::name gets nothing when no sub-tree.
- public void test_Axes075_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes075.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes075-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::name gets none when no elements have that name.
- public void test_Axes075_2() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes075.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes075-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::name gets the 1 descendant of that name.
- public void test_Axes075_3() throws Exception {
- String inputFile = "/TestSources/TreeCompass.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes075.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes075-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::name gets several elements.
- public void test_Axes075_4() throws Exception {
- String inputFile = "/TestSources/TreeStack.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes075.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes075-4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children, elem//child::node() gets none.
- public void test_Axes076_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes076.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes076-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::node() gets 1 child element.
- public void test_Axes076_2() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes076.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes076-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//child::node() gets 1 child text node.
- public void test_Axes076_3() throws Exception {
- String inputFile = "/TestSources/Tree1Text.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes076.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes076-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Several children for elem//child::node().
- public void test_Axes076_4() throws Exception {
- String inputFile = "/TestSources/TreeRepeat.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes076.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes076-4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children for elem//*.
- public void test_Axes077_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes077.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes077-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // 1 child for elem//*.
- public void test_Axes077_2() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes077.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes077-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Many children for elem//*.
- public void test_Axes077_3() throws Exception {
- String inputFile = "/TestSources/TreeRepeat.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes077.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes077-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//name gets none when there are no children.
- public void test_Axes078_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes078.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes078-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//name gets none when no elements have that name.
- public void test_Axes078_2() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes078.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes078-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//name gets the 1 descendant of that name.
- public void test_Axes078_3() throws Exception {
- String inputFile = "/TestSources/TreeCompass.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes078.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes078-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//name gets several elements.
- public void test_Axes078_4() throws Exception {
- String inputFile = "/TestSources/TreeStack.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes078.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes078-4.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // No children, elem//node() gets none.
- public void test_Axes079_1() throws Exception {
- String inputFile = "/TestSources/TreeTrunc.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes079.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes079-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//node() gets 1 child element.
- public void test_Axes079_2() throws Exception {
- String inputFile = "/TestSources/Tree1Child.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes079.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes079-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // elem//node() gets 1 child text node.
- public void test_Axes079_3() throws Exception {
- String inputFile = "/TestSources/Tree1Text.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/Steps/Axes/Axes079.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/Steps/Axes/Axes079-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: empty Sequence "<<" empty Sequence.
- public void test_nodeexpression17() throws Exception {
- String inputFile = "/TestSources/emptydoc.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeBefore/nodeexpression17.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeBefore/nodeexpression17.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: empty Sequence "<<" Single Node Element.
- public void test_nodeexpression19() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeBefore/nodeexpression19.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeBefore/nodeexpression19.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: empty Sequence "<<" Sequence of single Element Node.
- public void test_nodeexpression20() throws Exception {
- String inputFile = "/TestSources/staff.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeBefore/nodeexpression20.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeBefore/nodeexpression20.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: Single Node Element "<<" empty Sequence.
- public void test_nodeexpression25() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeBefore/nodeexpression25.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeBefore/nodeexpression25.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluation of a Node expression With the operands/operator set with the
- // following format: Single Node Element "<<" Single Node Element.
- public void test_nodeexpression27() throws Exception {
- String inputFile = "/TestSources/works.xml";
- String xqFile = "/Queries/XQuery/Expressions/Operators/NodeOp/NodeBefore/nodeexpression27.xq";
- String resultFile = "/ExpectedTestResults/Expressions/Operators/NodeOp/NodeBefore/nodeexpression27.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - child::empnum - select empnum children
- // of the context node.
- public void test_unabbreviatedSyntax_1() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-1.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-1.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - child::* - select all element children
- // of the context node.
- public void test_unabbreviatedSyntax_2() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-2.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-2.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - child::text() - select all text node
- // children of the context node.
- public void test_unabbreviatedSyntax_3() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-3.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-3.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - parent::node() - Selects the parent of
- // the context node.
- public void test_unabbreviatedSyntax_8() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-8.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-8.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - descendant::empnum - Selects the
- // "empnum" descendants of the context node.
- public void test_unabbreviatedSyntax_9() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-9.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-9.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - descendant-or-self::employee - Selects
- // all the "employee" descendant of the context node (selects employee, if
- // the context node is "employee").
- public void test_unabbreviatedSyntax_12() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-12.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-12.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - self::employee - Selects the context
- // node, if it is an "employee" element, otherwise returns empty sequence.
- // This test retuns an "employee" element.
- public void test_unabbreviatedSyntax_13() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-13.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-13.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax - self::hours - Selects the context node,
- // if it is an "hours" element, otherwise returns empty sequence. This test
- // retuns the empty sequence.
- public void test_unabbreviatedSyntax_14() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-14.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-14.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax child::employee/descendant:empnum- Selects
- // the empnum element descendants of the employee element children of the
- // context node.
- public void test_unabbreviatedSyntax_15() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-15.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-15.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax child::*/child:pnum)- Selects the pnum
- // grandchildren of the context node.
- public void test_unabbreviatedSyntax_16() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-16.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-16.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate /descendant::pnum - Selects all
- // the pnum elements in the same document as the context node.
- public void test_unabbreviatedSyntax_18() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-18.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-18.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // /descendant::employee/child::pnum selects all the pnum elements that have
- // an "employee" parent and that are in the same document as the context
- // node.
- public void test_unabbreviatedSyntax_19() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-19.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-19.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[fn:position() = 1]". Selects the first employee child of
- // the context node.
- public void test_unabbreviatedSyntax_20() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-20.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-20.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[fn:position() = fn:last()]". Selects the last "employee"
- // child of the context node.
- public void test_unabbreviatedSyntax_21() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-21.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-21.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[fn:position() = fn:last()-1]. Selects the previous to the last one "employee"
- // child of the context node.
- public void test_unabbreviatedSyntax_22() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-22.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-22.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::hours[fn:position() > 1]". Selects all the para children of the
- // context node other than the first "hours" child of the context node.
- public void test_unabbreviatedSyntax_23() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-23.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-23.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "/descendant::employee[fn:position() = 12]". Selects the twelfth employee
- // element in the document containing the context node.
- public void test_unabbreviatedSyntax_26() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-26.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-26.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "/child::works/child::employee[fn:position() = 5]/child::hours[fn:position() = 2]".
- // Selects the second "hours" of the fifth "employee" of the "works" whose
- // parent is the document node that contains the context node.
- public void test_unabbreviatedSyntax_27() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-27.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-27.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[attribute::name eq "Jane Doe 11"]". Selects all
- // "employee" children of the context node that have a "name" attribute with
- // value "Jane Doe 11".
- public void test_unabbreviatedSyntax_28() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-28.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-28.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[attribute::gender eq 'female'][fn:position() = 5]".
- // Selects the fifth employee child of the context node that has a gender
- // attribute with value "female".
- public void test_unabbreviatedSyntax_29() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-29.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-29.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[child::empnum = 'E3']". Selects the employee children of
- // the context node that have one or more empnum children whose typed value
- // is equal to the string "E3".
- public void test_unabbreviatedSyntax_30() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-30.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-30.txt";
- String expectedResult = "<result>" + getExpectedResult(resultFile)
- + "</result>";
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = "<result>" + buildXMLResultString(rs) + "</result>";
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::employee[child::status]". Selects the employee children of the
- // context node that have one or more status children.
- public void test_unabbreviatedSyntax_31() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-31.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-31.txt";
- String expectedResult = formatResultString(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::*[self::pnum or self::empnum]". Selects the pnum and empnum
- // children of the context node.
- public void test_unabbreviatedSyntax_32() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-32.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-32.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- // Evaluates unabbreviated syntax. Evaluate
- // "child::*[self::empnum or self::pnum][fn:position() = fn:last()]".
- // Selects the last empnum or pnum child of the context node.
- public void test_unabbreviatedSyntax_33() throws Exception {
- String inputFile = "/TestSources/works-mod.xml";
- String xqFile = "/Queries/XQuery/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-33.xq";
- String resultFile = "/ExpectedTestResults/Expressions/PathExpr/UnabbrAxes/unabbreviatedSyntax-33.txt";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertXMLEqual("XPath Result Error " + xqFile + ":", expectedResult,
- actual);
-
- }
-
- //FLWOR expression returns a constructed sequence.
- public void test_ReturnExpr011() throws Exception {
- String inputFile = "/TestSources/fsx.xml";
- String xqFile = "/Queries/XQuery/Expressions/FLWORExpr/ReturnExpr/ReturnExpr011.xq";
- String resultFile = "/ExpectedTestResults/Expressions/FLWORExpr/ReturnExpr/ReturnExpr011.xml";
- String expectedResult = getExpectedResult(resultFile);
- URL fileURL = bundle.getEntry(inputFile);
- domDoc = load(fileURL);
-
- // Get XML Schema Information for the Document
- XSModel schema = null;
-
- DynamicContext dc = setupDynamicContext(schema);
-
- String xpath = extractXPathExpression(xqFile, inputFile);
- String actual = null;
- try {
- XPath path = compileXPath(dc, xpath);
-
- Evaluator eval = new DefaultEvaluator(dc, domDoc);
- ResultSequence rs = eval.evaluate(path);
-
- actual = buildXMLResultString(rs);
-
- } catch (XPathParserException ex) {
- actual = ex.code();
- } catch (StaticError ex) {
- actual = ex.code();
- } catch (DynamicError ex) {
- actual = ex.code();
- }
-
- assertEquals("XPath Result Error " + xqFile + ":", expectedResult, actual);
-
-
- }
-
- protected String buildXMLResultString(ResultSequence rs) throws Exception {
- Iterator iterator = rs.iterator();
- StringBuffer buffer = new StringBuffer();
- while (iterator.hasNext()) {
- AnyType aat = (AnyType)iterator.next();
- if (aat instanceof NodeType) {
- NodeType nodeType = (NodeType) aat;
- IDOMNode node = (IDOMNode) nodeType.node_value();
- buffer = buffer.append(node.getSource());
- } else {
- buffer = buffer.append(aat.string_value());
- }
- }
-
- return buffer.toString();
- }
-
-}
diff --git a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/xml/note.xml b/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/xml/note.xml
deleted file mode 100644
index d4966d1..0000000
--- a/tests/org.eclipse.wst.xml.xpath2.wtptypes.tests/src/org/eclipse/wst/xml/xpath2/wtptypes/test/xml/note.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<note>
- <to>Self</to>
- <from>XPath2 Developers</from>
- <heading>Reminder</heading>
- <body>Don't reference external entities in tests</body>
-</note>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/.project b/tests/org.w3c.xqts.testsuite/.project
deleted file mode 100644
index 0dcb49c..0000000
--- a/tests/org.w3c.xqts.testsuite/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.w3c.xqts.testsuite</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.w3c.xqts.testsuite/.settings/org.eclipse.core.resources.prefs b/tests/org.w3c.xqts.testsuite/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index c237f34..0000000
--- a/tests/org.w3c.xqts.testsuite/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Nov 07 05:00:51 GMT 2009
-eclipse.preferences.version=1
-encoding/XQTSCatalog.xsd=UTF8
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ABSFunc/K-ABSFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateTimeToTimezoneFunc/K-AdjDateTimeToTimezoneFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjDateToTimezoneFunc/K-AdjDateToTimezoneFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/AdjTimeToTimezoneFunc/K-AdjTimeToTimezoneFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-1.txt
deleted file mode 100644
index 7c0646b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-some data
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-2.txt
deleted file mode 100644
index 7c0646b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-some data
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-3.txt
deleted file mode 100644
index 1c6ae71..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-4.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-5.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-6.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-7.txt
deleted file mode 100644
index e6c5217..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-A StringA StringA String
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-8.txt
deleted file mode 100644
index ca93785..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Annex-E/annex-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-<element1>some data 1</element1><element2>some data 2</element2>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-1.txt
deleted file mode 100644
index 3cacc0b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-12
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-10.txt
deleted file mode 100644
index 84be305..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-10.txt
+++ /dev/null
@@ -1 +0,0 @@
--7
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-2.txt
deleted file mode 100644
index ceba9a0..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-2.txt
+++ /dev/null
@@ -1 +0,0 @@
--12
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-3.txt
deleted file mode 100644
index 301160a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-8
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-4.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-5.txt
deleted file mode 100644
index c793025..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-6.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-7.txt
deleted file mode 100644
index c793025..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-7
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-8.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-9.txt
deleted file mode 100644
index 84be305..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Appendices/Appendix-A4/appendix-A4-9.txt
+++ /dev/null
@@ -1 +0,0 @@
--7
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/BaseURIFunc/K-BaseURIFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/BaseURIFunc/K-BaseURIFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/BaseURIFunc/K-BaseURIFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/falsevalue.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/falsevalue.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/falsevalue.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/truevalue.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/truevalue.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Basics/Types/SequenceTypeSyntax/truevalue.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog001.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog001.xml
deleted file mode 100644
index 8bb1f37..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog001.xml
+++ /dev/null
@@ -1 +0,0 @@
-<missing-variable></missing-variable>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog002.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog002.xml
deleted file mode 100644
index 7f98cb9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog002.xml
+++ /dev/null
@@ -1 +0,0 @@
-<standard-no-outputfile/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog003.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog003.xml
deleted file mode 100644
index 27c35fd..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Catalog/Catalog003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<error-no-expected-error/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CeilingFunc/K-CeilingFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-21.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-22.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-23.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/CodepointToStringFunc/K-CodepointToStringFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ConcatFunc/K-ConcatFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContainsFunc/K-ContainsFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDateFunc/K-ContextCurrentDateFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDateFunc/K-ContextCurrentDateFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDateFunc/K-ContextCurrentDateFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDatetimeFunc/K-ContextCurrentDatetimeFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDatetimeFunc/K-ContextCurrentDatetimeFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentDatetimeFunc/K-ContextCurrentDatetimeFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentTimeFunc/K-ContextCurrentTimeFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentTimeFunc/K-ContextCurrentTimeFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextCurrentTimeFunc/K-ContextCurrentTimeFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextDefaultCollationFunc/K-ContextDefaultCollationFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextDefaultCollationFunc/K-ContextDefaultCollationFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextDefaultCollationFunc/K-ContextDefaultCollationFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextImplicitTimezoneFunc/K-ContextImplicitTimezoneFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-19.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-20.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-21.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-22.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-23.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-24.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-24.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-24.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-25.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-25.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-25.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-26.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-26.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-26.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-27.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-27.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-27.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-28.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-28.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-28.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-29.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-29.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-29.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextLastFunc/K-ContextLastFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-19.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-20.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-21.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-22.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-23.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-24.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-24.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-24.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-25.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-25.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-25.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-26.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-26.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-26.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-27.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-27.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-27.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-28.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-28.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-28.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-29.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-29.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-29.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-30.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-30.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-30.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-31.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-31.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-31.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-32.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-32.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-32.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-33.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-33.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-33.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-34.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-34.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-34.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-35.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-35.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-35.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-36.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-36.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-36.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-37.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-37.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-37.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-38.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-38.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-38.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-39.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-39.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-39.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-40.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-40.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-40.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-41.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-41.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-41.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-42.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-42.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-42.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-43.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-43.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-43.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ContextPositionFunc/K-ContextPositionFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DataFunc/K-DataFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DateTimeFunc/K-DateTimeFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateFunc/K-DayFromDateFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DayFromDateTimeFunc/K-DayFromDateTimeFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DaysFromDurationFunc/K-DaysFromDurationFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DocumentURIFunc/K-DocumentURIFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DocumentURIFunc/K-DocumentURIFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/DocumentURIFunc/K-DocumentURIFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-6.txt
deleted file mode 100644
index 2c1e44c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EncodeURIfunc/K-EncodeURIfunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-some%20string
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EndsWithFunc/K-EndsWithFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ErrorFunc/K-ErrorFunc-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-6.txt
deleted file mode 100644
index caa12a8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/EscapeHTMLURIFunc/K-EscapeHTMLURIFunc-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/ExpandedQNameConstructFunc/K-ExpandedQNameConstructFunc-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr002.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr002.xml
deleted file mode 100644
index 7b5e8c3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr002.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem1 />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr003.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr003.xml
deleted file mode 100644
index 2aafb48..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem2 />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr004.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr004.xml
deleted file mode 100644
index 7b5e8c3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr004.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem1 />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr005.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr005.xml
deleted file mode 100644
index 2aafb48..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr005.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem2 />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr006.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr006.xml
deleted file mode 100644
index e97bdd2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr006.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>1</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr007.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr007.xml
deleted file mode 100644
index 7b5e8c3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr007.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem1 />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr008.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr008.xml
deleted file mode 100644
index 81a0a45..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr008.xml
+++ /dev/null
@@ -1 +0,0 @@
-<PASS />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr009.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr009.xml
deleted file mode 100644
index 81a0a45..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr009.xml
+++ /dev/null
@@ -1 +0,0 @@
-<PASS />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr010.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr010.xml
deleted file mode 100644
index e97bdd2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr010.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>1</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr011.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr011.xml
deleted file mode 100644
index 22fb6ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr011.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>3</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr012.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr012.xml
deleted file mode 100644
index 8780caa..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr012.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-<out name="axolotl"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr013.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr013.xml
deleted file mode 100644
index ea086e3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr013.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>search</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr014.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr014.xml
deleted file mode 100644
index 3c57632..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr014.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>17</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr015.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr015.xml
deleted file mode 100644
index 3c57632..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr015.xml
+++ /dev/null
@@ -1 +0,0 @@
-<out>17</out>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr016.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr016.xml
deleted file mode 100644
index 4f642ff..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr016.xml
+++ /dev/null
@@ -1 +0,0 @@
-<FileName>File00000000001</FileName><FileName>File00000000002</FileName><FileName>File00000000003</FileName><FileName>File00000000004</FileName><FileName>File00000000005</FileName><FileName>File00000000006</FileName><FileName>File00000000007</FileName><FileName>File00000000008</FileName><FileName>File00000000009</FileName><FileName>File00000000010</FileName><FileName>File00000000011</FileName><FileName>File00000000012</FileName><FileName>File00000000013</FileName><FileName>File00000000014</FileName><FileName>File00000000015</FileName><FileName>File00000000016</FileName><FileName>File00000000017</FileName><FileName>File00000000018</FileName><FileName>File00000000019</FileName><FileName>File00000000020</FileName><FileName>File00000000021</FileName><FileName>File00000000022</FileName><FileName>File00000000023</FileName><FileName>File00000000024</FileName><FileName>File00000000025</FileName><FileName>File00000000026</FileName><FileName>File00000000027</FileName><FileName>File00000000028</FileName><FileName>File00000000029</FileName><FileName>File00000000030</FileName>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr017.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr017.xml
deleted file mode 100644
index ea7c09a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr017.xml
+++ /dev/null
@@ -1 +0,0 @@
-<FileName>File00000000000</FileName>File00000000001 File00000000002 File00000000003 File00000000004 File00000000005 File00000000006 File00000000007 File00000000008 File00000000009 File00000000010 File00000000011 File00000000012 File00000000013 File00000000014 File00000000015 File00000000016 File00000000017 File00000000018 File00000000019 File00000000020 File00000000021 File00000000022 File00000000023 File00000000024 File00000000025 File00000000026 File00000000027 File00000000028 File00000000029 File00000000030
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr018.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr018.txt
deleted file mode 100644
index 9f83705..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr018.txt
+++ /dev/null
@@ -1 +0,0 @@
-File00000000000 File00000000001 File00000000002 File00000000003 1 File00000000005 File00000000006 File00000000007 File00000000008 File00000000009 File00000000010 File00000000011 File00000000012 File00000000013 File00000000014 File00000000015 File00000000016 File00000000017 File00000000018 File00000000019 File00000000020 File00000000021 File00000000022 File00000000023 File00000000024 File00000000025 File00000000026 File00000000027 File00000000028 File00000000029 File00000000030
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr020.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr020.txt
deleted file mode 100644
index 9a03714..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr020.txt
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr021.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr021.txt
deleted file mode 100644
index 9a03714..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/CondExpr021.txt
+++ /dev/null
@@ -1 +0,0 @@
-10
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/CondExpr/K-CondExpr-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-10.xml
deleted file mode 100644
index 6a3741e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-11.xml
deleted file mode 100644
index 6a3741e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-12.xml
deleted file mode 100644
index 6a3741e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-13.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-13.xml
deleted file mode 100644
index bc5156e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-13.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/foo"><elem foo:attr=""/></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-15.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-15.xml
deleted file mode 100644
index 6a3741e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-15.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-16.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-16.xml
deleted file mode 100644
index ff98d6d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-16.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/foo" foo:attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-8.xml
deleted file mode 100644
index 3659c79..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem aNCname="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-9.xml
deleted file mode 100644
index 25fcf3e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-compname-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem aQname="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-data-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-doc-1.xml
deleted file mode 100644
index 2a0df6d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="texttext texttext"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-1.xml
deleted file mode 100644
index f3162af..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 string 3.14 0.012345 2002-04-02T12:00:00-01:00"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-2.xml
deleted file mode 100644
index a813162..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="123 456 789"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-3.xml
deleted file mode 100644
index 2135594..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 2"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-4.xml
deleted file mode 100644
index 2135594..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 2"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-1.xml
deleted file mode 100644
index 994b916..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:id="ncname"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-2.xml
deleted file mode 100644
index d2f2e51..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-id-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:id="ab c d"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-1.xml
deleted file mode 100644
index 6a3741e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-2.xml
deleted file mode 100644
index ff98d6d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-name-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/foo" foo:attr="text"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-string-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConAttr/Constr-compattr-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-data-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doc-1.xml
deleted file mode 100644
index b3f090a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--texttext texttext-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doubledash-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doubledash-5.xml
deleted file mode 100644
index 237a066..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-doubledash-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--com - - ment-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-1.xml
deleted file mode 100644
index 8f0f2f2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--1 string 3.14 0.012345 2002-04-02T12:00:00-01:00-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-2.xml
deleted file mode 100644
index c15ae8c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--123 456 789-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-3.xml
deleted file mode 100644
index 56851a8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--1 2-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-4.xml
deleted file mode 100644
index 56851a8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--1 2-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-5.xml
deleted file mode 100644
index ba140de..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-enclexpr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--texttext-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-1.xml
deleted file mode 100644
index 24f2add..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--one two three four-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-2.xml
deleted file mode 100644
index 3116d46..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><!--one--><a><!--two--></a><!--three--></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-3.xml
deleted file mode 100644
index e2d453b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-nested-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--one--><a/><!--two--><b/><!--three-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-string-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConComment/Constr-compcomment-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-3.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-adjtext-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-attr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-attr-3.xml
deleted file mode 100644
index 3515aa4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-attr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem mark="w0" west-attr-1="w1"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-1.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-2.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-3.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-baseuri-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-10.xml
deleted file mode 100644
index 5aab5ef..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>text</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-11.xml
deleted file mode 100644
index 5aab5ef..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>text</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-12.xml
deleted file mode 100644
index 5aab5ef..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>text</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-13.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-13.xml
deleted file mode 100644
index f01dbf1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-13.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/foo"><foo:elem>text</foo:elem></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-15.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-15.xml
deleted file mode 100644
index 5aab5ef..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-15.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>text</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-16.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-16.xml
deleted file mode 100644
index f01dbf1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-16.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/foo"><foo:elem>text</foo:elem></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-8.xml
deleted file mode 100644
index f45d391..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<aNCname>text</aNCname>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-9.xml
deleted file mode 100644
index d584e84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-compname-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<aQname>text</aQname>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-4.txt
deleted file mode 100644
index b71fae5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-12678967
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-8.txt
deleted file mode 100644
index b71fae5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-constrmod-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-12678967
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-data-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-doc-1.xml
deleted file mode 100644
index 28bc363..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-1.xml
deleted file mode 100644
index 528e8f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-2.xml
deleted file mode 100644
index e2b9006..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 a 3.5 400</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-3.xml
deleted file mode 100644
index 33ab8a8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1<a>text</a><a>text</a>2 3<!--comment--><!--comment-->4 5<?pi content?><?pi content?>6 7texttext8</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-4.xml
deleted file mode 100644
index c31605e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 2</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-1.xml
deleted file mode 100644
index 5aab5ef..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>text</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-2.xml
deleted file mode 100644
index b791102..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-name-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:elem xmlns:foo="http://www.example.com/foo">text</foo:elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-1.xml
deleted file mode 100644
index 7b9ee0f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1<a>2<b><c/><d>3</d></b>4</a></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-2.xml
deleted file mode 100644
index 528e8f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nested-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-1.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-2.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-3.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-4.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-5.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-nodeid-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-string-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConElem/Constr-compelem-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-10.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-11.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-12.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-15.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-15.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-15.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-8.xml
deleted file mode 100644
index 0be93a7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-compname-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?aNCname text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-data-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-doc-1.xml
deleted file mode 100644
index fd233ad..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi texttext texttext?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-1.xml
deleted file mode 100644
index 383261b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi ?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-2.xml
deleted file mode 100644
index 383261b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-empty-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi ?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-1.xml
deleted file mode 100644
index c4c797c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi 1 string 3.14 0.012345 2002-04-02T12:00:00-01:00?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-2.xml
deleted file mode 100644
index 808267c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi 123 456 789?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-3.xml
deleted file mode 100644
index 62a98e9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi 1 2?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-4.xml
deleted file mode 100644
index 62a98e9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi 1 2?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-5.xml
deleted file mode 100644
index 2c3837a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-enclexpr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi texttext?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-name-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-name-1.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-name-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-1.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-2.xml
deleted file mode 100644
index 92aa968..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi text?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-3.txt
deleted file mode 100644
index 46018d3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-116 101 120 116
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-4.txt
deleted file mode 100644
index 46018d3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-space-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-116 101 120 116
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-string-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ComputeConPI/Constr-comppi-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-3.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-adjtext-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-2.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-4.txt
deleted file mode 100644
index b71fae5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmod-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-12678967
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmodalt-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmodalt-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-constrmodalt-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-data-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-doc-1.xml
deleted file mode 100644
index 9c952fe..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-1.xml
deleted file mode 100644
index e69de29..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-1.xml
+++ /dev/null
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-2.xml
deleted file mode 100644
index 84d8e4e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-1 a 3.5 400
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-3.xml
deleted file mode 100644
index 5df80fb..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-1<a>text</a><a>text</a>2 3<!--comment--><!--comment-->4 5<?pi content?><?pi content?>6 7texttext8
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-4.xml
deleted file mode 100644
index 5d3ab40..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-1 2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-1.xml
deleted file mode 100644
index 274c005..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-1234
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-2.xml
deleted file mode 100644
index 83a6ea8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nested-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-1.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-3.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-4.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-5.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-nodeid-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-string-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConDocNode/Constr-docnode-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-adjtext-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-2.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-3.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-4.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-5.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-6.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-count-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-data-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-doc-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-doc-1.txt
deleted file mode 100644
index e4a16cf..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-doc-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-texttext texttext
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-1.txt
deleted file mode 100644
index 6d06ffe..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 string 3.14 0.012345 2002-04-02T12:00:00-01:00
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-2.txt
deleted file mode 100644
index 022837a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-123 456 789
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-3.txt
deleted file mode 100644
index 5d3ab40..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-4.txt
deleted file mode 100644
index 5d3ab40..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-5.txt
deleted file mode 100644
index 363d8a9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-enclexpr-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-texttext
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-1.txt
deleted file mode 100644
index d993b66..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-one two three four
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-2.xml
deleted file mode 100644
index bd67e53..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>one<a>two</a>three</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-3.xml
deleted file mode 100644
index 40dcd39..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-nested-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-one<a/>two<b/>three
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-string-1.txt
deleted file mode 100644
index f337210..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ComputeCon/ConText/Constr-text-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-1.xml
deleted file mode 100644
index 4669575..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com" xmlns:XXX="http://www.example.com/parent1" XXX:attr1="attr1"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-10.xml
deleted file mode 100644
index e04dd62..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns="http://www.example.com"><child2 xmlns="" xmlns:foo="http://www.example.com/parent2" attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-11.xml
deleted file mode 100644
index 45ccb8f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><child1 xmlns:foo="http://www.example.com/parent1" attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-12.xml
deleted file mode 100644
index e04dd62..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns="http://www.example.com"><child2 xmlns="" xmlns:foo="http://www.example.com/parent2" attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-13.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-13.xml
deleted file mode 100644
index 1ebfebd..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-13.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-14.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-14.xml
deleted file mode 100644
index e07f60c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-14.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:new xmlns:foo="http://example.com"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-15.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-15.xml
deleted file mode 100644
index 83ad84d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-15.xml
+++ /dev/null
@@ -1 +0,0 @@
-<xml:new/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-16.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-16.xml
deleted file mode 100644
index 0680c08..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-16.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xml:attr="foo"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-17.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-17.xml
deleted file mode 100644
index 4766ed5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-17.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com"><child1 xmlns:foo="http://www.example.com/parent1" attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-18.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-18.xml
deleted file mode 100644
index 7b10923..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-18.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com/parent1"><child1 attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-19.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-19.xml
deleted file mode 100644
index 6c85225..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-19.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns="http://www.example.com"><child4 xmlns="http://www.example.com/parent4"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-2.xml
deleted file mode 100644
index e133ae9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com/parent1" xmlns:XXX="http://www.example.com/parent2" foo:attr1="attr1" XXX:attr2="attr2"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-20.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-20.xml
deleted file mode 100644
index 74af4aa..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-20.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns="http://www.example.com/parent4"><child4/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-3.xml
deleted file mode 100644
index 4669575..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com" xmlns:XXX="http://www.example.com/parent1" XXX:attr1="attr1"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-4.xml
deleted file mode 100644
index e133ae9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new xmlns:foo="http://www.example.com/parent1" xmlns:XXX="http://www.example.com/parent2" foo:attr1="attr1" XXX:attr2="attr2"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-5.xml
deleted file mode 100644
index a6ca8a3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><foo:child3 xmlns:foo="http://www.example.com/parent3"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-6.xml
deleted file mode 100644
index 3dd8409..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><child4 xmlns="http://www.example.com/parent4"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-7.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-7.xml
deleted file mode 100644
index a6ca8a3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><foo:child3 xmlns:foo="http://www.example.com/parent3"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-8.xml
deleted file mode 100644
index 3dd8409..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><child4 xmlns="http://www.example.com/parent4"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-9.xml
deleted file mode 100644
index 45ccb8f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/ConInScopeNamespace/Constr-inscope-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<new><child1 xmlns:foo="http://www.example.com/parent1" attr="child"/></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-1.xml
deleted file mode 100644
index 4636ba5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>{</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-2.xml
deleted file mode 100644
index 73959c8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>}</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-3.xml
deleted file mode 100644
index 4636ba5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>{</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-4.xml
deleted file mode 100644
index 73959c8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-curlybr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>}</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-1.xml
deleted file mode 100644
index 528e8f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-2.xml
deleted file mode 100644
index 528e8f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-3.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-4.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-5.xml
deleted file mode 100644
index 528e8f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/Constr-elem-empty-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-charref-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-charref-1.xml
deleted file mode 100644
index fafe342..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-charref-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="012"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1.xml
deleted file mode 100644
index 74ad00a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="abxxyz123890!@#$%^*()[]\|?/>:;"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1b.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1b.xml
deleted file mode 100644
index 943e8ac..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-content-1b.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="abxxyz123890!@#$%^*()[]\|?/>:;"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-1.txt
deleted file mode 100644
index 5de53b1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-The constructor for the element named "elem" uses the name "attr" for more than one attribute. Error QName=err:XQST0040.
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-3.txt
deleted file mode 100644
index 5de53b1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-The constructor for the element named "elem" uses the name "attr" for more than one attribute. Error QName=err:XQST0040.
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-4.txt
deleted file mode 100644
index 5de53b1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-distnames-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-The constructor for the element named "elem" uses the name "attr" for more than one attribute. Error QName=err:XQST0040.
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-1.xml
deleted file mode 100644
index 3d49c05..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 string 3.14 0.012345 2002-04-02T12:00:00-01:00"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-2.xml
deleted file mode 100644
index 5118dd0..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="123 456 789"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-3.xml
deleted file mode 100644
index 898bb0b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 2"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-4.xml
deleted file mode 100644
index 898bb0b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="1 2"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-5.xml
deleted file mode 100644
index c40c1e2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="123456"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-6.xml
deleted file mode 100644
index c40c1e2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="123456"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-7.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-7.xml
deleted file mode 100644
index cdf3f0c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-enclexpr-7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="12 34 56789"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-1.xml
deleted file mode 100644
index 151883e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="&<>"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-2.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-entref-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-1.xml
deleted file mode 100644
index 994b916..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:id="ncname"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-2.xml
deleted file mode 100644
index d2f2e51..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-id-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:id="ab c d"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-2.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsdecl-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-1.xml
deleted file mode 100644
index 1abe07d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.w3.org/XQueryTest/Construct" foo:attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-2.xml
deleted file mode 100644
index 55025fe..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nspre-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.w3.org/XQueryTest/Construct"><child foo:attr="value"/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-1.xml
deleted file mode 100644
index 1abe07d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.w3.org/XQueryTest/Construct" foo:attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-2.xml
deleted file mode 100644
index 1abe07d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-nsprein-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.w3.org/XQueryTest/Construct" foo:attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-parent-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-1.xml
deleted file mode 100644
index e074ed5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-10.xml
deleted file mode 100644
index e074ed5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-2.xml
deleted file mode 100644
index 8b8b403..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr1="val1" attr2="val2" attr3="val3"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-3.xml
deleted file mode 100644
index e074ed5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-4.xml
deleted file mode 100644
index 620d419..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="'"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-5.xml
deleted file mode 100644
index 27577b5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="""/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-8.xml
deleted file mode 100644
index 72660cd..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr1="val1" attr2="val2"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-9.xml
deleted file mode 100644
index e074ed5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-syntax-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="value"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-1.xml
deleted file mode 100644
index fb521dc..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr=" "/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-2.xml
deleted file mode 100644
index fb521dc..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr=" "/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-3.xml
deleted file mode 100644
index 9e63f96..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="
"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-4.xml
deleted file mode 100644
index 67dcc15..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="
"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-5.xml
deleted file mode 100644
index f541d7a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/Constr-attr-ws-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem attr="	"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/K2-DirectConElemAttr-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/K2-DirectConElemAttr-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemAttr/K2-DirectConElemAttr-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-2.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-3.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-4.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-adjtext-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-3.xml
deleted file mode 100644
index 296c166..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem mark="w0"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-5.xml
deleted file mode 100644
index 3515aa4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem mark="w0" west-attr-1="w1"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-6.xml
deleted file mode 100644
index 08dd61e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-attr-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem mark="w0" west-attr-1="w1" west-attr-2="w2"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-1.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-2.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-3.txt
deleted file mode 100644
index ddee11b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-baseuri-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-cdata-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-cdata-1.xml
deleted file mode 100644
index 32157a3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-cdata-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>cdata&<>'"&lt;&#x20;</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-charref-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-charref-1.xml
deleted file mode 100644
index 7ba50f9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-charref-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>0</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-2.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-4.txt
deleted file mode 100644
index b71fae5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-12678967
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-5.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-6.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-8.txt
deleted file mode 100644
index b71fae5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmod-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-12678967
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-6.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-constrmodalt-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-data-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-data-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-data-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-doc-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-doc-1.xml
deleted file mode 100644
index 28bc363..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-doc-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-1.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-2.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-document-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-2.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-3.xml
deleted file mode 100644
index e2b9006..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 a 3.5 400</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-4.xml
deleted file mode 100644
index 33ab8a8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1<a>text</a><a>text</a>2 3<!--comment--><!--comment-->4 5<?pi content?><?pi content?>6 7texttext8</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-5.xml
deleted file mode 100644
index c31605e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-enclexpr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 2</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-1.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-2.txt
deleted file mode 100644
index b2412e3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-62
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-3.txt
deleted file mode 100644
index c24b6ae..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-38
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-4.txt
deleted file mode 100644
index 3e932fe..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-34
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-5.txt
deleted file mode 100644
index 72f523f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-entref-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-39
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-1.xml
deleted file mode 100644
index c80d3c3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<codepoints>49 10 50</codepoints>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-2.xml
deleted file mode 100644
index c80d3c3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<codepoints>49 10 50</codepoints>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-3.xml
deleted file mode 100644
index 2d165f5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<codepoints>13 10</codepoints>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-4.xml
deleted file mode 100644
index 371448a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-eol-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<codepoints>13</codepoints>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-1.xml
deleted file mode 100644
index 40f5116..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><a><b/></a><a/><c/></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-2.xml
deleted file mode 100644
index 3502366..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><?pi ?><?pi content?></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-3.xml
deleted file mode 100644
index 0a63325..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><!----><!--content--></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-4.xml
deleted file mode 100644
index 47b6695..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>A<a>B<?pi ?>C<b/>D<!---->E</a>F<!--content-->G<a/>H<?pi content?>I<c/>J</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-5.xml
deleted file mode 100644
index 0b2b9ab..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nested-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><root><child1><a>text</a><!--comment--><?pi content?></child1><child2><a>text</a><!--comment--><?pi content?></child2></root></elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-1.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-2.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-3.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-4.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-5.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nodeid-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-1.xml
deleted file mode 100644
index c9f53e2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<z xmlns:preserve="preserve" xmlns:inherit="inherit"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-2.xml
deleted file mode 100644
index 4f1a993..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<z xmlns:inherit="inherit"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-3.xml
deleted file mode 100644
index 04c3edf..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<z xmlns:preserve="preserve"/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-4.xml
deleted file mode 100644
index 2d693f7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<z/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-5.txt
deleted file mode 100644
index 2bdb2eb..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-<new><atomic:QName atomic:attr="foo:aQname" xmlns:atomic="http://www.w3.org/XQueryTest">foo:aQname</atomic:QName></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-6.txt
deleted file mode 100644
index 2bdb2eb..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-nsmode-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-<new><atomic:QName atomic:attr="foo:aQname" xmlns:atomic="http://www.w3.org/XQueryTest">foo:aQname</atomic:QName></new>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-parent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-parent-1.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-parent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-string-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-string-1.txt
deleted file mode 100644
index 9ae9e86..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-string-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-ab
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-1.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-2.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-text-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-uripres-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-uripres-1.txt
deleted file mode 100644
index 78a9936..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/Constr-cont-uripres-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-http://www.example.com/base2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemContent/K2-DirectConElemContent-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-10.xml
deleted file mode 100644
index a12e34b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:elem xmlns:foo="http://www.example.com/element"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-11.xml
deleted file mode 100644
index dc014c1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:grand-child xmlns:foo="http://www.example.com/child"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-12.xml
deleted file mode 100644
index 098cc9d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:child xmlns:foo="http://www.example.com/parent"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-13.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-13.xml
deleted file mode 100644
index 0f792ab..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-13.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:elem xmlns:foo="http://www.example.com/parent"><child/></foo:elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-16.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-16.xml
deleted file mode 100644
index b2f6022..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-16.xml
+++ /dev/null
@@ -1 +0,0 @@
-<grand-child/>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-17.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-17.xml
deleted file mode 100644
index 4aae2ce..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-17.xml
+++ /dev/null
@@ -1 +0,0 @@
-<child xmlns="http://www.example.com"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-18.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-18.xml
deleted file mode 100644
index 6ca61d1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-18.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns="http://www.example.com/parent"><child xmlns="http://www.example.com/child"/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-19.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-19.xml
deleted file mode 100644
index 6a7b528..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-19.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns="http://www.example.com/element"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-2.xml
deleted file mode 100644
index cf524b9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-20.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-20.xml
deleted file mode 100644
index 0524ac9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-20.xml
+++ /dev/null
@@ -1 +0,0 @@
-<grand-child xmlns="http://www.example.com/child"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-21.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-21.xml
deleted file mode 100644
index 3acd0f2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-21.xml
+++ /dev/null
@@ -1 +0,0 @@
-<child xmlns="http://www.example.com/element"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-22.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-22.xml
deleted file mode 100644
index b614590..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-22.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns="http://www.example.com/parent"><child xmlns=""/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-23.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-23.xml
deleted file mode 100644
index 24e3795..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-23.xml
+++ /dev/null
@@ -1 +0,0 @@
-<grand-child/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-26.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-26.xml
deleted file mode 100644
index a3951b9..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-26.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:cm="http://www.example.com">1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-27.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-27.xml
deleted file mode 100644
index 0871880..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-27.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:cm="http://www.example.com" attr="1"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-3.xml
deleted file mode 100644
index 112778a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns="http://www.example.com"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-8.xml
deleted file mode 100644
index e5d1941..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<foo:child xmlns:foo="http://www.example.com"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-9.xml
deleted file mode 100644
index b0467cf..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemNamespace/Constr-namespace-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xmlns:foo="http://www.example.com/parent"><foo:child xmlns:foo="http://www.example.com/child"/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-1.xml
deleted file mode 100644
index c1f9e43..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-2.xml
deleted file mode 100644
index 29764c6..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<elem>
-
-</elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-3.xml
deleted file mode 100644
index 97e97f5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjcdata-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-1.xml
deleted file mode 100644
index d7cb5ba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> 0 </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-2.xml
deleted file mode 100644
index e44ca83..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-2.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<elem>
-0
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-3.xml
deleted file mode 100644
index dc6e618..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-adjchref-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> 0 </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-1.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-10.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-10.xml
deleted file mode 100644
index 35de145..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-10.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><a/><b/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-11.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-11.xml
deleted file mode 100644
index 35de145..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-11.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><a/><b/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-12.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-12.xml
deleted file mode 100644
index 35de145..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-12.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><a/><b/></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-13.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-13.xml
deleted file mode 100644
index ae7cfac..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-13.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> 1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-14.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-14.xml
deleted file mode 100644
index e475371..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-14.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<elem>
-
-
-1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-15.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-15.xml
deleted file mode 100644
index 4759899..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-15.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> 1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-16.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-16.xml
deleted file mode 100644
index 2cbf286..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-16.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 2</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-17.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-17.xml
deleted file mode 100644
index 27b3789..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-17.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<elem>1
-
-
-2</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-18.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-18.xml
deleted file mode 100644
index 527acf8..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-18.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 2</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-19.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-19.xml
deleted file mode 100644
index 6972a2f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-19.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-2.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-20.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-20.xml
deleted file mode 100644
index 6e95306..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-20.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<elem>1
-
-
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-21.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-21.xml
deleted file mode 100644
index 79beae7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-21.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1 </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-22.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-22.xml
deleted file mode 100644
index 70c3c63..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-22.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> <a/> <b/> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-23.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-23.xml
deleted file mode 100644
index 2c53fb0..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-23.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<elem>
-
-
-<a/>
-
-
-<b/>
-
-
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-24.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-24.xml
deleted file mode 100644
index 262d335..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-24.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> <a/> <b/> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-3.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-4.xml
deleted file mode 100644
index d611886..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>12</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-5.xml
deleted file mode 100644
index d611886..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>12</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-6.xml
deleted file mode 100644
index d611886..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>12</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-7.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-7.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-8.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-9.xml
deleted file mode 100644
index ed24eba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-enclexpr-9.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>1</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-1.xml
deleted file mode 100644
index b99404d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-2.xml
deleted file mode 100644
index 0b966b4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<elem>
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-3.xml
deleted file mode 100644
index 498ea15..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-gencdata-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-1.xml
deleted file mode 100644
index 08c267d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-2.xml
deleted file mode 100644
index 0b966b4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<elem>
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-3.xml
deleted file mode 100644
index ad207ce..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>
</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-4.xml
deleted file mode 100644
index 1ed2c57..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genchref-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-1.xml
deleted file mode 100644
index 08c267d..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-2.xml
deleted file mode 100644
index 0b966b4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<elem>
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-3.xml
deleted file mode 100644
index 1ed2c57..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-genenclexpr-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-1.xml
deleted file mode 100644
index fc5a7df..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> x</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-2.xml
deleted file mode 100644
index 64232f1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-2.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<elem>
-x</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-3.xml
deleted file mode 100644
index 0a71574..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> x</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-4.xml
deleted file mode 100644
index 88ffdec..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>x </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-5.xml
deleted file mode 100644
index c7890fd..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-5.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<elem>x
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-6.xml
deleted file mode 100644
index 164eaa5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-nobound-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem>x </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-1.xml
deleted file mode 100644
index 65d95c5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-10.txt
deleted file mode 100644
index f11c82a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-9
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-2.xml
deleted file mode 100644
index 65d95c5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-3.xml
deleted file mode 100644
index 65d95c5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-4.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-4.xml
deleted file mode 100644
index 4956cf5..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-4.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem><a/><a/><a><b/></a></elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-5.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-6.xml
deleted file mode 100644
index cba41a7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-7.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-7.xml
deleted file mode 100644
index f02663b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-7.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<elem>
-
-
-</elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-8.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-8.xml
deleted file mode 100644
index e607912..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-8.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-9.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-9.xml
deleted file mode 100644
index 94966ba..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-tag-9.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<elem>
- <a>
-
-
- </a>
-<a> </a> <a> <b>
-
- </b>
-
- </a>
-
-
- </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-1.xml
deleted file mode 100644
index 907b87c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:space="preserve"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-2.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-2.xml
deleted file mode 100644
index ac4f6d3..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConElem/DirectConElemWhitespace/Constr-ws-xmlspace-2.xml
+++ /dev/null
@@ -1 +0,0 @@
-<elem xml:space="strip"> </elem>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-1.xml
deleted file mode 100644
index a985848..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--comment-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-3.xml
deleted file mode 100644
index bf8942f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!---->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-5.xml
deleted file mode 100644
index 17375c4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-comment-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<!--<?&-< ><![CDATA[x]]>-->
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-1.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-1.xml
deleted file mode 100644
index 08d5a00..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-1.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi content?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-3.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-3.xml
deleted file mode 100644
index 383261b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-3.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi ?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-5.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-5.xml
deleted file mode 100644
index 453569f..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-5.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?pi <?&--< ><![CDATA[x]]> ?>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-6.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-6.xml
deleted file mode 100644
index bed1aec..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-6.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pi>120</pi>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-7.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-7.xml
deleted file mode 100644
index 961fdad..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/Construct/DirectConOther/Constr-pi-content-7.xml
+++ /dev/null
@@ -1 +0,0 @@
-<pi>120 32</pi>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-10.txt
deleted file mode 100644
index e3f1e9b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-80
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-11.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-12.txt
deleted file mode 100644
index f5624ae..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-1600
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-13.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-14.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-15.txt
deleted file mode 100644
index 56a6051..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-18.txt
deleted file mode 100644
index d8263ee..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-19.txt
deleted file mode 100644
index 86ee83a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-40
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-2.txt
deleted file mode 100644
index 186b02c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-E1
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-20.txt
deleted file mode 100644
index 8fdd954..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-22
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-21.txt
deleted file mode 100644
index aaa6442..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-41
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-22.txt
deleted file mode 100644
index dd4a226..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-22.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-<employee name="Jane Doe 1" gender="female">
- <empnum>E1</empnum>
- <pnum>P1</pnum>
- <hours>40</hours>
- </employee>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-3.txt
deleted file mode 100644
index 86ee83a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-40
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-4.txt
deleted file mode 100644
index 86ee83a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-40
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-5.txt
deleted file mode 100644
index 86ee83a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-40
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-6.txt
deleted file mode 100644
index 86ee83a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-40
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-8.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-9.txt
deleted file mode 100644
index e3f1e9b..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/ExternalContextExpr/externalcontextitem-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-80
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-10.txt
deleted file mode 100644
index 703ca85..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-11.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-12.txt
deleted file mode 100644
index adee11e..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-3 4 5
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-13.txt
deleted file mode 100644
index da2d398..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-14
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-14.txt
deleted file mode 100644
index 933d776..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-10 14
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-15.txt
deleted file mode 100644
index 933d776..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-10 14
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-16.txt
deleted file mode 100644
index d84cdac..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-17.txt
deleted file mode 100644
index d84cdac..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-18.txt
deleted file mode 100644
index 0a9e443..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-ABC DEF
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-19.txt
deleted file mode 100644
index 1ed0fb7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-2.txt
deleted file mode 100644
index f0f4941..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-A B C
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-20.txt
deleted file mode 100644
index 1ed0fb7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-21.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-3.txt
deleted file mode 100644
index 703ca85..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-4.txt
deleted file mode 100644
index 703ca85..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-5.txt
deleted file mode 100644
index 703ca85..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-6.txt
deleted file mode 100644
index 703ca85..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-1 2 3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-7.txt
deleted file mode 100644
index d84cdac..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-8.txt
deleted file mode 100644
index 4bd46a1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-false false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-9.txt
deleted file mode 100644
index c227083..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ContextExpr/InternalContextExpr/internalcontextitem-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K-ExtensionExpression-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-3.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-3.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/K2-ExtensionExpression-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-1.txt
deleted file mode 100644
index e8a5ec2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-1.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<overtime>
- <day>Monday</day>
- <day>Tuesday</day>
- </overtime>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-10.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-12.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-14.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-15.txt
deleted file mode 100644
index 5453e12..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-passed
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-16.txt
deleted file mode 100644
index 5453e12..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-passed
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-17.txt
deleted file mode 100644
index a668119..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-test passed
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-18.txt
deleted file mode 100644
index 02e4a84..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-false
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-19.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-20.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-21.txt
deleted file mode 100644
index 7813681..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-22.txt
deleted file mode 100644
index 7813681..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-23.txt
deleted file mode 100644
index 2edeafb..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-20
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-24.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-24.txt
deleted file mode 100644
index 7813681..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-24.txt
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-25.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-25.txt
deleted file mode 100644
index 7813681..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-25.txt
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-26.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-26.txt
deleted file mode 100644
index e440e5c..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-26.txt
+++ /dev/null
@@ -1 +0,0 @@
-3
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-3.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-3.txt
deleted file mode 100644
index e8a5ec2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-3.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<overtime>
- <day>Monday</day>
- <day>Tuesday</day>
- </overtime>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-5.txt
deleted file mode 100644
index e8a5ec2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-5.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<overtime>
- <day>Monday</day>
- <day>Tuesday</day>
- </overtime>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-6.txt
deleted file mode 100644
index e8a5ec2..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-6.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-<overtime>
- <day>Monday</day>
- <day>Tuesday</day>
- </overtime>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/ExtensionExpression/extexpr-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-19.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-20.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-21.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-22.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-23.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-24.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-24.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-24.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-25.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-25.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-25.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-26.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-26.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-26.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-27.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-27.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-27.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-28.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-28.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-28.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-29.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-29.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-29.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-30.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-30.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-30.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprPositionalVar/K-ForExprPositionalVar-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-12.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-12.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-12.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-13.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-13.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-13.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-14.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-14.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-14.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-15.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-15.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-15.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-16.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-16.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-16.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-17.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-17.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-17.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-18.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-18.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-18.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-19.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-19.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-19.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-20.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-20.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-20.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-21.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-21.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-21.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-22.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-22.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-22.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-23.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-23.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-23.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-24.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-24.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-24.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-25.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-25.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-25.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-48.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-48.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-48.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-49.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-49.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-49.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-50.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-50.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-50.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-51.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-51.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-51.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-52.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-52.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-52.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-53.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-53.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-53.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-54.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-54.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-54.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-55.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-55.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-55.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-56.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-56.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-56.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/ForExpr/ForExprWithout/K-ForExprWithout-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K-LetExprWithout-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K-LetExprWithout-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K-LetExprWithout-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/LetExpr/LetExprWithout/K2-LetExprWithout-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-1.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-1.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-1.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-10.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-10.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-10.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-11.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-11.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-11.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-2.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-2.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-2.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-4.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-4.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-4.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-5.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-5.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-5.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-6.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-6.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-6.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-7.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-7.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-7.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-8.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-8.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-8.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-9.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-9.txt
deleted file mode 100644
index f32a580..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWOR/WhereExpr/K-WhereExpr-9.txt
+++ /dev/null
@@ -1 +0,0 @@
-true
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr001.txt b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr001.txt
deleted file mode 100644
index b8b88c4..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr001.txt
+++ /dev/null
@@ -1 +0,0 @@
-test test1 test2
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr003.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr003.xml
deleted file mode 100644
index 296fff1..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr003.xml
+++ /dev/null
@@ -1 +0,0 @@
-<FolderName name="Folder00000000047"/>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr004.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr004.xml
deleted file mode 100644
index 0f99f6a..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr004.xml
+++ /dev/null
@@ -1 +0,0 @@
-<file creator="Mani" creation_date="08/06/00" />
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr005.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr005.xml
deleted file mode 100644
index 16f45b7..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr005.xml
+++ /dev/null
@@ -1,6 +0,0 @@
- <Deny>
- <security>
- <right>Read</right>
- </security>
- <user>system\Toshiko</user>
- </Deny>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr006.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr006.xml
deleted file mode 100644
index 5810a90..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr006.xml
+++ /dev/null
@@ -1 +0,0 @@
-<fragment-result><Folder name="Folder00000000017" id="67"><file idref="67">File00000000047</file></Folder><Folder name="Folder00000000017" id="67"><file idref="97">File00000000062</file></Folder><Folder name="Folder00000000032" id="97"><file idref="67">File00000000047</file></Folder><Folder name="Folder00000000032" id="97"><file idref="97">File00000000062</file></Folder></fragment-result>
\ No newline at end of file
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr007.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr007.xml
deleted file mode 100644
index 99fe211..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr007.xml
+++ /dev/null
@@ -1 +0,0 @@
-<FolderName>Folder00000000000</FolderName>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr008.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr008.xml
deleted file mode 100644
index 99fe211..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr008.xml
+++ /dev/null
@@ -1 +0,0 @@
-<FolderName>Folder00000000000</FolderName>
diff --git a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr010.xml b/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr010.xml
deleted file mode 100644
index e2188be..0000000
--- a/tests/org.w3c.xqts.testsuite/ExpectedTestResults/Expressions/FLWORExpr/ForExpr/ForExpr010.xml
+++ /dev/null
@@ -1 +0,0 @@
-<File folder="Folder00000000000">File00000000000</File><File folder="Folder00000000000">File00000000001</File><File folder="Folder00000000000">File00000000002</File><File folder="Folder00000000000">File00000000003</File><File folder="Folder00000000000">File00000000004</File><File folder="Folder00000000000">File00000000005</File><File folder="Folder00000000000">File00000000006</File><File folder="Folder00000000000">File00000000007</File><File folder="Folder00000000000">File00000000008</File><File folder="Folder00000000000">File00000000009</File><File folder="Folder00000000000">File00000000010</File><File folder="Folder00000000000">File00000000011</File><File folder="Folder00000000000">File00000000012</File><File folder="Folder00000000000">File00000000013</File><File folder="Folder00000000000">File00000000014</File><File folder="Folder00000000000">File00000000015</File><File folder="Folder00000000000">File00000000016</File><File folder="Folder00000000000">File00000000017</File><File folder="Folder00000000000">File00000000018</File><File folder="Folder00000000000">File00000000019</File><File folder="Folder00000000000">File00000000020</File><File folder="Folder00000000000">File00000000021</File><File folder="Folder00000000000">File00000000022</File><File folder="Folder00000000000">File00000000023</File><File folder="Folder00000000000">File00000000024</File><File folder="Folder00000000000">File00000000025</File><File folder="Folder00000000000">File00000000026</File><File folder="Folder00000000000">File00000000027</File><File folder="Folder00000000000">File00000000028</File><File folder="Folder00000000000">File00000000029</File><File folder="Folder00000000000">File00000000030</File><File folder="Folder00000000001">File00000000031</File><File folder="Folder00000000001">File00000000032</File><File folder="Folder00000000001">File00000000033</File><File folder="Folder00000000001">File00000000034</File><File folder="Folder00000000001">File00000000035</File><File folder="Folder00000000001">File00000000036</File><File folder="Folder00000000001">File00000000037</File><File folder="Folder00000000001">File00000000038</File><File folder="Folder00000000001">File00000000039</File><File folder="Folder00000000001">File00000000040</File><File folder="Folder00000000001">File00000000041</File><File folder="Folder00000000001">File00000000042</File><File folder="Folder00000000001">File00000000043</File><File folder="Folder00000000001">File00000000044</File><File folder="Folder00000000001">File00000000045</File><File folder="Folder00000000001">File00000000046</File><File folder="Folder00000000002">File00000000032</File><File folder="Folder00000000002">File00000000033</File><File folder="Folder00000000002">File00000000034</File><File folder="Folder00000000002">File00000000035</File><File folder="Folder00000000002">File00000000036</File><File folder="Folder00000000002">File00000000037</File><File folder="Folder00000000002">File00000000038</File><File folder="Folder00000000002">File00000000039</File><File folder="Folder00000000002">File00000000040</File><File folder="Folder00000000002">File00000000041</File><File folder="Folder00000000002">File00000000042</File><File folder="Folder00000000002">File00000000043</File><File folder="Folder00000000002">File00000000044</File><File folder="Folder00000000002">File00000000045</File><File folder="Folder00000000002">Fil