X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=test%2Ftest_rpn2cql.c;h=9a717c1a1fc7041f7f7f086556950684304eac59;hp=b7a511478a9896abfb3380ba3f3ba66a001b25f7;hb=84e48bf312354bb4bc3c9a122f2c48346776a4fa;hpb=def92a743ce6b4aaf3357bee1f07a847841b3fbe

diff --git a/test/test_rpn2cql.c b/test/test_rpn2cql.c
index b7a5114..9a717c1 100644
--- a/test/test_rpn2cql.c
+++ b/test/test_rpn2cql.c
@@ -59,6 +59,11 @@ static void tst1(void)
     YAZ_CHECK(compare(ct, "abc", "abc"));
     YAZ_CHECK(compare(ct, "\"a b c\"", "\"a b c\""));
     YAZ_CHECK(compare(ct, "@and a b", "a and b"));
+    YAZ_CHECK(compare(ct, "@or a @and b c", "a or (b and c)"));
+    YAZ_CHECK(compare(ct, "@or @and a b @and c d", "(a and b) or (c and d)"));
+    YAZ_CHECK(compare(ct, "@or @or a b @or c d", "(a or b) or (c or d)"));
+    YAZ_CHECK(compare(ct, "@and @and a b @and c d", "(a and b) and (c and d)"));
+
     YAZ_CHECK(compare(ct, "@attr 1=field abc", "field=abc"));
     YAZ_CHECK(compare(ct, "@attr 1=4 abc", 0)); /* should fail */