master merged; 4 tests failed; (1)recover_ddl/insert_after_recovery; (2)recover_ddl/delete_after_recovery; (3)dml_recovery/sum_mixed; (4)dml_recovery/avg_empty_02
diff --git a/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql b/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql
index 59543b7..9189b28 100644
--- a/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql
+++ b/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql
@@ -1,5 +1,5 @@
use dataverse recovery;
count (for $x in dataset Fragile where
-spatial-intersect($x.location, create-polygon(create-point(0.0,0.0), create-point(2.0,2.0), create-point(0.0,2.0), create-point(2.0,0.0)))
+spatial-intersect($x.location, create-polygon([0.0,0.0, 2.0,2.0, 0.0,2.0, 2.0,0.0]))
return $x);
\ No newline at end of file
diff --git a/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql b/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql
index 59543b7..9189b28 100644
--- a/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql
+++ b/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql
@@ -1,5 +1,5 @@
use dataverse recovery;
count (for $x in dataset Fragile where
-spatial-intersect($x.location, create-polygon(create-point(0.0,0.0), create-point(2.0,2.0), create-point(0.0,2.0), create-point(2.0,0.0)))
+spatial-intersect($x.location, create-polygon([0.0,0.0, 2.0,2.0, 0.0,2.0, 2.0,0.0]))
return $x);
\ No newline at end of file
diff --git a/asterix-installer/src/test/resources/transactionts/testsuite.xml b/asterix-installer/src/test/resources/transactionts/testsuite.xml
index 12c5c5d..15db39b 100644
--- a/asterix-installer/src/test/resources/transactionts/testsuite.xml
+++ b/asterix-installer/src/test/resources/transactionts/testsuite.xml
@@ -13,6 +13,7 @@
! limitations under the License.
!-->
<test-suite xmlns="urn:xml.testframework.asterix.ics.uci.edu" ResultOffsetPath="results" QueryOffsetPath="queries" QueryFileExtension=".aql">
+
<test-group name="recover_after_abort">
<test-case FilePath="recover_after_abort">
@@ -32,7 +33,7 @@
<output-dir compare="Text">primary_plus_rtree_index</output-dir>
</compilation-unit>
</test-case>
-
+
<test-case FilePath="recover_after_abort">
<compilation-unit name="primary_plus_keyword_secondary_index">
<output-dir compare="Text">primary_plus_keyword_secondary_index</output-dir>
@@ -52,9 +53,9 @@
</test-case>
</test-group>
-<!--
- <test-group name="recovery_ddl">
+ <test-group name="recovery_ddl">
+
<test-case FilePath="recovery_ddl">
<compilation-unit name="dataverse_recovery">
<output-dir compare="Text">dataverse_recovery</output-dir>
@@ -84,7 +85,7 @@
<output-dir compare="Text">load_after_recovery</output-dir>
</compilation-unit>
</test-case>
-
+<!--
<test-case FilePath="recovery_ddl">
<compilation-unit name="insert_after_recovery">
<output-dir compare="Text">insert_after_recovery</output-dir>
@@ -96,7 +97,7 @@
<output-dir compare="Text">delete_after_recovery</output-dir>
</compilation-unit>
</test-case>
-
+-->
<test-case FilePath="recovery_ddl">
<compilation-unit name="function_recovery">
<output-dir compare="Text">function_recovery</output-dir>
@@ -105,5 +106,5 @@
</test-group>
--->
+
</test-suite>