Merge pull request #497 from libgit2/arthur/rework-tests

Better Fixture Management

Author: Vicent Marti

rugged.gemspec

@@ -30,5 +30,5 @@ for testing and using the libgit2 library in a language that is awesome.
 desc
   s.add_development_dependency "rake-compiler", ">= 0.9.0"
   s.add_development_dependency "pry"
-  s.add_development_dependency "minitest", "~> 3.0.0"
+  s.add_development_dependency "minitest", "~> 3.0"
 end

test/blame_test.rb

@@ -1,18 +1,12 @@
 require "test_helper"
 require "time"
 
-class BlameTest < Rugged::SandboxedTestCase
+class BlameTest < Rugged::TestCase
   def setup
-    super
-    @repo = sandbox_init("testrepo")
+    @repo = FixtureRepo.from_libgit2("testrepo")
     @blame = Rugged::Blame.new(@repo, "branch_file.txt")
   end
 
-  def teardown
-    @repo.close
-    super
-  end
-
   def test_blame_index
     assert_equal 2, @blame.count
 

test/blob_test.rb

@@ -1,7 +1,9 @@
 require "test_helper"
 
 class BlobTest < Rugged::TestCase
-  include Rugged::RepositoryAccess
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   def test_lookup_raises_error_if_object_type_does_not_match
     assert_raises Rugged::InvalidError do
@@ -123,7 +125,10 @@ def test_blob_text_set_encoding
 end
 
 class BlobWriteTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @source_repo = FixtureRepo.from_rugged("testrepo.git")
+    @repo = FixtureRepo.clone(@source_repo)
+  end
 
   def test_fetch_blob_content_with_nulls
     content = "100644 example_helper.rb\x00\xD3\xD5\xED\x9DA4_"+
@@ -171,7 +176,9 @@ def test_blob_is_binary
 end
 
 class BlobLOCTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   def write_blob(data)
     sha = Rugged::Blob.from_buffer(@repo, data)
@@ -209,15 +216,9 @@ def test_loc_mixed_no_end_nl
   end
 end
 
-class BlobDiffTest < Rugged::SandboxedTestCase
+class BlobDiffTest < Rugged::TestCase
   def setup
-    super
-    @repo = sandbox_init("diff")
-  end
-
-  def teardown
-    @repo.close
-    super
+    @repo = FixtureRepo.from_libgit2("diff")
   end
 
   def test_diff_blob
@@ -351,7 +352,9 @@ def test_diff_with_paths
 end
 
 class BlobCreateFromIOTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   def test_write_blob_from_io_with_hintpath
     file_path= File.join(TEST_DIR, (File.join('fixtures', 'archive.tar.gz')))
@@ -415,7 +418,9 @@ def test_write_blob_from_io_bad_io
 end
 
 class BlobHashSignatureTest < Rugged::TestCase
-  include Rugged::RepositoryAccess
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   LOREM = <<-LOREM
 Lorem ipsum dolor sit amet, consectetur adipiscing elit.
@@ -445,4 +450,3 @@ def test_signature_from_blob
     assert Rugged::Blob::HashSignature.compare(sig1, sig2) > 75
   end
 end
-

test/branch_test.rb

@@ -2,7 +2,10 @@
 require "test_helper"
 
 class BranchTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @source_repo = FixtureRepo.from_rugged("testrepo.git")
+    @repo = FixtureRepo.clone(@source_repo)
+  end
 
   def test_list_all_names
     assert_equal [

test/cherrypick_test.rb

@@ -1,14 +1,8 @@
 require "test_helper"
 
-class WorkdirCherrypickTest < Rugged::SandboxedTestCase
+class WorkdirCherrypickTest < Rugged::TestCase
   def setup
-    super
-    @repo = sandbox_init("cherrypick")
-  end
-
-  def teardown
-    @repo.close
-    super
+    @repo = FixtureRepo.from_libgit2("cherrypick")
   end
 
   def test_automerge

test/commit_test.rb

@@ -1,7 +1,9 @@
 require "test_helper"
 
 class TestCommit < Rugged::TestCase
-  include Rugged::RepositoryAccess
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   def test_lookup_raises_error_if_object_type_does_not_match
     assert_raises Rugged::InvalidError do
@@ -174,7 +176,10 @@ def test_amend_commit_blank_message
 end
 
 class CommitWriteTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @source_repo = FixtureRepo.from_rugged("testrepo.git")
+    @repo = FixtureRepo.clone(@source_repo)
+  end
 
   def test_write_commit_with_time
     person = {:name => 'Scott', :email => '[email protected]', :time => Time.now }
@@ -258,17 +263,9 @@ def test_write_empty_email_fails
   end
 end
 
-class CommitToMboxTest < Rugged::SandboxedTestCase
+class CommitToMboxTest < Rugged::TestCase
   def setup
-    super
-
-    @repo = sandbox_init "diff_format_email"
-  end
-
-  def teardown
-    @repo.close
-
-    super
+    @repo = FixtureRepo.from_libgit2 "diff_format_email"
   end
 
   def test_format_to_mbox

test/config_test.rb

@@ -1,7 +1,9 @@
 require "test_helper"
 
-class ConfigTest < Rugged::TestCase 
-  include Rugged::RepositoryAccess
+class ConfigTest < Rugged::TestCase
+  def setup
+    @repo = FixtureRepo.from_rugged("testrepo.git")
+  end
 
   def test_read_config_file
     config = @repo.config
@@ -22,7 +24,11 @@ def test_read_global_config_file
 end
 
 class ConfigWriteTest < Rugged::TestCase
-  include Rugged::TempRepositoryAccess
+  def setup
+    @source_repo = FixtureRepo.from_rugged("testrepo.git")
+    @repo = FixtureRepo.clone(@source_repo)
+    @path = @repo.workdir
+  end
 
   def test_write_config_values
     config = @repo.config