6 files changed, 14 insertions, 107 deletions
diff --git a/spec/ruby/library/bigdecimal/shared/clone.rb b/spec/ruby/library/bigdecimal/shared/clone.rb
deleted file mode 100644
index 935ef76e7e..0000000000
--- a/spec/ruby/library/bigdecimal/shared/clone.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'bigdecimal'
-
-describe :bigdecimal_clone, shared: true do
-  before :each do
-    @obj = BigDecimal("1.2345")
-  end
-
-  it "returns self" do
-    copy = @obj.public_send(@method)
-
-    copy.should equal(@obj)
-  end
-end
diff --git a/spec/ruby/library/bigdecimal/shared/eql.rb b/spec/ruby/library/bigdecimal/shared/eql.rb
deleted file mode 100644
index 8e3e388bab..0000000000
--- a/spec/ruby/library/bigdecimal/shared/eql.rb
+++ /dev/null
@@ -1,61 +0,0 @@
-require 'bigdecimal'
-
-describe :bigdecimal_eql, shared: true do
-  before :each do
-    @bg6543_21 = BigDecimal("6543.21")
-    @bg5667_19 = BigDecimal("5667.19")
-    @a = BigDecimal("1.0000000000000000000000000000000000000000005")
-    @b = BigDecimal("1.00000000000000000000000000000000000000000005")
-    @bigint = BigDecimal("1000.0")
-    @nan = BigDecimal("NaN")
-    @infinity = BigDecimal("Infinity")
-    @infinity_minus = BigDecimal("-Infinity")
-  end
-
-  it "tests for equality" do
-    @bg6543_21.send(@method, @bg6543_21).should == true
-    @a.send(@method, @a).should == true
-    @a.send(@method, @b).should == false
-    @bg6543_21.send(@method, @a).should == false
-    @bigint.send(@method, 1000).should == true
-  end
-
-  it "returns false for NaN as it is never equal to any number" do
-    @nan.send(@method, @nan).should == false
-    @a.send(@method, @nan).should == false
-    @nan.send(@method, @a).should == false
-    @nan.send(@method, @infinity).should == false
-    @nan.send(@method, @infinity_minus).should == false
-    @infinity.send(@method, @nan).should == false
-    @infinity_minus.send(@method, @nan).should == false
-  end
-
-  it "returns true for infinity values with the same sign" do
-    @infinity.send(@method, @infinity).should == true
-    @infinity.send(@method, BigDecimal("Infinity")).should == true
-    BigDecimal("Infinity").send(@method, @infinity).should == true
-
-    @infinity_minus.send(@method, @infinity_minus).should == true
-    @infinity_minus.send(@method, BigDecimal("-Infinity")).should == true
-    BigDecimal("-Infinity").send(@method, @infinity_minus).should == true
-  end
-
-  it "returns false for infinity values with different signs" do
-    @infinity.send(@method, @infinity_minus).should == false
-    @infinity_minus.send(@method, @infinity).should == false
-  end
-
-  it "returns false when infinite value compared to finite one" do
-    @infinity.send(@method, @a).should == false
-    @infinity_minus.send(@method, @a).should == false
-
-    @a.send(@method, @infinity).should == false
-    @a.send(@method, @infinity_minus).should == false
-  end
-
-  it "returns false when compared objects that can not be coerced into BigDecimal" do
-    @infinity.send(@method, nil).should == false
-    @bigint.send(@method, nil).should == false
-    @nan.send(@method, nil).should == false
-  end
-end
diff --git a/spec/ruby/library/bigdecimal/shared/modulo.rb b/spec/ruby/library/bigdecimal/shared/modulo.rb
index aa5c5a640b..5b5e3503c4 100644
--- a/spec/ruby/library/bigdecimal/shared/modulo.rb
+++ b/spec/ruby/library/bigdecimal/shared/modulo.rb
@@ -101,25 +101,21 @@ describe :bigdecimal_modulo, shared: true do
     @infinity_minus.send(@method, @infinity).should.nan?
   end
 
-  it "returns the dividend if the divisor is Infinity" do
-    @one.send(@method, @infinity).should == @one
-    @one.send(@method, @infinity_minus).should == @one
-    @frac_2.send(@method, @infinity_minus).should == @frac_2
+  version_is BigDecimal::VERSION, "3.3.0" do
+    it "returns the dividend if the divisor is Infinity and signs are same" do
+      @one.send(@method, @infinity).should == @one
+      (-@frac_2).send(@method, @infinity_minus).should == -@frac_2
+    end
+
+    it "returns the divisor if the divisor is Infinity and signs are different" do
+      (-@one).send(@method, @infinity).should == @infinity
+      @frac_2.send(@method, @infinity_minus).should == @infinity_minus
+    end
   end
 
   it "raises TypeError if the argument cannot be coerced to BigDecimal" do
     -> {
       @one.send(@method, '2')
-    }.should raise_error(TypeError)
-  end
-end
-
-describe :bigdecimal_modulo_zerodivisionerror, shared: true do
-  it "raises ZeroDivisionError if other is zero" do
-    bd5667 = BigDecimal("5667.19")
-
-    -> { bd5667.send(@method, 0) }.should raise_error(ZeroDivisionError)
-    -> { bd5667.send(@method, BigDecimal("0")) }.should raise_error(ZeroDivisionError)
-    -> { @zero.send(@method, @zero) }.should raise_error(ZeroDivisionError)
+    }.should.raise(TypeError)
   end
 end
diff --git a/spec/ruby/library/bigdecimal/shared/power.rb b/spec/ruby/library/bigdecimal/shared/power.rb
index 568a08589b..6dafb638e2 100644
--- a/spec/ruby/library/bigdecimal/shared/power.rb
+++ b/spec/ruby/library/bigdecimal/shared/power.rb
@@ -10,8 +10,8 @@ describe :bigdecimal_power, shared: true do
     e = BigDecimal("1.00000000000000000000123456789")
     one = BigDecimal("1")
     ten = BigDecimal("10")
-    # The tolerance is dependent upon the size of BASE_FIG
-    tolerance = BigDecimal("1E-70")
+    # Accuracy is at least ndigits(== 30) + DOUBLE_FIG(== 16)
+    tolerance = BigDecimal("1E-46")
     ten_powers = BigDecimal("1E10000")
     pi = BigDecimal("3.14159265358979")
     e3_minus.send(@method, 2).should == e3_minus_power_2
diff --git a/spec/ruby/library/bigdecimal/shared/quo.rb b/spec/ruby/library/bigdecimal/shared/quo.rb
index 46e6d62bf4..18ff2fe9a5 100644
--- a/spec/ruby/library/bigdecimal/shared/quo.rb
+++ b/spec/ruby/library/bigdecimal/shared/quo.rb
@@ -31,6 +31,7 @@ describe :bigdecimal_quo, shared: true do
 
   describe "with Object" do
     it "tries to coerce the other operand to self" do
+      skip if @method == :div
       object = mock("Object")
       object.should_receive(:coerce).with(@one).and_return([@one, @two])
       @one.send(@method, object, *@object).should == BigDecimal("0.5")
diff --git a/spec/ruby/library/bigdecimal/shared/to_int.rb b/spec/ruby/library/bigdecimal/shared/to_int.rb
deleted file mode 100644
index 02f6092f23..0000000000
--- a/spec/ruby/library/bigdecimal/shared/to_int.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'bigdecimal'
-
-describe :bigdecimal_to_int , shared: true do
-  it "raises FloatDomainError if BigDecimal is infinity or NaN" do
-    -> { BigDecimal("Infinity").send(@method) }.should raise_error(FloatDomainError)
-    -> { BigDecimal("NaN").send(@method) }.should raise_error(FloatDomainError)
-  end
-
-  it "returns Integer or Bignum otherwise" do
-    BigDecimal("3E-20001").send(@method).should == 0
-    BigDecimal("2E4000").send(@method).should == 2 * 10 ** 4000
-    BigDecimal("2").send(@method).should == 2
-    BigDecimal("2E10").send(@method).should == 20000000000
-    BigDecimal("3.14159").send(@method).should == 3
-  end
-end