diff options
Diffstat (limited to 'spec/ruby/core/complex')
| -rw-r--r-- | spec/ruby/core/complex/coerce_spec.rb | 8 | ||||
| -rw-r--r-- | spec/ruby/core/complex/comparison_spec.rb | 25 | ||||
| -rw-r--r-- | spec/ruby/core/complex/equal_value_spec.rb | 4 | ||||
| -rw-r--r-- | spec/ruby/core/complex/exponent_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/complex/fdiv_spec.rb | 18 | ||||
| -rw-r--r-- | spec/ruby/core/complex/finite_spec.rb | 12 | ||||
| -rw-r--r-- | spec/ruby/core/complex/inspect_spec.rb | 21 | ||||
| -rw-r--r-- | spec/ruby/core/complex/negative_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/complex/polar_spec.rb | 18 | ||||
| -rw-r--r-- | spec/ruby/core/complex/positive_spec.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/complex/rationalize_spec.rb | 8 | ||||
| -rw-r--r-- | spec/ruby/core/complex/shared/divide.rb | 2 | ||||
| -rw-r--r-- | spec/ruby/core/complex/shared/rect.rb | 22 | ||||
| -rw-r--r-- | spec/ruby/core/complex/spaceship_spec.rb | 27 | ||||
| -rw-r--r-- | spec/ruby/core/complex/to_c_spec.rb | 12 | ||||
| -rw-r--r-- | spec/ruby/core/complex/to_f_spec.rb | 6 | ||||
| -rw-r--r-- | spec/ruby/core/complex/to_i_spec.rb | 6 | ||||
| -rw-r--r-- | spec/ruby/core/complex/to_r_spec.rb | 16 | ||||
| -rw-r--r-- | spec/ruby/core/complex/to_s_spec.rb | 11 |
19 files changed, 143 insertions, 79 deletions
diff --git a/spec/ruby/core/complex/coerce_spec.rb b/spec/ruby/core/complex/coerce_spec.rb index ce2fb36b73..a30a6c1d5f 100644 --- a/spec/ruby/core/complex/coerce_spec.rb +++ b/spec/ruby/core/complex/coerce_spec.rb @@ -53,18 +53,18 @@ describe "Complex#coerce" do 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_error(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_error(TypeError) end it "raises a TypeError when other is nil" do - lambda { @one.coerce(nil) }.should raise_error(TypeError) + -> { @one.coerce(nil) }.should raise_error(TypeError) end it "raises a TypeError when other is false" do - lambda { @one.coerce(false) }.should raise_error(TypeError) + -> { @one.coerce(false) }.should raise_error(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..3a3142f234 --- /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 be_nil + (Complex(1) <=> Complex(2, 1)).should be_nil + (5 <=> Complex(2, 1)).should be_nil + end + + it "returns nil if argument is not numeric" do + (Complex(5, 1) <=> "cmp").should be_nil + (Complex(1) <=> "cmp").should be_nil + (Complex(1) <=> Object.new).should be_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/equal_value_spec.rb b/spec/ruby/core/complex/equal_value_spec.rb index b1e4f9cfcd..97c486d820 100644 --- a/spec/ruby/core/complex/equal_value_spec.rb +++ b/spec/ruby/core/complex/equal_value_spec.rb @@ -53,7 +53,7 @@ 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) @@ -76,7 +76,7 @@ describe "Complex#==" do (Complex(real, 0) == @other).should be_true end - it "returns false when when the imaginary part is not zero" do + it "returns false when the imaginary part is not zero" do (Complex(3, 1) == @other).should be_false end end diff --git a/spec/ruby/core/complex/exponent_spec.rb b/spec/ruby/core/complex/exponent_spec.rb index bf07c90038..86f827aece 100644 --- a/spec/ruby/core/complex/exponent_spec.rb +++ b/spec/ruby/core/complex/exponent_spec.rb @@ -1,7 +1,7 @@ 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)) end diff --git a/spec/ruby/core/complex/fdiv_spec.rb b/spec/ruby/core/complex/fdiv_spec.rb index 20d2f41354..68f7d1b309 100644 --- a/spec/ruby/core/complex/fdiv_spec.rb +++ b/spec/ruby/core/complex/fdiv_spec.rb @@ -2,21 +2,21 @@ 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_error(TypeError) + -> { Complex(20).fdiv(2.0) }.should_not raise_error(TypeError) + -> { Complex(20).fdiv(bignum_value) }.should_not raise_error(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_error(TypeError) + -> { Complex(20).fdiv(-2.0) }.should_not raise_error(TypeError) + -> { Complex(20).fdiv(-bignum_value) }.should_not raise_error(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_error(TypeError) + -> { Complex(20).fdiv(:sym) }.should raise_error(TypeError) + -> { Complex(20).fdiv('s') }.should raise_error(TypeError) end it "sets the real part to NaN if self's real part is NaN" do diff --git a/spec/ruby/core/complex/finite_spec.rb b/spec/ruby/core/complex/finite_spec.rb index 718848390c..7d9f82404e 100644 --- a/spec/ruby/core/complex/finite_spec.rb +++ b/spec/ruby/core/complex/finite_spec.rb @@ -2,31 +2,31 @@ require_relative '../../spec_helper' describe "Complex#finite?" do it "returns true if magnitude is finite" do - (1+1i).finite?.should == true + (1+1i).should.finite? end it "returns false for positive infinity" do value = Complex(Float::INFINITY, 42) - value.finite?.should == false + value.should_not.finite? end it "returns false for positive complex with infinite imaginary" do value = Complex(1, Float::INFINITY) - value.finite?.should == false + value.should_not.finite? end it "returns false for negative infinity" do value = -Complex(Float::INFINITY, 42) - value.finite?.should == false + value.should_not.finite? end it "returns false for negative complex with infinite imaginary" do value = -Complex(1, Float::INFINITY) - value.finite?.should == false + value.should_not.finite? end it "returns false for NaN" do value = Complex(Float::NAN, Float::NAN) - value.finite?.should == false + value.should_not.finite? 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/negative_spec.rb b/spec/ruby/core/complex/negative_spec.rb index 1ea5392f39..62ab89c04a 100644 --- a/spec/ruby/core/complex/negative_spec.rb +++ b/spec/ruby/core/complex/negative_spec.rb @@ -6,7 +6,7 @@ describe "Complex#negative?" do c.methods.should_not include(:negative?) - lambda { + -> { c.negative? }.should raise_error(NoMethodError) end diff --git a/spec/ruby/core/complex/polar_spec.rb b/spec/ruby/core/complex/polar_spec.rb index f9d28b8388..56335584ef 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_error(TypeError) + ->{ Complex.polar(nil, nil) }.should raise_error(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 be_true + a.imag.real?.should be_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 be_true + b.imag.real?.should be_true end end diff --git a/spec/ruby/core/complex/positive_spec.rb b/spec/ruby/core/complex/positive_spec.rb index eea0af3755..f1bad8608c 100644 --- a/spec/ruby/core/complex/positive_spec.rb +++ b/spec/ruby/core/complex/positive_spec.rb @@ -6,7 +6,7 @@ describe "Complex#positive?" do c.methods.should_not include(:positive?) - lambda { + -> { c.positive? }.should raise_error(NoMethodError) end diff --git a/spec/ruby/core/complex/rationalize_spec.rb b/spec/ruby/core/complex/rationalize_spec.rb index 165f3d2700..043b8ddf2a 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_error(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_error(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_error(ArgumentError) + -> { Complex(1,0).rationalize(0.1, 0.1, 2) }.should raise_error(ArgumentError) end end diff --git a/spec/ruby/core/complex/shared/divide.rb b/spec/ruby/core/complex/shared/divide.rb index e3701405b9..a60802c74c 100644 --- a/spec/ruby/core/complex/shared/divide.rb +++ b/spec/ruby/core/complex/shared/divide.rb @@ -19,7 +19,7 @@ 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_error(ZeroDivisionError) end it "produces Rational parts" do diff --git a/spec/ruby/core/complex/shared/rect.rb b/spec/ruby/core/complex/shared/rect.rb index 971821ac33..4ac294e771 100644 --- a/spec/ruby/core/complex/shared/rect.rb +++ b/spec/ruby/core/complex/shared/rect.rb @@ -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_error(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_error(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_error(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_error(TypeError) + -> { Complex.send(@method, 0, :sym) }.should raise_error(TypeError) end end end diff --git a/spec/ruby/core/complex/spaceship_spec.rb b/spec/ruby/core/complex/spaceship_spec.rb deleted file mode 100644 index 7b2849a86a..0000000000 --- a/spec/ruby/core/complex/spaceship_spec.rb +++ /dev/null @@ -1,27 +0,0 @@ -require_relative '../../spec_helper' - -describe "Complex#<=>" do - ruby_version_is '2.7' do - it "returns nil if either self or argument has imaginary part" do - (Complex(5, 1) <=> Complex(2)).should be_nil - (Complex(1) <=> Complex(2, 1)).should be_nil - (5 <=> Complex(2, 1)).should be_nil - end - - it "returns nil if argument is not numeric" do - (Complex(5, 1) <=> "cmp").should be_nil - (Complex(1) <=> "cmp").should be_nil - (Complex(1) <=> Object.new).should be_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 -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..5ce01d9d4e --- /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..b53471c1fc 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_error(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_error(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..1e78f5ec0e 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_error(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_error(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..788027a500 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_error(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_error(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 |
