X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F02git_Repository.t;h=5d0b2e2913fe43629bf477c7403b8673f3cdeae4;hb=b97080613d55027e3d01f09df4f92b7c74455d9a;hp=176651d738c9f3079fd944188fc9408139ff976f;hpb=140c970f902ac49e196a2638c016bcf60c704a23;p=catagits%2FGitalist.git

diff --git a/t/02git_Repository.t b/t/02git_Repository.t
index 176651d..5d0b2e2 100644
--- a/t/02git_Repository.t
+++ b/t/02git_Repository.t
@@ -1,6 +1,13 @@
+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::Exception;
 use Test::utf8;
@@ -8,19 +15,16 @@ use Encode qw/decode_utf8/;
 use Data::Dumper;
 
 BEGIN {
-    # Don't die on win32.
-    eval {
-      # Mocking to allow testing regardless of the user's locale
-      require I18N::Langinfo;
-      no warnings 'redefine';
-      *I18N::Langinfo::langinfo = sub($) {
+    # Mocking to allow testing regardless of the user's locale
+    require I18N::Langinfo;
+    no warnings 'redefine';
+    *I18N::Langinfo::langinfo = sub($) {
         return "UTF-8" if $_[0] == I18N::Langinfo::CODESET();
-      };
-      *CORE::GLOBAL::getpwuid = sub {
+    };
+    *CORE::GLOBAL::getpwuid = sub {
         wantarray
-	  ? ("test", "x", "1000", "1000", "", "", "T\x{c3}\x{a9}st", "/home/test", "/bin/bash")
-          : "test";
-      };
+            ? ("test", "x", "1000", "1000", "", "", "T\x{c3}\x{a9}st", "/home/test", "/bin/bash")
+            : "test";
     };
 }
 
@@ -54,22 +58,19 @@ is($proj->head_hash, '36c6c6708b8360d7023e8a1649c45bcf9b3bd818', 'head_hash for
 is($proj->head_hash('refs/heads/master'), '36c6c6708b8360d7023e8a1649c45bcf9b3bd818', 'head_hash for refs/heads/master is correct');
 is($proj->head_hash('rafs/head/mister'), undef, 'head_hash for rafs/head/mister is undef');
 
-is(scalar $proj->list_tree, 2, 'expected number of entries in tree');
-isa_ok(($proj->list_tree)[1], 'Gitalist::Git::Object');
-
 # Return an ::Object from a sha1
 my $obj1 = $proj->get_object('729a7c3f6ba5453b42d16a43692205f67fb23bc1');
 isa_ok($obj1, 'Gitalist::Git::Object::Tree');
 
-my $hbp_sha1 = $proj->hash_by_path('36c6c6708b8360d7023e8a1649c45bcf9b3bd818', 'dir1/file2');
-my $obj2 = $proj->get_object($hbp_sha1);
-isa_ok($obj2, 'Gitalist::Git::Object::Blob');
-is($obj2->type, 'blob', 'hash_by_path obj is a file');
-is($obj2->content, "foo\n", 'hash_by_path obj is a file');
-
 my $obj3 = $proj->get_object($proj->head_hash);
 isa_ok($obj3, 'Gitalist::Git::Object::Commit');
 
+my $obj2 = $obj3->sha_by_path('dir1/file2');
+isa_ok($obj2, 'Gitalist::Git::Object::Blob');
+is($obj2->type, 'blob', 'sha_by_path obj is a blob');
+is($obj2->content, "foo\n", 'sha_by_path obj content is correct');
+
+
 like($proj->head_hash('HEAD'), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
 
 {
@@ -78,10 +79,7 @@ like($proj->head_hash('HEAD'), qr/^([0-9a-fA-F]{40})$/, 'head_hash');
     isa_ok($tree[0], 'Gitalist::Git::Object', 'tree element 0');
 }
 
-# Be win32 friendly. Poor poor win32.
-if($^O ne 'MSWin32') {
-  my $owner = $proj->owner;
-  is_flagged_utf8($owner, "Owner name is flagged as utf8");
-  is_sane_utf8($owner, "Owner name is not double-encoded");
-  is($owner, decode_utf8("T\x{c3}\x{a9}st"),  "Owner name is correct");
-}
+my $owner = $proj->owner;
+is_flagged_utf8($owner, "Owner name is flagged as utf8");
+is_sane_utf8($owner, "Owner name is not double-encoded");
+is($owner, decode_utf8("T\x{c3}\x{a9}st"),  "Owner name is correct");