imap: reinstate non-UID SEARCH

[public-inbox.git] / t / imapd.t

diff --git a/t/imapd.t b/t/imapd.t
index 0f48e905557baadd0eac5388be3609a2a4861ca1..36082d8c7eea187f4166c2b99397338e8980775c 100644 (file)
--- a/t/imapd.t
+++ b/t/imapd.t
@@ -148,10 +148,16 @@ is_deeply(scalar $mic->flags('1'), [], '->flags works');
        my $exp = $mic->fetch_hash(1, 'UID');
        $ret = $mic->fetch_hash('559:*', 'UID');
        is_deeply($ret, $exp, 'beginning range too big');
-       for my $r (qw(559:558 558:559)) {
-               $ret = $mic->fetch_hash($r, 'UID');
+       {
+               my @w; # Mail::IMAPClient hits a warning via overload
+               local $SIG{__WARN__} = sub { push @w, @_ };
+               $ret = $mic->fetch_hash(my $r = '559:558', 'UID');
                is_deeply($ret, {}, "out-of-range UID FETCH $r");
+               @w = grep(!/\boverload\.pm\b/, @w);
+               is_deeply(\@w, [], 'no unexpected warning');
        }
+       $ret = $mic->fetch_hash(my $r = '558:559', 'UID');
+       is_deeply($ret, {}, "out-of-range UID FETCH $r");
 }
 
 for my $r ('1:*', '1') {
@@ -217,8 +223,8 @@ for my $r ('1:*', '1') {
        is(lc($bs->bodytype), 'text', '->bodytype');
        is(lc($bs->bodyenc), '8bit', '->bodyenc');
 }
-
-is_deeply([$mic->has_capability('COMPRESS')], ['DEFLATE'], 'deflate cap');
+ok($mic->has_capability('COMPRESS') ||
+       $mic->has_capability('COMPRESS=DEFLATE'), 'deflate cap');
 SKIP: {
        skip 'Mail::IMAPClient too old for ->compress', 2 if !$can_compress;
        my $c = $imap_client->new(%mic_opt);
@@ -243,7 +249,7 @@ $pi_config->each_inbox(sub {
        my $mb = "$ng.$first_range";
        my $uidnext = $mic->uidnext($mb); # we'll fetch BODYSTRUCTURE on this
        ok($uidnext, 'got uidnext for later fetch');
-       is_deeply([$mic->has_capability('IDLE')], ['IDLE'], "IDLE capa $name");
+       ok($mic->has_capability('IDLE'), "IDLE capa $name");
        ok(!$mic->idle, "IDLE fails w/o SELECT/EXAMINE $name");
        ok($mic->examine($mb), "EXAMINE $ng succeeds");
        ok(my $idle_tag = $mic->idle, "IDLE succeeds on $ng");
@@ -361,6 +367,44 @@ is(scalar keys %$ret, 3, 'got all 3 messages with comma-separated sequence');
 $ret = $mic->fetch_hash('1:*', 'RFC822') or BAIL_OUT "FETCH $@";
 is(scalar keys %$ret, 3, 'got all 3 messages');
 
+SKIP: {
+       # do any clients use non-UID IMAP SEARCH?
+       skip 'Xapian missing', 2 if $level eq 'basic';
+       my $x = $mic->search('all');
+       is_deeply($x, [1, 2, 3], 'MSN SEARCH works before rm');
+       $x = $mic->search(qw(header subject embedded));
+       is_deeply($x, [2], 'MSN SEARCH on Subject works before rm');
+}
+
+{
+       my $rdr = { 0 => \($ret->{1}->{RFC822}) };
+       my $env = { HOME => $ENV{HOME} };
+       my @cmd = qw(-learn rm --all);
+       run_script(\@cmd, $env, $rdr) or BAIL_OUT('-learn rm');
+}
+
+SKIP: {
+       # do any clients use non-UID IMAP SEARCH?  We only ensure
+       # MSN "SEARCH" can return a result which can be retrieved
+       # via MSN "FETCH"
+       skip 'Xapian missing', 3 if $level eq 'basic';
+       my $x = $mic->search(qw(header subject embedded));
+       is(scalar(@$x), 1, 'MSN SEARCH on Subject works after rm');
+       $x = $mic->message_string($x->[0]);
+       is($x, $ret->{2}->{RFC822}, 'message 2 unchanged');
+}
+
+# FIXME? no EXPUNGE response, yet
+my $r2 = $mic->fetch_hash('1:*', 'BODY.PEEK[]') or BAIL_OUT "FETCH $@";
+is(scalar keys %$r2, 2, 'did not get all 3 messages');
+is($r2->{2}->{'BODY[]'}, $ret->{2}->{RFC822}, 'message 2 unchanged');
+is($r2->{3}->{'BODY[]'}, $ret->{3}->{RFC822}, 'message 3 unchanged');
+$r2 = $mic->fetch_hash(2, 'BODY.PEEK[HEADER.FIELDS (message-id)]')
+                       or BAIL_OUT "FETCH $@";
+is($r2->{2}->{'BODY[HEADER.FIELDS (MESSAGE-ID)]'},
+       'Message-ID: <20200418222508.GA13918@dcvr>'."\r\n\r\n",
+       'BODY.PEEK[HEADER.FIELDS ...] drops .PEEK');
+
 {
        my @new_list = $mic->list;
        # tag differs in [-1]