[DRE-commits] [ruby-deprecated] 04/04: updated unit test fixes for 3.0.1
Dmitry Borodaenko
angdraug at alioth.debian.org
Sat Aug 10 22:27:36 UTC 2013
This is an automated email from the git hooks/post-receive script.
angdraug pushed a commit to branch master
in repository ruby-deprecated.
commit 6adf04a21509a7b7fe163524d460c48beee38229
Author: Dmitry Borodaenko <angdraug at gmail.com>
Date: Sat Aug 10 15:26:11 2013 -0700
updated unit test fixes for 3.0.1
---
debian/patches/0001-unit-test-fixes.patch | 91 ++++++++++----------------
debian/patches/0002-README-from-GitHub.patch | 83 -----------------------
debian/patches/series | 1 -
3 files changed, 36 insertions(+), 139 deletions(-)
diff --git a/debian/patches/0001-unit-test-fixes.patch b/debian/patches/0001-unit-test-fixes.patch
index 11b50cf..1071f59 100644
--- a/debian/patches/0001-unit-test-fixes.patch
+++ b/debian/patches/0001-unit-test-fixes.patch
@@ -4,13 +4,12 @@ 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(-)
+ test/test_deprecated.rb | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/test/test_deprecated.rb b/test/test_deprecated.rb
-index a490837..40f9dab 100644
+index 1e65f20..77b0532 100644
--- a/test/test_deprecated.rb
+++ b/test/test_deprecated.rb
@@ -1,7 +1,5 @@
@@ -19,64 +18,46 @@ index a490837..40f9dab 100644
-require 'rubygems'
-gem 'test-unit'
require 'test/unit'
- require 'lib/deprecated.rb'
-
-@@ -56,32 +54,23 @@ Deprecated.set_action(:raise)
+ $:.unshift 'lib'
+ require 'deprecated.rb'
+@@ -61,13 +59,13 @@ class DeprecateTest < Test::Unit::TestCase
+ assert_raises(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
++ assert_raises(DeprecatedError, "DummyClass#monkey is deprecated.") do
+ DummyClass.new.monkey
+ end
- class DeprecateTest < Test::Unit::TestCase
- def test_set_action
-- assert_raises(DeprecatedError) { DummyClass.new.monkey }
-+ assert_raise(DeprecatedError) { DummyClass.new.monkey }
+ Deprecated.set_action(:raise)
- 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)
+- assert_raises(DeprecatedError.new("DummyClass#monkey is deprecated.")) do
++ assert_raises(DeprecatedError, "DummyClass#monkey is deprecated.") do
+ DummyClass.new.monkey
+ end
- Deprecated.set_action(:raise)
+@@ -83,7 +81,7 @@ class DeprecateTest < Test::Unit::TestCase
-- 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)
+ Deprecated.set_action(:fail)
- # set to warn and make sure our return values are getting through.
- Deprecated.set_action(:warn)
- assert(DummyClass.new.monkey)
+- assert_raises("failed") { DummyClass.new.monkey }
++ assert_raises(RuntimeError, "failed") { DummyClass.new.monkey }
+ end
-- 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
+@@ -102,13 +100,13 @@ class DeprecateTest < Test::Unit::TestCase
+ 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_scoped_actions
+- assert_raises(DeprecatedError.new("foo!")) { DummyClass2.new.monkey }
++ assert_raises(DeprecatedError, "foo!") { DummyClass2.new.monkey }
+ end
- def test_replacement
- Deprecated.set_action(:raise)
+ 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)
+- assert_raises(DeprecatedError.new("DummyClass#monkey_bars is deprecated. Please use FooClass#fart.")) do
++ assert_raises(DeprecatedError, "DummyClass#monkey_bars is deprecated. Please use FooClass#fart.") do
+ DummyClass.new.monkey_bars
end
- end
---
+ end
diff --git a/debian/patches/0002-README-from-GitHub.patch b/debian/patches/0002-README-from-GitHub.patch
deleted file mode 100644
index 51e94f8..0000000
--- a/debian/patches/0002-README-from-GitHub.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Dmitry Borodaenko <angdraug at debian.org>
-Date: Sat, 10 Sep 2011 23:35:32 +0300
-Subject: README from GitHub
-
----
- README | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 67 insertions(+), 0 deletions(-)
- create mode 100644 README
-
-diff --git a/README b/README
-new file mode 100644
-index 0000000..528c976
---- /dev/null
-+++ b/README
-@@ -0,0 +1,67 @@
-+Deprecated is a module to help you deprecate code BEFORE you remove it. Don't
-+surprise your users, deprecate them!
-+
-+Usage is simple:
-+
-+ class Foo
-+ include Deprecated
-+
-+ def moo
-+ "cow"
-+ end
-+
-+ deprecated :moo
-+
-+ def sheep
-+ "baaa"
-+ end
-+
-+ deprecated :sheep, "Sounds#baa"
-+
-+ protected
-+
-+ def bar
-+ true
-+ end
-+
-+ deprecated :bar
-+ end
-+
-+ Foo.new.moo # warns that the call is deprecated
-+
-+ Deprecated.set_action(:raise)
-+ Foo.new.moo # raises with the same message
-+
-+ Deprecated.set_action do |klass, sym, replacement|
-+ email_boss(
-+ "Someone tried to use #{klass}##{sym}! " +
-+ "They should be using #{replacement} instead!"
-+ )
-+ end
-+
-+ Foo.new.sheep # do I really need to explain?
-+
-+ Foo.new.bar # still protected!
-+
-+Let's do it live!
-+
-+ class Bar
-+ include Deprecated
-+
-+ # sets it just for this class
-+ deprecated_set_action do |klass, sym, replacement|
-+ email_boss(
-+ "Someone tried to use #{klass}##{sym}! " +
-+ "They should be using #{replacement} instead!"
-+ )
-+ end
-+
-+ def cow
-+ "moo"
-+ end
-+
-+ deprecate :cow # emails your boss when called!
-+ end
-+
-+Please see Deprecated::Module#deprecated, Deprecated.set_action, and
-+Deprecated::Module#deprecated_set_action for more information.
---
diff --git a/debian/patches/series b/debian/patches/series
index 6dfff95..69aab0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
0001-unit-test-fixes.patch
-0002-README-from-GitHub.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-deprecated.git
More information about the Pkg-ruby-extras-commits
mailing list