searchidx: make v1 indexing closer to v2

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

diff --git a/t/search.t b/t/search.t
index d4ca28c794f8255b648100355c40726c3e3e88c5..a75d944c32e9a1bf7a1e448072ba88d9772cc2ed 100644 (file)
--- a/t/search.t
+++ b/t/search.t
@@ -21,8 +21,8 @@ ok($@, "exception raised on non-existent DB");
 
 my $rw = PublicInbox::SearchIdx->new($ibx, 1);
 $ibx->with_umask(sub {
-       $rw->_xdb_acquire;
-       $rw->_xdb_release;
+       $rw->idx_acquire;
+       $rw->idx_release;
 });
 $rw = undef;
 my $ro = PublicInbox::Search->new($ibx);
@@ -59,6 +59,14 @@ sub oct_is ($$$) {
        }
 }
 
+{
+       my $crlf_adjust = \&PublicInbox::SearchIdx::crlf_adjust;
+       is($crlf_adjust->("hi\r\nworld\r\n"), 0, 'no adjustment needed');
+       is($crlf_adjust->("hi\nworld\n"), 2, 'LF-only counts two CR');
+       is($crlf_adjust->("hi\r\nworld\n"), 1, 'CRLF/LF-mix 1 counts 1 CR');
+       is($crlf_adjust->("hi\nworld\r\n"), 1, 'CRLF/LF-mix 2 counts 1 CR');
+}
+
 $ibx->with_umask(sub {
        my $root = PublicInbox::Eml->new(<<'EOF');
 Date: Fri, 02 Oct 1993 00:00:00 +0000
@@ -389,7 +397,9 @@ $ibx->with_umask(sub {
 
 $ibx->with_umask(sub {
        my $amsg = eml_load 't/search-amsg.eml';
-       ok($rw->add_message($amsg), 'added attachment');
+       my $oid = ('0'x40);
+       my $smsg = bless { blob => $oid }, 'PublicInbox::Smsg';
+       ok($rw->add_message($amsg, $smsg), 'added attachment');
        $rw_commit->();
        $ro->reopen;
        my $n = $ro->query('n:attached_fart.txt');
@@ -410,7 +420,7 @@ $ibx->with_umask(sub {
                $art = $ro->{over_ro}->next_by_mid($mid, \$id, \$prev);
                ok($art, 'article exists in OVER DB');
        }
-       $rw->unindex_blob($amsg);
+       $rw->unindex_eml($oid, $amsg);
        $rw->commit_txn_lazy;
        SKIP: {
                skip('$art not defined', 1) unless defined $art;