Fixed a bug in AssertThatBinaryExpression inspection for assertThat(null != expression) and related that would not correctly invert the condition on transformation.

2019-09-29 12:32:32 +02:00
parent 2b97494c17
commit acc81863f5
6 changed files with 40 additions and 2 deletions
@@ -38,7 +38,13 @@ class AssertThatBinaryExpressionInspection : AbstractAssertJInspection() {

                if (isLeftNull && isRightNull) return
                if (isLeftNull || isRightNull) {
-                    val replacementMethod = expectedResult.map(MethodNames.IS_NULL, MethodNames.IS_NOT_NULL)
+                    val expectedResultOnOp =
+                        when (binaryExpression.operationTokenType) {
+                            JavaTokenType.EQEQ -> expectedResult
+                            JavaTokenType.NE -> !expectedResult
+                            else -> return
+                        }
+                    val replacementMethod = expectedResultOnOp.map(MethodNames.IS_NULL, MethodNames.IS_NOT_NULL)
                    registerSplitMethod(holder, expectedCallExpression, replacementMethod) { desc, method ->
                        SplitBinaryExpressionMethodCallQuickFix(desc, method, pickRightOperand = isLeftNull, noExpectedExpression = true)
                    }