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

[09/50] [abbrv] Added more parallel tests to the VXQuery test suite.

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
new file mode 100644
index 0000000..664e91b
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q05_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Join Aggregate Query :)
+(: Find the lowest recorded temperature (TMIN) in the United States for     :)
+(: 2001.                                                                      :)
+    let $station_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $s in collection($station_collection)/stationCollection/station
+    
+    let $sensor_collection := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r in collection($sensor_collection)/dataCollection/data
+    
+    where $s/id eq $r/station
+        and (some $x in $s/locationLabels satisfies ($x/type eq "CNTRY" and $x/id eq "FIPS:US"))
+        and $r/dataType eq "TMIN" 
+        and fn:year-from-dateTime(xs:dateTime(fn:data($r/date))) eq 2001
+    return $r/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
new file mode 100644
index 0000000..6f8c165
--- /dev/null
+++ b/vxquery-xtest/tests/Queries/XQuery/GhcndRecords/Partition-4/q07_records.xq
@@ -0,0 +1,14 @@
+(: XQuery Self Join Query :)
+(: Self join with all stations finding the difference in min and max       :)
+(: temperature and get the average.                                        :)
+    let $sensor_collection_min := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_min in collection($sensor_collection_min)/dataCollection/data
+    
+    let $sensor_collection_max := "/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/|/Users/prestoncarman/Documents/smartsvn/vxquery_git_master/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_4/"
+    for $r_max in collection($sensor_collection_max)/dataCollection/data
+    
+    where $r_min/station eq $r_max/station
+        and $r_min/date eq $r_max/date
+        and $r_min/dataType eq "TMIN"
+        and $r_max/dataType eq "TMAX"
+    return $r_max/value - $r_min/value

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
index bb0124e..cc2fd33 100644
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
+++ b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_1/sesnors/US000000001_200101_0.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
index b4a7897..c095726 100644
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
+++ b/vxquery-xtest/tests/TestSources/ghcnd/half_1/quarter_2/sesnors/US000000002_200202_0.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
index 6a23ab6..3a540d3 100644
--- a/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
+++ b/vxquery-xtest/tests/TestSources/ghcnd/half_2/quarter_3/sesnors/AS000000003_200303_0.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/XQTSCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/XQTSCatalog.xml b/vxquery-xtest/tests/XQTSCatalog.xml
index 3b30b30..7f6554f 100644
--- a/vxquery-xtest/tests/XQTSCatalog.xml
+++ b/vxquery-xtest/tests/XQTSCatalog.xml
@@ -145,13 +145,21 @@
 
 <!ELEMENT title ( #PCDATA ) >
 
+<!ENTITY AggregatePartition1Queries SYSTEM "cat/AggregatePartition1Queries.xml">
+<!ENTITY AggregatePartition2Queries SYSTEM "cat/AggregatePartition2Queries.xml">
+<!ENTITY AggregatePartition4Queries SYSTEM "cat/AggregatePartition4Queries.xml">
+
 <!ENTITY GhcndPartition1Queries SYSTEM "cat/GhcndPartition1Queries.xml">
 <!ENTITY GhcndPartition2Queries SYSTEM "cat/GhcndPartition2Queries.xml">
 <!ENTITY GhcndPartition4Queries SYSTEM "cat/GhcndPartition4Queries.xml">
 
-<!ENTITY CollectionPartition1Queries SYSTEM "cat/CollectionPartition1Queries.xml">
-<!ENTITY CollectionPartition2Queries SYSTEM "cat/CollectionPartition2Queries.xml">
-<!ENTITY CollectionPartition4Queries SYSTEM "cat/CollectionPartition4Queries.xml">
+<!ENTITY GhcndRecordsPartition1Queries SYSTEM "cat/GhcndRecordsPartition1Queries.xml">
+<!ENTITY GhcndRecordsPartition2Queries SYSTEM "cat/GhcndRecordsPartition2Queries.xml">
+<!ENTITY GhcndRecordsPartition4Queries SYSTEM "cat/GhcndRecordsPartition4Queries.xml">
+
+<!ENTITY GhcndCountPartition1Queries SYSTEM "cat/GhcndCountPartition1Queries.xml">
+<!ENTITY GhcndCountPartition2Queries SYSTEM "cat/GhcndCountPartition2Queries.xml">
+<!ENTITY GhcndCountPartition4Queries SYSTEM "cat/GhcndCountPartition4Queries.xml">
 
 ]>
 <test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
@@ -942,6 +950,21 @@
       <context-property name="Available collections" context-type="dynamic"/>
       <context-property name="Default collection" context-type="dynamic"/>
    </context-properties>
+   <test-group name="AggregatePartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>Aggregate Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="AggregateParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Aggregate Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &AggregatePartition1Queries;
+         &AggregatePartition2Queries;
+         &AggregatePartition4Queries;
+      </test-group>
+   </test-group>
    <test-group name="GhcndPartitionQueries" featureOwner="Preston Carman">
       <GroupInfo>
          <title>GHCND Partition Queries</title>
@@ -957,19 +980,34 @@
          &GhcndPartition4Queries;
       </test-group>
    </test-group>
-   <test-group name="CollectionPartitionQueries" featureOwner="Preston Carman">
+   <test-group name="GhcndCountPartitionQueries" featureOwner="Preston Carman">
       <GroupInfo>
-         <title>Collection Partition Queries</title>
+         <title>GHCND Count Partition Queries</title>
          <description/>
       </GroupInfo>
-      <test-group name="ParallelExecutionTests" featureOwner="Preston Carman">
+      <test-group name="CountParallelExecutionTests" featureOwner="Preston Carman">
          <GroupInfo>
             <title>Parallel Execution Tests</title>
             <description/>
          </GroupInfo>
-         &CollectionPartition1Queries;
-         &CollectionPartition2Queries;
-         &CollectionPartition4Queries;
+         &GhcndCountPartition1Queries;
+         &GhcndCountPartition2Queries;
+         &GhcndCountPartition4Queries;
+      </test-group>
+   </test-group>
+   <test-group name="GhcndRecordsPartitionQueries" featureOwner="Preston Carman">
+      <GroupInfo>
+         <title>GHCND Records Partition Queries</title>
+         <description/>
+      </GroupInfo>
+      <test-group name="RecordsParallelExecutionTests" featureOwner="Preston Carman">
+         <GroupInfo>
+            <title>Records Parallel Execution Tests</title>
+            <description/>
+         </GroupInfo>
+         &GhcndRecordsPartition1Queries;
+         &GhcndRecordsPartition2Queries;
+         &GhcndRecordsPartition4Queries;
       </test-group>
    </test-group>
 </test-suite>

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/7cde080b/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
new file mode 100644
index 0000000..b058d7d
--- /dev/null
+++ b/vxquery-xtest/tests/cat/AggregatePartition1Queries.xml
@@ -0,0 +1,36 @@
+<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 is-XPath2="true" name="aggregate-partition-1-avg" 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="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-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"/>
+      <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-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"/>
+      <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-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"/>
+      <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-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"/>
+      <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/7cde080b/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
new file mode 100644
index 0000000..a4ac807
--- /dev/null
+++ b/vxquery-xtest/tests/cat/AggregatePartition2Queries.xml
@@ -0,0 +1,36 @@
+<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/7cde080b/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml b/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
new file mode 100644
index 0000000..d920d31
--- /dev/null
+++ b/vxquery-xtest/tests/cat/AggregatePartition4Queries.xml
@@ -0,0 +1,36 @@
+<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/7cde080b/vxquery-xtest/tests/cat/CollectionPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/CollectionPartition1Queries.xml b/vxquery-xtest/tests/cat/CollectionPartition1Queries.xml
deleted file mode 100644
index 71673af..0000000
--- a/vxquery-xtest/tests/cat/CollectionPartition1Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="CollectionPartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Collection Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="collection-partition-1-q02" FilePath="Collection/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="collection-partition-1-q03" FilePath="Collection/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="collection-partition-1-q05" FilePath="Collection/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="collection-partition-1-q07" FilePath="Collection/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/7cde080b/vxquery-xtest/tests/cat/CollectionPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/CollectionPartition2Queries.xml b/vxquery-xtest/tests/cat/CollectionPartition2Queries.xml
deleted file mode 100644
index 80dd480..0000000
--- a/vxquery-xtest/tests/cat/CollectionPartition2Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="CollectionPartition2Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Collection Partition 2</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="collection-partition-2-q02" FilePath="Collection/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="collection-partition-2-q03" FilePath="Collection/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="collection-partition-2-q05" FilePath="Collection/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="collection-partition-2-q07" FilePath="Collection/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/7cde080b/vxquery-xtest/tests/cat/CollectionPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/CollectionPartition4Queries.xml b/vxquery-xtest/tests/cat/CollectionPartition4Queries.xml
deleted file mode 100644
index 8b99f0f..0000000
--- a/vxquery-xtest/tests/cat/CollectionPartition4Queries.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="CollectionPartition4Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>Collection Partition 4</title>
-      <description/>
-   </GroupInfo>
-   <test-case is-XPath2="true" name="collection-partition-4-q02" FilePath="Collection/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="collection-partition-4-q03" FilePath="Collection/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="collection-partition-4-q05" FilePath="Collection/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="collection-partition-4-q07" FilePath="Collection/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/7cde080b/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
new file mode 100644
index 0000000..515738e
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndCountPartition1Queries.xml
@@ -0,0 +1,30 @@
+<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/7cde080b/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
new file mode 100644
index 0000000..8bb590b
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndCountPartition2Queries.xml
@@ -0,0 +1,30 @@
+<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/7cde080b/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml b/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
new file mode 100644
index 0000000..ff75d3a
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndCountPartition4Queries.xml
@@ -0,0 +1,30 @@
+<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/7cde080b/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
new file mode 100644
index 0000000..0c22422
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndRecordsPartition1Queries.xml
@@ -0,0 +1,30 @@
+<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/7cde080b/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
new file mode 100644
index 0000000..929ff28
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndRecordsPartition2Queries.xml
@@ -0,0 +1,30 @@
+<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/7cde080b/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml b/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
new file mode 100644
index 0000000..03eea78
--- /dev/null
+++ b/vxquery-xtest/tests/cat/GhcndRecordsPartition4Queries.xml
@@ -0,0 +1,30 @@
+<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