Update to ruby/spec@0fe33ac

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

14 files changed, 218 insertions, 88 deletions

diff --git a/spec/ruby/core/integer/allbits_spec.rb b/spec/ruby/core/integer/allbits_spec.rb
index 54c99265ba..a8ae19be15 100644
--- a/spec/ruby/core/integer/allbits_spec.rb
+++ b/spec/ruby/core/integer/allbits_spec.rb
@@ -1,37 +1,39 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe "Integer#allbits?" do
-  it "returns true iff all the bits of the argument are set in the receiver" do
-    42.allbits?(42).should == true
-    0b1010_1010.allbits?(0b1000_0010).should == true
-    0b1010_1010.allbits?(0b1000_0001).should == false
-    0b1000_0010.allbits?(0b1010_1010).should == false
-    (0b1010_1010 | bignum_value).allbits?(0b1000_0010 | bignum_value).should == true
-    (0b1010_1010 | bignum_value).allbits?(0b1000_0001 | bignum_value).should == false
-    (0b1000_0010 | bignum_value).allbits?(0b1010_1010 | bignum_value).should == false
-  end
+ruby_version_is '2.5' do
+  describe "Integer#allbits?" do
+    it "returns true iff all the bits of the argument are set in the receiver" do
+      42.allbits?(42).should == true
+      0b1010_1010.allbits?(0b1000_0010).should == true
+      0b1010_1010.allbits?(0b1000_0001).should == false
+      0b1000_0010.allbits?(0b1010_1010).should == false
+      (0b1010_1010 | bignum_value).allbits?(0b1000_0010 | bignum_value).should == true
+      (0b1010_1010 | bignum_value).allbits?(0b1000_0001 | bignum_value).should == false
+      (0b1000_0010 | bignum_value).allbits?(0b1010_1010 | bignum_value).should == false
+    end
 
-  it "handles negative values using two's complement notation" do
-    (~0b1).allbits?(42).should == true
-    (-42).allbits?(-42).should == true
-    (~0b1010_1010).allbits?(~0b1110_1011).should == true
-    (~0b1010_1010).allbits?(~0b1000_0010).should == false
-    (~(0b1010_1010 | bignum_value)).allbits?(~(0b1110_1011 | bignum_value)).should == true
-    (~(0b1010_1010 | bignum_value)).allbits?(~(0b1000_0010 | bignum_value)).should == false
-  end
+    it "handles negative values using two's complement notation" do
+      (~0b1).allbits?(42).should == true
+      (-42).allbits?(-42).should == true
+      (~0b1010_1010).allbits?(~0b1110_1011).should == true
+      (~0b1010_1010).allbits?(~0b1000_0010).should == false
+      (~(0b1010_1010 | bignum_value)).allbits?(~(0b1110_1011 | bignum_value)).should == true
+      (~(0b1010_1010 | bignum_value)).allbits?(~(0b1000_0010 | bignum_value)).should == false
+    end
 
-  it "coerces the rhs using to_int" do
-    obj = mock("the int 0b10")
-    obj.should_receive(:to_int).and_return(0b10)
-    0b110.allbits?(obj).should == true
-  end
+    it "coerces the rhs using to_int" do
+      obj = mock("the int 0b10")
+      obj.should_receive(:to_int).and_return(0b10)
+      0b110.allbits?(obj).should == true
+    end
 
-  it "raises a TypeError when given a non-Integer" do
-    lambda {
-      (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
-      13.allbits?(obj)
-    }.should raise_error(TypeError)
-    lambda { 13.allbits?("10")    }.should raise_error(TypeError)
-    lambda { 13.allbits?(:symbol) }.should raise_error(TypeError)
+    it "raises a TypeError when given a non-Integer" do
+      lambda {
+        (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
+        13.allbits?(obj)
+      }.should raise_error(TypeError)
+      lambda { 13.allbits?("10")    }.should raise_error(TypeError)
+      lambda { 13.allbits?(:symbol) }.should raise_error(TypeError)
+    end
   end
 end
diff --git a/spec/ruby/core/integer/anybits_spec.rb b/spec/ruby/core/integer/anybits_spec.rb
index 409e2e65c5..e2fd009a5f 100644
--- a/spec/ruby/core/integer/anybits_spec.rb
+++ b/spec/ruby/core/integer/anybits_spec.rb
@@ -1,36 +1,38 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe "Integer#anybits?" do
-  it "returns true iff all the bits of the argument are set in the receiver" do
-    42.anybits?(42).should == true
-    0b1010_1010.anybits?(0b1000_0010).should == true
-    0b1010_1010.anybits?(0b1000_0001).should == true
-    0b1000_0010.anybits?(0b0010_1100).should == false
-    different_bignum = (2 * bignum_value) & (~bignum_value)
-    (0b1010_1010 | different_bignum).anybits?(0b1000_0010 | bignum_value).should == true
-    (0b1010_1010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == true
-    (0b1000_0010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == false
-  end
+ruby_version_is '2.5' do
+  describe "Integer#anybits?" do
+    it "returns true iff all the bits of the argument are set in the receiver" do
+      42.anybits?(42).should == true
+      0b1010_1010.anybits?(0b1000_0010).should == true
+      0b1010_1010.anybits?(0b1000_0001).should == true
+      0b1000_0010.anybits?(0b0010_1100).should == false
+      different_bignum = (2 * bignum_value) & (~bignum_value)
+      (0b1010_1010 | different_bignum).anybits?(0b1000_0010 | bignum_value).should == true
+      (0b1010_1010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == true
+      (0b1000_0010 | different_bignum).anybits?(0b0010_1100 | bignum_value).should == false
+    end
 
-  it "handles negative values using two's complement notation" do
-    (~42).anybits?(42).should == false
-    (-42).anybits?(-42).should == true
-    (~0b100).anybits?(~0b1).should == true
-    (~(0b100 | bignum_value)).anybits?(~(0b1 | bignum_value)).should == true
-  end
+    it "handles negative values using two's complement notation" do
+      (~42).anybits?(42).should == false
+      (-42).anybits?(-42).should == true
+      (~0b100).anybits?(~0b1).should == true
+      (~(0b100 | bignum_value)).anybits?(~(0b1 | bignum_value)).should == true
+    end
 
-  it "coerces the rhs using to_int" do
-    obj = mock("the int 0b10")
-    obj.should_receive(:to_int).and_return(0b10)
-    0b110.anybits?(obj).should == true
-  end
+    it "coerces the rhs using to_int" do
+      obj = mock("the int 0b10")
+      obj.should_receive(:to_int).and_return(0b10)
+      0b110.anybits?(obj).should == true
+    end
 
-  it "raises a TypeError when given a non-Integer" do
-    lambda {
-      (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
-      13.anybits?(obj)
-    }.should raise_error(TypeError)
-    lambda { 13.anybits?("10")    }.should raise_error(TypeError)
-    lambda { 13.anybits?(:symbol) }.should raise_error(TypeError)
+    it "raises a TypeError when given a non-Integer" do
+      lambda {
+        (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
+        13.anybits?(obj)
+      }.should raise_error(TypeError)
+      lambda { 13.anybits?("10")    }.should raise_error(TypeError)
+      lambda { 13.anybits?(:symbol) }.should raise_error(TypeError)
+    end
   end
 end
diff --git a/spec/ruby/core/integer/divide_spec.rb b/spec/ruby/core/integer/divide_spec.rb
new file mode 100644
index 0000000000..6c81d5474f
--- /dev/null
+++ b/spec/ruby/core/integer/divide_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/arithmetic_exception_in_coerce', __FILE__)
+
+describe "Integer#/" do
+  it_behaves_like :integer_arithmetic_exception_in_coerce, :/
+end
+
diff --git a/spec/ruby/core/integer/fixtures/classes.rb b/spec/ruby/core/integer/fixtures/classes.rb
new file mode 100644
index 0000000000..6ebfbd1565
--- /dev/null
+++ b/spec/ruby/core/integer/fixtures/classes.rb
@@ -0,0 +1,4 @@
+module IntegerSpecs
+  class CoerceError < StandardError
+  end
+end
diff --git a/spec/ruby/core/integer/gt_spec.rb b/spec/ruby/core/integer/gt_spec.rb
new file mode 100644
index 0000000000..ec0834d346
--- /dev/null
+++ b/spec/ruby/core/integer/gt_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/comparison_exception_in_coerce', __FILE__)
+
+describe "Integer#>" do
+  it_behaves_like :integer_comparison_exception_in_coerce, :>
+end
+
diff --git a/spec/ruby/core/integer/gte_spec.rb b/spec/ruby/core/integer/gte_spec.rb
new file mode 100644
index 0000000000..a49535f823
--- /dev/null
+++ b/spec/ruby/core/integer/gte_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/comparison_exception_in_coerce', __FILE__)
+
+describe "Integer#>=" do
+  it_behaves_like :integer_comparison_exception_in_coerce, :>=
+end
+
diff --git a/spec/ruby/core/integer/lt_spec.rb b/spec/ruby/core/integer/lt_spec.rb
new file mode 100644
index 0000000000..3b778d7f6c
--- /dev/null
+++ b/spec/ruby/core/integer/lt_spec.rb
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/comparison_exception_in_coerce', __FILE__)
+
+describe "Integer#<" do
+  it_behaves_like :integer_comparison_exception_in_coerce, :<
+end
diff --git a/spec/ruby/core/integer/lte_spec.rb b/spec/ruby/core/integer/lte_spec.rb
new file mode 100644
index 0000000000..d62780c78c
--- /dev/null
+++ b/spec/ruby/core/integer/lte_spec.rb
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/comparison_exception_in_coerce', __FILE__)
+
+describe "Integer#<=" do
+  it_behaves_like :integer_comparison_exception_in_coerce, :<=
+end
diff --git a/spec/ruby/core/integer/minus_spec.rb b/spec/ruby/core/integer/minus_spec.rb
new file mode 100644
index 0000000000..6e8fa69759
--- /dev/null
+++ b/spec/ruby/core/integer/minus_spec.rb
@@ -0,0 +1,7 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/arithmetic_exception_in_coerce', __FILE__)
+
+describe "Integer#-" do
+  it_behaves_like :integer_arithmetic_exception_in_coerce, :-
+end
+
diff --git a/spec/ruby/core/integer/multiply_spec.rb b/spec/ruby/core/integer/multiply_spec.rb
new file mode 100644
index 0000000000..cfce2418a4
--- /dev/null
+++ b/spec/ruby/core/integer/multiply_spec.rb
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/arithmetic_exception_in_coerce', __FILE__)
+
+describe "Integer#*" do
+  it_behaves_like :integer_arithmetic_exception_in_coerce, :*
+end
diff --git a/spec/ruby/core/integer/nobits_spec.rb b/spec/ruby/core/integer/nobits_spec.rb
index 5b5d82a040..cfa63a4b94 100644
--- a/spec/ruby/core/integer/nobits_spec.rb
+++ b/spec/ruby/core/integer/nobits_spec.rb
@@ -1,36 +1,38 @@
 require File.expand_path('../../../spec_helper', __FILE__)
 
-describe "Integer#nobits?" do
-  it "returns true iff all no bits of the argument are set in the receiver" do
-    42.nobits?(42).should == false
-    0b1010_1010.nobits?(0b1000_0010).should == false
-    0b1010_1010.nobits?(0b1000_0001).should == false
-    0b0100_0101.nobits?(0b1010_1010).should == true
-    different_bignum = (2 * bignum_value) & (~bignum_value)
-    (0b1010_1010 | different_bignum).nobits?(0b1000_0010 | bignum_value).should == false
-    (0b1010_1010 | different_bignum).nobits?(0b1000_0001 | bignum_value).should == false
-    (0b0100_0101 | different_bignum).nobits?(0b1010_1010 | bignum_value).should == true
-  end
+ruby_version_is '2.5' do
+  describe "Integer#nobits?" do
+    it "returns true iff all no bits of the argument are set in the receiver" do
+      42.nobits?(42).should == false
+      0b1010_1010.nobits?(0b1000_0010).should == false
+      0b1010_1010.nobits?(0b1000_0001).should == false
+      0b0100_0101.nobits?(0b1010_1010).should == true
+      different_bignum = (2 * bignum_value) & (~bignum_value)
+      (0b1010_1010 | different_bignum).nobits?(0b1000_0010 | bignum_value).should == false
+      (0b1010_1010 | different_bignum).nobits?(0b1000_0001 | bignum_value).should == false
+      (0b0100_0101 | different_bignum).nobits?(0b1010_1010 | bignum_value).should == true
+    end
 
-  it "handles negative values using two's complement notation" do
-    (~0b1101).nobits?(0b1101).should == true
-    (-42).nobits?(-42).should == false
-    (~0b1101).nobits?(~0b10).should == false
-    (~(0b1101 | bignum_value)).nobits?(~(0b10 | bignum_value)).should == false
-  end
+    it "handles negative values using two's complement notation" do
+      (~0b1101).nobits?(0b1101).should == true
+      (-42).nobits?(-42).should == false
+      (~0b1101).nobits?(~0b10).should == false
+      (~(0b1101 | bignum_value)).nobits?(~(0b10 | bignum_value)).should == false
+    end
 
-  it "coerces the rhs using to_int" do
-    obj = mock("the int 0b10")
-    obj.should_receive(:to_int).and_return(0b10)
-    0b110.nobits?(obj).should == false
-  end
+    it "coerces the rhs using to_int" do
+      obj = mock("the int 0b10")
+      obj.should_receive(:to_int).and_return(0b10)
+      0b110.nobits?(obj).should == false
+    end
 
-  it "raises a TypeError when given a non-Integer" do
-    lambda {
-      (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
-      13.nobits?(obj)
-    }.should raise_error(TypeError)
-    lambda { 13.nobits?("10")    }.should raise_error(TypeError)
-    lambda { 13.nobits?(:symbol) }.should raise_error(TypeError)
+    it "raises a TypeError when given a non-Integer" do
+      lambda {
+        (obj = mock('10')).should_receive(:coerce).any_number_of_times.and_return([42,10])
+        13.nobits?(obj)
+      }.should raise_error(TypeError)
+      lambda { 13.nobits?("10")    }.should raise_error(TypeError)
+      lambda { 13.nobits?(:symbol) }.should raise_error(TypeError)
+    end
   end
 end
diff --git a/spec/ruby/core/integer/plus_spec.rb b/spec/ruby/core/integer/plus_spec.rb
new file mode 100644
index 0000000000..c292943d06
--- /dev/null
+++ b/spec/ruby/core/integer/plus_spec.rb
@@ -0,0 +1,6 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+require File.expand_path('../shared/arithmetic_exception_in_coerce', __FILE__)
+
+describe "Integer#+" do
+  it_behaves_like :integer_arithmetic_exception_in_coerce, :+
+end
diff --git a/spec/ruby/core/integer/shared/arithmetic_exception_in_coerce.rb b/spec/ruby/core/integer/shared/arithmetic_exception_in_coerce.rb
new file mode 100644
index 0000000000..dd3f55d444
--- /dev/null
+++ b/spec/ruby/core/integer/shared/arithmetic_exception_in_coerce.rb
@@ -0,0 +1,33 @@
+require File.expand_path('../../fixtures/classes', __FILE__)
+
+describe :integer_arithmetic_exception_in_coerce, shared: true do
+  ruby_version_is ""..."2.5" do
+    it "rescues exception (StandardError and subclasses) raised in other#coerce and raises TypeError" do
+      b = mock("numeric with failed #coerce")
+      b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
+
+      # e.g. 1 + b
+      -> { 1.send(@method, b) }.should raise_error(TypeError, /MockObject can't be coerced into #{1.class}/)
+    end
+
+    it "does not rescue Exception and StandardError siblings raised in other#coerce" do
+      [Exception, NoMemoryError].each do |exception|
+        b = mock("numeric with failed #coerce")
+        b.should_receive(:coerce).and_raise(exception)
+
+        # e.g. 1 + b
+        -> { 1.send(@method, b) }.should raise_error(exception)
+      end
+    end
+  end
+
+  ruby_version_is "2.5" do
+    it "does not rescue exception raised in other#coerce" do
+      b = mock("numeric with failed #coerce")
+      b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
+
+      # e.g. 1 + b
+      -> { 1.send(@method, b) }.should raise_error(IntegerSpecs::CoerceError)
+    end
+  end
+end
diff --git a/spec/ruby/core/integer/shared/comparison_exception_in_coerce.rb b/spec/ruby/core/integer/shared/comparison_exception_in_coerce.rb
new file mode 100644
index 0000000000..f99d680d6d
--- /dev/null
+++ b/spec/ruby/core/integer/shared/comparison_exception_in_coerce.rb
@@ -0,0 +1,35 @@
+require File.expand_path('../../fixtures/classes', __FILE__)
+
+describe :integer_comparison_exception_in_coerce, shared: true do
+  ruby_version_is ""..."2.5" do
+    it "rescues exception (StandardError and subclasses) raised in other#coerce and raises ArgumentError" do
+      b = mock("numeric with failed #coerce")
+      b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
+
+      # e.g. 1 > b
+      -> {
+        -> { 1.send(@method, b) }.should raise_error(ArgumentError, /comparison of #{1.class} with MockObject failed/)
+      }.should complain(/Numerical comparison operators will no more rescue exceptions of #coerce/)
+    end
+
+    it "does not rescue Exception and StandardError siblings raised in other#coerce" do
+      [Exception, NoMemoryError].each do |exception|
+        b = mock("numeric with failed #coerce")
+        b.should_receive(:coerce).and_raise(exception)
+
+        # e.g. 1 > b
+        -> { 1.send(@method, b) }.should raise_error(exception)
+      end
+    end
+  end
+
+  ruby_version_is "2.5" do
+    it "does not rescue exception raised in other#coerce" do
+      b = mock("numeric with failed #coerce")
+      b.should_receive(:coerce).and_raise(IntegerSpecs::CoerceError)
+
+      # e.g. 1 > b
+      -> { 1.send(@method, b) }.should raise_error(IntegerSpecs::CoerceError)
+    end
+  end
+end