X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimap_searchqp.t;h=e2f49e5aa27496290a7e4e4e3f8aa9dfd4c1f78d;hb=d0bc58517c97c8982fdf42533297d96be9efb484;hp=d73600b35d2ab62980c44af496bbaff784c19182;hpb=bdee1f6bfaa0017877e5d5284c2d5e41f67e847a;p=public-inbox.git

diff --git a/t/imap_searchqp.t b/t/imap_searchqp.t
index d73600b3..e2f49e5a 100644
--- a/t/imap_searchqp.t
+++ b/t/imap_searchqp.t
@@ -1,11 +1,11 @@
 #!perl -w
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
-use Test::More;
+use v5.10.1;
 use Time::Local qw(timegm);
 use PublicInbox::TestCommon;
-require_mods(qw(Parse::RecDescent));
+require_mods(qw(-imapd));
 use_ok 'PublicInbox::IMAPsearchqp';
 use_ok 'PublicInbox::IMAP';
 
@@ -13,6 +13,9 @@ my $imap = bless {}, 'PublicInbox::IMAP';
 my $q;
 my $parse = sub { PublicInbox::IMAPsearchqp::parse($imap, $_[0]) };
 
+$q = $parse->(qq{BODY oops});
+is($q->{xap}, 'b:"oops"', 'BODY key supported');
+
 $q = $parse->(qq{OR HEADER TO Brian (OR FROM Ryan (OR TO Joe CC Scott))});
 is($q->{sql}, undef, 'not using SQLite for complex query');
 is($q->{xap}, '(t:"brian" OR (f:"ryan" OR (t:"joe" OR c:"scott")))',
@@ -72,17 +75,17 @@ is($q->{xap}, 'c:"b" d:..19931002', 'compound query w/ parens');
 	$q = $parse->($s = qq{BEFORE 2-Oct-1993});
 	is_deeply($q->{sql}, \" AND ts <= $t0", 'BEFORE SQL');
 	$q = $parse->("FROM z $s");
-	is($q->{xap}, qq{f:"z" ts:..$t0}, 'BEFORE Xapian');
+	is($q->{xap}, qq{f:"z" rt:..$t0}, 'BEFORE Xapian');
 
 	$q = $parse->($s = qq{SINCE 2-Oct-1993});
 	is_deeply($q->{sql}, \" AND ts >= $t0", 'SINCE SQL');
 	$q = $parse->("FROM z $s");
-	is($q->{xap}, qq{f:"z" ts:$t0..}, 'SINCE Xapian');
+	is($q->{xap}, qq{f:"z" rt:$t0..}, 'SINCE Xapian');
 
 	$q = $parse->($s = qq{ON 2-Oct-1993});
 	is_deeply($q->{sql}, \" AND ts >= $t0 AND ts <= $t1", 'ON SQL');
 	$q = $parse->("FROM z $s");
-	is($q->{xap}, qq{f:"z" ts:$t0..$t1}, 'ON Xapian');
+	is($q->{xap}, qq{f:"z" rt:$t0..$t1}, 'ON Xapian');
 }
 
 {