diff options
Diffstat (limited to 'spec/ruby/core/class')
| -rw-r--r-- | spec/ruby/core/class/allocate_spec.rb | 6 | ||||
| -rw-r--r-- | spec/ruby/core/class/attached_object_spec.rb | 29 | ||||
| -rw-r--r-- | spec/ruby/core/class/dup_spec.rb | 5 | ||||
| -rw-r--r-- | spec/ruby/core/class/inherited_spec.rb | 21 | ||||
| -rw-r--r-- | spec/ruby/core/class/initialize_spec.rb | 10 | ||||
| -rw-r--r-- | spec/ruby/core/class/new_spec.rb | 19 | ||||
| -rw-r--r-- | spec/ruby/core/class/subclasses_spec.rb | 85 | ||||
| -rw-r--r-- | spec/ruby/core/class/superclass_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/class/to_s_spec.rb | 23 |
9 files changed, 158 insertions, 42 deletions
diff --git a/spec/ruby/core/class/allocate_spec.rb b/spec/ruby/core/class/allocate_spec.rb index 4cf5665392..b39622e06a 100644 --- a/spec/ruby/core/class/allocate_spec.rb +++ b/spec/ruby/core/class/allocate_spec.rb @@ -14,7 +14,7 @@ describe "Class#allocate" do it "throws an exception when calling a method on a new instance" do klass = Class.allocate - lambda do + -> do klass.new end.should raise_error(Exception) end @@ -30,11 +30,11 @@ describe "Class#allocate" do end end - klass.allocate.initialized?.should == false + klass.allocate.should_not.initialized? end it "raises TypeError for #superclass" do - lambda do + -> do Class.allocate.superclass end.should raise_error(TypeError) end diff --git a/spec/ruby/core/class/attached_object_spec.rb b/spec/ruby/core/class/attached_object_spec.rb new file mode 100644 index 0000000000..8f8a0734c6 --- /dev/null +++ b/spec/ruby/core/class/attached_object_spec.rb @@ -0,0 +1,29 @@ +require_relative '../../spec_helper' + +describe "Class#attached_object" do + it "returns the object that is attached to a singleton class" do + a = Class.new + + a_obj = a.new + a_obj.singleton_class.attached_object.should == a_obj + end + + it "returns the class object that is attached to a class's singleton class" do + a = Class.new + singleton_class = (class << a; self; end) + + singleton_class.attached_object.should == a + end + + it "raises TypeError if the class is not a singleton class" do + a = Class.new + + -> { a.attached_object }.should raise_error(TypeError, /is not a singleton class/) + end + + it "raises TypeError for special singleton classes" do + -> { nil.singleton_class.attached_object }.should raise_error(TypeError, /[`']NilClass' is not a singleton class/) + -> { true.singleton_class.attached_object }.should raise_error(TypeError, /[`']TrueClass' is not a singleton class/) + -> { false.singleton_class.attached_object }.should raise_error(TypeError, /[`']FalseClass' is not a singleton class/) + end +end diff --git a/spec/ruby/core/class/dup_spec.rb b/spec/ruby/core/class/dup_spec.rb index 701fd72e19..1ff9abf7b4 100644 --- a/spec/ruby/core/class/dup_spec.rb +++ b/spec/ruby/core/class/dup_spec.rb @@ -59,6 +59,11 @@ describe "Class#dup" do it "stores the new name if assigned to a constant" do CoreClassSpecs::RecordCopy = CoreClassSpecs::Record.dup CoreClassSpecs::RecordCopy.name.should == "CoreClassSpecs::RecordCopy" + ensure + CoreClassSpecs.send(:remove_const, :RecordCopy) end + it "raises TypeError if called on BasicObject" do + -> { BasicObject.dup }.should raise_error(TypeError, "can't copy the root class") + end end diff --git a/spec/ruby/core/class/inherited_spec.rb b/spec/ruby/core/class/inherited_spec.rb index fb7fb8e75a..2a8d1ff813 100644 --- a/spec/ruby/core/class/inherited_spec.rb +++ b/spec/ruby/core/class/inherited_spec.rb @@ -92,10 +92,27 @@ describe "Class.inherited" do end class << top; private :inherited; end - lambda { Class.new(top) }.should_not raise_error + -> { Class.new(top) }.should_not raise_error class << top; protected :inherited; end - lambda { Class.new(top) }.should_not raise_error + -> { Class.new(top) }.should_not raise_error end + it "if the subclass is assigned to a constant, it is all set" do + ScratchPad.record [] + + parent = Class.new do + def self.inherited(subclass) + ScratchPad << defined?(self::C) + ScratchPad << const_defined?(:C) + ScratchPad << constants + ScratchPad << const_get(:C) + ScratchPad << subclass.name.match?(/\A#<Class:0x\w+>::C\z/) + end + end + + class parent::C < parent; end + + ScratchPad.recorded.should == ["constant", true, [:C], parent::C, true] + end end diff --git a/spec/ruby/core/class/initialize_spec.rb b/spec/ruby/core/class/initialize_spec.rb index 88a9fcfa7a..6348758485 100644 --- a/spec/ruby/core/class/initialize_spec.rb +++ b/spec/ruby/core/class/initialize_spec.rb @@ -6,18 +6,18 @@ describe "Class#initialize" do end it "raises a TypeError when called on already initialized classes" do - lambda{ - Fixnum.send :initialize + ->{ + Integer.send :initialize }.should raise_error(TypeError) - lambda{ + ->{ Object.send :initialize }.should raise_error(TypeError) end # See [redmine:2601] it "raises a TypeError when called on BasicObject" do - lambda{ + ->{ BasicObject.send :initialize }.should raise_error(TypeError) end @@ -28,7 +28,7 @@ describe "Class#initialize" do end it "raises a TypeError" do - lambda{@uninitialized.send(:initialize, Class)}.should raise_error(TypeError) + ->{@uninitialized.send(:initialize, Class)}.should raise_error(TypeError) end end end diff --git a/spec/ruby/core/class/new_spec.rb b/spec/ruby/core/class/new_spec.rb index 7f7ec183ea..6fe54c3209 100644 --- a/spec/ruby/core/class/new_spec.rb +++ b/spec/ruby/core/class/new_spec.rb @@ -70,7 +70,7 @@ describe "Class.new" do it "raises a TypeError if passed a metaclass" do obj = mock("Class.new metaclass") meta = obj.singleton_class - lambda { Class.new meta }.should raise_error(TypeError) + -> { Class.new meta }.should raise_error(TypeError) end it "creates a class without a name" do @@ -83,6 +83,8 @@ describe "Class.new" do a = Class.new MyClass::NestedClass = a MyClass::NestedClass.name.should == "MyClass::NestedClass" + ensure + Object.send(:remove_const, :MyClass) end it "sets the new class' superclass to the given class" do @@ -95,12 +97,13 @@ describe "Class.new" do end it "raises a TypeError when given a non-Class" do - error_msg = /superclass must be a Class/ - lambda { Class.new("") }.should raise_error(TypeError, error_msg) - lambda { Class.new(1) }.should raise_error(TypeError, error_msg) - lambda { Class.new(:symbol) }.should raise_error(TypeError, error_msg) - lambda { Class.new(mock('o')) }.should raise_error(TypeError, error_msg) - lambda { Class.new(Module.new) }.should raise_error(TypeError, error_msg) + error_msg = /superclass must be a.*Class/ + -> { Class.new("") }.should raise_error(TypeError, error_msg) + -> { Class.new(1) }.should raise_error(TypeError, error_msg) + -> { Class.new(:symbol) }.should raise_error(TypeError, error_msg) + -> { Class.new(mock('o')) }.should raise_error(TypeError, error_msg) + -> { Class.new(Module.new) }.should raise_error(TypeError, error_msg) + -> { Class.new(BasicObject.new) }.should raise_error(TypeError, error_msg) end end @@ -126,7 +129,7 @@ describe "Class#new" do end end - klass.new.initialized?.should == true + klass.new.should.initialized? klass.new(1, 2, 3).args.should == [1, 2, 3] end diff --git a/spec/ruby/core/class/subclasses_spec.rb b/spec/ruby/core/class/subclasses_spec.rb new file mode 100644 index 0000000000..f692152787 --- /dev/null +++ b/spec/ruby/core/class/subclasses_spec.rb @@ -0,0 +1,85 @@ +require_relative '../../spec_helper' +require_relative '../module/fixtures/classes' + +describe "Class#subclasses" do + it "returns a list of classes directly inheriting from self" do + assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2]) + end + + it "does not return included modules from the parent" do + parent = Class.new + child = Class.new(parent) + mod = Module.new + parent.include(mod) + + assert_subclasses(parent, [child]) + end + + it "does not return included modules from the child" do + parent = Class.new + child = Class.new(parent) + mod = Module.new + parent.include(mod) + + assert_subclasses(parent, [child]) + end + + it "does not return prepended modules from the parent" do + parent = Class.new + child = Class.new(parent) + mod = Module.new + parent.prepend(mod) + + assert_subclasses(parent, [child]) + end + + it "does not return prepended modules from the child" do + parent = Class.new + child = Class.new(parent) + mod = Module.new + child.prepend(mod) + + assert_subclasses(parent, [child]) + end + + it "does not return singleton classes" do + a = Class.new + + a_obj = a.new + def a_obj.force_singleton_class + 42 + end + + a.subclasses.should_not include(a_obj.singleton_class) + end + + it "has 1 entry per module or class" do + ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq + end + + it "works when creating subclasses concurrently" do + t = 16 + n = 1000 + go = false + superclass = Class.new + + threads = t.times.map do + Thread.new do + Thread.pass until go + n.times.map do + Class.new(superclass) + end + end + end + + go = true + classes = threads.map(&:value) + + superclass.subclasses.size.should == t * n + superclass.subclasses.each { |c| c.should be_kind_of(Class) } + end + + def assert_subclasses(mod,subclasses) + mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect) + end +end diff --git a/spec/ruby/core/class/superclass_spec.rb b/spec/ruby/core/class/superclass_spec.rb index deb5a45336..00579238a6 100644 --- a/spec/ruby/core/class/superclass_spec.rb +++ b/spec/ruby/core/class/superclass_spec.rb @@ -8,7 +8,7 @@ describe "Class#superclass" do Class.superclass.should == Module Class.new.superclass.should == Object Class.new(String).superclass.should == String - Class.new(Fixnum).superclass.should == Fixnum + Class.new(Integer).superclass.should == Integer end # redmine:567 diff --git a/spec/ruby/core/class/to_s_spec.rb b/spec/ruby/core/class/to_s_spec.rb deleted file mode 100644 index 2055593a03..0000000000 --- a/spec/ruby/core/class/to_s_spec.rb +++ /dev/null @@ -1,23 +0,0 @@ -require_relative '../../spec_helper' -require_relative 'fixtures/classes' - -describe "Class#to_s" do - it 'regular class returns same name as Module#to_s' do - String.to_s.should == 'String' - end - - describe 'singleton class' do - it 'for modules includes module name' do - CoreClassSpecs.singleton_class.to_s.should == '#<Class:CoreClassSpecs>' - end - - it 'for classes includes class name' do - CoreClassSpecs::Record.singleton_class.to_s.should == '#<Class:CoreClassSpecs::Record>' - end - - it 'for objects includes class name and object ID' do - obj = CoreClassSpecs::Record.new - obj.singleton_class.to_s.should =~ /#<Class:#<CoreClassSpecs::Record:0x[0-9a-f]+>>/ - end - end -end |
