lazy load Xapian and make it optional for v2

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

diff --git a/t/nntp.t b/t/nntp.t
index 5513c7bcd58a5be43e02876f374157d2707ad0b4..7ab801c1c2bdcb4f8ba2bd6985c56f91d6ca387b 100644 (file)
--- a/t/nntp.t
+++ b/t/nntp.t
@@ -1,21 +1,20 @@
-# Copyright (C) 2015 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Data::Dumper;
 
-foreach my $mod (qw(DBD::SQLite Search::Xapian Danga::Socket)) {
+foreach my $mod (qw(DBD::SQLite Data::Dumper)) {
        eval "require $mod";
        plan skip_all => "$mod missing for nntp.t" if $@;
 }
 
 use_ok 'PublicInbox::NNTP';
-use_ok 'PublicInbox::NewsGroup';
+use_ok 'PublicInbox::Inbox';
 
 {
        sub quote_str {
-               my (undef, $s) = split(/ = /, Dumper($_[0]), 2);
+               my (undef, $s) = split(/ = /, Data::Dumper::Dumper($_[0]), 2);
                $s =~ s/;\n//;
                $s;
        }
@@ -99,15 +98,23 @@ use_ok 'PublicInbox::NewsGroup';
 { # test setting NNTP headers in HEAD and ARTICLE requests
        require Email::MIME;
        my $u = 'https://example.com/a/';
-       my $ng = PublicInbox::NewsGroup->new('test', 'test.git',
-                               'a@example.com', '//example.com/a');
-       is($ng->{url}, $u, 'URL expanded');
+       my $ng = PublicInbox::Inbox->new({ name => 'test',
+                                       mainrepo => 'test.git',
+                                       address => 'a@example.com',
+                                       -primary_address => 'a@example.com',
+                                       newsgroup => 'test',
+                                       domain => 'example.com',
+                                       url => '//example.com/a'});
+       is($ng->base_url, $u, 'URL expanded');
        my $mid = 'a@b';
        my $mime = Email::MIME->new("Message-ID: <$mid>\r\n\r\n");
-       PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 1, $mid);
+       my $hdr = $mime->header_obj;
+       my $mock_self = { nntpd => { grouplist => [], 
+                                    servername => 'example.com' } };
+       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 1, $mid);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
-       is_deeply([ $mime->header('Archived-At') ], [ "<${u}a%40b/>" ],
+       is_deeply([ $mime->header('Archived-At') ], [ "<${u}a\@b/>" ],
                'Archived-At: set');
        is_deeply([ $mime->header('List-Archive') ], [ "<$u>" ],
                'List-Archive: set');
@@ -118,12 +125,12 @@ use_ok 'PublicInbox::NewsGroup';
        is_deeply([ $mime->header('Xref') ], [ 'example.com test:1' ],
                'Xref: set');
 
-       $ng->{url} = 'http://mirror.example.com/m/';
-       PublicInbox::NNTP::set_nntp_headers($mime->header_obj, $ng, 2, $mid);
+       $ng->{-base_url} = 'http://mirror.example.com/m/';
+       PublicInbox::NNTP::set_nntp_headers($mock_self, $hdr, $ng, 2, $mid);
        is_deeply([ $mime->header('Message-ID') ], [ "<$mid>" ],
                'Message-ID unchanged');
        is_deeply([ $mime->header('Archived-At') ],
-               [ "<${u}a%40b/>", '<http://mirror.example.com/m/a%40b/>' ],
+               [ "<${u}a\@b/>", '<http://mirror.example.com/m/a@b/>' ],
                'Archived-At: appended');
        is_deeply([ $mime->header('Xref') ], [ 'example.com test:2' ],
                'Old Xref: clobbered');