at last, do BN comparison == vs eql? properly - just like MRI version

Author: kares

src/main/java/org/jruby/ext/openssl/BN.java

@@ -89,10 +89,6 @@ static BN newInstance(final Ruby runtime, BigInteger value) {
         return new BN(runtime, value != null ? value : BigInteger.ZERO);
     }
 
-    //static BN newInstance(final Ruby runtime, long value) {
-    //    return new BN(runtime, BigInteger.valueOf(value));
-    //}
-
     public static void createBN(final Ruby runtime, final RubyModule OpenSSL) {
         final RubyClass OpenSSLError = OpenSSL.getClass("OpenSSLError");
         OpenSSL.defineClassUnder("BNError", OpenSSLError, OpenSSLError.getAllocator());
@@ -164,7 +160,7 @@ public IRubyObject initialize(final ThreadContext context,
     }
 
     @Override
-    public synchronized IRubyObject initialize_copy(final IRubyObject that) {
+    public IRubyObject initialize_copy(final IRubyObject that) {
         super.initialize_copy(that);
         if ( this != that ) this.value = ((BN) that).value;
         return this;
@@ -342,8 +338,18 @@ public IRubyObject ucmp(final ThreadContext context, IRubyObject other) {
         return context.runtime.newFixnum( value.abs().compareTo( asBigInteger(other).abs() ) );
     }
 
-    @JRubyMethod(name={"eql?", "==", "==="})
-    public RubyBoolean eql_p(final ThreadContext context, IRubyObject other) {
+    @JRubyMethod(name = "eql?")
+    public IRubyObject eql_p(ThreadContext context, IRubyObject other) {
+        return context.runtime.newBoolean(eql(other));
+    }
+
+    @Override
+    public boolean eql(IRubyObject other) {
+        return equals(other);
+    }
+
+    @JRubyMethod(name = "==")
+    public IRubyObject op_equal(ThreadContext context, IRubyObject other) {
         return context.runtime.newBoolean( value.equals( asBigInteger(other) ) );
     }
 

src/test/ruby/test_bn.rb

@@ -52,6 +52,25 @@ def test_to_bn
     assert_equal bn, 1234567890123456789012345678901234567890.to_bn
   end
 
+  def test_comparison
+    e1 = OpenSSL::BN.new(999.to_s(16), 16)
+    e3 = OpenSSL::BN.new((2**107-1).to_s(16), 16)
+    assert_equal(false, e1 == nil)
+    assert_equal(false, e1 == -999)
+    assert_equal(true, e1 == 999)
+    assert_equal(true, e1 == 999.to_bn)
+    assert_equal(false, e1.eql?(nil))
+    assert_equal(false, e1.eql?(999))
+    assert_equal(true, e1.eql?(999.to_bn))
+    assert_equal(e1.hash, 999.to_bn.hash)
+    assert_not_equal(e1.hash, e3.hash)
+    assert_equal(0, e1.cmp(999))
+    assert_equal(1, e1.cmp(-999))
+    assert_equal(0, e1.ucmp(999))
+    assert_equal(0, e1.ucmp(-999))
+    assert_instance_of(String, e1.hash.to_s)
+  end
+
   def test_to_java
     assert_equal java.lang.Integer.new(42), OpenSSL::BN.new('42').to_java(:int)
     assert_equal java.math.BigInteger.valueOf(24), OpenSSL::BN.new('24').to_java