X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fmodel_Git.t;h=d6fb5e28e3d447c663c60bd5ce8c3c24872679ea;hb=24ae21b061d0136538f9f30dadb865815a09d4f9;hp=fcaf04e22329ad5fad40402e9d28ab73d84f554f;hpb=1e805b5e997558375bdb2380f467b8ddc8b807b0;p=catagits%2FGitalist.git

diff --git a/t/model_Git.t b/t/model_Git.t
index fcaf04e..d6fb5e2 100644
--- a/t/model_Git.t
+++ b/t/model_Git.t
@@ -1,13 +1,13 @@
 use strict;
 use warnings;
 use FindBin qw/$Bin/;
-use Test::More qw/no_plan/;
+use Test::More;
 
 BEGIN { use_ok 'Gitalist::Model::Git' }
 
-my $c = bless {}, 'Gitalist';
-my $m = Gitalist::Model::Git->new($c, { repo_dir => "$Bin/lib/repositories" });
-isa_ok($m, 'Gitalist::Model::Git');
+use Git::PurePerl;
+my $m = Git::Repos->new({ repo_dir => "$Bin/lib/repositories" });
+isa_ok($m, 'Git::Repos');
 
 # 'bare.git' is a bare git repository in the repository dir
 use Path::Class;
@@ -23,24 +23,29 @@ my $repoEmpty = Path::Class::Dir->new('t/lib/repositories/empty.git');
 ok( ! $m->is_git_repo( $repoEmpty ), 'is_git_repo is false for empty dir' );
 
 my $projectList = $m->list_projects('t/lib/repositories');
-ok( scalar @{$projectList} == 2, 'list_projects returns an array with the correct number of members' );
+ok( scalar @{$projectList} == 3, 'list_projects returns an array with the correct number of members' );
 is( $projectList->[0]->{name}, 'bare.git', 'list_projects has correct name for "bare.git" repo' );
 #ok( $projectList->[1]->{name} eq 'working/.git', 'list_projects has correct name for "working" repo' );
 
-$m->project('repo1');
 
-like($m->head_hash, qr/^([0-9a-fA-F]{40})$/, 'head_hash');
+# Liberally borrowed from rafl's gitweb
+$m->project('repo1');
+is($m->project, 'repo1', 'model project correct');
+my $pd = $m->project_dir($m->project);
+isa_ok($pd, 'Path::Class::Dir', 'model project_dir');
+is($pd, $m->repo_dir . '/' . $m->project, 'model project_dir correct');
+ok( $m->gpp(Git::PurePerl->new( gitdir => $pd, directory => $pd )), 'model gpp set ok' );
+like($m->head_hash('HEAD'), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
 
 {
     my @tree = $m->list_tree('3bc0634310b9c62222bb0e724c11ffdfb297b4ac');
-
-    is(scalar @tree, 1);
+    is(scalar @tree, 1, "tree array contains one entry.");
     is_deeply($tree[0], {
-            mode => oct 100644,
-            modestr => '-rw-r--r--',
-            type => 'blob',
-            object => '257cc5642cb1a054f08cc83f2d943e56fd3ebe99',
-            file => 'file1'
+        mode => oct 100644,
+        modestr => '-rw-r--r--',
+        type => 'blob',
+        object => '257cc5642cb1a054f08cc83f2d943e56fd3ebe99',
+        file => 'file1'
     });
 
     is($m->get_object_mode_string($tree[0]), '-rw-r--r--');
@@ -50,20 +55,33 @@ is($m->get_object_type('729a7c3f6ba5453b42d16a43692205f67fb23bc1'), 'tree');
 is($m->get_object_type('257cc5642cb1a054f08cc83f2d943e56fd3ebe99'), 'blob');
 is($m->get_object_type('5716ca5987cbf97d6bb54920bea6adde242d87e6'), 'blob');
 
-is($m->cat_file('257cc5642cb1a054f08cc83f2d943e56fd3ebe99'), 'foo');
-is($m->cat_file('5716ca5987cbf97d6bb54920bea6adde242d87e6'), 'bar');
-
-# XXX Write something to test a sane interface, then fix the diff interface.
-is($m->diff(
-  commit => $m->get_object('3bc0634310b9c62222bb0e724c11ffdfb297b4ac'),
-  parent => '3f7567c7bdf7e7ebf410926493b92d398333116e',
-), <<EOD);
-diff --git a/file1 b/file1
-index 257cc56..5716ca5 100644
---- a/file1
+is($m->cat_file('257cc5642cb1a054f08cc83f2d943e56fd3ebe99'), "foo\n");
+is($m->cat_file('5716ca5987cbf97d6bb54920bea6adde242d87e6'), "bar\n");
+
+
+my $commit = $m->get_object('3f7567c7bdf7e7ebf410926493b92d398333116e');
+isa_ok($commit, 'Git::PurePerl::Object::Commit', "commit object type correct");
+my ($tree, $patch) = $m->diff(
+    commit => $commit,
+    parent => '',
+    file => '',
+    patch => 1,
+);
+$patch = $patch->[0];
+is($patch->{head}, 'diff --git a/file1 b/file1', 'patch->{head} is correct');
+is($patch->{a}, 'a/file1', 'patch->{a} is correct');
+is($patch->{b}, 'b/file1', 'patch->{b} is correct');
+is($patch->{file}, 'file1', 'patch->{file} is correct');
+is($patch->{mode}, '100644', 'patch->{mode} is correct');
+is($patch->{src}, '257cc5642cb1a054f08cc83f2d943e56fd3ebe99', 'patch->{src} is correct');
+is($patch->{index}, 'index 257cc5642cb1a054f08cc83f2d943e56fd3ebe99..5716ca5987cbf97d6bb54920bea6adde242d87e6 100644', 'patch->{index} is correct');
+is($patch->{diff}, '--- a/file1
 +++ b/file1
 @@ -1 +1 @@
 -foo
 +bar
-EOD
+', 'patch->{diff} is correct');
+is($patch->{dst}, '5716ca5987cbf97d6bb54920bea6adde242d87e6', 'patch->{dst} is correct');
+
+done_testing;