import: consolidate object info for v2 imports

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

diff --git a/t/import.t b/t/import.t
index ca597720cea45bfe03e005f22c95b64648422aa0..eee47447d3c9fbada1f9addee0f19423551e8cf4 100644 (file)
--- a/t/import.t
+++ b/t/import.t
@@ -28,11 +28,14 @@ my $mime = PublicInbox::MIME->create(
        body => "hello world\n",
 );
 
-$im->{want_object_id} = 1 if 'v2';
+$im->{want_object_info} = 1 if 'v2';
 like($im->add($mime), qr/\A:\d+\z/, 'added one message');
 
 if ('v2') {
-       like($im->{last_object_id}, qr/\A[a-f0-9]{40}\z/, 'got last_object_id');
+       my $info = $im->{last_object};
+       like($info->[0], qr/\A[a-f0-9]{40}\z/, 'got last object_id');
+       is($mime->as_string, ${$info->[2]}, 'string matches');
+       is($info->[1], length(${$info->[2]}), 'length matches');
        my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin));
        my $in = tempfile();
        print $in $mime->as_string or die "write failed: $!";
@@ -44,7 +47,7 @@ if ('v2') {
        is($?, 0, 'hash-object');
        $out->seek(0, SEEK_SET);
        chomp(my $hashed_obj = <$out>);
-       is($hashed_obj, $im->{last_object_id}, "last_object_id matches exp");
+       is($hashed_obj, $info->[0], "last object_id matches exp");
 }
 
 $im->done;