Fix for AssertThatStringIsEmpty, refactored method.

src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractAssertJInspection.kt

@@ -2,6 +2,8 @@ package de.platon42.intellij.plugins.cajon.inspections
 
 import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool
 import com.intellij.psi.CommonClassNames
+import com.intellij.psi.PsiCapturedWildcardType
+import com.intellij.psi.PsiMethodCallExpression
 import com.siyeh.ig.callMatcher.CallMatcher
 
 open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
@@ -26,4 +28,12 @@ open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
     override fun getGroupDisplayName(): String {
         return "AssertJ"
     }
+
+    protected fun checkAssertedType(expression: PsiMethodCallExpression, prefix: String): Boolean {
+        var assertedType = expression.methodExpression.qualifierExpression?.type
+        if (assertedType is PsiCapturedWildcardType) {
+            assertedType = assertedType.upperBound
+        }
+        return assertedType?.canonicalText?.startsWith(prefix) ?: false
+    }
 }

src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatBooleanIsTrueOrFalseInspection.kt

@@ -39,14 +39,12 @@ class AssertThatBooleanIsTrueOrFalseInspection : AbstractAssertJInspection() {
                 if (!(normalBooleanTest || flippedBooleanTest)) {
                     return
                 }
-                var assertedType = expression.methodExpression.qualifierExpression?.type
-                if (assertedType is PsiCapturedWildcardType) {
-                    assertedType = assertedType.upperBound
+                if (!checkAssertedType(expression, ABSTRACT_BOOLEAN_ASSERT_CLASSNAME)) {
+                    return
                 }
-                val assertedTypeIsBoolean =
-                    assertedType?.canonicalText?.startsWith(ABSTRACT_BOOLEAN_ASSERT_CLASSNAME) ?: false
+
                 val equalToExpression = expression.argumentList.expressions[0]!!
-                if (!TypeConversionUtil.isBooleanType(equalToExpression.type) || !assertedTypeIsBoolean) {
+                if (!TypeConversionUtil.isBooleanType(equalToExpression.type)) {
                     return
                 }
                 val constantEvaluationHelper = JavaPsiFacade.getInstance(holder.project).constantEvaluationHelper

src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringIsEmptyInspection.kt

@@ -33,6 +33,10 @@ class AssertThatStringIsEmptyInspection : AbstractAssertJInspection() {
                     return
                 }
 
+                if (!checkAssertedType(expression, ABSTRACT_STRING_ASSERT_CLASSNAME)) {
+                    return
+                }
+
                 val psiExpression = expression.argumentList.expressions[0] as? PsiLiteralExpression ?: return
 
                 if (psiExpression.value == "") {
@@ -47,5 +51,4 @@ class AssertThatStringIsEmptyInspection : AbstractAssertJInspection() {
             }
         }
     }
-
 }