X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fthread-cycle.t;h=1e5dfb51ab47a2865f9ab7835eda154291a5e65e;hb=bedc22c355d570ed07ff6600717a97226f791ff5;hp=0e1ecfe261507efa5e1697d999e393c3ff050176;hpb=fdd089ee175bf458d2674893e19b4af2edd82b4e;p=public-inbox.git
diff --git a/t/thread-cycle.t b/t/thread-cycle.t
index 0e1ecfe2..1e5dfb51 100644
--- a/t/thread-cycle.t
+++ b/t/thread-cycle.t
@@ -1,29 +1,36 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2021 all contributors
# License: AGPL-3.0+
-use strict;
-use warnings;
-use Test::More;
-use_ok('PublicInbox::SearchMsg');
+use strict; use v5.10.1; use PublicInbox::TestCommon;
use_ok('PublicInbox::SearchThread');
-use Email::Simple;
my $mt = eval {
require Mail::Thread;
no warnings 'once';
$Mail::Thread::nosubject = 1;
$Mail::Thread::noprune = 1;
+ require Email::Simple; # required by Mail::Thread (via Email::Abstract)
};
-my @check;
-my @msgs = map {
- my $msg = $_;
- $msg->{references} =~ s/\s+/ /sg if $msg->{references};
- my $simple = Email::Simple->create(header => [
- 'Message-Id' => "<$msg->{mid}>",
- 'References' => $msg->{references},
- ]);
- push @check, $simple;
- bless $msg, 'PublicInbox::SearchMsg'
-} (
+my $make_objs = sub {
+ my @simples;
+ my $n = 0;
+ my @msgs = map {
+ my $msg = $_;
+ $msg->{ds} ||= ++$n;
+ $msg->{references} =~ s/\s+/ /sg if $msg->{references};
+ $msg->{blob} = '0'x40; # any dummy value will do, here
+ if ($mt) {
+ my $simple = Email::Simple->create(header => [
+ 'Message-ID' => "<$msg->{mid}>",
+ 'References' => $msg->{references},
+ ]);
+ push @simples, $simple;
+ }
+ bless $msg, 'PublicInbox::Smsg'
+ } @_;
+ (\@simples, \@msgs);
+};
+
+my ($simples, $smsgs) = $make_objs->(
# data from t/testbox-6 in Mail::Thread 2.55:
{ mid => '20021124145312.GA1759@nlin.net' },
{ mid => 'slrnau448m.7l4.markj+0111@cloaked.freeserve.co.uk',
@@ -51,47 +58,93 @@ my @msgs = map {
}
);
-my $st = thread_to_s(\@msgs);
+my $st = thread_to_s($smsgs);
SKIP: {
skip 'Mail::Thread missing', 1 unless $mt;
- $mt = Mail::Thread->new(@check);
- $mt->thread;
- $mt->order(sub { sort { $a->messageid cmp $b->messageid } @_ });
- my $check = '';
-
- my @q = map { (0, $_) } $mt->rootset;
- while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- $check .= (" "x$level) . $node->messageid . "\n";
- unshift @q, $level + 1, $node->child, $level, $node->next;
- }
- is($check, $st, 'Mail::Thread output matches');
+ check_mt($st, $simples, 'Mail::Thread output matches');
}
-@msgs = map { bless $_, 'PublicInbox::SearchMsg' } (
- { mid => 'a@b' },
- { mid => 'b@c', references => ' ' },
- { mid => 'd@e', references => '' },
+my @backwards = (
+ { mid => 1, references => '<2> <3> <4>' },
+ { mid => 4, references => '<2> <3>' },
+ { mid => 5, references => '<6> <7> <8> <3> <2>' },
+ { mid => 9, references => '<6> <3>' },
+ { mid => 10, references => '<8> <7> <6>' },
+ { mid => 2, references => '<6> <7> <8> <3>' },
+ { mid => 3, references => '<6> <7> <8>' },
+ { mid => 6, references => '<8> <7>' },
+ { mid => 7, references => '<8>' },
+ { mid => 8, references => '' }
);
-is(thread_to_s(\@msgs), "a\@b\n b\@c\nd\@e\n", 'ok with self-references');
+($simples, $smsgs) = $make_objs->(@backwards);
+my $backward = thread_to_s($smsgs);
+SKIP: {
+ skip 'Mail::Thread missing', 1 unless $mt;
+ check_mt($backward, $simples, 'matches Mail::Thread backwards');
+}
+($simples, $smsgs) = $make_objs->(reverse @backwards);
+my $forward = thread_to_s($smsgs);
+unless ('Mail::Thread sorts by Date') {
+ SKIP: {
+ skip 'Mail::Thread missing', 1 unless $mt;
+ check_mt($forward, $simples, 'matches Mail::Thread forwards');
+ }
+}
+if ('sorting by Date') {
+ is("\n".$backward, "\n".$forward, 'forward and backward matches');
+}
+
+SKIP: {
+ require_mods 'Devel::Cycle', 1;
+ Devel::Cycle->import('find_cycle');
+ my @dup = (
+ { mid => 5, references => '<6>' },
+ { mid => 5, references => '<6> <1>' },
+ );
+ open my $fh, '+>', \(my $out = '') or xbail "open: $!";
+ (undef, $smsgs) = $make_objs->(@dup);
+ eval 'package EmptyInbox; sub smsg_by_mid { undef }';
+ my $ctx = { ibx => bless {}, 'EmptyInbox' };
+ my $rootset = PublicInbox::SearchThread::thread($smsgs, sub {
+ @{$_[0]} = sort { $a->{mid} cmp $b->{mid} } @{$_[0]} }, $ctx);
+ my $oldout = select $fh;
+ find_cycle($rootset);
+ select $oldout;
+ is($out, '', 'nothing from find_cycle');
+} # Devel::Cycle check
-done_testing();
+done_testing;
sub thread_to_s {
- my $th = PublicInbox::SearchThread->new(shift);
- $th->thread;
- $th->order(sub { [ sort { $a->{id} cmp $b->{id} } @{$_[0]} ] });
+ my ($msgs) = @_;
+ my $rootset = PublicInbox::SearchThread::thread($msgs, sub {
+ @{$_[0]} = sort { $a->{mid} cmp $b->{mid} } @{$_[0]} });
my $st = '';
- my @q = map { (0, $_) } @{$th->{rootset}};
+ my @q = map { (0, $_) } @$rootset;
while (@q) {
my $level = shift @q;
my $node = shift @q or next;
- $st .= (" "x$level). "$node->{id}\n";
+ $st .= (" "x$level). "$node->{mid}\n";
my $cl = $level + 1;
unshift @q, map { ($cl, $_) } @{$node->{children}};
}
$st;
}
+
+sub check_mt {
+ my ($st, $simples, $msg) = @_;
+ my $mt = Mail::Thread->new(@$simples);
+ $mt->thread;
+ $mt->order(sub { sort { $a->messageid cmp $b->messageid } @_ });
+ my $check = '';
+ my @q = map { (0, $_) } $mt->rootset;
+ while (@q) {
+ my $level = shift @q;
+ my $node = shift @q or next;
+ $check .= (" "x$level) . $node->messageid . "\n";
+ unshift @q, $level + 1, $node->child, $level, $node->next;
+ }
+ is("\n".$check, "\n".$st, $msg);
+}