Fix for multiple JUnit Conversions in batch mode with and without delta creating an exception.

Added new AssertThatObjectExpression inspection for toString() and hashCode() and moved equals() from AssertThatBinaryExpression there.

src/test/resources/inspections/BinaryExpression/BinaryExpressionAfter.java

@@ -146,12 +146,12 @@ public class BinaryExpression {
         assertThat(numberObjAct).isGreaterThan(1);
         assertThat(numberObjAct).isGreaterThan(1);
 
-        assertThat(numberObjAct).as("doh!").isEqualTo(numberObjExp);
-        assertThat(numberObjAct).isEqualTo(numberObjExp);
-        assertThat(numberObjAct).isEqualTo(numberObjExp);
-        assertThat(numberObjAct).isNotEqualTo(numberObjExp);
-        assertThat(numberObjAct).isNotEqualTo(numberObjExp);
-        assertThat(numberObjAct).isNotEqualTo(numberObjExp);
+        assertThat(numberObjAct.equals(numberObjExp)).as("doh!").isTrue();
+        assertThat(numberObjAct.equals(numberObjExp)).isEqualTo(true);
+        assertThat(numberObjAct.equals(numberObjExp)).isNotEqualTo(false);
+        assertThat(numberObjAct.equals(numberObjExp)).isFalse();
+        assertThat(numberObjAct.equals(numberObjExp)).isEqualTo(false);
+        assertThat(numberObjAct.equals(numberObjExp)).isNotEqualTo(true);
 
         assertThat(stringAct).as("doh!").isSameAs(stringExp);
         assertThat(stringAct).isSameAs(stringExp);
@@ -160,12 +160,12 @@ public class BinaryExpression {
         assertThat(stringAct).isNotSameAs(stringExp);
         assertThat(stringAct).isNotSameAs(stringExp);
 
-        assertThat(stringAct).as("doh!").isEqualTo(stringExp);
-        assertThat(stringAct).isEqualTo(stringExp);
-        assertThat(stringAct).isEqualTo(stringExp);
-        assertThat(stringAct).isNotEqualTo(stringExp);
-        assertThat(stringAct).isNotEqualTo(stringExp);
-        assertThat(stringAct).isNotEqualTo(stringExp);
+        assertThat(stringAct.equals(stringExp)).as("doh!").isTrue();
+        assertThat(stringAct.equals(stringExp)).isEqualTo(true);
+        assertThat(stringAct.equals(stringExp)).isNotEqualTo(false);
+        assertThat(stringAct.equals(stringExp)).isFalse();
+        assertThat(stringAct.equals(stringExp)).isEqualTo(false);
+        assertThat(stringAct.equals(stringExp)).isNotEqualTo(true);
 
         assertThat(stringAct).as("doh!").isNotSameAs(stringExp);
         assertThat(stringAct).isNotSameAs(stringExp);
@@ -194,6 +194,6 @@ public class BinaryExpression {
         assertThat(primAct).as("doh!").isEqualTo(primExp).isEqualTo(primExp);
         assertThat(primAct == primExp).isFalse().as("doh!").isEqualTo(true);
 
-        assertThat(numberObjAct).as("doh!").isEqualTo(numberObjExp).isEqualTo(numberObjExp);
+        assertThat(numberObjAct.equals(numberObjExp)).as("doh!").isTrue().isEqualTo(true);
     }
 }

src/test/resources/inspections/ObjectExpression/ObjectExpressionAfter.java

@@ -0,0 +1,27 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ObjectExpression {
+
+    private void objectExpression() {
+        Integer object = 1;
+        Integer otherObject = 1;
+        boolean foo = false;
+
+        assertThat(object).hasToString("foo");
+        assertThat(object.toString()).isNotEqualTo("foo");
+
+        assertThat(object).hasSameHashCodeAs(otherObject);
+        assertThat(object.hashCode()).isEqualTo(123);
+
+        assertThat(object).as("doh!").isEqualTo(otherObject);
+        assertThat(object).isEqualTo(otherObject);
+        assertThat(object).isEqualTo(otherObject);
+        assertThat(object).isNotEqualTo(otherObject);
+        assertThat(object).isNotEqualTo(otherObject);
+        assertThat(object).isNotEqualTo(otherObject);
+
+        assertThat(object.equals(otherObject)).isEqualTo(foo);
+
+        assertThat(object).as("doh!").isEqualTo(otherObject).isEqualTo(otherObject);
+    }
+}

src/test/resources/inspections/ObjectExpression/ObjectExpressionBefore.java

@@ -0,0 +1,27 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ObjectExpression {
+
+    private void objectExpression() {
+        Integer object = 1;
+        Integer otherObject = 1;
+        boolean foo = false;
+
+        assertThat(object.toString()).isEqualTo("foo");
+        assertThat(object.toString()).isNotEqualTo("foo");
+
+        assertThat(object.hashCode()).isEqualTo(otherObject.hashCode());
+        assertThat(object.hashCode()).isEqualTo(123);
+
+        assertThat(object.equals(otherObject)).as("doh!").isTrue();
+        assertThat(object.equals(otherObject)).isEqualTo(true);
+        assertThat(object.equals(otherObject)).isNotEqualTo(false);
+        assertThat(object.equals(otherObject)).isFalse();
+        assertThat(object.equals(otherObject)).isEqualTo(false);
+        assertThat(object.equals(otherObject)).isNotEqualTo(true);
+
+        assertThat(object.equals(otherObject)).isEqualTo(foo);
+
+        assertThat(object.equals(otherObject)).as("doh!").isTrue().isEqualTo(true);
+    }
+}

src/test/resources/inspections/StringExpression/StringExpressionAfter.java

@@ -8,6 +8,7 @@ public class StringExpression {
 
         assertThat(string).as("foo").isEmpty();
         assertThat(string).isEmpty();
+        assertThat(string).isEmpty();
         assertThat(string).isEqualTo("foo");
         assertThat(string).isEqualTo("foo");
         assertThat(string).isEqualToIgnoringCase("foo");
@@ -27,6 +28,7 @@ public class StringExpression {
 
         assertThat(string).as("foo").isNotEmpty();
         assertThat(string).isNotEmpty();
+        assertThat(string).isNotEmpty();
         assertThat(string).isNotEqualTo("foo");
         assertThat(string).isNotEqualTo("foo");
         assertThat(string).isNotEqualToIgnoringCase("foo");

src/test/resources/inspections/StringExpression/StringExpressionBefore.java

@@ -7,6 +7,7 @@ public class StringExpression {
         StringBuilder stringBuilder = new StringBuilder();
 
         assertThat(string.isEmpty()).as("foo").isEqualTo(true);
+        assertThat(string.isEmpty()).isNotEqualTo(false);
         assertThat(string.isEmpty()).isTrue();
         assertThat(string.equals("foo")).isEqualTo(true);
         assertThat(string.equals("foo")).isTrue();
@@ -26,6 +27,7 @@ public class StringExpression {
         assertThat(string.endsWith("foo")).isTrue();
 
         assertThat(string.isEmpty()).as("foo").isEqualTo(false);
+        assertThat(string.isEmpty()).isNotEqualTo(true);
         assertThat(string.isEmpty()).isFalse();
         assertThat(string.equals("foo")).isEqualTo(false);
         assertThat(string.equals("foo")).isFalse();