[DRE-commits] [SCM] ruby-deprecated.git branch, master, updated. upstream/3.0.0-3-ge596d44

[Dmitry Borodaenko]

The following commit has been merged in the master branch:
commit e596d44aaa3dad94625d7c2580fddda40f07784f
Author: Dmitry Borodaenko <angdraug at debian.org>
Date:   Sat Sep 10 21:55:00 2011 +0300

    unit test fixes

diff --git a/debian/changelog b/debian/changelog
index 1f569ad..105430c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ ruby-deprecated (3.0.0-1) unstable; urgency=low
     - transitional packages added
     - source format changed to 3.0 (quilt).
   * Redirect watch file to GitHub.
+  * Fix upstream unit test.
 
  -- Dmitry Borodaenko <angdraug at debian.org>  Sat, 10 Sep 2011 18:46:48 +0300
 
diff --git a/debian/patches/0001-unit-test-fixes.patch b/debian/patches/0001-unit-test-fixes.patch
new file mode 100644
index 0000000..11b50cf
--- /dev/null
+++ b/debian/patches/0001-unit-test-fixes.patch
@@ -0,0 +1,82 @@
+From: Dmitry Borodaenko <angdraug at debian.org>
+Date: Sat, 10 Sep 2011 20:38:38 +0300
+Subject: unit test fixes
+
+* remove rubygems usage from the test
+* fix improper use of assert_raise
+* checking for RuntimeError is enough to test :fail codepath
+---
+ test/test_deprecated.rb |   31 ++++++++++---------------------
+ 1 files changed, 10 insertions(+), 21 deletions(-)
+
+diff --git a/test/test_deprecated.rb b/test/test_deprecated.rb
+index a490837..40f9dab 100644
+--- a/test/test_deprecated.rb
++++ b/test/test_deprecated.rb
+@@ -1,7 +1,5 @@
+ #!/usr/bin/env ruby
+ 
+-require 'rubygems'
+-gem 'test-unit'
+ require 'test/unit'
+ require 'lib/deprecated.rb'
+ 
+@@ -56,32 +54,23 @@ Deprecated.set_action(:raise)
+ 
+ class DeprecateTest < Test::Unit::TestCase
+     def test_set_action
+-        assert_raises(DeprecatedError) { DummyClass.new.monkey }
++        assert_raise(DeprecatedError) { DummyClass.new.monkey }
+ 
+         Deprecated.set_action { |klass, sym| raise DeprecatedError.new("#{klass}##{sym} is deprecated.") }
+-        assert_raises(DeprecatedError.new("DummyClass#monkey is deprecated.")) do 
+-            DummyClass.new.monkey 
+-        end
++        exception = assert_raise(DeprecatedError) { DummyClass.new.monkey }
++        assert_equal("DummyClass#monkey is deprecated.", exception.message)
+ 
+         Deprecated.set_action(:raise)
+ 
+-        assert_raises(DeprecatedError.new("DummyClass#monkey is deprecated.")) do 
+-            DummyClass.new.monkey 
+-        end
++        assert_raise(DeprecatedError) { DummyClass.new.monkey }
++        assert_equal("DummyClass#monkey is deprecated.", exception.message)
+ 
+         # set to warn and make sure our return values are getting through.
+         Deprecated.set_action(:warn)
+         assert(DummyClass.new.monkey)
+ 
+-        Kernel.module_eval { 
+-            def self.fail
+-                raise "failed"
+-            end
+-        }
+-        
+         Deprecated.set_action(:fail)
+-
+-        assert_raises("failed") { DummyClass.new.monkey }
++        assert_raise(RuntimeError) { DummyClass.new.monkey }
+     end
+ 
+     def test_scope
+@@ -100,14 +89,14 @@ class DeprecateTest < Test::Unit::TestCase
+     end
+ 
+     def test_scoped_actions
+-        assert_raises(DeprecatedError.new("foo!")) { DummyClass2.new.monkey }
++        exception = assert_raise(DeprecatedError) { DummyClass2.new.monkey }
++        assert_equal("foo!", exception.message)
+     end
+ 
+     def test_replacement
+         Deprecated.set_action(:raise)
+ 
+-        assert_raises(DeprecatedError.new("DummyClass#monkey_bars is deprecated. Please use FooClass#fart.")) do 
+-            DummyClass.new.monkey_bars
+-        end
++        exception = assert_raise(DeprecatedError) { DummyClass.new.monkey_bars }
++        assert_equal("DummyClass#monkey_bars is deprecated. Please use FooClass#fart.", exception.message)
+     end
+ end
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..69aab0b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-unit-test-fixes.patch

-- 
ruby-deprecated.git