[DRE-commits] [SCM] gem2deb.git branch, setuprb, updated. debian/0.2.3-19-g006db65

[Vincent Fourmond]

The following commit has been merged in the setuprb branch:
commit 006db65be91fd3499be0d8953eaeed2412ed099a
Author: Vincent Fourmond <fourmond at debian.org>
Date:   Fri Jun 3 23:37:48 2011 +0200

    Move installed_file_path and assert_installed from DhRubyTest into its superclass

diff --git a/test/test_helper.rb b/test/test_helper.rb
index c959987..6b305ad 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -83,6 +83,16 @@ class Gem2DebTestCase < Test::Unit::TestCase
     assert !File.exist?(path), "#{path} should NOT exist"
   end
 
+  # Installation-related functions
+
+  def installed_file_path(gem_dirname, package, path)
+    File.join(self.class.tmpdir, 'ruby-' + gem_dirname, 'debian', package, path)
+  end
+
+  def assert_installed(gem_dirname, package, path)
+    assert_file_exists installed_file_path(gem_dirname, package, path)
+  end
+
   def self.silence_stream(stream)
     orig_stream = stream.clone
     begin
diff --git a/test/unit/dh_ruby_test.rb b/test/unit/dh_ruby_test.rb
index 16f4c18..e7498f7 100644
--- a/test/unit/dh_ruby_test.rb
+++ b/test/unit/dh_ruby_test.rb
@@ -159,18 +159,10 @@ class DhRubyTest < Gem2DebTestCase
 
   protected
 
-  def assert_installed(gem_dirname, package, path)
-    assert_file_exists installed_file_path(gem_dirname, package, path)
-  end
-
   def read_installed_file(gem_dirname, package, path)
     File.read(installed_file_path(gem_dirname, package, path))
   end
 
-  def installed_file_path(gem_dirname, package, path)
-    File.join(self.class.tmpdir, 'ruby-' + gem_dirname, 'debian', package, path)
-  end
-
   def self.build(gem, source_package)
     package_path = File.join(tmpdir, 'ruby-' + source_package)
     tarball =  File.join(tmpdir, source_package + '.tar.gz')
diff --git a/test/unit/dh_rubysetuprb_test.rb b/test/unit/dh_rubysetuprb_test.rb
index 69f2367..190900a 100644
--- a/test/unit/dh_rubysetuprb_test.rb
+++ b/test/unit/dh_rubysetuprb_test.rb
@@ -40,18 +40,6 @@ class DhRubySetuprbTest < Gem2DebTestCase
 
   protected
 
-  def assert_installed(gem_dirname, package, path)
-    assert_file_exists installed_file_path(gem_dirname, package, path)
-  end
-
-  def read_installed_file(gem_dirname, package, path)
-    File.read(installed_file_path(gem_dirname, package, path))
-  end
-
-  def installed_file_path(gem_dirname, package, path)
-    File.join(self.class.tmpdir, 'ruby-' + gem_dirname, 'debian', package, path)
-  end
-
   def self.build(pkgname, source_package)
     package_path = File.join(tmpdir, 'ruby-' + source_package)
     tarball =  File.join(tmpdir, source_package + '.tar.gz')

-- 
gem2deb.git