summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-10 14:59:12 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-07-10 14:59:12 +0000
commitc1183af5753eba52f5c8a0057cdec8673a5a18db (patch)
tree79772c829083eb4efdce71da23587334586118c2 /test
parent80a01400db7875c7192ec67a025fe3ba559cc4b0 (diff)
reverted Module#mix -- r31873, r31917 and r31918.
-- * class.c (rb_mix_module): implement Module#mix. -- * class.c (check_mix_method_i, do_mix_method_i): not mix methods -- * test/ruby/test_module.rb (TestModule#test_mix_const): test for git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_module.rb59
1 files changed, 0 insertions, 59 deletions
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index e2649a908f..a35e98119b 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1100,63 +1100,4 @@ class TestModule < Test::Unit::TestCase
INPUT
assert_in_out_err([], src, ["NameError"], [])
end
-
- def test_mix_method
- american = Module.new do
- attr_accessor :address
- end
- japanese = Module.new do
- attr_accessor :address
- end
-
- japanese_american = Class.new
- assert_nothing_raised(ArgumentError) {
- japanese_american.class_eval {mix american}
- }
- assert_raise(ArgumentError) {
- japanese_american.class_eval {mix japanese}
- }
-
- japanese_american = Class.new
- assert_nothing_raised(ArgumentError) {
- japanese_american.class_eval {
- mix american, :address => :us_address, :address= => :us_address=
- }
- }
- assert_nothing_raised(ArgumentError) {
- japanese_american.class_eval {
- mix japanese, :address => :jp_address, :address= => :jp_address=
- }
- }
-
- japanese_american = Class.new
- assert_nothing_raised(ArgumentError) {
- japanese_american.class_eval {
- mix japanese, :address => nil, :address= => nil
- }
- }
- assert_raise(NoMethodError) {
- japanese_american.new.address
- }
- assert_nothing_raised(ArgumentError) {
- japanese_american.class_eval {
- mix american
- }
- }
- end
-
- def test_mix_const
- foo = Module.new do
- const_set(:D, 55)
- end
- bar = Class.new do
- const_set(:D, 42)
- end
- assert_nothing_raised(ArgumentError) {
- bar.class_eval {
- mix foo
- }
- }
- assert_equal(42, bar::D)
- end
end