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

diff --git a/t/02git_object.t b/t/02git_object.t
index bc1a544..3cdc2cc 100644
--- a/t/02git_object.t
+++ b/t/02git_object.t
@@ -1,43 +1,48 @@
 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"),
 );
 
-BEGIN { use_ok 'Gitalist::Git::Object' }
+BEGIN {
+    use_ok 'Gitalist::Git::Object::Tree';
+    use_ok 'Gitalist::Git::Object::Blob';
+    use_ok 'Gitalist::Git::Object::Commit';
+    use_ok 'Gitalist::Git::Object::Tag';
+    }
 
-my $object = Gitalist::Git::Object->new(
-    project => $project,
+my $object = Gitalist::Git::Object::Tree->new(
+    repository => $repository,
     sha1 => '729a7c3f6ba5453b42d16a43692205f67fb23bc1',
     type => 'tree',
     file => 'dir1',
     mode => 16384,
 );
-isa_ok($object, 'Gitalist::Git::Object');
+isa_ok($object, 'Gitalist::Git::Object::Tree', 'tree object');
 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->new(
-    project => $project,
+my $obj2 = Gitalist::Git::Object::Blob->new(
+    repository => $repository,
     sha1 => '5716ca5987cbf97d6bb54920bea6adde242d87e6',
 );
-isa_ok($obj2, 'Gitalist::Git::Object');
+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 {
@@ -47,11 +52,11 @@ dies_ok {
     print $obj2->comment;
 } 'comment is an empty string';
 
-my $commit_obj = Gitalist::Git::Object->new(
-    project => $project,
+my $commit_obj = Gitalist::Git::Object::Commit->new(
+    repository => $repository,
     sha1 => '3f7567c7bdf7e7ebf410926493b92d398333116e',
 );
-isa_ok($commit_obj, 'Gitalist::Git::Object', "commit object type correct");
+isa_ok($commit_obj, 'Gitalist::Git::Object::Commit', "commit object");
 my ($tree, $patch) = $commit_obj->diff(
     parent => undef,
     file => undef,
@@ -72,3 +77,31 @@ is($patch->{diff}, '--- a/file1
 +bar
 ', 'patch->{diff} is correct');
 is($patch->{dst}, '5716ca5987cbf97d6bb54920bea6adde242d87e6', 'patch->{dst} is correct');
+
+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
+
+---
+ file1 |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/file1 b/file1
+index 257cc56..5716ca5 100644
+--- a/file1
++++ b/file1
+@@ -1 +1 @@
+-foo
++bar
+--') == 0, '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;
+