aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-25 08:49:32 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-25 08:49:32 +0000
commit82a408fb9d755b106be2cc23dd08831f158893f5 (patch)
treeed11d1b0761ad87968fbbc565696de0cebc3cc50 /test
parent7c3d0ce3ccd5b3c1489dac2823f38d78f439456d (diff)
downloadruby-82a408fb9d755b106be2cc23dd08831f158893f5.tar.gz
Revert r31873 Module#mix
* class.c (rb_mix_module): revert Module#mix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36216 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 66cc0073f7..b24fa3222d 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -1238,63 +1238,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