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 | 7 | ||||
| -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 | 24 | ||||
| -rw-r--r-- | spec/ruby/core/class/subclasses_spec.rb | 95 | ||||
| -rw-r--r-- | spec/ruby/core/class/superclass_spec.rb | 2 |
8 files changed, 147 insertions, 47 deletions
diff --git a/spec/ruby/core/class/allocate_spec.rb b/spec/ruby/core/class/allocate_spec.rb index b39622e06a..b8950a678e 100644 --- a/spec/ruby/core/class/allocate_spec.rb +++ b/spec/ruby/core/class/allocate_spec.rb @@ -3,7 +3,7 @@ require_relative '../../spec_helper' describe "Class#allocate" do it "returns an instance of self" do klass = Class.new - klass.allocate.should be_an_instance_of(klass) + klass.allocate.should.instance_of?(klass) end it "returns a fully-formed instance of Module" do @@ -16,7 +16,7 @@ describe "Class#allocate" do klass = Class.allocate -> do klass.new - end.should raise_error(Exception) + end.should.raise(Exception) end it "does not call initialize on the new instance" do @@ -36,6 +36,6 @@ describe "Class#allocate" do it "raises TypeError for #superclass" do -> do Class.allocate.superclass - end.should raise_error(TypeError) + end.should.raise(TypeError) end 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..b75e61ca07 --- /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(TypeError, /is not a singleton class/) + end + + it "raises TypeError for special singleton classes" do + -> { nil.singleton_class.attached_object }.should.raise(TypeError, /[`']NilClass' is not a singleton class/) + -> { true.singleton_class.attached_object }.should.raise(TypeError, /[`']TrueClass' is not a singleton class/) + -> { false.singleton_class.attached_object }.should.raise(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..17c0171ceb 100644 --- a/spec/ruby/core/class/dup_spec.rb +++ b/spec/ruby/core/class/dup_spec.rb @@ -53,12 +53,17 @@ describe "Class#dup" do it "sets the name from the class to nil if not assigned to a constant" do copy = CoreClassSpecs::Record.dup - copy.name.should be_nil + copy.name.should == nil end 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(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 8ef8bb8c35..c9acc740a1 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 - -> { Class.new(top) }.should_not raise_error + -> { Class.new(top) }.should_not.raise class << top; protected :inherited; end - -> { Class.new(top) }.should_not raise_error + -> { Class.new(top) }.should_not.raise 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 6348758485..ab8f0a157e 100644 --- a/spec/ruby/core/class/initialize_spec.rb +++ b/spec/ruby/core/class/initialize_spec.rb @@ -2,24 +2,24 @@ require_relative '../../spec_helper' describe "Class#initialize" do it "is private" do - Class.should have_private_method(:initialize) + Class.private_methods(false).should.include?(:initialize) end it "raises a TypeError when called on already initialized classes" do ->{ Integer.send :initialize - }.should raise_error(TypeError) + }.should.raise(TypeError) ->{ Object.send :initialize - }.should raise_error(TypeError) + }.should.raise(TypeError) end # See [redmine:2601] it "raises a TypeError when called on BasicObject" do ->{ BasicObject.send :initialize - }.should raise_error(TypeError) + }.should.raise(TypeError) end describe "when given the Class" do @@ -28,7 +28,7 @@ describe "Class#initialize" do end it "raises a TypeError" do - ->{@uninitialized.send(:initialize, Class)}.should raise_error(TypeError) + ->{@uninitialized.send(:initialize, Class)}.should.raise(TypeError) end end end diff --git a/spec/ruby/core/class/new_spec.rb b/spec/ruby/core/class/new_spec.rb index 93152a83ee..111e31252e 100644 --- a/spec/ruby/core/class/new_spec.rb +++ b/spec/ruby/core/class/new_spec.rb @@ -7,7 +7,7 @@ describe "Class.new with a block given" do klass = Class.new do self_in_block = self end - self_in_block.should equal klass + self_in_block.should.equal? klass end it "uses the given block as the class' body" do @@ -70,11 +70,11 @@ describe "Class.new" do it "raises a TypeError if passed a metaclass" do obj = mock("Class.new metaclass") meta = obj.singleton_class - -> { Class.new meta }.should raise_error(TypeError) + -> { Class.new meta }.should.raise(TypeError) end it "creates a class without a name" do - Class.new.name.should be_nil + Class.new.name.should == nil end it "creates a class that can be given a name by assigning it to a constant" 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 @@ -96,12 +98,12 @@ describe "Class.new" do it "raises a TypeError when given a non-Class" do 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) + -> { Class.new("") }.should.raise(TypeError, error_msg) + -> { Class.new(1) }.should.raise(TypeError, error_msg) + -> { Class.new(:symbol) }.should.raise(TypeError, error_msg) + -> { Class.new(mock('o')) }.should.raise(TypeError, error_msg) + -> { Class.new(Module.new) }.should.raise(TypeError, error_msg) + -> { Class.new(BasicObject.new) }.should.raise(TypeError, error_msg) end end @@ -139,8 +141,8 @@ describe "Class#new" do end instance = klass.new - instance.should be_kind_of klass - instance.class.should equal klass + instance.should.is_a? klass + instance.class.should.equal? klass end it "passes the block to #initialize" do diff --git a/spec/ruby/core/class/subclasses_spec.rb b/spec/ruby/core/class/subclasses_spec.rb index ddbcfb02c0..c3d7b07e12 100644 --- a/spec/ruby/core/class/subclasses_spec.rb +++ b/spec/ruby/core/class/subclasses_spec.rb @@ -1,38 +1,85 @@ require_relative '../../spec_helper' require_relative '../module/fixtures/classes' -ruby_version_is '3.1' do - describe "Class#subclasses" do - it "returns a list of classes directly inheriting from self" do - assert_subclasses(ModuleSpecs::Parent, [ModuleSpecs::Child, ModuleSpecs::Child2]) - end +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" do - parent = Class.new - child = Class.new(parent) - mod = Module.new - parent.include(mod) + 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 + assert_subclasses(parent, [child]) + end - it "does not return singleton classes" do - a = Class.new + it "does not return included modules from the child" do + parent = Class.new + child = Class.new(parent) + mod = Module.new + parent.include(mod) - a_obj = a.new - def a_obj.force_singleton_class - 42 - end + assert_subclasses(parent, [child]) + end - a.subclasses.should_not include(a_obj.singleton_class) - 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 "has 1 entry per module or class" do - ModuleSpecs::Parent.subclasses.should == ModuleSpecs::Parent.subclasses.uniq + it "does not return singleton classes" do + a = Class.new + + a_obj = a.new + def a_obj.force_singleton_class + 42 end - def assert_subclasses(mod,subclasses) - mod.subclasses.sort_by(&:inspect).should == subclasses.sort_by(&:inspect) + 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.is_a?(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 00579238a6..87d9b20490 100644 --- a/spec/ruby/core/class/superclass_spec.rb +++ b/spec/ruby/core/class/superclass_spec.rb @@ -3,7 +3,7 @@ require_relative 'fixtures/classes' describe "Class#superclass" do it "returns the superclass of self" do - BasicObject.superclass.should be_nil + BasicObject.superclass.should == nil Object.superclass.should == BasicObject Class.superclass.should == Module Class.new.superclass.should == Object |
