From 7796718ec4fbca85908cbb70f85db5c88927cae6 Mon Sep 17 00:00:00 2001 From: Timo Rohwedder Date: Thu, 12 Nov 2015 16:43:36 +0100 Subject: [PATCH 1/2] I think BigInteger is also a number and BigInteger("1") is equal to "1". --- src/main/java/org/assertj/db/type/Value.java | 4 +++- .../db/util/Values_AreEqual_Object_And_Object_Test.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/assertj/db/type/Value.java b/src/main/java/org/assertj/db/type/Value.java index 358e2e9a..732047a9 100644 --- a/src/main/java/org/assertj/db/type/Value.java +++ b/src/main/java/org/assertj/db/type/Value.java @@ -13,6 +13,7 @@ package org.assertj.db.type; import java.math.BigDecimal; +import java.math.BigInteger; import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; @@ -82,7 +83,8 @@ static ValueType getType(Object object) { || object instanceof Long || object instanceof Float || object instanceof Double - || object instanceof BigDecimal) { + || object instanceof BigDecimal + || object instanceof BigInteger) { return ValueType.NUMBER; } diff --git a/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java b/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java index 58d9e33a..2c758818 100644 --- a/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java +++ b/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java @@ -335,7 +335,7 @@ public void test_are_equal_for_double_and_string() throws Exception { */ @Test public void test_are_equal_for_biginteger_and_string() throws Exception { - assertThat(Values.areEqual(getValue(null, new BigInteger("1")), (Object) "1")).isFalse(); + assertThat(Values.areEqual(getValue(null, new BigInteger("1")), (Object) "1")).isTrue(); assertThat(Values.areEqual(getValue(null, new BigInteger("2")), (Object) "1")).isFalse(); } From 4bf194a2fb559f4253acd955ebed784e2dfcd815 Mon Sep 17 00:00:00 2001 From: Timo Rohwedder Date: Fri, 13 Nov 2015 08:32:51 +0100 Subject: [PATCH 2/2] source format --- .../assertj/db/util/Values_AreEqual_Object_And_Object_Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java b/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java index 2c758818..06620c0c 100644 --- a/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java +++ b/src/test/java/org/assertj/db/util/Values_AreEqual_Object_And_Object_Test.java @@ -335,7 +335,7 @@ public void test_are_equal_for_double_and_string() throws Exception { */ @Test public void test_are_equal_for_biginteger_and_string() throws Exception { - assertThat(Values.areEqual(getValue(null, new BigInteger("1")), (Object) "1")).isTrue(); + assertThat(Values.areEqual(getValue(null, new BigInteger("1")), (Object) "1")).isTrue(); assertThat(Values.areEqual(getValue(null, new BigInteger("2")), (Object) "1")).isFalse(); }