X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_object.t;h=3cdc2cc5f170d6d76f1a871e3f03ebfabf35f137;hb=a52e795a489956578e8b8fcd2163b4eb6faa63c8;hp=a3396fc9d7e8617da55dbfecb68f2dff1e4d6473;hpb=f707d2644b79c7a5563b130e89b160e1aad4f4bb;p=catagits%2FGitalist.git

diff --git a/t/02git_object.t b/t/02git_object.t
index a3396fc..3cdc2cc 100644
--- a/t/02git_object.t
+++ b/t/02git_object.t
@@ -1,13 +1,13 @@
 use strict;
 use warnings;
 use FindBin qw/$Bin/;
-use Test::More qw/no_plan/;
+use Test::More;
 use Test::Exception;
 use Data::Dumper;
 
 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"),
 );
 
@@ -19,7 +19,7 @@ BEGIN {
     }
 
 my $object = Gitalist::Git::Object::Tree->new(
-    project => $project,
+    repository => $repository,
     sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1',
     type => 'tree',
     file => 'dir1',
@@ -30,19 +30,19 @@ 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");
 
 # 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 {
@@ -53,7 +53,7 @@ dies_ok {
 } 'comment is an empty string';
 
 my $commit_obj = Gitalist::Git::Object::Commit->new(
-    project => $project,
+    repository => $repository,
     sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e',
 );
 isa_ok($commit_obj, 'Gitalist::Git::Object::Commit', "commit object");
@@ -78,7 +78,8 @@ 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
+ok(index(do { local $/; my $fh = $commit_obj->get_patch; <$fh> },
+'From 3f7567c7bdf7e7ebf410926493b92d398333116e Mon Sep 17 00:00:00 2001
 From: Florian Ragwitz <rafl@debian.org>
 Date: Tue, 6 Mar 2007 20:39:45 +0100
 Subject: [PATCH] bar
@@ -94,9 +95,13 @@ index 257cc56..5716ca5 100644
 @@ -1 +1 @@
 -foo
 +bar
--- 
-1.6.4.2
+--') == 0, 'commit_obj->get_patch can return a patch');
 
-', 'commit_obj->get_patch can return a patch');
+# Note - 2 patches = 3 parts due to where we split.
+{
+    my @bits = split /Subject: \[PATC/, do { local $/; my $fh = $commit_obj->get_patch(undef, 3); <$fh> };
+    is(scalar(@bits), 3,
+        'commit_obj->get_patch can return a patchset');
+}
+done_testing;
 
-like($commit_obj->get_patch(undef, 3), qr!PATCH 2/2!, 'commit_obj->get_patch can return a patchset');