Test changes to quantifier tests
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization@689 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
index fad06ba..bd52181 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_02.aql
@@ -5,10 +5,6 @@
* Date : 5th July 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_everysat_02.adm";
let $a := [
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
index 7f9824e..99b4844 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_03.aql
@@ -5,24 +5,20 @@
* Date : 5th July 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_everysat_02.adm";
let $a := [
every $x in [1, 2] satisfies avg([$x, 1]) = 1,
-every $x in [1, 2] satisfies string($x) = "1",
-every $x in [1, 2] satisfies string-length(string($x)) = 1,
+every $x in ["1", "2"] satisfies string($x) = "1",
+every $x in ["1", "2"] satisfies string-length($x) = 1,
every $x in [[1, 2],[10],[1,5,7,8]] satisfies count($x) = 1,
every $x in [[2],[10],[8]] satisfies count($x) = 1,
-every $x in [1, 2] satisfies boolean("true"),
-every $x in [1, 2] satisfies not($x),
+every $x in [true, false] satisfies boolean("true"),
+every $x in [true,true] satisfies not($x),
every $x in [1,2,3], $y in [4,5,6] satisfies $x + $y = 5,
every $x in [1,2,3], $y in [4,5,6] satisfies $x - $y = 5,
every $x in [1,2,3], $y in [4,5,6] satisfies $x * $y = 10,
-every $x in [1,2,3], $y in [4,5,6] satisfies string($x) = string($y),
+every $x in ["ab","cd"], $y in ["ab","de"] satisfies string($x) = string($y),
every $x in [1,2,3], $y in [4,5,6] satisfies int32($x) = int32($y),
every $x in [1,2,3], $y in [4,5,6] satisfies float($x) = float($y),
every $x in [1,2,3], $y in [4,5,6] satisfies double($x) = double($y),
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
index b9eccfd..5e9174e 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/everysat_04.aql
@@ -3,10 +3,6 @@
* Success : Yes
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_everysat_04.adm";
let $x := [
@@ -20,4 +16,4 @@
every $x in [true,true] satisfies not($x)
]
for $i in $x
-return $i
\ No newline at end of file
+return $i
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
index 5995b9b..7178156 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_03.aql
@@ -1,13 +1,9 @@
/*
- * Description : Test quantified expressions; some variable in [ordered list] satisfies expression.
+ * Description : Test quantified expressions; some variable in [ordered list] satisfies expression.
* Expected Result : Success
* Date : 6th July 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_somesat_03.adm";
let $a := [
@@ -20,7 +16,7 @@
some $x in [1, 2] satisfies avg([$x,1]) = 1,
some $x in [1, 2] satisfies boolean("true"),
some $x in [1, 2] satisfies boolean("false"),
-some $x in [1, 2] satisfies not($x),
+some $x in [true,false] satisfies not($x),
some $x in [1, 2] satisfies $x = 1 or $x = 2,
some $x in [1, 2] satisfies $x = 1 and ($x +1) = 2
]
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
index 8d92cbb..b308aa2 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_04.aql
@@ -6,16 +6,11 @@
* Date : 5th July 2012
*/
-
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_somesat_04.adm";
let $a := [
-some $x in ["foo","foobar","foot","fox"] satisfies string-length($x) = 1,
-some $x in [1,2,3,4,5,6,7,8] satisfies count($x) = 8,
+some $x in ["foo","foobar","foot","fox"] satisfies string-length($x) = 3,
+some $x in [[5,4,3,2],[1,2,3,4,5,6,7,8],[4,2,3,4]] satisfies count($x) = 8,
some $x in [1, 2] satisfies $x = 1 or $x = 2,
some $x in [1, 2] satisfies $x = 1 and ($x +1) = 2,
some $x in ["A","B","C"] satisfies $x = "A",
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
index fefd86d..4d802c7 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_05.aql
@@ -5,10 +5,6 @@
* Date : 5th July 2012
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_somesat_05.adm";
let $a := [
diff --git a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
index 6e8892c..07d8857 100644
--- a/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/quantifiers/somesat_06.aql
@@ -3,10 +3,6 @@
* Success : Yes
*/
-drop dataverse test if exists;
-create dataverse test;
-use dataverse test;
-
write output to nc1:"rttest/quantifiers_somesat_06.adm";
let $x := [
@@ -20,4 +16,4 @@
some $x in [true,true] satisfies not($x)
]
for $i in $x
-return $i
\ No newline at end of file
+return $i