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:30 UTC

[32/50] [abbrv] git commit: Cleaned up the XML file by removing unnecessary information.

Cleaned up the XML file by removing unnecessary information.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/0febd9c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/0febd9c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/0febd9c4

Branch: refs/heads/master
Commit: 0febd9c4c0fbb15b90d974af09810d6d867f1b7c
Parents: c8f9462
Author: Preston Carman <pr...@apache.org>
Authored: Thu Apr 3 11:00:25 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu Apr 3 11:00:25 2014 -0700

----------------------------------------------------------------------
 .../cat/AggregatePartition1Queries.xml          |  8 ++--
 .../cat/AggregatePartition2Queries.xml          | 25 +++++-------
 .../cat/AggregatePartition4Queries.xml          | 25 +++++-------
 .../cat/GhcndCountPartition1Queries.xml         | 20 ++++------
 .../cat/GhcndCountPartition2Queries.xml         | 20 ++++------
 .../cat/GhcndCountPartition4Queries.xml         | 20 ++++------
 .../resources/cat/GhcndPartition1Queries.xml    | 40 ++++++++------------
 .../resources/cat/GhcndPartition2Queries.xml    | 40 ++++++++------------
 .../resources/cat/GhcndPartition4Queries.xml    | 40 ++++++++------------
 .../cat/GhcndRecordsPartition1Queries.xml       | 20 ++++------
 .../cat/GhcndRecordsPartition2Queries.xml       | 20 ++++------
 .../cat/GhcndRecordsPartition4Queries.xml       | 20 ++++------
 12 files changed, 120 insertions(+), 178 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
index c901468..b3ed2fc 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition1Queries.xml
@@ -8,22 +8,22 @@
       <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">
+   <test-case name="aggregate-partition-1-count" FilePath="Aggregate/Partition-1/" 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">
+   <test-case name="aggregate-partition-1-min" FilePath="Aggregate/Partition-1/" 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">
+   <test-case name="aggregate-partition-1-max" FilePath="Aggregate/Partition-1/" 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">
+   <test-case name="aggregate-partition-1-sum" FilePath="Aggregate/Partition-1/" 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>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
index a4ac807..efa93d0 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition2Queries.xml
@@ -3,34 +3,29 @@
       <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">
+   <test-case name="aggregate-partition-2-avg" FilePath="Aggregate/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-2-count" FilePath="Aggregate/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-2-min" FilePath="Aggregate/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-2-max" FilePath="Aggregate/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-2-sum" FilePath="Aggregate/Partition-2/" 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>
+      <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/0febd9c4/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
index d920d31..800de1c 100644
--- a/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/AggregatePartition4Queries.xml
@@ -3,34 +3,29 @@
       <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">
+   <test-case name="aggregate-partition-4-avg" FilePath="Aggregate/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-4-count" FilePath="Aggregate/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-4-min" FilePath="Aggregate/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-4-max" FilePath="Aggregate/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="aggregate-partition-4-sum" FilePath="Aggregate/Partition-4/" 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>
+      <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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
index 515738e..6a5b609 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition1Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-count-partition-1-q02" FilePath="GhcndCount/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-1-q03" FilePath="GhcndCount/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-1-q05" FilePath="GhcndCount/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-1-q07" FilePath="GhcndCount/Partition-1/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
index 8bb590b..99fee09 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition2Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-count-partition-2-q02" FilePath="GhcndCount/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-2-q03" FilePath="GhcndCount/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-2-q05" FilePath="GhcndCount/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-2-q07" FilePath="GhcndCount/Partition-2/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
index ff75d3a..8f1b3f0 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndCountPartition4Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-count-partition-4-q02" FilePath="GhcndCount/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-4-q03" FilePath="GhcndCount/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-4-q05" FilePath="GhcndCount/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-count-partition-4-q07" FilePath="GhcndCount/Partition-4/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
index 1237971..94c45dc 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition1Queries.xml
@@ -3,52 +3,44 @@
       <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">
+   <test-case name="ghcnd-partition-1-q00" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q01" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q02" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q03" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q04" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q05" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q06" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-1-q07" FilePath="Ghcnd/Partition-1/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
index 86b5cf0..a35c153 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition2Queries.xml
@@ -3,52 +3,44 @@
       <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">
+   <test-case name="ghcnd-partition-2-q00" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q01" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q02" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q03" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q04" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q05" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q06" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-2-q07" FilePath="Ghcnd/Partition-2/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
index 232a7b0..fcbf3d5 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndPartition4Queries.xml
@@ -3,52 +3,44 @@
       <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">
+   <test-case name="ghcnd-partition-4-q00" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q01" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q02" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q03" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q04" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q05" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q06" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-partition-4-q07" FilePath="Ghcnd/Partition-4/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 0c22422..31f6a13 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-records-partition-1-q02" FilePath="GhcndRecords/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-1-q03" FilePath="GhcndRecords/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-1-q07" FilePath="GhcndRecords/Partition-1/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
index 929ff28..41b1966 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition2Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-records-partition-2-q02" FilePath="GhcndRecords/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-2-q03" FilePath="GhcndRecords/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-2-q05" FilePath="GhcndRecords/Partition-2/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-2-q07" FilePath="GhcndRecords/Partition-2/" 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>
+      <output-file 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/0febd9c4/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
index 03eea78..f1b99ed 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition4Queries.xml
@@ -3,28 +3,24 @@
       <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">
+   <test-case name="ghcnd-records-partition-4-q02" FilePath="GhcndRecords/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-4-q03" FilePath="GhcndRecords/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-4-q05" FilePath="GhcndRecords/Partition-4/" 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>
+      <output-file 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">
+   <test-case name="ghcnd-records-partition-4-q07" FilePath="GhcndRecords/Partition-4/" 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>
+      <output-file compare="Text">q07_records.txt</output-file>
    </test-case>
 </test-group>
\ No newline at end of file