diff options
Diffstat (limited to 'spec/ruby/core/complex')
24 files changed, 234 insertions, 149 deletions
diff --git a/spec/ruby/core/complex/coerce_spec.rb b/spec/ruby/core/complex/coerce_spec.rb index ce2fb36b73..d4ea85a713 100644 --- a/spec/ruby/core/complex/coerce_spec.rb +++ b/spec/ruby/core/complex/coerce_spec.rb @@ -8,37 +8,37 @@ describe "Complex#coerce" do it "returns an array containing other and self as Complex when other is an Integer" do result = @one.coerce(2) result.should == [2, 1] - result.first.should be_kind_of(Complex) - result.last.should be_kind_of(Complex) + result.first.should.is_a?(Complex) + result.last.should.is_a?(Complex) end it "returns an array containing other and self as Complex when other is a Float" do result = @one.coerce(20.5) result.should == [20.5, 1] - result.first.should be_kind_of(Complex) - result.last.should be_kind_of(Complex) + result.first.should.is_a?(Complex) + result.last.should.is_a?(Complex) end it "returns an array containing other and self as Complex when other is a Bignum" do result = @one.coerce(4294967296) result.should == [4294967296, 1] - result.first.should be_kind_of(Complex) - result.last.should be_kind_of(Complex) + result.first.should.is_a?(Complex) + result.last.should.is_a?(Complex) end it "returns an array containing other and self as Complex when other is a Rational" do result = @one.coerce(Rational(5,6)) result.should == [Rational(5,6), 1] - result.first.should be_kind_of(Complex) - result.last.should be_kind_of(Complex) + result.first.should.is_a?(Complex) + result.last.should.is_a?(Complex) end it "returns an array containing other and self when other is a Complex" do other = Complex(2) result = @one.coerce(other) result.should == [other, @one] - result.first.should equal(other) - result.last.should equal(@one) + result.first.should.equal?(other) + result.last.should.equal?(@one) end it "returns an array containing other as Complex and self when other is a Numeric which responds to #real? with true" do @@ -46,25 +46,25 @@ describe "Complex#coerce" do other.should_receive(:real?).any_number_of_times.and_return(true) result = @one.coerce(other) result.should == [other, @one] - result.first.should eql(Complex(other)) - result.last.should equal(@one) + result.first.should.eql?(Complex(other)) + result.last.should.equal?(@one) end it "raises TypeError when other is a Numeric which responds to #real? with false" do other = mock_numeric('other') other.should_receive(:real?).any_number_of_times.and_return(false) - lambda { @one.coerce(other) }.should raise_error(TypeError) + -> { @one.coerce(other) }.should.raise(TypeError) end it "raises a TypeError when other is a String" do - lambda { @one.coerce("20") }.should raise_error(TypeError) + -> { @one.coerce("20") }.should.raise(TypeError) end it "raises a TypeError when other is nil" do - lambda { @one.coerce(nil) }.should raise_error(TypeError) + -> { @one.coerce(nil) }.should.raise(TypeError) end it "raises a TypeError when other is false" do - lambda { @one.coerce(false) }.should raise_error(TypeError) + -> { @one.coerce(false) }.should.raise(TypeError) end end diff --git a/spec/ruby/core/complex/comparison_spec.rb b/spec/ruby/core/complex/comparison_spec.rb new file mode 100644 index 0000000000..3115f4e205 --- /dev/null +++ b/spec/ruby/core/complex/comparison_spec.rb @@ -0,0 +1,25 @@ +require_relative '../../spec_helper' + +describe "Complex#<=>" do + it "returns nil if either self or argument has imaginary part" do + (Complex(5, 1) <=> Complex(2)).should == nil + (Complex(1) <=> Complex(2, 1)).should == nil + (5 <=> Complex(2, 1)).should == nil + end + + it "returns nil if argument is not numeric" do + (Complex(5, 1) <=> "cmp").should == nil + (Complex(1) <=> "cmp").should == nil + (Complex(1) <=> Object.new).should == nil + end + + it "returns 0, 1, or -1 if self and argument do not have imaginary part" do + (Complex(5) <=> Complex(2)).should == 1 + (Complex(2) <=> Complex(3)).should == -1 + (Complex(2) <=> Complex(2)).should == 0 + + (Complex(5) <=> 2).should == 1 + (Complex(2) <=> 3).should == -1 + (Complex(2) <=> 2).should == 0 + end +end diff --git a/spec/ruby/core/complex/constants_spec.rb b/spec/ruby/core/complex/constants_spec.rb index 50303de16c..200e97731a 100644 --- a/spec/ruby/core/complex/constants_spec.rb +++ b/spec/ruby/core/complex/constants_spec.rb @@ -2,6 +2,6 @@ require_relative '../../spec_helper' describe "Complex::I" do it "is Complex(0, 1)" do - Complex::I.should eql(Complex(0, 1)) + Complex::I.should.eql?(Complex(0, 1)) end end diff --git a/spec/ruby/core/complex/eql_spec.rb b/spec/ruby/core/complex/eql_spec.rb index 9194efc074..2082a22feb 100644 --- a/spec/ruby/core/complex/eql_spec.rb +++ b/spec/ruby/core/complex/eql_spec.rb @@ -2,23 +2,23 @@ require_relative '../../spec_helper' describe "Complex#eql?" do it "returns false if other is not Complex" do - Complex(1).eql?(1).should be_false + Complex(1).eql?(1).should == false end it "returns true when the respective parts are of the same classes and self == other" do - Complex(1, 2).eql?(Complex(1, 2)).should be_true + Complex(1, 2).eql?(Complex(1, 2)).should == true end it "returns false when the real parts are of different classes" do - Complex(1).eql?(Complex(1.0)).should be_false + Complex(1).eql?(Complex(1.0)).should == false end it "returns false when the imaginary parts are of different classes" do - Complex(1, 2).eql?(Complex(1, 2.0)).should be_false + Complex(1, 2).eql?(Complex(1, 2.0)).should == false end it "returns false when self == other is false" do - Complex(1, 2).eql?(Complex(2, 3)).should be_false + Complex(1, 2).eql?(Complex(2, 3)).should == false end it "does NOT send #eql? to real or imaginary parts" do @@ -26,6 +26,6 @@ describe "Complex#eql?" do imag = mock_numeric('imag') real.should_not_receive(:eql?) imag.should_not_receive(:eql?) - Complex(real, imag).eql?(Complex(real, imag)).should be_true + Complex(real, imag).eql?(Complex(real, imag)).should == true end end diff --git a/spec/ruby/core/complex/equal_value_spec.rb b/spec/ruby/core/complex/equal_value_spec.rb index b1e4f9cfcd..b3562ff3fb 100644 --- a/spec/ruby/core/complex/equal_value_spec.rb +++ b/spec/ruby/core/complex/equal_value_spec.rb @@ -53,14 +53,14 @@ describe "Complex#==" do end describe "with Object" do - # Fixnum#==, Float#== and Bignum#== only return booleans - Bug? + # Integer#== and Float#== only return booleans - Bug? it "calls other#== with self" do value = Complex(3, 0) obj = mock("Object") obj.should_receive(:==).with(value).and_return(:expected) - (value == obj).should_not be_false + (value == obj).should_not == false end end @@ -73,11 +73,11 @@ describe "Complex#==" do it "returns real == other when the imaginary part is zero" do real = mock_numeric('real') real.should_receive(:==).with(@other).and_return(true) - (Complex(real, 0) == @other).should be_true + (Complex(real, 0) == @other).should == true end - it "returns false when when the imaginary part is not zero" do - (Complex(3, 1) == @other).should be_false + it "returns false when the imaginary part is not zero" do + (Complex(3, 1) == @other).should == false end end @@ -87,7 +87,7 @@ describe "Complex#==" do other = mock_numeric('other') other.should_receive(:real?).any_number_of_times.and_return(false) other.should_receive(:==).with(complex).and_return(true) - (complex == other).should be_true + (complex == other).should == true end end end diff --git a/spec/ruby/core/complex/exponent_spec.rb b/spec/ruby/core/complex/exponent_spec.rb index bf07c90038..d0db0a40c2 100644 --- a/spec/ruby/core/complex/exponent_spec.rb +++ b/spec/ruby/core/complex/exponent_spec.rb @@ -1,15 +1,15 @@ require_relative '../../spec_helper' describe "Complex#**" do - describe "with Fixnum 0" do + describe "with Integer 0" do it "returns Complex(1)" do - (Complex(3, 4) ** 0).should eql(Complex(1)) + (Complex(3, 4) ** 0).should.eql?(Complex(1)) end end describe "with Float 0.0" do it "returns Complex(1.0, 0.0)" do - (Complex(3, 4) ** 0.0).should eql(Complex(1.0, 0.0)) + (Complex(3, 4) ** 0.0).should.eql?(Complex(1.0, 0.0)) end end diff --git a/spec/ruby/core/complex/fdiv_spec.rb b/spec/ruby/core/complex/fdiv_spec.rb index 20d2f41354..fdcbc6a95d 100644 --- a/spec/ruby/core/complex/fdiv_spec.rb +++ b/spec/ruby/core/complex/fdiv_spec.rb @@ -2,44 +2,44 @@ require_relative '../../spec_helper' describe "Complex#fdiv" do it "accepts a numeric argument" do - lambda { Complex(20).fdiv(2) }.should_not raise_error(TypeError) - lambda { Complex(20).fdiv(2.0) }.should_not raise_error(TypeError) - lambda { Complex(20).fdiv(bignum_value) }.should_not raise_error(TypeError) + -> { Complex(20).fdiv(2) }.should_not.raise(TypeError) + -> { Complex(20).fdiv(2.0) }.should_not.raise(TypeError) + -> { Complex(20).fdiv(bignum_value) }.should_not.raise(TypeError) end it "accepts a negative numeric argument" do - lambda { Complex(20).fdiv(-2) }.should_not raise_error(TypeError) - lambda { Complex(20).fdiv(-2.0) }.should_not raise_error(TypeError) - lambda { Complex(20).fdiv(-bignum_value) }.should_not raise_error(TypeError) + -> { Complex(20).fdiv(-2) }.should_not.raise(TypeError) + -> { Complex(20).fdiv(-2.0) }.should_not.raise(TypeError) + -> { Complex(20).fdiv(-bignum_value) }.should_not.raise(TypeError) end it "raises a TypeError if passed a non-numeric argument" do - lambda { Complex(20).fdiv([]) }.should raise_error(TypeError) - lambda { Complex(20).fdiv(:sym) }.should raise_error(TypeError) - lambda { Complex(20).fdiv('s') }.should raise_error(TypeError) + -> { Complex(20).fdiv([]) }.should.raise(TypeError) + -> { Complex(20).fdiv(:sym) }.should.raise(TypeError) + -> { Complex(20).fdiv('s') }.should.raise(TypeError) end it "sets the real part to NaN if self's real part is NaN" do - Complex(nan_value).fdiv(2).real.nan?.should be_true + Complex(nan_value).fdiv(2).real.nan?.should == true end it "sets the imaginary part to NaN if self's imaginary part is NaN" do - Complex(2, nan_value).fdiv(2).imag.nan?.should be_true + Complex(2, nan_value).fdiv(2).imag.nan?.should == true end it "sets the real and imaginary part to NaN if self's real and imaginary parts are NaN" do - Complex(nan_value, nan_value).fdiv(2).imag.nan?.should be_true - Complex(nan_value, nan_value).fdiv(2).real.nan?.should be_true + Complex(nan_value, nan_value).fdiv(2).imag.nan?.should == true + Complex(nan_value, nan_value).fdiv(2).real.nan?.should == true end it "sets the real and imaginary part to NaN if self's real part and the argument are both NaN" do - Complex(nan_value, 2).fdiv(nan_value).imag.nan?.should be_true - Complex(nan_value, 2).fdiv(nan_value).real.nan?.should be_true + Complex(nan_value, 2).fdiv(nan_value).imag.nan?.should == true + Complex(nan_value, 2).fdiv(nan_value).real.nan?.should == true end it "sets the real and imaginary part to NaN if self's real part, self's imaginary part, and the argument are NaN" do - Complex(nan_value, nan_value).fdiv(nan_value).imag.nan?.should be_true - Complex(nan_value, nan_value).fdiv(nan_value).real.nan?.should be_true + Complex(nan_value, nan_value).fdiv(nan_value).imag.nan?.should == true + Complex(nan_value, nan_value).fdiv(nan_value).real.nan?.should == true end it "sets the real part to Infinity if self's real part is Infinity" do @@ -58,8 +58,8 @@ describe "Complex#fdiv" do end it "sets the real part to NaN and the imaginary part to NaN if self's imaginary part, self's real part, and the argument are Infinity" do - Complex(infinity_value, infinity_value).fdiv(infinity_value).real.nan?.should be_true - Complex(infinity_value, infinity_value).fdiv(infinity_value).imag.nan?.should be_true + Complex(infinity_value, infinity_value).fdiv(infinity_value).real.nan?.should == true + Complex(infinity_value, infinity_value).fdiv(infinity_value).imag.nan?.should == true end end @@ -71,7 +71,7 @@ describe "Complex#fdiv with no imaginary part" do it "returns a Complex number" do @numbers.each do |real| @numbers.each do |other| - Complex(real).fdiv(other).should be_an_instance_of(Complex) + Complex(real).fdiv(other).should.instance_of?(Complex) end end end @@ -103,7 +103,7 @@ describe "Complex#fdiv with an imaginary part" do @numbers.each_with_index do |other,idx| Complex( real,@numbers[idx == 0 ? -1 : idx-1] - ).fdiv(other).should be_an_instance_of(Complex) + ).fdiv(other).should.instance_of?(Complex) end end end diff --git a/spec/ruby/core/complex/finite_spec.rb b/spec/ruby/core/complex/finite_spec.rb index de4ba78246..7d9f82404e 100644 --- a/spec/ruby/core/complex/finite_spec.rb +++ b/spec/ruby/core/complex/finite_spec.rb @@ -1,36 +1,32 @@ require_relative '../../spec_helper' -ruby_version_is "2.4" do - describe "Complex#finite?" do - it "returns true if magnitude is finite" do - (1+1i).finite?.should == true - end +describe "Complex#finite?" do + it "returns true if magnitude is finite" do + (1+1i).should.finite? + end - it "returns false for positive infinity" do - value = Complex(Float::INFINITY, 42) - value.finite?.should == false - end + it "returns false for positive infinity" do + value = Complex(Float::INFINITY, 42) + value.should_not.finite? + end - it "returns false for positive complex with infinite imaginary" do - value = Complex(1, Float::INFINITY) - value.finite?.should == false - end + it "returns false for positive complex with infinite imaginary" do + value = Complex(1, Float::INFINITY) + value.should_not.finite? + end - it "returns false for negative infinity" do - value = -Complex(Float::INFINITY, 42) - value.finite?.should == false - end + it "returns false for negative infinity" do + value = -Complex(Float::INFINITY, 42) + value.should_not.finite? + end - it "returns false for negative complex with infinite imaginary" do - value = -Complex(1, Float::INFINITY) - value.finite?.should == false - end + it "returns false for negative complex with infinite imaginary" do + value = -Complex(1, Float::INFINITY) + value.should_not.finite? + end - ruby_bug "#14014", "2.4"..."2.5" do - it "returns false for NaN" do - value = Complex(Float::NAN, Float::NAN) - value.finite?.should == false - end - end + it "returns false for NaN" do + value = Complex(Float::NAN, Float::NAN) + value.should_not.finite? end end diff --git a/spec/ruby/core/complex/infinite_spec.rb b/spec/ruby/core/complex/infinite_spec.rb index 27aa038cd2..9e48860dee 100644 --- a/spec/ruby/core/complex/infinite_spec.rb +++ b/spec/ruby/core/complex/infinite_spec.rb @@ -1,34 +1,32 @@ require_relative '../../spec_helper' -ruby_version_is "2.4" do - describe "Complex#infinite?" do - it "returns nil if magnitude is finite" do - (1+1i).infinite?.should == nil - end +describe "Complex#infinite?" do + it "returns nil if magnitude is finite" do + (1+1i).infinite?.should == nil + end - it "returns 1 for positive infinity" do - value = Complex(Float::INFINITY, 42).infinite? - value.should == 1 - end + it "returns 1 for positive infinity" do + value = Complex(Float::INFINITY, 42).infinite? + value.should == 1 + end - it "returns 1 for positive complex with infinite imaginary" do - value = Complex(1, Float::INFINITY).infinite? - value.should == 1 - end + it "returns 1 for positive complex with infinite imaginary" do + value = Complex(1, Float::INFINITY).infinite? + value.should == 1 + end - it "returns -1 for negative infinity" do - value = -Complex(Float::INFINITY, 42).infinite? - value.should == -1 - end + it "returns -1 for negative infinity" do + value = -Complex(Float::INFINITY, 42).infinite? + value.should == -1 + end - it "returns -1 for negative complex with infinite imaginary" do - value = -Complex(1, Float::INFINITY).infinite? - value.should == -1 - end + it "returns -1 for negative complex with infinite imaginary" do + value = -Complex(1, Float::INFINITY).infinite? + value.should == -1 + end - it "returns nil for NaN" do - value = Complex(0, Float::NAN).infinite? - value.should == nil - end + it "returns nil for NaN" do + value = Complex(0, Float::NAN).infinite? + value.should == nil end end diff --git a/spec/ruby/core/complex/inspect_spec.rb b/spec/ruby/core/complex/inspect_spec.rb index 71aabde5be..045be94b22 100644 --- a/spec/ruby/core/complex/inspect_spec.rb +++ b/spec/ruby/core/complex/inspect_spec.rb @@ -1,4 +1,5 @@ require_relative '../../spec_helper' +require_relative '../numeric/fixtures/classes' describe "Complex#inspect" do it "returns (${real}+${image}i) for positive imaginary parts" do @@ -13,4 +14,24 @@ describe "Complex#inspect" do Complex(-1, -4).inspect.should == "(-1-4i)" Complex(-7, -6.7).inspect.should == "(-7-6.7i)" end + + it "calls #inspect on real and imaginary" do + real = NumericSpecs::Subclass.new + # + because of https://bugs.ruby-lang.org/issues/20337 + real.should_receive(:inspect).and_return(+"1") + imaginary = NumericSpecs::Subclass.new + imaginary.should_receive(:inspect).and_return("2") + imaginary.should_receive(:<).any_number_of_times.and_return(false) + Complex(real, imaginary).inspect.should == "(1+2i)" + end + + it "adds an `*' before the `i' if the last character of the imaginary part is not numeric" do + real = NumericSpecs::Subclass.new + # + because of https://bugs.ruby-lang.org/issues/20337 + real.should_receive(:inspect).and_return(+"(1)") + imaginary = NumericSpecs::Subclass.new + imaginary.should_receive(:inspect).and_return("(2)") + imaginary.should_receive(:<).any_number_of_times.and_return(false) + Complex(real, imaginary).inspect.should == "((1)+(2)*i)" + end end diff --git a/spec/ruby/core/complex/integer_spec.rb b/spec/ruby/core/complex/integer_spec.rb index 0957accb70..559bfbccfd 100644 --- a/spec/ruby/core/complex/integer_spec.rb +++ b/spec/ruby/core/complex/integer_spec.rb @@ -2,10 +2,10 @@ require_relative '../../spec_helper' describe "Complex#integer?" do it "returns false for a Complex with no imaginary part" do - Complex(20).integer?.should be_false + Complex(20).integer?.should == false end it "returns false for a Complex with an imaginary part" do - Complex(20,3).integer?.should be_false + Complex(20,3).integer?.should == false end end diff --git a/spec/ruby/core/complex/marshal_dump_spec.rb b/spec/ruby/core/complex/marshal_dump_spec.rb index 116899b0ad..201d55e9e5 100644 --- a/spec/ruby/core/complex/marshal_dump_spec.rb +++ b/spec/ruby/core/complex/marshal_dump_spec.rb @@ -2,7 +2,7 @@ require_relative '../../spec_helper' describe "Complex#marshal_dump" do it "is a private method" do - Complex.should have_private_instance_method(:marshal_dump, false) + Complex.private_instance_methods(false).should.include?(:marshal_dump) end it "dumps real and imaginary parts" do diff --git a/spec/ruby/core/complex/negative_spec.rb b/spec/ruby/core/complex/negative_spec.rb index 1ea5392f39..566975b8e1 100644 --- a/spec/ruby/core/complex/negative_spec.rb +++ b/spec/ruby/core/complex/negative_spec.rb @@ -4,10 +4,10 @@ describe "Complex#negative?" do it "is undefined" do c = Complex(1) - c.methods.should_not include(:negative?) + c.methods.should_not.include?(:negative?) - lambda { + -> { c.negative? - }.should raise_error(NoMethodError) + }.should.raise(NoMethodError) end end diff --git a/spec/ruby/core/complex/polar_spec.rb b/spec/ruby/core/complex/polar_spec.rb index f9d28b8388..824211fcd0 100644 --- a/spec/ruby/core/complex/polar_spec.rb +++ b/spec/ruby/core/complex/polar_spec.rb @@ -7,8 +7,22 @@ describe "Complex.polar" do end it "raises a TypeError when given non real arguments" do - lambda{ Complex.polar(nil) }.should raise_error(TypeError) - lambda{ Complex.polar(nil, nil) }.should raise_error(TypeError) + ->{ Complex.polar(nil) }.should.raise(TypeError) + ->{ Complex.polar(nil, nil) }.should.raise(TypeError) + end + + it "computes the real values of the real & imaginary parts from the polar form" do + a = Complex.polar(1.0+0.0i, Math::PI/2+0.0i) + a.real.should be_close(0.0, TOLERANCE) + a.imag.should be_close(1.0, TOLERANCE) + a.real.real?.should == true + a.imag.real?.should == true + + b = Complex.polar(1+0.0i) + b.real.should be_close(1.0, TOLERANCE) + b.imag.should be_close(0.0, TOLERANCE) + b.real.real?.should == true + b.imag.real?.should == true end end diff --git a/spec/ruby/core/complex/positive_spec.rb b/spec/ruby/core/complex/positive_spec.rb index eea0af3755..d2fb256538 100644 --- a/spec/ruby/core/complex/positive_spec.rb +++ b/spec/ruby/core/complex/positive_spec.rb @@ -4,10 +4,10 @@ describe "Complex#positive?" do it "is undefined" do c = Complex(1) - c.methods.should_not include(:positive?) + c.methods.should_not.include?(:positive?) - lambda { + -> { c.positive? - }.should raise_error(NoMethodError) + }.should.raise(NoMethodError) end end diff --git a/spec/ruby/core/complex/rationalize_spec.rb b/spec/ruby/core/complex/rationalize_spec.rb index 165f3d2700..d49bb52def 100644 --- a/spec/ruby/core/complex/rationalize_spec.rb +++ b/spec/ruby/core/complex/rationalize_spec.rb @@ -2,11 +2,11 @@ require_relative '../../spec_helper' describe "Complex#rationalize" do it "raises RangeError if self has non-zero imaginary part" do - lambda { Complex(1,5).rationalize }.should raise_error(RangeError) + -> { Complex(1,5).rationalize }.should.raise(RangeError) end it "raises RangeError if self has 0.0 imaginary part" do - lambda { Complex(1,0.0).rationalize }.should raise_error(RangeError) + -> { Complex(1,0.0).rationalize }.should.raise(RangeError) end it "returns a Rational if self has zero imaginary part" do @@ -25,7 +25,7 @@ describe "Complex#rationalize" do end it "raises ArgumentError when passed more than one argument" do - lambda { Complex(1,0).rationalize(0.1, 0.1) }.should raise_error(ArgumentError) - lambda { Complex(1,0).rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError) + -> { Complex(1,0).rationalize(0.1, 0.1) }.should.raise(ArgumentError) + -> { Complex(1,0).rationalize(0.1, 0.1, 2) }.should.raise(ArgumentError) end end diff --git a/spec/ruby/core/complex/real_spec.rb b/spec/ruby/core/complex/real_spec.rb index 2ea791c005..41734b23f0 100644 --- a/spec/ruby/core/complex/real_spec.rb +++ b/spec/ruby/core/complex/real_spec.rb @@ -11,18 +11,18 @@ end describe "Complex#real?" do it "returns false if there is an imaginary part" do - Complex(2,3).real?.should be_false + Complex(2,3).real?.should == false end it "returns false if there is not an imaginary part" do - Complex(2).real?.should be_false + Complex(2).real?.should == false end it "returns false if the real part is Infinity" do - Complex(infinity_value).real?.should be_false + Complex(infinity_value).real?.should == false end it "returns false if the real part is NaN" do - Complex(nan_value).real?.should be_false + Complex(nan_value).real?.should == false end end diff --git a/spec/ruby/core/complex/shared/divide.rb b/spec/ruby/core/complex/shared/divide.rb index e3701405b9..ef79ecdf75 100644 --- a/spec/ruby/core/complex/shared/divide.rb +++ b/spec/ruby/core/complex/shared/divide.rb @@ -19,11 +19,11 @@ describe :complex_divide, shared: true do end it "raises a ZeroDivisionError when given zero" do - lambda { Complex(20, 40).send(@method, 0) }.should raise_error(ZeroDivisionError) + -> { Complex(20, 40).send(@method, 0) }.should.raise(ZeroDivisionError) end it "produces Rational parts" do - Complex(5, 9).send(@method, 2).should eql(Complex(Rational(5,2), Rational(9,2))) + Complex(5, 9).send(@method, 2).should.eql?(Complex(Rational(5,2), Rational(9,2))) end end @@ -76,7 +76,7 @@ describe :complex_divide, shared: true do other = mock_numeric('other') other.should_receive(:real?).any_number_of_times.and_return(false) other.should_receive(:coerce).with(complex).and_return([5, 2]) - complex.send(@method, other).should eql(Rational(5, 2)) + complex.send(@method, other).should.eql?(Rational(5, 2)) end end end diff --git a/spec/ruby/core/complex/shared/rect.rb b/spec/ruby/core/complex/shared/rect.rb index 971821ac33..858234961b 100644 --- a/spec/ruby/core/complex/shared/rect.rb +++ b/spec/ruby/core/complex/shared/rect.rb @@ -13,7 +13,7 @@ describe :complex_rect, shared: true do it "returns an Array" do @numbers.each do |number| - number.send(@method).should be_an_instance_of(Array) + number.send(@method).should.instance_of?(Array) end end @@ -24,20 +24,20 @@ describe :complex_rect, shared: true do end it "returns the real part of self as the first element" do - @numbers.each do |number| - number.send(@method).first.should == number.real - end + @numbers.each do |number| + number.send(@method).first.should == number.real + end end it "returns the imaginary part of self as the last element" do - @numbers.each do |number| - number.send(@method).last.should == number.imaginary - end + @numbers.each do |number| + number.send(@method).last.should == number.imaginary + end end it "raises an ArgumentError if given any arguments" do @numbers.each do |number| - lambda { number.send(@method, number) }.should raise_error(ArgumentError) + -> { number.send(@method, number) }.should.raise(ArgumentError) end end end @@ -57,7 +57,7 @@ describe :complex_rect_class, shared: true do it "raises TypeError" do n = mock_numeric('n') n.should_receive(:real?).any_number_of_times.and_return(false) - lambda { Complex.send(@method, n) }.should raise_error(TypeError) + -> { Complex.send(@method, n) }.should.raise(TypeError) end end @@ -68,7 +68,7 @@ describe :complex_rect_class, shared: true do n2 = mock_numeric('n2') n1.should_receive(:real?).any_number_of_times.and_return(r1) n2.should_receive(:real?).any_number_of_times.and_return(r2) - lambda { Complex.send(@method, n1, n2) }.should raise_error(TypeError) + -> { Complex.send(@method, n1, n2) }.should.raise(TypeError) end end end @@ -87,8 +87,8 @@ describe :complex_rect_class, shared: true do describe "passed a non-Numeric" do it "raises TypeError" do - lambda { Complex.send(@method, :sym) }.should raise_error(TypeError) - lambda { Complex.send(@method, 0, :sym) }.should raise_error(TypeError) + -> { Complex.send(@method, :sym) }.should.raise(TypeError) + -> { Complex.send(@method, 0, :sym) }.should.raise(TypeError) end end end diff --git a/spec/ruby/core/complex/to_c_spec.rb b/spec/ruby/core/complex/to_c_spec.rb new file mode 100644 index 0000000000..cd7195556c --- /dev/null +++ b/spec/ruby/core/complex/to_c_spec.rb @@ -0,0 +1,12 @@ +require_relative '../../spec_helper' + +describe "Complex#to_c" do + it "returns self" do + value = Complex(1, 5) + value.to_c.should.equal?(value) + end + + it 'returns the same value' do + Complex(1, 5).to_c.should == Complex(1, 5) + end +end diff --git a/spec/ruby/core/complex/to_f_spec.rb b/spec/ruby/core/complex/to_f_spec.rb index 12c34dfbb1..9f3265cdb9 100644 --- a/spec/ruby/core/complex/to_f_spec.rb +++ b/spec/ruby/core/complex/to_f_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' describe "Complex#to_f" do - describe "when the imaginary part is Fixnum 0" do + describe "when the imaginary part is Integer 0" do it "returns the result of sending #to_f to the real part" do real = mock_numeric('real') real.should_receive(:to_f).and_return(:f) @@ -29,13 +29,13 @@ describe "Complex#to_f" do describe "when the imaginary part is non-zero" do it "raises RangeError" do - lambda { Complex(0, 1).to_f }.should raise_error(RangeError) + -> { Complex(0, 1).to_f }.should.raise(RangeError) end end describe "when the imaginary part is Float 0.0" do it "raises RangeError" do - lambda { Complex(0, 0.0).to_f }.should raise_error(RangeError) + -> { Complex(0, 0.0).to_f }.should.raise(RangeError) end end end diff --git a/spec/ruby/core/complex/to_i_spec.rb b/spec/ruby/core/complex/to_i_spec.rb index acdf719376..9149ffbbaa 100644 --- a/spec/ruby/core/complex/to_i_spec.rb +++ b/spec/ruby/core/complex/to_i_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' describe "Complex#to_i" do - describe "when the imaginary part is Fixnum 0" do + describe "when the imaginary part is Integer 0" do it "returns the result of sending #to_i to the real part" do real = mock_numeric('real') real.should_receive(:to_i).and_return(:i) @@ -29,13 +29,13 @@ describe "Complex#to_i" do describe "when the imaginary part is non-zero" do it "raises RangeError" do - lambda { Complex(0, 1).to_i }.should raise_error(RangeError) + -> { Complex(0, 1).to_i }.should.raise(RangeError) end end describe "when the imaginary part is Float 0.0" do it "raises RangeError" do - lambda { Complex(0, 0.0).to_i }.should raise_error(RangeError) + -> { Complex(0, 0.0).to_i }.should.raise(RangeError) end end end diff --git a/spec/ruby/core/complex/to_r_spec.rb b/spec/ruby/core/complex/to_r_spec.rb index 46bac98ef4..6587ae9e2e 100644 --- a/spec/ruby/core/complex/to_r_spec.rb +++ b/spec/ruby/core/complex/to_r_spec.rb @@ -1,7 +1,7 @@ require_relative '../../spec_helper' describe "Complex#to_r" do - describe "when the imaginary part is Fixnum 0" do + describe "when the imaginary part is Integer 0" do it "returns the result of sending #to_r to the real part" do real = mock_numeric('real') real.should_receive(:to_r).and_return(:r) @@ -29,13 +29,21 @@ describe "Complex#to_r" do describe "when the imaginary part is non-zero" do it "raises RangeError" do - lambda { Complex(0, 1).to_r }.should raise_error(RangeError) + -> { Complex(0, 1).to_r }.should.raise(RangeError) end end describe "when the imaginary part is Float 0.0" do - it "raises RangeError" do - lambda { Complex(0, 0.0).to_r }.should raise_error(RangeError) + ruby_version_is ''...'3.4' do + it "raises RangeError" do + -> { Complex(0, 0.0).to_r }.should.raise(RangeError) + end + end + + ruby_version_is '3.4' do + it "returns a Rational" do + Complex(0, 0.0).to_r.should == 0r + end end end end diff --git a/spec/ruby/core/complex/to_s_spec.rb b/spec/ruby/core/complex/to_s_spec.rb index 989a7ae0b7..ceccffe470 100644 --- a/spec/ruby/core/complex/to_s_spec.rb +++ b/spec/ruby/core/complex/to_s_spec.rb @@ -1,4 +1,5 @@ require_relative '../../spec_helper' +require_relative '../numeric/fixtures/classes' describe "Complex#to_s" do describe "when self's real component is 0" do @@ -41,4 +42,14 @@ describe "Complex#to_s" do it "returns 1+NaN*i for Complex(1, NaN)" do Complex(1, nan_value).to_s.should == "1+NaN*i" end + + it "treats real and imaginary parts as strings" do + real = NumericSpecs::Subclass.new + # + because of https://bugs.ruby-lang.org/issues/20337 + real.should_receive(:to_s).and_return(+"1") + imaginary = NumericSpecs::Subclass.new + imaginary.should_receive(:to_s).and_return("2") + imaginary.should_receive(:<).any_number_of_times.and_return(false) + Complex(real, imaginary).to_s.should == "1+2i" + end end |