kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Reverts the changes of lib/test/unit/* in r19543, r19534 and r19503.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-09-30 14:13:12 +00:00
parent 1eeb3e151e
commit 1af1196616
6 changed files with 14 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
Tue Sep 30 23:00:05 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* lib/test/unit.rb: removed.
Temporarily reverts the changes of lib/test/unit/* in
r19543, r19534 and r19503, in order to release 1.9.0-5.
* lib/test/unit/assertions.rb: ditto.
* lib/test/unit/deprecate.rb: ditto.
* lib/test/unit/error.rb: ditto.
* lib/test/unit/testcase.rb: ditto.
Tue Sep 30 17:04:59 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/bigdecimal/test_bigdecimal.rb (test_sqrt_bigdecimal): wrong

10
lib/test/unit.rb
View file

@ -1,10 +0,0 @@
############################################################
# This file is imported from a different project.
# DO NOT make modifications in this repo.
# File a patch instead and assign it to Ryan Davis
############################################################
require 'mini/test'
require 'test/unit/testcase' # pull in deprecated functionality
Mini::Test.autorun

59
lib/test/unit/assertions.rb
View file

@ -1,59 +0,0 @@
############################################################
# This file is imported from a different project.
# DO NOT make modifications in this repo.
# File a patch instead and assign it to Ryan Davis
############################################################
require 'mini/test'
require 'test/unit/deprecate'
module Test; end
module Test::Unit # patch up bastards that that extend improperly.
if defined? Assertions then
warn "ARGH! someone defined Test::Unit::Assertions rather than requiring"
CRAP_ASSERTIONS = Assertions
remove_const :Assertions
# this will break on junit and rubinius... *sigh*
ObjectSpace.each_object(Module) do |offender|
offender.send :include, ::Mini::Assertions if offender < CRAP_ASSERTIONS
end rescue nil
Test::Unit::TestCase.send :include, CRAP_ASSERTIONS
end
Assertions = ::Mini::Assertions
module Assertions
def self.included mod
mod.send :include, Test::Unit::CRAP_ASSERTIONS
end if defined? Test::Unit::CRAP_ASSERTIONS
end
end
module Test::Unit
module Assertions # deprecations
tu_deprecate :assert_nothing_thrown, :assert_nothing_raised # 2009-06-01
tu_deprecate :assert_raise, :assert_raises # 2010-06-01
tu_deprecate :assert_not_equal, :refute_equal # 2009-06-01
tu_deprecate :assert_no_match, :refute_match # 2009-06-01
tu_deprecate :assert_not_nil, :refute_nil # 2009-06-01
tu_deprecate :assert_not_same, :refute_same # 2009-06-01
def assert_nothing_raised _ = :ignored # 2009-06-01
self.class.tu_deprecation_warning :assert_nothing_raised
self._assertions += 1
yield
rescue => e
raise Mini::Assertion, exception_details(e, "Exception raised:")
end
def build_message(user_message, template_message, *args) # 2009-06-01
self.class.tu_deprecation_warning :build_message
user_message ||= ''
user_message += ' ' unless user_message.empty?
msg = template_message.split(/<\?>/).zip(args.map { |o| o.inspect })
user_message + msg.join
end
end
end

30
lib/test/unit/deprecate.rb
View file

@ -1,30 +0,0 @@
############################################################
# This file is imported from a different project.
# DO NOT make modifications in this repo.
# File a patch instead and assign it to Ryan Davis
############################################################
class Module # define deprecation api
DEPS = Hash.new { |h,k| h[k] = {} }
def tu_deprecation_warning old, new = nil, kaller = nil
kaller ||= caller[1]
unless DEPS[old][kaller] then
msg = "#{self}##{old} deprecated. "
msg += new ? "Use ##{new}" : "No replacement is provided"
msg += ". From #{kaller}."
warn msg
end
DEPS[old][kaller] = true
end
def tu_deprecate old, new
class_eval <<-EOM
def #{old} *args, &block
cls, clr = self.class, caller.first
self.class.tu_deprecation_warning #{old.inspect}, #{new.inspect}, clr
#{new}(*args, &block)
end
EOM
end
end

17
lib/test/unit/error.rb
View file

@ -1,17 +0,0 @@
############################################################
# This file is imported from a different project.
# DO NOT make modifications in this repo.
# File a patch instead and assign it to Ryan Davis
############################################################
require 'test/unit/deprecate'
# rails currently needs this file and this one method.
module Test::Unit
class Error
def message
self.class.tu_deprecation_warning :message # 2009-06-01
"you're a loser"
end
end
end

31
lib/test/unit/testcase.rb
View file

@ -1,31 +0,0 @@
############################################################
# This file is imported from a different project.
# DO NOT make modifications in this repo.
# File a patch instead and assign it to Ryan Davis
############################################################
require 'mini/test'
require 'test/unit/deprecate'
warn "require 'test/unit/testcase' has been deprecated" unless
caller.first =~ /test.unit.rb/
module Test; end
module Test::Unit # was ::Mini::Test, but rails' horrid code forced my hand
if defined? TestCase then
warn "ARGH! someone defined Test::Unit::TestCase rather than requiring"
remove_const :TestCase
end
AssertionFailedError = ::Mini::Assertion
class TestCase < ::Mini::Test::TestCase
tu_deprecate :method_name, :name # 2009-06-01
def self.test_order # 2009-06-01
:sorted
end
end
end
require 'test/unit/assertions' # brings in deprecated methods