AssertThatJava8Optional and AssertThatGuavaOptional inspections do not longer try to fix assertThat(optional).isEqualTo(Optional.fromNullable(expression)) to contains() when expression is not a non-null constant expression.

2019-07-30 20:02:40 +02:00
parent 8fb3ecce95
commit 4420a0a392
9 changed files with 44 additions and 5 deletions
@@ -70,6 +70,9 @@ class AssertThatGuavaOptionalInspection : AbstractAssertJInspection() {
                if (IS_EQUAL_TO_OBJECT.test(expression)) {
                    val innerExpectedCall = expression.firstArg as? PsiMethodCallExpression ?: return
                    if (CallMatcher.anyOf(GUAVA_OPTIONAL_OF, GUAVA_OPTIONAL_FROM_NULLABLE).test(innerExpectedCall)) {
+                        if (GUAVA_OPTIONAL_FROM_NULLABLE.test(innerExpectedCall)) {
+                            innerExpectedCall.firstArg.calculateConstantValue() ?: return
+                        }
                        registerRemoveExpectedOutmostMethod(holder, expression, expression, MethodNames.CONTAINS) { desc, method ->
                            QuickFixWithPostfixDelegate(
                                UnwrapExpectedStaticMethodCallQuickFix(desc, method),
@@ -60,6 +60,9 @@ class AssertThatJava8OptionalInspection : AbstractAssertJInspection() {
                if (IS_EQUAL_TO_OBJECT.test(expression)) {
                    val innerExpectedCall = expression.firstArg as? PsiMethodCallExpression ?: return
                    if (CallMatcher.anyOf(OPTIONAL_OF, OPTIONAL_OF_NULLABLE).test(innerExpectedCall)) {
+                        if (OPTIONAL_OF_NULLABLE.test(innerExpectedCall)) {
+                            innerExpectedCall.firstArg.calculateConstantValue() ?: return
+                        }
                        registerRemoveExpectedOutmostMethod(holder, expression, expression, MethodNames.CONTAINS, ::UnwrapExpectedStaticMethodCallQuickFix)
                    } else if (OPTIONAL_EMPTY.test(innerExpectedCall)) {
                        registerSimplifyMethod(holder, expression, MethodNames.IS_NOT_PRESENT)