You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/04/09 00:16:23 UTC

[25/50] [abbrv] make tests location-independent - use source elements in the catalog to identify partitions for collections - more test resources from src/tests/resources to src/test/resources

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
deleted file mode 100644
index c901468..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition1Queries.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="aggregate-partition-1-avg" FilePath="Aggregate/Partition-1/" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <output-file compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <output-file compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <output-file compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <output-file compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <output-file compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
deleted file mode 100644
index a4ac807..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition2Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
deleted file mode 100644
index d920d31..0000000
--- a/vxquery-xtest/src/tests/resources/cat/AggregatePartition4Queries.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Aggregate Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="avg" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">avg.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partition.</description>
-      <query name="count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partition.</description>
-      <query name="min" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">min.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partition.</description>
-      <query name="max" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">max.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partition.</description>
-      <query name="sum" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">sum.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
deleted file mode 100644
index 515738e..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
deleted file mode 100644
index 8bb590b..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
deleted file mode 100644
index ff75d3a..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndCountPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndCountPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Count Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_count.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_count" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_count.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
deleted file mode 100644
index 1237971..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition1Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 1 partition.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 1 partition.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 1 partition.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 1 partition.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
deleted file mode 100644
index 86b5cf0..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition2Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 2 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 2 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 2 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 2 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
deleted file mode 100644
index 232a7b0..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndPartition4Queries.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q00 from the weather benchmark with 4 partitions.</description>
-      <query name="q00" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q00.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q01 from the weather benchmark with 4 partitions.</description>
-      <query name="q01" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q01.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q04 from the weather benchmark with 4 partitions.</description>
-      <query name="q04" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q04.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q06 from the weather benchmark with 4 partitions.</description>
-      <query name="q06" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q06.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Execution of q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
deleted file mode 100644
index 0c22422..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
deleted file mode 100644
index 929ff28..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 2 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 2 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 2 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 2 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/fc9c5bf1/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
deleted file mode 100644
index 03eea78..0000000
--- a/vxquery-xtest/src/tests/resources/cat/GhcndRecordsPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="GhcndRecordsPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>GHCND Records Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q02 from the weather benchmark with 4 partitions.</description>
-      <query name="q02_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q02_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q03 from the weather benchmark with 4 partitions.</description>
-      <query name="q03_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q03_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q05 from the weather benchmark with 4 partitions.</description>
-      <query name="q05_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q05_records.txt</output-file>
-   </test-case>
-   <test-case is-XPath2="true" name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" scenario="runtime-error" Creator="Preston Carman">
-      <description>Count records returned for q07 from the weather benchmark with 4 partitions.</description>
-      <query name="q07_records" date="2014-04-01"/>
-      <input-file role="principal-data" variable="input-context1">emptydoc</input-file>
-      <output-file role="principal" compare="Text">q07_records.txt</output-file>
-   </test-case>
-</test-group>
\ No newline at end of file