X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fregression%2Fqueries.raw;h=67daa489b35c783d06782ce7db5947d64f191f11;hb=64483d3d31c182adfb96fd75f8be10ff9f374d34;hp=5366fb949652a0c926dd3c2fb3f4b8564498d38b;hpb=b4c87f12830bb1525aebb00e98dce5e6153bea71;p=cql-java-moved-to-github.git

diff --git a/test/regression/queries.raw b/test/regression/queries.raw
index 5366fb9..67daa48 100644
--- a/test/regression/queries.raw
+++ b/test/regression/queries.raw
@@ -1,4 +1,5 @@
-# Simple
+
+# Simple 
 
 cat
 "cat"
@@ -9,6 +10,8 @@ xml:element
 "prox/>=/5/word"
 ("cat")
 ((dog))
+all
+prox
 
 # index relation term
 
@@ -23,6 +26,7 @@ dc.title any/stem fish
 dc.fish all/stem/fuzzy "fish chips"
 (title any frog)
 ((dc.title any/stem "frog pond"))
+dc.title scr "fish frog chicken"
 
 # Simple Boolean
 
@@ -31,22 +35,24 @@ cat and fish
 cat not frog
 (cat not frog)
 "cat" not "fish food"
-xml and "prox///word/"
+xml and "prox///"
+fred and any
+((fred or all))
 a or b and c not d
 
 # I/R/T plus Boolean
 
 bath.author any fish and dc.title all "cat dog"
-(title any/stem "fish dog" or "and")
+(title any/stem "fish dog" or and)
 
 # Prox
 
 cat prox hat
 cat prox/=/3/word/ordered hat
 cat prox//3 hat
-"fish food" prox///sentence "and"
-title all "chips frog" prox//5/word "any"
-(dc.author exact "jones" prox//5 title >= "smith")
+"fish food" prox///sentence and
+title all "chips frog" prox/>=/5 exact
+(dc.author exact "jones" prox/</5/element title >= "smith")
 ((cat prox hat))
 
 # Special characters
@@ -65,22 +71,21 @@ cat?dog
 
 # Lame searches
 
-"any" or "all:stem" and "all" exact "any" prox///word "prox"="fuzzy"
-((((((((("any")))))))))
-
+any or all:stem and all exact any prox prox=fuzzy
+(((((((((any)))))))))
+("")
 
 # Invalid searches [should error]
 
 >
 ===
 cat or
-index any
+index any 
 index any/wrong term
 a prox/wrong b
 ()
 (a
 index any fish)
 (cat any dog or ())
-fred and any
-((fred or all))
-sorry = (mike)
+title = ("illegal parentheses")
+"quoted" any "illegal quotes"