X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_object.t;h=72b3755111fdc3c5e32eb0225e9d9fcda59953bf;hb=460b079a490cc638ecdd666c63d8edc09b7a8bcc;hp=a3396fc9d7e8617da55dbfecb68f2dff1e4d6473;hpb=f707d2644b79c7a5563b130e89b160e1aad4f4bb;p=catagits%2FGitalist.git diff --git a/t/02git_object.t b/t/02git_object.t index a3396fc..72b3755 100644 --- a/t/02git_object.t +++ b/t/02git_object.t @@ -1,13 +1,21 @@ +use FindBin qw/$Bin/; +BEGIN { + my $env = "$FindBin::Bin/../script/env"; + if (-r $env) { + do $env or die $@; + } +} + use strict; use warnings; -use FindBin qw/$Bin/; -use Test::More qw/no_plan/; +use Test::More; use Test::Exception; use Data::Dumper; +use Test::Deep; use Path::Class; -use Gitalist::Git::Project; -my $project = Gitalist::Git::Project->new( +use Gitalist::Git::Repository; +my $repository = Gitalist::Git::Repository->new( dir("$Bin/lib/repositories/repo1"), ); @@ -16,10 +24,10 @@ BEGIN { use_ok 'Gitalist::Git::Object::Blob'; use_ok 'Gitalist::Git::Object::Commit'; use_ok 'Gitalist::Git::Object::Tag'; - } +} my $object = Gitalist::Git::Object::Tree->new( - project => $project, + repository => $repository, sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1', type => 'tree', file => 'dir1', @@ -30,19 +38,41 @@ is($object->sha1,'729a7c3f6ba5453b42d16a43692205f67fb23bc1', 'sha1 is correct'); is($object->type, 'tree', 'type is correct'); is($object->file, 'dir1', 'file is correct'); is($object->mode, 16384, 'mode is correct'); -is($object->modestr, 'd---------', "modestr is correct" ); +is($object->modestr, 'drwxr-xr-x', "modestr is correct" ); is($object->size, 33, "size is correct"); +is($object,'729a7c3f6ba5453b42d16a43692205f67fb23bc1', 'stringifies correctly'); + +cmp_deeply $object->pack, { + __CLASS__ + => 'Gitalist::Git::Object::Tree', + file => 'dir1', + mode => 16384, + modestr + => 'drwxr-xr-x', + repository + => { + __CLASS__ => 'Gitalist::Git::Repository', + description => 'some test repository', + is_bare => 1, + last_change => '2011-06-05T23:00:44Z', + name => 'repo1', + owner => code(\&is_system_account_name), + }, + sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1', + size => 33, + type => 'tree' +}, 'Serialized tree correctly'; # Create object from sha1. my $obj2 = Gitalist::Git::Object::Blob->new( - project => $project, + repository => $repository, sha1 => '5716ca5987cbf97d6bb54920bea6adde242d87e6', ); isa_ok($obj2, 'Gitalist::Git::Object::Blob', 'blob object'); is($obj2->sha1,'5716ca5987cbf97d6bb54920bea6adde242d87e6', 'sha1 is correct'); is($obj2->type, 'blob', 'type is correct'); is($obj2->mode, 0, 'mode is correct'); -is($obj2->modestr, '?---------', "modestr is correct" ); +is($obj2->modestr, '----------', "modestr is correct" ); is($obj2->content, "bar\n", 'obj2 contents is correct'); is($obj2->size, 4, "size is correct"); dies_ok { @@ -52,14 +82,73 @@ dies_ok { print $obj2->comment; } 'comment is an empty string'; +cmp_deeply $obj2->pack, { + __CLASS__ + => 'Gitalist::Git::Object::Blob', + mode => 0, + modestr + => '----------', + repository + => { + __CLASS__ => 'Gitalist::Git::Repository', + description => 'some test repository', + is_bare => 1, + last_change => '2011-06-05T23:00:44Z', + name => 'repo1', + owner => code(\&is_system_account_name), + }, + sha1 => '5716ca5987cbf97d6bb54920bea6adde242d87e6', + size => 4, + type => 'blob' +}, 'Serialized blob correctly'; + my $commit_obj = Gitalist::Git::Object::Commit->new( - project => $project, + repository => $repository, sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e', ); isa_ok($commit_obj, 'Gitalist::Git::Object::Commit', "commit object"); +isa_ok($commit_obj->tree->[0], 'Gitalist::Git::Object::Tree'); + +cmp_deeply $commit_obj->pack, { + __CLASS__ + => 'Gitalist::Git::Object::Commit', + mode => 0, + modestr + => '----------', + repository + => { + __CLASS__ => 'Gitalist::Git::Repository', + description => 'some test repository', + is_bare => 1, + last_change => '2011-06-05T23:00:44Z', + name => 'repo1', + owner => code(\&is_system_account_name), + }, + sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e', + size => 218, + tree => [ { + __CLASS__ + => 'Gitalist::Git::Object::Tree', + mode => 0, + modestr + => '----------', + repository + => { + __CLASS__ => 'Gitalist::Git::Repository', + description => 'some test repository', + is_bare => 1, + last_change => '2011-06-05T23:00:44Z', + name => 'repo1', + owner => code(\&is_system_account_name), + }, + sha1 => '9062594aebb5df0de7fb92413f17a9eced196c22', + size => 33, + type => 'tree' + } ], + type => 'commit' +}, 'Serialized commit correctly'; + my ($tree, $patch) = $commit_obj->diff( - parent => undef, - file => undef, patch => 1, ); $patch = $patch->[0]; @@ -78,14 +167,16 @@ is($patch->{diff}, '--- a/file1 ', 'patch->{diff} is correct'); is($patch->{dst}, '5716ca5987cbf97d6bb54920bea6adde242d87e6', 'patch->{dst} is correct'); -is($commit_obj->get_patch, 'From 3f7567c7bdf7e7ebf410926493b92d398333116e Mon Sep 17 00:00:00 2001 -From: Florian Ragwitz +{ + my $contents = do { local $/; my $fh = $commit_obj->get_patch; <$fh> }; +like $contents, qr{^\QFrom 3f7567c7bdf7e7ebf410926493b92d398333116e Mon Sep 17 00:00:00 2001 +From: Florian Ragwitz <\Erafl[@]debian\Q.org> Date: Tue, 6 Mar 2007 20:39:45 +0100 Subject: [PATCH] bar --- - file1 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + file1 |\E\s+2\Q +- + 1 \Efiles?\Q changed, 1 \Einsertions?\Q(+), 1 \Edeletions?\Q(-) diff --git a/file1 b/file1 index 257cc56..5716ca5 100644 @@ -94,9 +185,34 @@ index 257cc56..5716ca5 100644 @@ -1 +1 @@ -foo +bar --- -1.6.4.2 +--}, 'commit_obj->get_patch can return a patch'; +} + +# Note - 2 patches = 3 parts due to where we split. +{ + my $contents = do { local $/; my $fh = $commit_obj->get_patch(undef, 3); <$fh> }; + my @bits = split /Subject: \[PATC/, $contents; + is(scalar(@bits), 3, + 'commit_obj->get_patch can return a patchset') + or warn("Contents was $contents"); +} + +my $blame_this = Gitalist::Git::Object::Commit->new( + repository => $repository, + sha1 => 'd6ddf8b26be63066e01d96a0922c87cd8d6e2270', +); + +{ + local $SIG{ALRM} = sub { die "Regressions suck!" }; + alarm 1; + eval { $blame_this->blame('empty-for-a-reason', $blame_this->sha1) }; + is $@, '', "Silly infinite loop didn't manifest for an empty file."; +} -', 'commit_obj->get_patch can return a patch'); +done_testing; -like($commit_obj->get_patch(undef, 3), qr!PATCH 2/2!, 'commit_obj->get_patch can return a patchset'); +sub is_system_account_name { + my $name = shift; + return 0 if !$name; + return 1; +}