X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fimap.t;h=e6efe04f7702c0c6a2b92f23ec8da32fbd9e77c6;hb=refs%2Fheads%2Fmaster;hp=2401237c8a05b0f91f7d69037c04e519290ad1ee;hpb=a7d1920f149bd1ee99297883ff0781f362b66680;p=public-inbox.git

diff --git a/t/imap.t b/t/imap.t
index 2401237c..e6efe04f 100644
--- a/t/imap.t
+++ b/t/imap.t
@@ -1,29 +1,14 @@
 #!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>
 # unit tests (no network) for IMAP, see t/imapd.t for end-to-end tests
 use strict;
-use Test::More;
-use PublicInbox::IMAP;
-use PublicInbox::IMAPD;
+use v5.10.1;
 use PublicInbox::TestCommon;
-require_mods(qw(DBD::SQLite));
 require_git 2.6;
-use POSIX qw(strftime);
-
-{
-	my $parse_date = \&PublicInbox::IMAP::parse_date;
-	is(strftime('%Y-%m-%d', gmtime($parse_date->('02-Oct-1993'))),
-		'1993-10-02', 'parse_date works');
-	is(strftime('%Y-%m-%d', gmtime($parse_date->('2-Oct-1993'))),
-		'1993-10-02', 'parse_date works w/o leading zero');
-
-	is($parse_date->('2-10-1993'), undef, 'bad month');
-
-	# from what I can tell, RFC 3501 says nothing about date-month
-	# case-insensitivity, so be case-sensitive for now
-	is($parse_date->('02-oct-1993'), undef, 'case-sensitive month');
-}
+require_mods(qw(-imapd));
+require_ok 'PublicInbox::IMAP';
+require_ok 'PublicInbox::IMAPD';
 
 my ($tmpdir, $for_destroy) = tmpdir();
 my $cfgfile = "$tmpdir/config";
@@ -70,21 +55,26 @@ EOF
 {
 	my $partial_prepare = \&PublicInbox::IMAP::partial_prepare;
 	my $x = {};
-	my $r = $partial_prepare->($x, [], my $p = 'BODY[9]');
+	my $n = 0;
+	my $r = $partial_prepare->(\$n, $x, [], my $p = 'BODY[9]');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[9]<5>');
+	$r = $partial_prepare->(\$n, $x, [], $p = 'BODY[9]<5>');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[9]<5.1>');
+	$r = $partial_prepare->(\$n, $x, [], $p = 'BODY[9]<5.1>');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[1.1]');
+	$r = $partial_prepare->(\$n, $x, [], $p = 'BODY[1.1]');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[HEADER.FIELDS (DATE FROM)]');
+	$r = $partial_prepare->(\$n, $x, [],
+				$p = 'BODY[HEADER.FIELDS (DATE FROM)]');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[HEADER.FIELDS.NOT (TO)]');
+	$r = $partial_prepare->(\$n, $x, [],
+				$p = 'BODY[HEADER.FIELDS.NOT (TO)]');
 	ok($r, $p);
-	$r = $partial_prepare->($x, [], $p = 'BODY[HEDDER.FIELDS.NOT (TO)]');
+	$r = $partial_prepare->(\$n, $x, [],
+				$p = 'BODY[HEDDER.FIELDS.NOT (TO)]');
 	ok(!$r, "rejected misspelling $p");
-	$r = $partial_prepare->($x, [], $p = 'BODY[1.1.HEADER.FIELDS (TO)]');
+	$r = $partial_prepare->(\$n, $x, [],
+				$p = 'BODY[1.1.HEADER.FIELDS (TO)]');
 	ok($r, $p);
 	my $partial_body = \&PublicInbox::IMAP::partial_body;
 	my $partial_hdr_get = \&PublicInbox::IMAP::partial_hdr_get;
@@ -111,16 +101,61 @@ EOF
 	my $fetch_compile = \&PublicInbox::IMAP::fetch_compile;
 	my ($cb, $ops, $partial) = $fetch_compile->(['BODY[]']);
 	is($partial, undef, 'no partial fetch data');
-	is_deeply($ops,
-		[ 'BODY[]', \&PublicInbox::IMAP::emit_rfc822 ],
-		'proper key and op compiled for BODY[]');
+	is_deeply($ops, [
+		undef, \&PublicInbox::IMAP::op_crlf_bref,
+		'BODY[]', \&PublicInbox::IMAP::emit_rfc822
+	], 'proper key and op compiled for BODY[]');
 
 	($cb, $ops, $partial) = $fetch_compile->(['BODY', 'BODY[]']);
 	is_deeply($ops, [
+		undef, \&PublicInbox::IMAP::op_crlf_bref,
 		'BODY[]', \&PublicInbox::IMAP::emit_rfc822,
 		undef, \&PublicInbox::IMAP::op_eml_new,
 		'BODY', \&PublicInbox::IMAP::emit_body,
 	], 'placed op_eml_new before emit_body');
 }
 
+# UID <=> MSN mapping
+
+sub uo2m_str_new ($) {
+	no warnings 'uninitialized'; # uom2m_ary_new may have may have undef
+	pack('S*', @{$_[0]->uo2m_ary_new}); # 2 bytes per-MSN
+}
+
+{
+	my $ibx = bless { uid_range => [ 1, 2, 4 ] }, 'Uo2mTestInbox';
+	my $imap = bless { uid_base => 0, ibx => $ibx }, 'PublicInbox::IMAP';
+	my $uo2m = $imap->uo2m_ary_new;
+	is_deeply($uo2m, [ 1, 2, undef, 3 ], 'uo2m ary');
+	$uo2m = uo2m_str_new($imap);
+	is_deeply([ unpack('S*', $uo2m) ], [ 1, 2, 0, 3 ], 'uo2m str');
+
+	$ibx->{uid_range} = [ 1, 2, 4, 5, 6 ];
+	for ([ 1, 2, undef, 3 ], $uo2m) {
+		$imap->{uo2m} = $_;
+		is($imap->uid2msn(1), 1, 'uid2msn');
+		is($imap->uid2msn(4), 3, 'uid2msn');
+		is($imap->uo2m_last_uid, 4, 'uo2m_last_uid');
+		$imap->uo2m_extend(6);
+		is($imap->uid2msn(5), 4, 'uid2msn 5 => 4');
+		is($imap->uid2msn(6), 5, 'uid2msn 6 => 5');
+		is($imap->uo2m_last_uid, 6, 'uo2m_last_uid');
+
+		my $msn2uid = $imap->msn2uid;
+		my $range = '1,4:5';
+		$imap->can('msn_to_uid_range')->($msn2uid, $range);
+		is($range, '1,5:6', 'range converted');
+	}
+}
+
 done_testing;
+
+package Uo2mTestInbox;
+use strict;
+require PublicInbox::DummyInbox;
+our @ISA = qw(PublicInbox::DummyInbox);
+sub over { shift }
+sub uid_range {
+	my ($self, $beg, $end, undef) = @_;
+	[ grep { $_ >= $beg && $_ <= $end } @{$self->{uid_range}} ];
+}