X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fthread-cycle.t;h=f3ae1a359dbff9c04f6e8220627086a2e5415c7d;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=4d60f7e39bcb8df3f99411c921e0c2924ae30157;hpb=30100c46326e2eac275e0af13116636701d2537e;p=public-inbox.git
diff --git a/t/thread-cycle.t b/t/thread-cycle.t
index 4d60f7e3..f3ae1a35 100644
--- a/t/thread-cycle.t
+++ b/t/thread-cycle.t
@@ -1,9 +1,8 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
-use_ok('PublicInbox::SearchMsg');
use_ok('PublicInbox::SearchThread');
use Email::Simple;
my $mt = eval {
@@ -12,18 +11,25 @@ my $mt = eval {
$Mail::Thread::nosubject = 1;
$Mail::Thread::noprune = 1;
};
-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'
-} (
+sub make_objs {
+ my @simples;
+ my $n = 0;
+ my @msgs = map {
+ my $msg = $_;
+ $msg->{ds} ||= ++$n;
+ $msg->{references} =~ s/\s+/ /sg if $msg->{references};
+ my $simple = Email::Simple->create(header => [
+ 'Message-ID' => "<$msg->{mid}>",
+ 'References' => $msg->{references},
+ ]);
+ push @simples, $simple;
+ bless $msg, 'PublicInbox::SearchMsg'
+ } @_;
+ (\@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,36 +57,74 @@ my @msgs = map {
}
);
-my $th = PublicInbox::SearchThread->new(\@msgs);
-$th->thread;
-$th->order(sub { [ sort { $a->{id} cmp $b->{id} } @{$_[0]} ] });
-my $st = '';
-my @q = map { (0, $_) } @{$th->{rootset}};
-while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- $st .= (" "x$level). "$node->{id}\n";
- my $cl = $level + 1;
- unshift @q, map { ($cl, $_) } @{$node->{children}}
+my $st = thread_to_s($smsgs);
+
+SKIP: {
+ skip 'Mail::Thread missing', 1 unless $mt;
+ check_mt($st, $simples, 'Mail::Thread output matches');
}
+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 => '' }
+);
+
+($simples, $smsgs) = make_objs(@backwards);
+my $backward = thread_to_s($smsgs);
SKIP: {
skip 'Mail::Thread missing', 1 unless $mt;
- $mt = Mail::Thread->new(@check);
+ 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');
+}
+
+done_testing();
+
+sub thread_to_s {
+ my ($msgs) = @_;
+ my $rootset = PublicInbox::SearchThread::thread($msgs, sub {
+ [ sort { $a->{id} cmp $b->{id} } @{$_[0]} ] });
+ my $st = '';
+ my @q = map { (0, $_) } @$rootset;
+ while (@q) {
+ my $level = shift @q;
+ my $node = shift @q or next;
+ $st .= (" "x$level). "$node->{id}\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 = '';
-
- @q = map { (0, $_) } $mt->rootset;
+ 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');
+ is("\n".$check, "\n".$st, $msg);
}
-
-done_testing();
-
-1;