New AssertThatInstanceOf inspection that moves instanceof expressions out of assertThat(). Fixes to documentation.

Renamed a few inspections to better/shorter names (and fixed file and directory names accordingly).

README.md

@@ -1,15 +1,17 @@
 # Cajon - Concise AssertJ Optimizing Nitpicker
 
-Cajon is an IntelliJ IDEA Plugin for shortening and optimizing AssertJ assertions.
+Cajon is an IntelliJ IDEA Plugin for shortening and optimizing [AssertJ](https://assertj.github.io/doc/) assertions.
 
-## Why?
+## Purpose
 
 First, code is easier to read, when it is concise and reflects the intention clearly.
 AssertJ has plenty of different convenience methods that describing various intentions precisely.
 Why write longer, more complex code that can be expressed in brevity?
 
-Second, AssertJ is able to output more meaningful descriptions when an assertion fails.
+Second, when using the available special assertion methods of AssertJ, a failure of a condition
+can be expressed in better detail and with more meaningful descriptions.
 This makes finding bugs and fixing failed tests more efficient.
+Nobody likes to read failures of the kind "failed because true is not false".
 
 For example:
 
@@ -17,7 +19,7 @@ For example:
 assertThat(collection.size()).isEqualTo(5);
 ```
 
-If the collection has more or less than 5 elements, the assertion will fail, but will not
+If the collection has more or less than five elements, the assertion will fail, but will not
 tell you about the contents, making it hard to guess what went wrong.
 
 Instead, if you wrote the same assertion the following way:
@@ -26,18 +28,45 @@ Instead, if you wrote the same assertion the following way:
 assertThat(collection).hasSize(5);
 ```
 
-Then AssertJ would tell you the contents of the collection on failure.
+Then AssertJ would tell you the _actual contents_ of the collection on failure.
 
 ## Conversion of JUnit assertions to AssertJ
 
 The plugin also supports the conversion of the most common JUnit 4 assertions to AssertJ.
 
+## Lookup and refactoring of string-based extracting()
+
+AssertJ allows [extracting POJO fields/properties on iterables/arrays](http://joel-costigliola.github.io/assertj/assertj-core-features-highlight.html#extracted-properties-assertion).
+
+Using strings is not safe for refactoring (and before Java 8 Lambdas were available,
+creating extractor functions just for testing purpose was a bit too tedious).
+
+This plugin adds support for referencing these fields (so you can ctrl(/cmd)-click on the 
+string to go to the definition) and also allows safe refactoring on the 
+fields (refactoring a getter method without a corresponding field will not work 
+correctly right now).
+
 ## Usage
 
 The plugin will report inspections in your opened editor file as warnings.
 You can then quick-fix these with your quick-fix hotkey (usually Alt-Return or Opt-Return).
 
 Or, you can use the "Run Inspection by Name..." action to run one inspection on a bigger scope (e.g. the whole project).
+Applying a quick fix might result in further optimization possibilities, so 
+you might need to perform a couple of fixes before you get to the final result.
+
+Check out this example where every line represents the result after a Cajon quickfix:
+```
+assertFalse(!(array.length == collection.size()));
+
+assertThat(!(array.length == collection.size())).isFalse();
+
+assertThat(array.length == collection.size()).isTrue();
+
+assertThat(array.length).isEqualTo(collection.size());
+
+assertThat(array).hasSameSizeAs(collection);
+```
 
 You can toggle the various inspections in the Settings/Editor/Inspections in the AssertJ group.
 
@@ -52,12 +81,30 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
     to: assertThat(object).isNotNull();
   ```
 
-- AssertThatBooleanIsTrueOrFalse
+- AssertThatBooleanCondition
   ```
   from: assertThat(booleanValue).isEqualTo(true/false/Boolean.TRUE/Boolean.FALSE);  
     to: assertThat(booleanValue).isTrue()/isFalse();
   ```
 
+- AssertThatInvertedBooleanCondition
+  ```
+  from: assertThat(!booleanValue).isEqualTo(true/false/Boolean.TRUE/Boolean.FALSE);  
+  from: assertThat(!booleanValue).isTrue()/isFalse();  
+    to: assertThat(booleanValue).isFalse()/isTrue();
+  ```
+
+- AssertThatInstanceOf
+  ```
+  from: assertThat(object instanceof classname).isEqualTo(true);
+  from: assertThat(object instanceof classname).isTrue();
+    to: assertThat(object).isInstanceOf(classname.class);
+
+  from: assertThat(object instanceof classname).isEqualTo(false);
+  from: assertThat(object instanceof classname).isFalse();
+    to: assertThat(object).isNotInstanceOf(classname.class);
+  ```
+
 - AssertThatStringIsEmpty
   ```
   from: assertThat(charSequence/string).isEqualTo("");
@@ -65,6 +112,29 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
     to: assertThat(charSequence/string).isEmpty();
   ```
 
+- AssertThatStringExpression
+  ```
+  from: assertThat(stringActual.isEmpty()).isTrue();
+    to: assertThat(stringActual).isEmpty();
+
+  from: assertThat(stringActual.equals(stringExpected)).isTrue();
+  from: assertThat(stringActual.contentEquals(charSeqExpected)).isTrue();
+    to: assertThat(stringActual).isEqualTo(stringExpected);
+
+  from: assertThat(stringActual.equalsIgnoreCase(stringExpected)).isTrue();
+    to: assertThat(stringActual).isEqualToIgnoringCase(stringExpected);
+
+  from: assertThat(stringActual.contains(stringExpected)).isTrue();
+    to: assertThat(stringActual).contains(stringExpected);
+
+  from: assertThat(stringActual.startsWith(stringExpected)).isTrue();
+    to: assertThat(stringActual).startsWith(stringExpected);
+
+  from: assertThat(stringActual.endsWith(stringExpected)).isTrue();
+    to: assertThat(stringActual).endsWith(stringExpected);
+  ```
+  Analogously with ```isFalse()```.
+
 - AssertThatEnumerableIsEmpty
   ```
   from: assertThat(enumerable).hasSize(0);
@@ -88,7 +158,7 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
     to: assertThat(array).hasSameSizeAs(anotherArray);
   ```
 
-  with AssertJ 13.2.0 or higher
+  and additionally with AssertJ 13.2.0 or later
 
   ```
   from: assertThat(array.length).isLessThanOrEqualTo(expression);
@@ -103,10 +173,17 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
   from: assertThat(array.length).isGreaterThanOrEqualTo(expression);
     to: assertThat(array).hasSizeGreaterThanOrEqualTo(expression);
   ```
+  and analogously for collections, strings and CharSequences, e.g:
 
-  and analogously for collections...
+  ```
+  from: assertThat("string".length()).isLessThan(1);
+    to: assertThat("string").isEmpty();
 
-- AssertThatBinaryExpressionIsTrueOrFalse
+  from: assertThat("string".length()).isEqualTo(collection.size())
+    to: assertThat("string").hasSameSizeAs(collection);
+  ```
+
+- AssertThatBinaryExpression
   ```
   from: assertThat(primActual == primExpected).isTrue();
     to: assertThat(primActual).isEqualTo(primExpected);
@@ -119,8 +196,11 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
 
   from: assertThat(null == objActual).isFalse();
     to: assertThat(objActual).isNotNull();
+
+  from: assertThat(objActual.equals(objExpected).isTrue();
+    to: assertThat(objActual).isEqualTo(objExpected);
   ```
-  and many, many more combinations (more than 150).
+  ...and many, many more combinations (more than 150).
 
 - AssertThatJava8Optional
   ```
@@ -151,34 +231,6 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
     to: assertThat(opt).isPresent();
   ```
 
-- JUnitAssertToAssertJ
-  ```
-  assertTrue(condition);
-  assertTrue(message, condition);
-  assertFalse(condition);
-  assertFalse(message, condition);
-  assertNull(object);
-  assertNull(message, object);
-  assertNonNull(object);
-  assertNonNull(message, object);
-  assertEquals(expected, actual);
-  assertEquals(message, expected, actual);
-  assertEquals(expectedDoubleOrFloat, actualDoubleOrFloat, delta);
-  assertEquals(message, expectedDoubleOrFloat, actualDoubleOrFloat, delta);
-  assertNotEquals(unexpected, actual);
-  assertNotEquals(message, unexpected, actual);
-  assertNotEquals(unexpectedDoubleOrFloat, actualDoubleOrFloat, delta);
-  assertNotEquals(message, unexpectedDoubleOrFloat, actualDoubleOrFloat, delta);
-  assertSame(expected, actual);
-  assertSame(message, expected, actual);
-  assertNotSame(unexpected, actual);
-  assertNotSame(message, unexpected, actual);
-  assertArrayEquals(expected, actual);
-  assertArrayEquals(message, expectedArray, actualArray);
-  assertArrayEquals(expectedDoubleOrFloatArray, actualDoubleOrFloatArray, delta);
-  assertArrayEquals(message, expectedDoubleOrFloatArray, actualDoubleOrFloatArray, delta);
-  ```
-  
 - AssertThatGuavaOptional
   ```
   from: assertThat(opt.isPresent()).isEqualTo(true);
@@ -207,37 +259,100 @@ You can toggle the various inspections in the Settings/Editor/Inspections in the
 
   AssertJ for Guava needs to be available in the classpath.
 
+- JUnitAssertToAssertJ
+  ```
+  assertTrue(condition);
+  assertTrue(message, condition);
+  assertFalse(condition);
+  assertFalse(message, condition);
+  assertNull(object);
+  assertNull(message, object);
+  assertNonNull(object);
+  assertNonNull(message, object);
+  assertEquals(expected, actual);
+  assertEquals(message, expected, actual);
+  assertEquals(expectedDoubleOrFloat, actualDoubleOrFloat, delta);
+  assertEquals(message, expectedDoubleOrFloat, actualDoubleOrFloat, delta);
+  assertNotEquals(unexpected, actual);
+  assertNotEquals(message, unexpected, actual);
+  assertNotEquals(unexpectedDoubleOrFloat, actualDoubleOrFloat, delta);
+  assertNotEquals(message, unexpectedDoubleOrFloat, actualDoubleOrFloat, delta);
+  assertSame(expected, actual);
+  assertSame(message, expected, actual);
+  assertNotSame(unexpected, actual);
+  assertNotSame(message, unexpected, actual);
+  assertArrayEquals(expected, actual);
+  assertArrayEquals(message, expectedArray, actualArray);
+  assertArrayEquals(expectedDoubleOrFloatArray, actualDoubleOrFloatArray, delta);
+  assertArrayEquals(message, expectedDoubleOrFloatArray, actualDoubleOrFloatArray, delta);
+  ```
+
+### Implemented referencing
+
+  ```
+  .extracting("field")
+  .extracting("outerField.fieldInsideObjectTypeOfOuterField.andSoOn")
+  .extracting("property") // where the class has a getProperty() (or isProperty() for boolean) method
+  .extracting("bareMethod") // supported with AssertJ 13.12.0
+  .extracting(Extractors.byName("fieldOrPropertyOrBareMethod")
+  .extracting(Extractors.byName("fieldOrPropertyOrBareMethod.orAPathLikeAbove")
+  .extracting(Extractors.resultOf("bareMethod")
+  .extractingResultOf("bareMethod")
+  .flatExtracting("fieldOrPropertyOrBareMethod.orAPathLikeAbove")
+  .flatExtracting(Extractors.byName("fieldOrPropertyOrBareMethod.orAPathLikeAbove")
+  .flatExtracting(Extractors.resultOf("bareMethod")
+  ```
+  Works on both POJOs and ```Iterable```s/```Array```s. 
+  Implementation is very basic though and does not work with fancy cascaded .extracting() sequences.
+  If there's demand, I will add it.
+
 ## Development notice
 
 Cajon is written in Kotlin 1.3.
 
 Cajon is probably the only plugin that uses JUnit 5 Jupiter for unit testing so far (or at least the only one that I'm aware of ;) ).
-The IntelliJ framework actually uses the JUnit 3 TestCase for plugin testing and I took me quite a while to make it work with JUnit 5.
+The IntelliJ framework actually uses the JUnit 3 TestCase for plugin testing and it took me quite a while to make it work with JUnit 5.
 Feel free to use the code (in package de.platon42.intellij.jupiter) for your projects (with attribution).
 
 ## TODO
-- AssertThatNegatedBooleanExpression
+- AssumeThatInsteadOfReturn
-- AssertThatInstanceOf
+- Join consecutive assertThats
-- Referencing string properties inside extracting()
 - Extraction with property names to lambda with Java 8
   ```
   from: assertThat(object).extracting("propOne", "propNoGetter", "propTwo.innerProp")...
     to: assertThat(object).extracting(type::getPropOne, it -> it.propNoGetter, it -> it.getPropTwo().getInnerProp())...
   ```
-- Kotlin support
+
+- Kotlin support (right now, however, with less than 100 downloads after a month, this is unlikely to happen)
 
 ## Changelog
 
+#### V0.6 (22-Apr-19)
+- New AssertThatStringExpression inspection that will move ```isEmpty()```, ```equals()```, ```equalsIgnoreCase()```, ```contains()```,
+  ```startsWith()```, and ```endsWith()``` out of actual expression.
+- Extended AssertThatSize inspection to take ```String```s and ```CharSequences``` into account, too.
+- New AssertThatInvertedBooleanCondition inspection that will remove inverted boolean expressions inside ```assertThat()```.
+- Renamed a few inspections to better/shorter names.
+- New AssertThatInstanceOf inspection that moves instanceof expressions out of ```assertThat()```.
+
+#### V0.5 (18-Apr-19)
+- Fixed incompatibility with IDEA versions < 2018.2 (affected AssertThatSizeInspection). Minimal version is now 2017.3.
+- Fixed missing Guava imports (if not already present) for AssertThatGuavaInspection. This was a major PITA to get right.
+- Added support for referencing and refactoring inside ```.extracting()``` methods with fields, properties and methods (though
+  getter renaming does not work that perfect, but I'm giving up for now as the IntelliJ SDK docs are seriously lacking).
+- Fixed an exception in batch mode if the description string was the same but for different fixes. 
+  Now descriptions are different for quick fixes triggered by AssertThatJava8OptionalInspection and AssertThatGuavaOptionalInspection.
+
 #### V0.4 (11-Apr-19)
 - Reduced minimal supported IDEA version from 2018.2 to 2017.2.
-- New inspection AssertThatJava8Optional that operates on Java 8 Optional objects and tries to use contains(), containsSame(), isPresent(), and isNotPresent() instead.
+- New inspection AssertThatJava8Optional that operates on Java 8 ```Optional``` objects and tries to use ```contains()```, ```containsSame()```, ```isPresent()```, and ```isNotPresent()``` instead.
-- New inspection AssertThatGuavaOptional that operates on Guava Optional objects and tries to use contains(), isPresent(), and isAbsent() instead.
+- New inspection AssertThatGuavaOptional that operates on Guava ```Optional``` objects and tries to use ```contains()```, ```isPresent()```, and ```isAbsent()``` instead.
-- Added support in AssertThatBinaryExpressionIsTrueOrFalse for is(Not)EqualTo(Boolean.TRUE/FALSE).
+- Added support in AssertThatBinaryExpressionIsTrueOrFalse for ```is(Not)EqualTo(Boolean.TRUE/FALSE)```.
 
 #### V0.3 (07-Apr-19)
-- New inspection AssertThatBinaryExpressionIsTrueOrFalse that will find and fix common binary expressions and equals() statements (more than 150 combinations) inside assertThat().
+- New inspection AssertThatBinaryExpressionIsTrueOrFalse that will find and fix common binary expressions and ```equals()``` statements (more than 150 combinations) inside ```assertThat()```.
 - Merged AssertThatObjectIsNull and AssertThatObjectIsNotNull to AssertThatObjectIsNullOrNotNull.
-- Support for hasSizeLessThan(), hasSizeLessThanOrEqualTo(), hasSizeGreaterThanOrEqualTo(), and hasSizeGreaterThan() for AssertThatSizeInspection (with AssertJ >=13.2.0).
+- Support for ```hasSizeLessThan()```, ```hasSizeLessThanOrEqualTo()```, ```hasSizeGreaterThanOrEqualTo()```, and ```hasSizeGreaterThan()``` for AssertThatSizeInspection (with AssertJ >=13.2.0).
 - Really fixed highlighting for JUnit conversion. Sorry.
 
 #### V0.2 (01-Apr-19)

build.gradle

@@ -1,11 +1,11 @@
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij' version '0.4.3'
+    id 'org.jetbrains.intellij' version '0.4.8'
     id 'org.jetbrains.kotlin.jvm' version '1.3.30'
 }
 
 group 'de.platon42'
-version '0.4'
+version '0.6'
 
 repositories {
     mavenCentral()
@@ -22,9 +22,8 @@ dependencies {
     testCompile "org.assertj:assertj-guava:3.2.1"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.0'
-    testRuntimeOnly 'org.junit.vintage:junit-vintage-engine:5.4.0'
     testImplementation "org.jetbrains.kotlin:kotlin-test"
-    testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
+//    testImplementation "org.jetbrains.kotlin:kotlin-test-junit"
 }
 
 compileKotlin {
@@ -34,27 +33,32 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
 intellij {
-    version '2019.1'
+    version '2019.1.1'
 //    pluginName 'Concise AssertJ Optimizing Nitpicker (Cajon)'
     updateSinceUntilBuild false
 }
 
 patchPluginXml {
     changeNotes """
-  <h4>V0.4 (11-Apr-19)</h4>
+  <h4>V0.6 (22-Apr-19)</h4>
     <ul>
-      <li>Reduced minimal supported IDEA version from 2018.2 to 2017.2.
+      <li>New AssertThatStringExpression inspection that will move isEmpty(), equals(), equalsIgnoreCase(), contains(),
-      <li>New inspection AssertThatJava8Optional that operates on Java 8 Optional objects and tries to use contains(), containsSame(), isPresent(), and isNotPresent() instead.
+          startsWith(), and endsWith() out of actual expression.
-      <li>New inspection AssertThatGuavaOptional that operates on Guava Optional objects and tries to use contains(), isPresent(), and isAbsent() instead.
+      <li>Extended AssertThatSize inspection to take strings and CharSequences into account, too.
-      <li>Added support in AssertThatBinaryExpressionIsTrueOrFalse for is(Not)EqualTo(Boolean.TRUE/FALSE).
+      <li>New AssertThatInvertedBooleanCondition inspection that will remove inverted boolean expressions inside assertThat().
+      <li>Renamed a few inspections to better/shorter names.
+      <li>New AssertThatInstanceOf inspection that moves instanceof expressions out of assertThat().
     </ul>  
-  <h4>V0.3 (07-Apr-19)</h4>
+  <h4>V0.5 (18-Apr-19)</h4>
     <ul>
-      <li>New inspection AssertThatBinaryExpressionIsTrueOrFalse that will find and fix common binary expressions and equals() statements (more than 150 combinations) inside assertThat().
+      <li>Fixed incompatibility with IDEA versions < 2018.2 (affected AssertThatSizeInspection). Minimal version is now 2017.3.
-      <li>Merged AssertThatObjectIsNull and AssertThatObjectIsNotNull to AssertThatObjectIsNullOrNotNull.
+      <li>Fixed missing Guava imports (if not already present) for AssertThatGuavaInspection. This was a major PITA to get right.
-      <li>Support for hasSizeLessThan(), hasSizeLessThanOrEqualTo(), hasSizeGreaterThanOrEqualTo(), and hasSizeGreaterThan() for AssertThatSizeInspection (with AssertJ >=13.2.0).
+      <li>Added support for referencing and refactoring inside .extracting() methods with fields, properties and methods (though
-      <li>Really fixed highlighting for JUnit conversion. Sorry.
+          getter renaming does not work that perfect, but I'm giving up for now as the IntelliJ SDK docs are seriously lacking).
+      <li>Fixed an exception in batch mode if the description string was the same but for different fixes. 
+          Now descriptions are different for quick fixes triggered by AssertThatJava8OptionalInspection and AssertThatGuavaOptionalInspection.
     </ul>
+  <p>Full changelog available at <a href="https://github.com/chrisly42/cajon-plugin#changelog">Github project site</a>.</p>
 """
 }
 

src/main/java/de/platon42/intellij/plugins/cajon/AssertJClassNames.kt

@@ -10,6 +10,8 @@ class AssertJClassNames {
         @NonNls
         const val ABSTRACT_ASSERT_CLASSNAME = "org.assertj.core.api.AbstractAssert"
         @NonNls
+        const val ABSTRACT_OBJECT_ASSERT_CLASSNAME = "org.assertj.core.api.AbstractObjectAssert"
+        @NonNls
         const val ABSTRACT_BOOLEAN_ASSERT_CLASSNAME = "org.assertj.core.api.AbstractBooleanAssert"
         @NonNls
         const val ABSTRACT_INTEGER_ASSERT_CLASSNAME = "org.assertj.core.api.AbstractIntegerAssert"
@@ -23,6 +25,8 @@ class AssertJClassNames {
         const val ABSTRACT_ITERABLE_ASSERT_CLASSNAME = "org.assertj.core.api.AbstractIterableAssert"
         @NonNls
         const val ABSTRACT_ENUMERABLE_ASSERT_CLASSNAME = "org.assertj.core.api.EnumerableAssert"
+        @NonNls
+        const val EXTRACTORS_CLASSNAME = "org.assertj.core.extractor.Extractors"
 
         @NonNls
         const val GUAVA_OPTIONAL_CLASSNAME = "com.google.common.base.Optional"

src/main/java/de/platon42/intellij/plugins/cajon/Extensions.kt

@@ -1,12 +1,14 @@
 package de.platon42.intellij.plugins.cajon
 
-import com.intellij.psi.PsiExpression
+import com.intellij.psi.*
-import com.intellij.psi.PsiMethodCallExpression
+import com.intellij.psi.codeStyle.CodeStyleManager
+import com.intellij.psi.codeStyle.JavaCodeStyleManager
+import com.intellij.psi.util.PsiTreeUtil
 
 val PsiMethodCallExpression.qualifierExpression: PsiExpression get() = this.methodExpression.qualifierExpression!!
 val PsiMethodCallExpression.firstArg: PsiExpression get() = this.argumentList.expressions[0]!!
 
-fun PsiMethodCallExpression.replaceQualifier(qualifier: PsiExpression) {
+fun PsiMethodCallExpression.replaceQualifier(qualifier: PsiElement) {
     this.qualifierExpression.replace(qualifier)
 }
 
@@ -14,6 +16,32 @@ fun PsiMethodCallExpression.replaceQualifierFromMethodCall(oldMethodCall: PsiMet
     this.qualifierExpression.replace(oldMethodCall.qualifierExpression)
 }
 
+fun PsiElement.findOutmostMethodCall(): PsiMethodCallExpression? {
+    val statement = PsiTreeUtil.getParentOfType(this, PsiStatement::class.java) ?: return null
+    return PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java)
+}
+
 fun PsiMethodCallExpression.getArg(n: Int): PsiExpression = this.argumentList.expressions[n]
 
 fun <T> Boolean.map(forTrue: T, forFalse: T) = if (this) forTrue else forFalse
+
+fun PsiMethod.addAsStaticImport(context: PsiElement, vararg allowedClashes: String) {
+    val factory = JavaPsiFacade.getElementFactory(context.project)
+    val methodName = this.name
+    val containingClass = this.containingClass ?: return
+    val importList = (context.containingFile as PsiJavaFile).importList ?: return
+    val notImportedStatically = importList.importStaticStatements.none {
+        val targetClass = it.resolveTargetClass() ?: return@none false
+        ((it.referenceName == methodName) && !allowedClashes.contains(targetClass.qualifiedName))
+                || (it.isOnDemand && (targetClass == this.containingClass))
+    }
+    if (notImportedStatically) {
+        importList.add(factory.createImportStaticStatement(containingClass, methodName))
+    }
+}
+
+fun PsiElement.shortenAndReformat() {
+    val codeStyleManager = JavaCodeStyleManager.getInstance(project)
+    codeStyleManager.shortenClassReferences(this)
+    CodeStyleManager.getInstance(project).reformat(this)
+}

src/main/java/de/platon42/intellij/plugins/cajon/Helper.kt

@@ -0,0 +1,35 @@
+package de.platon42.intellij.plugins.cajon
+
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiExpression
+import com.intellij.psi.PsiMethodCallExpression
+import com.siyeh.ig.callMatcher.CallMatcher
+
+val CORE_ASSERT_THAT_MATCHER = CallMatcher.staticCall(AssertJClassNames.ASSERTIONS_CLASSNAME, MethodNames.ASSERT_THAT)!!
+
+fun createAssertThat(context: PsiElement, actualExpression: PsiExpression): PsiMethodCallExpression {
+    return createAssertThat(context, AssertJClassNames.ASSERTIONS_CLASSNAME, actualExpression)
+}
+
+fun createGuavaAssertThat(context: PsiElement, actualExpression: PsiExpression): PsiMethodCallExpression {
+    return createAssertThat(context, AssertJClassNames.GUAVA_ASSERTIONS_CLASSNAME, actualExpression)
+}
+
+fun createAssertThat(context: PsiElement, baseclass: String, actualExpression: PsiExpression): PsiMethodCallExpression {
+    return createMethodCall(context, "$baseclass.${MethodNames.ASSERT_THAT}", actualExpression)
+}
+
+fun createExpectedMethodCall(context: PsiElement, methodName: String, vararg arguments: PsiElement): PsiMethodCallExpression {
+    return createMethodCall(context, "a.$methodName", *arguments)
+}
+
+fun createMethodCall(context: PsiElement, fullQualifiedMethodName: String, vararg arguments: PsiElement): PsiMethodCallExpression {
+    val factory = JavaPsiFacade.getElementFactory(context.project)
+    val argString = generateSequence('b') { it + 1 }.take(arguments.size).joinToString(", ")
+    val expectedExpression = factory.createExpressionFromText(
+        "$fullQualifiedMethodName($argString)", context
+    ) as PsiMethodCallExpression
+    arguments.forEachIndexed { index, newArg -> expectedExpression.getArg(index).replace(newArg) }
+    return expectedExpression
+}

src/main/java/de/platon42/intellij/plugins/cajon/MethodNames.kt

@@ -45,6 +45,10 @@ class MethodNames {
         const val IS_CLOSE_TO = "isCloseTo"
         @NonNls
         const val IS_NOT_CLOSE_TO = "isNotCloseTo"
+        @NonNls
+        const val IS_INSTANCE_OF = "isInstanceOf"
+        @NonNls
+        const val IS_NOT_INSTANCE_OF = "isNotInstanceOf"
 
         @NonNls
         const val IS_EMPTY = "isEmpty"
@@ -65,8 +69,22 @@ class MethodNames {
         @NonNls
         const val CONTAINS = "contains"
         @NonNls
+        const val DOES_NOT_CONTAIN = "doesNotContain"
+        @NonNls
         const val CONTAINS_EXACTLY = "containsExactly"
         @NonNls
+        const val IS_EQUAL_TO_IC = "isEqualToIgnoringCase"
+        @NonNls
+        const val IS_NOT_EQUAL_TO_IC = "isNotEqualToIgnoringCase"
+        @NonNls
+        const val STARTS_WITH = "startsWith"
+        @NonNls
+        const val ENDS_WITH = "endsWith"
+        @NonNls
+        const val DOES_NOT_START_WITH = "doesNotStartWith"
+        @NonNls
+        const val DOES_NOT_END_WITH = "doesNotEndWith"
+        @NonNls
         const val CONTAINS_SAME = "containsSame"
         @NonNls
         const val IS_PRESENT = "isPresent"

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

@@ -1,6 +1,7 @@
 package de.platon42.intellij.plugins.cajon.inspections
 
 import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
@@ -18,8 +19,6 @@ import de.platon42.intellij.plugins.cajon.AssertJClassNames.Companion.GUAVA_OPTI
 import de.platon42.intellij.plugins.cajon.MethodNames
 import de.platon42.intellij.plugins.cajon.getArg
 import de.platon42.intellij.plugins.cajon.qualifierExpression
-import de.platon42.intellij.plugins.cajon.quickfixes.RemoveActualOutmostMethodCallQuickFix
-import de.platon42.intellij.plugins.cajon.quickfixes.RemoveExpectedOutmostMethodCallQuickFix
 import de.platon42.intellij.plugins.cajon.quickfixes.ReplaceSimpleMethodCallQuickFix
 
 open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
@@ -29,6 +28,8 @@ open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
         const val MORE_CONCISE_MESSAGE_TEMPLATE = "%s() would be more concise than %s()"
 
         const val REPLACE_DESCRIPTION_TEMPLATE = "Replace %s() with %s()"
+        const val REMOVE_EXPECTED_OUTMOST_DESCRIPTION_TEMPLATE = "Remove unwrapping of expected expression and replace %s() with %s()"
+        const val REMOVE_ACTUAL_OUTMOST_DESCRIPTION_TEMPLATE = "Unwrap actual expression and replace %s() with %s()"
 
         val TOKEN_TO_ASSERTJ_FOR_PRIMITIVE_MAP = mapOf<IElementType, String>(
             JavaTokenType.EQEQ to MethodNames.IS_EQUAL_TO,
@@ -117,6 +118,8 @@ open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
 
         val COLLECTION_SIZE = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_COLLECTION, "size")
             .parameterCount(0)!!
+        val CHAR_SEQUENCE_LENGTH = CallMatcher.instanceCall("java.lang.CharSequence", "length")
+            .parameterCount(0)!!
         val OBJECT_EQUALS = CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, "equals")
             .parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)!!
 
@@ -174,31 +177,49 @@ open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
         holder.registerProblem(expression, message, quickFix)
     }
 
-    protected fun registerRemoveActualOutmostMethod(
+    protected fun registerReplaceMethod(
         holder: ProblemsHolder,
         expression: PsiMethodCallExpression,
-        expectedCallExpression: PsiMethodCallExpression,
+        oldExpectedCallExpression: PsiMethodCallExpression,
         replacementMethod: String,
-        noExpectedExpression: Boolean = false
+        quickFixSupplier: (String, String) -> LocalQuickFix
     ) {
-        val originalMethod = getOriginalMethodName(expectedCallExpression) ?: return
+        registerConciseMethod(REPLACE_DESCRIPTION_TEMPLATE, oldExpectedCallExpression, replacementMethod, quickFixSupplier, holder, expression)
-        val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
+    }
+
+    private fun registerConciseMethod(
+        descriptionTemplate: String,
+        oldExpectedCallExpression: PsiMethodCallExpression,
+        replacementMethod: String,
+        quickFixSupplier: (String, String) -> LocalQuickFix,
+        holder: ProblemsHolder,
+        expression: PsiMethodCallExpression
+    ) {
+        val originalMethod = getOriginalMethodName(oldExpectedCallExpression) ?: return
+        val description = descriptionTemplate.format(originalMethod, replacementMethod)
         val message = MORE_CONCISE_MESSAGE_TEMPLATE.format(replacementMethod, originalMethod)
-        val quickfix = RemoveActualOutmostMethodCallQuickFix(description, replacementMethod, noExpectedExpression)
+        val quickfix = quickFixSupplier(description, replacementMethod)
         holder.registerProblem(expression, message, quickfix)
     }
 
     protected fun registerRemoveExpectedOutmostMethod(
         holder: ProblemsHolder,
         expression: PsiMethodCallExpression,
-        expectedCallExpression: PsiMethodCallExpression,
+        oldExpectedCallExpression: PsiMethodCallExpression,
-        replacementMethod: String
+        replacementMethod: String,
+        quickFixSupplier: (String, String) -> LocalQuickFix
     ) {
-        val originalMethod = getOriginalMethodName(expectedCallExpression) ?: return
+        registerConciseMethod(REMOVE_EXPECTED_OUTMOST_DESCRIPTION_TEMPLATE, oldExpectedCallExpression, replacementMethod, quickFixSupplier, holder, expression)
-        val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
+    }
-        val message = MORE_CONCISE_MESSAGE_TEMPLATE.format(replacementMethod, originalMethod)
+
-        val quickfix = RemoveExpectedOutmostMethodCallQuickFix(description, replacementMethod)
+    protected fun registerRemoveActualOutmostMethod(
-        holder.registerProblem(expression, message, quickfix)
+        holder: ProblemsHolder,
+        expression: PsiMethodCallExpression,
+        oldExpectedCallExpression: PsiMethodCallExpression,
+        replacementMethod: String,
+        quickFixSupplier: (String, String) -> LocalQuickFix
+    ) {
+        registerConciseMethod(REMOVE_ACTUAL_OUTMOST_DESCRIPTION_TEMPLATE, oldExpectedCallExpression, replacementMethod, quickFixSupplier, holder, expression)
     }
 
     protected fun calculateConstantParameterValue(expression: PsiMethodCallExpression, argIndex: Int): Any? {
@@ -239,6 +260,6 @@ open class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() {
         val findClass =
             JavaPsiFacade.getInstance(element.project).findClass(classname, GlobalSearchScope.allScope(element.project))
                 ?: return false
-        return findClass.findMethodsByName(methodname).isNotEmpty()
+        return findClass.allMethods.any { it.name == methodname }
     }
 }

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

@@ -1,18 +1,17 @@
 package de.platon42.intellij.plugins.cajon.inspections
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.*
-import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.TypeConversionUtil
 import de.platon42.intellij.plugins.cajon.MethodNames
-import de.platon42.intellij.plugins.cajon.MethodNames.Companion.IS_NOT_NULL
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
-import de.platon42.intellij.plugins.cajon.MethodNames.Companion.IS_NULL
 import de.platon42.intellij.plugins.cajon.firstArg
 import de.platon42.intellij.plugins.cajon.map
+import de.platon42.intellij.plugins.cajon.quickfixes.MoveActualOuterExpressionMethodCallQuickFix
 import de.platon42.intellij.plugins.cajon.quickfixes.SplitBinaryExpressionMethodCallQuickFix
-import de.platon42.intellij.plugins.cajon.quickfixes.SplitEqualsExpressionMethodCallQuickFix
 
-class AssertThatBinaryExpressionIsTrueOrFalseInspection : AbstractAssertJInspection() {
+class AssertThatBinaryExpressionInspection : AbstractAssertJInspection() {
 
     companion object {
         private const val DISPLAY_NAME = "Asserting a binary expression"
@@ -30,18 +29,13 @@ class AssertThatBinaryExpressionIsTrueOrFalseInspection : AbstractAssertJInspect
                     return
                 }
 
-                val statement = PsiTreeUtil.getParentOfType(expression, PsiStatement::class.java) ?: return
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
-                val expectedCallExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
                 val expectedResult = getExpectedBooleanResult(expectedCallExpression) ?: return
 
                 val assertThatArgument = expression.firstArg
                 if (assertThatArgument is PsiMethodCallExpression && OBJECT_EQUALS.test(assertThatArgument)) {
-                    val replacementMethod = if (expectedResult) MethodNames.IS_EQUAL_TO else MethodNames.IS_NOT_EQUAL_TO
+                    val replacementMethod = expectedResult.map(MethodNames.IS_EQUAL_TO, MethodNames.IS_NOT_EQUAL_TO)
-                    val type = "${MethodNames.EQUALS}()"
+                    registerSplitMethod(holder, expression, "${MethodNames.EQUALS}()", replacementMethod, ::MoveActualOuterExpressionMethodCallQuickFix)
-                    val description = SPLIT_EXPRESSION_DESCRIPTION_TEMPLATE.format(type)
-                    val message = MORE_MEANINGFUL_MESSAGE_TEMPLATE.format(type)
-                    val quickFix = SplitEqualsExpressionMethodCallQuickFix(description, replacementMethod)
-                    holder.registerProblem(expression, message, quickFix)
                     return
                 }
 
@@ -55,8 +49,10 @@ class AssertThatBinaryExpressionIsTrueOrFalseInspection : AbstractAssertJInspect
                 if (isLeftNull && isRightNull) {
                     return
                 } else if (isLeftNull || isRightNull) {
-                    val replacementMethod = if (expectedResult) IS_NULL else IS_NOT_NULL
+                    val replacementMethod = expectedResult.map(MethodNames.IS_NULL, MethodNames.IS_NOT_NULL)
-                    registerSplitBinaryExpressionMethod(holder, expression, replacementMethod, pickRightOperand = isLeftNull, noExpectedExpression = true)
+                    registerSplitMethod(holder, expression, "binary", replacementMethod) { desc, method ->
+                        SplitBinaryExpressionMethodCallQuickFix(desc, method, pickRightOperand = isLeftNull, noExpectedExpression = true)
+                    }
                     return
                 }
 
@@ -65,32 +61,33 @@ class AssertThatBinaryExpressionIsTrueOrFalseInspection : AbstractAssertJInspect
                 val constantEvaluationHelper = JavaPsiFacade.getInstance(expression.project).constantEvaluationHelper
                 val swapExpectedAndActual = constantEvaluationHelper.computeConstantExpression(binaryExpression.lOperand) != null
 
-                val tokenType = binaryExpression.operationSign.tokenType
+                val tokenType = binaryExpression.operationTokenType
                     .let {
                         if (swapExpectedAndActual) SWAP_SIDE_OF_BINARY_OPERATOR.getOrDefault(it, it) else it
                     }
                     .let {
                         if (expectedResult) it else INVERT_BINARY_OPERATOR.getOrDefault(it, it)
-                    } ?: return
+                    }
                 val mappingToUse =
                     (isPrimitive || isNumericType).map(TOKEN_TO_ASSERTJ_FOR_PRIMITIVE_MAP, TOKEN_TO_ASSERTJ_FOR_OBJECT_MAPPINGS)
                 val replacementMethod = mappingToUse[tokenType] ?: return
 
-                registerSplitBinaryExpressionMethod(holder, expression, replacementMethod, pickRightOperand = swapExpectedAndActual)
+                registerSplitMethod(holder, expression, "binary", replacementMethod) { desc, method ->
+                    SplitBinaryExpressionMethodCallQuickFix(desc, method, pickRightOperand = swapExpectedAndActual)
+                }
             }
 
-            private fun registerSplitBinaryExpressionMethod(
+            private fun registerSplitMethod(
                 holder: ProblemsHolder,
                 expression: PsiMethodCallExpression,
+                type: String,
                 replacementMethod: String,
-                pickRightOperand: Boolean = false,
+                quickFixSupplier: (String, String) -> LocalQuickFix
-                noExpectedExpression: Boolean = false
             ) {
-                val type = "binary"
                 val description = SPLIT_EXPRESSION_DESCRIPTION_TEMPLATE.format(type)
                 val message = MORE_MEANINGFUL_MESSAGE_TEMPLATE.format(type)
-                val quickFix = SplitBinaryExpressionMethodCallQuickFix(description, replacementMethod, pickRightOperand, noExpectedExpression)
+                val quickfix = quickFixSupplier(description, replacementMethod)
-                holder.registerProblem(expression, message, quickFix)
+                holder.registerProblem(expression, message, quickfix)
             }
         }
     }

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

@@ -10,10 +10,10 @@ import de.platon42.intellij.plugins.cajon.MethodNames
 import de.platon42.intellij.plugins.cajon.firstArg
 import de.platon42.intellij.plugins.cajon.map
 
-class AssertThatBooleanIsTrueOrFalseInspection : AbstractAssertJInspection() {
+class AssertThatBooleanConditionInspection : AbstractAssertJInspection() {
 
     companion object {
-        private const val DISPLAY_NAME = "Asserting true or false"
+        private const val DISPLAY_NAME = "Asserting a boolean condition"
     }
 
     override fun getDisplayName() = DISPLAY_NAME

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

@@ -1,13 +1,14 @@
 package de.platon42.intellij.plugins.cajon.inspections
 
 import com.intellij.codeInspection.ProblemsHolder
-import com.intellij.psi.*
+import com.intellij.psi.JavaElementVisitor
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiMethodCallExpression
 import com.intellij.psi.search.GlobalSearchScope
-import com.intellij.psi.util.PsiTreeUtil
+import com.siyeh.ig.callMatcher.CallMatcher
-import de.platon42.intellij.plugins.cajon.AssertJClassNames
+import de.platon42.intellij.plugins.cajon.*
-import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.quickfixes.*
-import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.map
 
 class AssertThatGuavaOptionalInspection : AbstractAssertJInspection() {
 
@@ -27,35 +28,83 @@ class AssertThatGuavaOptionalInspection : AbstractAssertJInspection() {
                 if (!(ASSERT_THAT_ANY.test(expression) || assertThatGuava)) {
                     return
                 }
-                val statement = PsiTreeUtil.getParentOfType(expression, PsiStatement::class.java) ?: return
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
-                val expectedCallExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
 
+                val isEqualTo = IS_EQUAL_TO_OBJECT.test(expectedCallExpression)
+                val isNotEqualTo = IS_NOT_EQUAL_TO_OBJECT.test(expectedCallExpression)
                 if (assertThatGuava) {
-                    if (IS_EQUAL_TO_OBJECT.test(expectedCallExpression)) {
+                    if (isEqualTo) {
                         val innerExpectedCall = expectedCallExpression.firstArg as? PsiMethodCallExpression ?: return
-                        if (GUAVA_OPTIONAL_OF.test(innerExpectedCall) || GUAVA_OPTIONAL_FROM_NULLABLE.test(innerExpectedCall)) {
+                        if (CallMatcher.anyOf(GUAVA_OPTIONAL_OF, GUAVA_OPTIONAL_FROM_NULLABLE).test(innerExpectedCall)) {
-                            registerRemoveExpectedOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS)
+                            registerRemoveExpectedOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS, ::RemoveExpectedOutmostMethodCallQuickFix)
                         } else if (GUAVA_OPTIONAL_ABSENT.test(innerExpectedCall)) {
                             registerSimplifyMethod(holder, expectedCallExpression, MethodNames.IS_ABSENT)
                         }
-                    } else if (IS_NOT_EQUAL_TO_OBJECT.test(expectedCallExpression)) {
+                    } else if (isNotEqualTo) {
                         val innerExpectedCall = expectedCallExpression.firstArg as? PsiMethodCallExpression ?: return
                         if (GUAVA_OPTIONAL_ABSENT.test(innerExpectedCall)) {
                             registerSimplifyMethod(holder, expectedCallExpression, MethodNames.IS_PRESENT)
                         }
                     }
                 } else {
-                    val actualExpression = expression.firstArg as? PsiMethodCallExpression ?: return
+                    // we're not calling an assertThat() from Guava, but a core-AssertJ one!
-
+                    // We need to replace that by the Guava one, if we want to apply a formally correct fix.
-                    if (GUAVA_OPTIONAL_GET.test(actualExpression) && IS_EQUAL_TO_OBJECT.test(expectedCallExpression)) {
+                    val actualExpression = expression.firstArg as? PsiMethodCallExpression
-                        registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS)
+                    if (actualExpression != null) {
+                        if (GUAVA_OPTIONAL_GET.test(actualExpression) && isEqualTo) {
+                            registerRemoveActualOutmostForGuavaMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS)
                         } else if (GUAVA_OPTIONAL_IS_PRESENT.test(actualExpression)) {
                             val expectedPresence = getExpectedBooleanResult(expectedCallExpression) ?: return
                             val replacementMethod = expectedPresence.map(MethodNames.IS_PRESENT, MethodNames.IS_ABSENT)
-                        registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, replacementMethod, noExpectedExpression = true)
+                            registerRemoveActualOutmostForGuavaMethod(holder, expression, expectedCallExpression, replacementMethod, noExpectedExpression = true)
+                        }
+                    }
+                    if (isEqualTo) {
+                        val innerExpectedCall = expectedCallExpression.firstArg as? PsiMethodCallExpression ?: return
+                        if (CallMatcher.anyOf(GUAVA_OPTIONAL_OF, GUAVA_OPTIONAL_FROM_NULLABLE).test(innerExpectedCall)) {
+                            registerRemoveExpectedOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS) { desc, method ->
+                                QuickFixWithPostfixDelegate(
+                                    RemoveExpectedOutmostMethodCallQuickFix(desc, method),
+                                    ForGuavaPostFix.REPLACE_BY_GUAVA_ASSERT_THAT_AND_STATIC_IMPORT
+                                )
+                            }
+                        } else if (GUAVA_OPTIONAL_ABSENT.test(innerExpectedCall)) {
+                            registerSimplifyForGuavaMethod(holder, expectedCallExpression, MethodNames.IS_ABSENT)
+                        }
+                    } else if (isNotEqualTo) {
+                        val innerExpectedCall = expectedCallExpression.firstArg as? PsiMethodCallExpression ?: return
+                        if (GUAVA_OPTIONAL_ABSENT.test(innerExpectedCall)) {
+                            registerSimplifyForGuavaMethod(holder, expectedCallExpression, MethodNames.IS_PRESENT)
                         }
                     }
                 }
             }
         }
+    }
+
+    private fun registerRemoveActualOutmostForGuavaMethod(
+        holder: ProblemsHolder,
+        expression: PsiMethodCallExpression,
+        oldExpectedCallExpression: PsiMethodCallExpression,
+        replacementMethod: String,
+        noExpectedExpression: Boolean = false
+    ) {
+        registerRemoveActualOutmostMethod(holder, expression, oldExpectedCallExpression, replacementMethod) { desc, method ->
+            QuickFixWithPostfixDelegate(
+                RemoveActualOutmostMethodCallQuickFix(desc, method, noExpectedExpression),
+                ForGuavaPostFix.REPLACE_BY_GUAVA_ASSERT_THAT_AND_STATIC_IMPORT
+            )
+        }
+    }
+
+    private fun registerSimplifyForGuavaMethod(holder: ProblemsHolder, expression: PsiMethodCallExpression, replacementMethod: String) {
+        val originalMethod = getOriginalMethodName(expression) ?: return
+        val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
+        val message = SIMPLIFY_MESSAGE_TEMPLATE.format(originalMethod, replacementMethod)
+        val quickFix = QuickFixWithPostfixDelegate(
+            ReplaceSimpleMethodCallQuickFix(description, replacementMethod),
+            ForGuavaPostFix.REPLACE_BY_GUAVA_ASSERT_THAT_AND_STATIC_IMPORT
+        )
+        holder.registerProblem(expression, message, quickFix)
+    }
 }

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

@@ -0,0 +1,54 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.codeInspection.LocalQuickFix
+import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.JavaElementVisitor
+import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiInstanceOfExpression
+import com.intellij.psi.PsiMethodCallExpression
+import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
+import de.platon42.intellij.plugins.cajon.firstArg
+import de.platon42.intellij.plugins.cajon.map
+import de.platon42.intellij.plugins.cajon.quickfixes.RemoveInstanceOfExpressionQuickFix
+
+class AssertThatInstanceOfInspection : AbstractAssertJInspection() {
+
+    companion object {
+        private const val DISPLAY_NAME = "Asserting a class instance"
+        private const val REPLACE_INSTANCEOF_DESCRIPTION_TEMPLATE = "Replace instanceof expression by assertThat().%s()"
+        private const val MOVE_OUT_INSTANCEOF_MESSAGE = "instanceof expression could be moved out of assertThat()"
+    }
+
+    override fun getDisplayName() = DISPLAY_NAME
+
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : JavaElementVisitor() {
+            override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
+                super.visitMethodCallExpression(expression)
+                if (!ASSERT_THAT_BOOLEAN.test(expression)) {
+                    return
+                }
+
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
+                val expectedResult = getExpectedBooleanResult(expectedCallExpression) ?: return
+
+                if (expression.firstArg is PsiInstanceOfExpression) {
+                    val replacementMethod = expectedResult.map(MethodNames.IS_INSTANCE_OF, MethodNames.IS_NOT_INSTANCE_OF)
+                    registerRemoveInstanceOfMethod(holder, expression, replacementMethod, ::RemoveInstanceOfExpressionQuickFix)
+                }
+            }
+
+            private fun registerRemoveInstanceOfMethod(
+                holder: ProblemsHolder,
+                expression: PsiMethodCallExpression,
+                replacementMethod: String,
+                quickFixSupplier: (String, String) -> LocalQuickFix
+            ) {
+                val description = REPLACE_INSTANCEOF_DESCRIPTION_TEMPLATE.format(replacementMethod)
+                val quickfix = quickFixSupplier(description, replacementMethod)
+                holder.registerProblem(expression, MOVE_OUT_INSTANCEOF_MESSAGE, quickfix)
+            }
+        }
+    }
+}

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

@@ -0,0 +1,51 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.codeInspection.LocalQuickFix
+import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.*
+import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
+import de.platon42.intellij.plugins.cajon.firstArg
+import de.platon42.intellij.plugins.cajon.map
+import de.platon42.intellij.plugins.cajon.quickfixes.RemoveUnaryExpressionQuickFix
+
+class AssertThatInvertedBooleanConditionInspection : AbstractAssertJInspection() {
+
+    companion object {
+        private const val DISPLAY_NAME = "Asserting an inverted boolean condition"
+        private const val INVERT_CONDITION_DESCRIPTION = "Invert condition in assertThat()"
+        private const val INVERT_CONDITION_MESSAGE = "Condition inside assertThat() could be inverted"
+    }
+
+    override fun getDisplayName() = DISPLAY_NAME
+
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : JavaElementVisitor() {
+            override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
+                super.visitMethodCallExpression(expression)
+                if (!ASSERT_THAT_BOOLEAN.test(expression)) {
+                    return
+                }
+
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
+                val expectedResult = getExpectedBooleanResult(expectedCallExpression) ?: return
+
+                val prefixExpression = expression.firstArg as? PsiPrefixExpression ?: return
+                if (prefixExpression.operationTokenType == JavaTokenType.EXCL) {
+                    val replacementMethod = expectedResult.map(MethodNames.IS_FALSE, MethodNames.IS_TRUE)
+                    registerInvertMethod(holder, expression, replacementMethod, ::RemoveUnaryExpressionQuickFix)
+                }
+            }
+
+            private fun registerInvertMethod(
+                holder: ProblemsHolder,
+                expression: PsiMethodCallExpression,
+                replacementMethod: String,
+                quickFixSupplier: (String, String) -> LocalQuickFix
+            ) {
+                val quickfix = quickFixSupplier(INVERT_CONDITION_DESCRIPTION, replacementMethod)
+                holder.registerProblem(expression, INVERT_CONDITION_MESSAGE, quickfix)
+            }
+        }
+    }
+}

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

@@ -4,11 +4,13 @@ import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.JavaElementVisitor
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.PsiStatement
+import com.siyeh.ig.callMatcher.CallMatcher
-import com.intellij.psi.util.PsiTreeUtil
 import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
 import de.platon42.intellij.plugins.cajon.firstArg
 import de.platon42.intellij.plugins.cajon.map
+import de.platon42.intellij.plugins.cajon.quickfixes.RemoveActualOutmostMethodCallQuickFix
+import de.platon42.intellij.plugins.cajon.quickfixes.RemoveExpectedOutmostMethodCallQuickFix
 
 class AssertThatJava8OptionalInspection : AbstractAssertJInspection() {
 
@@ -25,14 +27,13 @@ class AssertThatJava8OptionalInspection : AbstractAssertJInspection() {
                 if (!ASSERT_THAT_ANY.test(expression)) {
                     return
                 }
-                val statement = PsiTreeUtil.getParentOfType(expression, PsiStatement::class.java) ?: return
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
-                val expectedCallExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
 
                 if (ASSERT_THAT_JAVA8_OPTIONAL.test(expression)) {
                     if (IS_EQUAL_TO_OBJECT.test(expectedCallExpression)) {
                         val innerExpectedCall = expectedCallExpression.firstArg as? PsiMethodCallExpression ?: return
-                        if (OPTIONAL_OF.test(innerExpectedCall) || OPTIONAL_OF_NULLABLE.test(innerExpectedCall)) {
+                        if (CallMatcher.anyOf(OPTIONAL_OF, OPTIONAL_OF_NULLABLE).test(innerExpectedCall)) {
-                            registerRemoveExpectedOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS)
+                            registerRemoveExpectedOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS, ::RemoveExpectedOutmostMethodCallQuickFix)
                         } else if (OPTIONAL_EMPTY.test(innerExpectedCall)) {
                             registerSimplifyMethod(holder, expectedCallExpression, MethodNames.IS_NOT_PRESENT)
                         }
@@ -47,14 +48,20 @@ class AssertThatJava8OptionalInspection : AbstractAssertJInspection() {
 
                     if (OPTIONAL_GET.test(actualExpression)) {
                         if (IS_EQUAL_TO_OBJECT.test(expectedCallExpression)) {
-                            registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS)
+                            registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS) { desc, method ->
+                                RemoveActualOutmostMethodCallQuickFix(desc, method)
+                            }
                         } else if (IS_SAME_AS_OBJECT.test(expectedCallExpression)) {
-                            registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS_SAME)
+                            registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, MethodNames.CONTAINS_SAME) { desc, method ->
+                                RemoveActualOutmostMethodCallQuickFix(desc, method)
+                            }
                         }
                     } else if (OPTIONAL_IS_PRESENT.test(actualExpression)) {
                         val expectedPresence = getExpectedBooleanResult(expectedCallExpression) ?: return
                         val replacementMethod = expectedPresence.map(MethodNames.IS_PRESENT, MethodNames.IS_NOT_PRESENT)
-                        registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, replacementMethod, noExpectedExpression = true)
+                        registerRemoveActualOutmostMethod(holder, expression, expectedCallExpression, replacementMethod) { desc, method ->
+                            RemoveActualOutmostMethodCallQuickFix(desc, method, noExpectedExpression = true)
+                        }
                     }
                 }
             }

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

@@ -2,9 +2,9 @@ package de.platon42.intellij.plugins.cajon.inspections
 
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.*
-import com.intellij.psi.util.PsiTreeUtil
 import de.platon42.intellij.plugins.cajon.AssertJClassNames.Companion.ABSTRACT_ITERABLE_ASSERT_CLASSNAME
 import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
 import de.platon42.intellij.plugins.cajon.firstArg
 import de.platon42.intellij.plugins.cajon.map
 import de.platon42.intellij.plugins.cajon.quickfixes.ReplaceSizeMethodCallQuickFix
@@ -12,7 +12,7 @@ import de.platon42.intellij.plugins.cajon.quickfixes.ReplaceSizeMethodCallQuickF
 class AssertThatSizeInspection : AbstractAssertJInspection() {
 
     companion object {
-        private const val DISPLAY_NAME = "Asserting the size of an collection or array"
+        private const val DISPLAY_NAME = "Asserting the size of an collection, array or string"
 
         private val BONUS_EXPRESSIONS_CALL_MATCHER_MAP = listOf(
             IS_LESS_THAN_INT to MethodNames.HAS_SIZE_LESS_THAN,
@@ -33,19 +33,28 @@ class AssertThatSizeInspection : AbstractAssertJInspection() {
                 }
                 val actualExpression = expression.firstArg
 
-                if (isArrayLength(actualExpression) || isCollectionSize(actualExpression)) {
+                val isForArrayOrCollection = isArrayLength(actualExpression) || isCollectionSize(actualExpression)
-                    val statement = PsiTreeUtil.getParentOfType(expression, PsiStatement::class.java) ?: return
+                val isForString = isCharSequenceLength(actualExpression)
-                    val expectedCallExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
+                if (isForArrayOrCollection || isForString) {
+                    val expectedCallExpression = expression.findOutmostMethodCall() ?: return
                     val constValue = calculateConstantParameterValue(expectedCallExpression, 0)
                     if (IS_EQUAL_TO_INT.test(expectedCallExpression)) {
                         if (constValue == 0) {
-                            registerReplaceSizeMethod(holder, expression, expectedCallExpression, MethodNames.IS_EMPTY, noExpectedExpression = true)
+                            registerReplaceMethod(holder, expression, expectedCallExpression, MethodNames.IS_EMPTY) { desc, method ->
+                                ReplaceSizeMethodCallQuickFix(desc, method, noExpectedExpression = true)
+                            }
                         } else {
                             val equalToExpression = expectedCallExpression.firstArg
-                            if (isCollectionSize(equalToExpression) || isArrayLength(equalToExpression)) {
+                            if (isForArrayOrCollection && (isCollectionSize(equalToExpression) || isArrayLength(equalToExpression)) ||
-                                registerReplaceSizeMethod(holder, expression, expectedCallExpression, MethodNames.HAS_SAME_SIZE_AS, expectedIsCollection = true)
+                                isForString && (isCollectionSize(equalToExpression) || isArrayLength(equalToExpression) || isCharSequenceLength(equalToExpression))
+                            ) {
+                                registerReplaceMethod(holder, expression, expectedCallExpression, MethodNames.HAS_SAME_SIZE_AS) { desc, method ->
+                                    ReplaceSizeMethodCallQuickFix(desc, method, expectedIsCollection = true)
+                                }
                             } else {
-                                registerReplaceSizeMethod(holder, expression, expectedCallExpression, MethodNames.HAS_SIZE)
+                                registerReplaceMethod(holder, expression, expectedCallExpression, MethodNames.HAS_SIZE) { desc, method ->
+                                    ReplaceSizeMethodCallQuickFix(desc, method)
+                                }
                             }
                         }
                     } else {
@@ -57,15 +66,21 @@ class AssertThatSizeInspection : AbstractAssertJInspection() {
                                 || IS_NOT_ZERO.test(expectedCallExpression))
                         if (isTestForEmpty || isTestForNotEmpty) {
                             val replacementMethod = isTestForEmpty.map(MethodNames.IS_EMPTY, MethodNames.IS_NOT_EMPTY)
-                            registerReplaceSizeMethod(holder, expression, expectedCallExpression, replacementMethod, noExpectedExpression = true)
+                            registerReplaceMethod(holder, expression, expectedCallExpression, replacementMethod) { desc, method ->
+                                ReplaceSizeMethodCallQuickFix(desc, method, noExpectedExpression = true)
+                            }
                         } else if (hasAssertJMethod(expression, ABSTRACT_ITERABLE_ASSERT_CLASSNAME, MethodNames.HAS_SIZE_LESS_THAN)) {
                             // new stuff in AssertJ 13.2.0
                             val matchedMethod = BONUS_EXPRESSIONS_CALL_MATCHER_MAP.find { it.first.test(expectedCallExpression) }?.second ?: return
-                            registerReplaceSizeMethod(holder, expression, expectedCallExpression, matchedMethod)
+                            registerReplaceMethod(holder, expression, expectedCallExpression, matchedMethod) { desc, method ->
+                                ReplaceSizeMethodCallQuickFix(desc, method)
                             }
                         }
                     }
                 }
+            }
+
+            private fun isCharSequenceLength(expression: PsiExpression) = (expression is PsiMethodCallExpression) && CHAR_SEQUENCE_LENGTH.test(expression)
 
             private fun isCollectionSize(expression: PsiExpression) = (expression is PsiMethodCallExpression) && COLLECTION_SIZE.test(expression)
 
@@ -74,21 +89,6 @@ class AssertThatSizeInspection : AbstractAssertJInspection() {
                 return ((psiReferenceExpression.qualifierExpression?.type is PsiArrayType)
                         && ((psiReferenceExpression.resolve() as? PsiField)?.name == "length"))
             }
-
-            private fun registerReplaceSizeMethod(
-                holder: ProblemsHolder,
-                expression: PsiMethodCallExpression,
-                expectedCallExpression: PsiMethodCallExpression,
-                replacementMethod: String,
-                noExpectedExpression: Boolean = false,
-                expectedIsCollection: Boolean = false
-            ) {
-                val originalMethod = getOriginalMethodName(expectedCallExpression) ?: return
-                val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
-                val message = MORE_CONCISE_MESSAGE_TEMPLATE.format(replacementMethod, originalMethod)
-                val quickfix = ReplaceSizeMethodCallQuickFix(description, replacementMethod, noExpectedExpression, expectedIsCollection)
-                holder.registerProblem(expression, message, quickfix)
-            }
         }
     }
 }

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

@@ -0,0 +1,102 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.codeInspection.LocalQuickFix
+import com.intellij.codeInspection.ProblemsHolder
+import com.intellij.psi.CommonClassNames
+import com.intellij.psi.JavaElementVisitor
+import com.intellij.psi.PsiElementVisitor
+import com.intellij.psi.PsiMethodCallExpression
+import com.siyeh.ig.callMatcher.CallMatcher
+import de.platon42.intellij.plugins.cajon.MethodNames
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
+import de.platon42.intellij.plugins.cajon.firstArg
+import de.platon42.intellij.plugins.cajon.quickfixes.MoveActualOuterExpressionMethodCallQuickFix
+import de.platon42.intellij.plugins.cajon.quickfixes.RemoveActualOutmostMethodCallQuickFix
+
+class AssertThatStringExpressionInspection : AbstractAssertJInspection() {
+
+    companion object {
+        private const val DISPLAY_NAME = "Asserting a string specific expression"
+        private const val MOVE_EXPECTED_EXPRESSION_DESCRIPTION_TEMPLATE = "Remove %s() of expected expression and use assertThat().%s() instead"
+        private const val MOVING_OUT_MESSAGE_TEMPLATE = "Moving %s() expression out of assertThat() would be more concise"
+
+        private val MAPPINGS = listOf(
+            Mapping(
+                CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "isEmpty").parameterCount(0)!!,
+                MethodNames.IS_EMPTY, MethodNames.IS_NOT_EMPTY, hasExpected = false
+            ),
+            Mapping(
+                CallMatcher.anyOf(
+                    CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "equals").parameterCount(1)!!,
+                    CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "contentEquals").parameterCount(1)!!
+                ),
+                MethodNames.IS_EQUAL_TO, MethodNames.IS_NOT_EQUAL_TO
+            ),
+            Mapping(
+                CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "equalsIgnoreCase").parameterTypes(CommonClassNames.JAVA_LANG_STRING)!!,
+                MethodNames.IS_EQUAL_TO_IC, MethodNames.IS_NOT_EQUAL_TO_IC
+            ),
+            Mapping(
+                CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "contains").parameterCount(1)!!,
+                MethodNames.CONTAINS, MethodNames.DOES_NOT_CONTAIN
+            ),
+            Mapping(
+                CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "startsWith").parameterTypes(CommonClassNames.JAVA_LANG_STRING)!!,
+                MethodNames.STARTS_WITH, MethodNames.DOES_NOT_START_WITH
+            ),
+            Mapping(
+                CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "endsWith").parameterTypes(CommonClassNames.JAVA_LANG_STRING)!!,
+                MethodNames.ENDS_WITH, MethodNames.DOES_NOT_END_WITH
+            )
+        )
+    }
+
+    override fun getDisplayName() = DISPLAY_NAME
+
+    override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean): PsiElementVisitor {
+        return object : JavaElementVisitor() {
+            override fun visitMethodCallExpression(expression: PsiMethodCallExpression) {
+                super.visitMethodCallExpression(expression)
+                if (!ASSERT_THAT_BOOLEAN.test(expression)) {
+                    return
+                }
+                val assertThatArgument = expression.firstArg as? PsiMethodCallExpression ?: return
+
+                val mapping = MAPPINGS.firstOrNull { it.callMatcher.test(assertThatArgument) } ?: return
+
+                val expectedCallExpression = expression.findOutmostMethodCall() ?: return
+                val expectedResult = getExpectedBooleanResult(expectedCallExpression) ?: return
+
+                val replacementMethod = if (expectedResult) mapping.replacementForTrue else mapping.replacementForFalse
+                if (mapping.hasExpected) {
+                    registerMoveOutMethod(holder, expression, assertThatArgument, replacementMethod, ::MoveActualOuterExpressionMethodCallQuickFix)
+                } else {
+                    registerMoveOutMethod(holder, expression, assertThatArgument, replacementMethod) { desc, method ->
+                        RemoveActualOutmostMethodCallQuickFix(desc, method, noExpectedExpression = true)
+                    }
+                }
+            }
+
+            private fun registerMoveOutMethod(
+                holder: ProblemsHolder,
+                expression: PsiMethodCallExpression,
+                oldActualExpression: PsiMethodCallExpression,
+                replacementMethod: String,
+                quickFixSupplier: (String, String) -> LocalQuickFix
+            ) {
+                val originalMethod = getOriginalMethodName(oldActualExpression) ?: return
+                val description = MOVE_EXPECTED_EXPRESSION_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
+                val message = MOVING_OUT_MESSAGE_TEMPLATE.format(originalMethod)
+                val quickfix = quickFixSupplier(description, replacementMethod)
+                holder.registerProblem(expression, message, quickfix)
+            }
+        }
+    }
+
+    private class Mapping(
+        val callMatcher: CallMatcher,
+        val replacementForTrue: String,
+        val replacementForFalse: String,
+        val hasExpected: Boolean = true
+    )
+}

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

@@ -1,10 +1,12 @@
 package de.platon42.intellij.plugins.cajon.inspections
 
+import com.intellij.codeInspection.LocalQuickFix
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.*
 import com.intellij.psi.search.GlobalSearchScope
 import com.siyeh.ig.callMatcher.CallMatcher
 import com.siyeh.ig.callMatcher.CallMatcher.anyOf
+import com.siyeh.ig.callMatcher.CallMatcher.staticCall
 import de.platon42.intellij.plugins.cajon.AssertJClassNames
 import de.platon42.intellij.plugins.cajon.MethodNames
 import de.platon42.intellij.plugins.cajon.quickfixes.ReplaceJUnitAssertMethodCallQuickFix
@@ -18,91 +20,91 @@ class JUnitAssertToAssertJInspection : AbstractJUnitAssertInspection() {
         private val MAPPINGS = listOf(
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_TRUE_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "boolean"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_TRUE_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "boolean"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_TRUE_METHOD).parameterTypes("boolean")
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_TRUE_METHOD).parameterTypes("boolean")
                 ),
                 MethodNames.IS_TRUE, false
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_FALSE_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "boolean"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_FALSE_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "boolean"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_FALSE_METHOD).parameterTypes("boolean")
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_FALSE_METHOD).parameterTypes("boolean")
                 ),
                 MethodNames.IS_FALSE, false
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, CommonClassNames.JAVA_LANG_OBJECT),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, CommonClassNames.JAVA_LANG_OBJECT),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)
                 ),
                 MethodNames.IS_NULL, false
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, CommonClassNames.JAVA_LANG_OBJECT),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, CommonClassNames.JAVA_LANG_OBJECT),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_NULL_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)
                 ),
                 MethodNames.IS_NOT_NULL, false
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double", "double", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double", "double", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes("double", "double", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes("double", "double", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float", "float", "float"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float", "float", "float"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes("float", "float", "float")
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterTypes("float", "float", "float")
                 ),
                 MethodNames.IS_CLOSE_TO, hasDelta = true
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterCount(3),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterCount(3),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterCount(2)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_EQUALS_METHOD).parameterCount(2)
                 ),
                 MethodNames.IS_EQUAL_TO
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double", "double", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double", "double", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes("double", "double", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes("double", "double", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float", "float", "float"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float", "float", "float"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes("float", "float", "float")
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterTypes("float", "float", "float")
                 ),
                 MethodNames.IS_NOT_CLOSE_TO, hasDelta = true
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterCount(3),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterCount(3),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterCount(2)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_EQUALS_METHOD).parameterCount(2)
                 ),
                 MethodNames.IS_NOT_EQUAL_TO
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_SAME_METHOD).parameterCount(3),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_SAME_METHOD).parameterCount(3),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_SAME_METHOD).parameterCount(2)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_SAME_METHOD).parameterCount(2)
                 ),
                 MethodNames.IS_SAME_AS
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_SAME_METHOD).parameterCount(3),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_SAME_METHOD).parameterCount(3),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_SAME_METHOD).parameterCount(2)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_NOT_SAME_METHOD).parameterCount(2)
                 ),
                 MethodNames.IS_NOT_SAME_AS
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double[]", "double[]", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "double[]", "double[]", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes("double[]", "double[]", "double"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes("double[]", "double[]", "double"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float[]", "float[]", "float"),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes(CommonClassNames.JAVA_LANG_STRING, "float[]", "float[]", "float"),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes("float[]", "float[]", "float")
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterTypes("float[]", "float[]", "float")
                 ),
                 MethodNames.CONTAINS_EXACTLY, hasDelta = true
             ),
             Mapping(
                 anyOf(
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterCount(2),
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterCount(2),
-                    CallMatcher.staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterCount(3)
+                    staticCall(JUNIT_ASSERT_CLASSNAME, ASSERT_ARRAY_EQUALS_METHOD).parameterCount(3)
                 ),
                 MethodNames.CONTAINS_EXACTLY
             )
@@ -121,43 +123,29 @@ class JUnitAssertToAssertJInspection : AbstractJUnitAssertInspection() {
                 }
                 JavaPsiFacade.getInstance(expression.project)
                     .findClass(AssertJClassNames.ASSERTIONS_CLASSNAME, GlobalSearchScope.allScope(expression.project)) ?: return
-                for (mapping in MAPPINGS) {
+                val mapping = MAPPINGS.firstOrNull { it.callMatcher.test(expression) } ?: return
-                    if (mapping.callMatcher.test(expression)) {
                 if (mapping.hasDelta) {
-                            registerDeltaReplacementMethod(holder, expression, mapping.replacement)
+                    registerConvertMethod(holder, expression, mapping.replacement, ::ReplaceJUnitDeltaAssertMethodCallQuickFix)
                 } else {
-                            registerSimpleReplacementMethod(holder, expression, mapping.hasExpected, mapping.replacement)
+                    registerConvertMethod(holder, expression, mapping.replacement) { desc, method ->
-                        }
+                        ReplaceJUnitAssertMethodCallQuickFix(desc, method, !mapping.hasExpected)
-                        return
                     }
                 }
             }
         }
     }
 
-    private fun registerSimpleReplacementMethod(
+    private fun registerConvertMethod(
         holder: ProblemsHolder,
         expression: PsiMethodCallExpression,
-        hasExpected: Boolean,
+        replacementMethod: String,
-        replacementMethod: String
+        quickFixSupplier: (String, String) -> LocalQuickFix
     ) {
         val originalMethod = getOriginalMethodName(expression) ?: return
         val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
         val message = CONVERT_MESSAGE_TEMPLATE.format(originalMethod)
-        val quickFix = ReplaceJUnitAssertMethodCallQuickFix(description, !hasExpected, replacementMethod)
+        val quickfix = quickFixSupplier(description, replacementMethod)
-        holder.registerProblem(expression, message, quickFix)
+        holder.registerProblem(expression, message, quickfix)
-    }
-
-    private fun registerDeltaReplacementMethod(
-        holder: ProblemsHolder,
-        expression: PsiMethodCallExpression,
-        replacementMethod: String
-    ) {
-        val originalMethod = getOriginalMethodName(expression) ?: return
-        val description = REPLACE_DESCRIPTION_TEMPLATE.format(originalMethod, replacementMethod)
-        val message = CONVERT_MESSAGE_TEMPLATE.format(originalMethod)
-        val quickFix = ReplaceJUnitDeltaAssertMethodCallQuickFix(description, replacementMethod)
-        holder.registerProblem(expression, message, quickFix)
     }
 
     private class Mapping(

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/AbstractCommonQuickFix.kt

@@ -1,35 +1,9 @@
 package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.LocalQuickFix
-import com.intellij.psi.*
-import de.platon42.intellij.plugins.cajon.AssertJClassNames
-import de.platon42.intellij.plugins.cajon.MethodNames
-import de.platon42.intellij.plugins.cajon.firstArg
 
 abstract class AbstractCommonQuickFix(private val description: String) : LocalQuickFix {
 
     override fun getFamilyName() = description
 
-    protected fun addStaticImport(method: PsiMethod, element: PsiMethodCallExpression, factory: PsiElementFactory, vararg allowedClashes: String) {
-        val methodName = method.name
-        val containingClass = method.containingClass ?: return
-        val importList = (element.containingFile as PsiJavaFile).importList ?: return
-        val notImportedStatically = importList.importStaticStatements.none {
-            val targetClass = it.resolveTargetClass() ?: return@none false
-            ((it.referenceName == methodName) && !allowedClashes.contains(targetClass.qualifiedName))
-                    || (it.isOnDemand && (targetClass == method.containingClass))
-        }
-        if (notImportedStatically) {
-            importList.add(factory.createImportStaticStatement(containingClass, methodName))
-        }
-    }
-
-    protected fun createAssertThat(context: PsiElement, actualExpression: PsiExpression): PsiMethodCallExpression {
-        val factory = JavaPsiFacade.getElementFactory(context.project)
-        val newMethodCall = factory.createExpressionFromText(
-            "${AssertJClassNames.ASSERTIONS_CLASSNAME}.${MethodNames.ASSERT_THAT}(a)", context
-        ) as PsiMethodCallExpression
-        newMethodCall.firstArg.replace(actualExpression)
-        return newMethodCall
-    }
 }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/ForGuavaPostFix.kt

@@ -0,0 +1,25 @@
+package de.platon42.intellij.plugins.cajon.quickfixes
+
+import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiMethodCallExpression
+import com.intellij.psi.PsiStatement
+import com.intellij.psi.util.PsiTreeUtil
+import de.platon42.intellij.plugins.cajon.*
+
+class ForGuavaPostFix {
+    companion object {
+        val REPLACE_BY_GUAVA_ASSERT_THAT_AND_STATIC_IMPORT: (Project, ProblemDescriptor) -> Unit = exit@
+        { _, descriptor ->
+            val element = descriptor.startElement
+            val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return@exit
+            val assertThatCall = PsiTreeUtil.findChildrenOfType(statement, PsiMethodCallExpression::class.java).find { CORE_ASSERT_THAT_MATCHER.test(it) } ?: return@exit
+
+            val newMethodCall = createGuavaAssertThat(element, assertThatCall.firstArg)
+            newMethodCall.resolveMethod()?.addAsStaticImport(element, AssertJClassNames.ASSERTIONS_CLASSNAME)
+            val parentCall = PsiTreeUtil.getParentOfType(assertThatCall, PsiMethodCallExpression::class.java) ?: return@exit
+            parentCall.replaceQualifier(newMethodCall)
+            parentCall.shortenAndReformat()
+        }
+    }
+}

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/MoveActualOuterExpressionMethodCallQuickFix.kt

@@ -0,0 +1,22 @@
+package de.platon42.intellij.plugins.cajon.quickfixes
+
+import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiMethodCallExpression
+import de.platon42.intellij.plugins.cajon.*
+
+class MoveActualOuterExpressionMethodCallQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
+
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
+        val element = descriptor.startElement
+        val methodCallExpression = element as? PsiMethodCallExpression ?: return
+        val assertExpression = methodCallExpression.firstArg as? PsiMethodCallExpression ?: return
+        val assertExpressionArg = assertExpression.firstArg.copy()
+        assertExpression.replace(assertExpression.qualifierExpression)
+
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, assertExpressionArg)
+        expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
+        oldExpectedExpression.replace(expectedExpression)
+    }
+}

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/QuickFixWithPostfixDelegate.kt

@@ -0,0 +1,16 @@
+package de.platon42.intellij.plugins.cajon.quickfixes
+
+import com.intellij.codeInspection.LocalQuickFix
+import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.openapi.project.Project
+
+class QuickFixWithPostfixDelegate(
+    private val mainFix: LocalQuickFix,
+    private val postfix: (Project, ProblemDescriptor) -> Unit
+) : LocalQuickFix by mainFix {
+
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
+        mainFix.applyFix(project, descriptor)
+        postfix(project, descriptor)
+    }
+}

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/RemoveActualOutmostMethodCallQuickFix.kt

@@ -2,19 +2,13 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.PsiStatement
+import de.platon42.intellij.plugins.cajon.*
-import com.intellij.psi.util.PsiTreeUtil
-import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.map
-import de.platon42.intellij.plugins.cajon.qualifierExpression
-import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
 
 class RemoveActualOutmostMethodCallQuickFix(
     description: String,
     private val replacementMethod: String,
-    private val noExpectedExpression: Boolean
+    private val noExpectedExpression: Boolean = false
 ) : AbstractCommonQuickFix(description) {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
@@ -22,16 +16,10 @@ class RemoveActualOutmostMethodCallQuickFix(
         val methodCallExpression = element as? PsiMethodCallExpression ?: return
         val assertExpression = methodCallExpression.firstArg as? PsiMethodCallExpression ?: return
         assertExpression.replace(assertExpression.qualifierExpression)
-        val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return
-        val oldExpectedExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
 
-        val factory = JavaPsiFacade.getElementFactory(element.project)
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
-        val expectedExpression = factory.createExpressionFromText(
+        val args = if (noExpectedExpression) emptyArray() else oldExpectedExpression.argumentList.expressions
-            "a.$replacementMethod${noExpectedExpression.map("()", "(e)")}", element
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, *args)
-        ) as PsiMethodCallExpression
-        if (!noExpectedExpression) {
-            expectedExpression.firstArg.replace(oldExpectedExpression.firstArg)
-        }
         expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
         oldExpectedExpression.replace(expectedExpression)
     }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/RemoveExpectedOutmostMethodCallQuickFix.kt

@@ -2,10 +2,9 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.PsiStatement
+import de.platon42.intellij.plugins.cajon.createExpectedMethodCall
-import com.intellij.psi.util.PsiTreeUtil
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
 import de.platon42.intellij.plugins.cajon.firstArg
 import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
 
@@ -13,14 +12,9 @@ class RemoveExpectedOutmostMethodCallQuickFix(description: String, private val r
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val element = descriptor.startElement
-        val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
-        val oldExpectedExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
-
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedExpression =
-            factory.createExpressionFromText("a.$replacementMethod(e)", element) as PsiMethodCallExpression
         val expectedMethodCallExpression = oldExpectedExpression.firstArg as? PsiMethodCallExpression ?: return
-        expectedExpression.firstArg.replace(expectedMethodCallExpression.firstArg)
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, expectedMethodCallExpression.firstArg)
         expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
         oldExpectedExpression.replace(expectedExpression)
     }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/RemoveInstanceOfExpressionQuickFix.kt

@@ -0,0 +1,36 @@
+package de.platon42.intellij.plugins.cajon.quickfixes
+
+import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiInstanceOfExpression
+import com.intellij.psi.PsiMethodCallExpression
+import com.intellij.psi.PsiParenthesizedExpression
+import de.platon42.intellij.plugins.cajon.createExpectedMethodCall
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
+import de.platon42.intellij.plugins.cajon.firstArg
+import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
+
+class RemoveInstanceOfExpressionQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
+
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
+        val element = descriptor.startElement
+        val methodCallExpression = element as? PsiMethodCallExpression ?: return
+        val assertExpression = methodCallExpression.firstArg as? PsiInstanceOfExpression ?: return
+        val expectedClass = assertExpression.checkType ?: return
+        val factory = JavaPsiFacade.getElementFactory(project)
+        val classObjectAccess = factory.createExpressionFromText("${expectedClass.type.canonicalText}.class", null)
+
+        var operand = assertExpression.operand
+        while (operand is PsiParenthesizedExpression) {
+            operand = operand.expression ?: return
+        }
+
+        assertExpression.replace(operand)
+
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, classObjectAccess)
+        expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
+        oldExpectedExpression.replace(expectedExpression)
+    }
+}

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/RemoveUnaryExpressionQuickFix.kt

@@ -0,0 +1,30 @@
+package de.platon42.intellij.plugins.cajon.quickfixes
+
+import com.intellij.codeInspection.ProblemDescriptor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiMethodCallExpression
+import com.intellij.psi.PsiParenthesizedExpression
+import com.intellij.psi.PsiUnaryExpression
+import de.platon42.intellij.plugins.cajon.createExpectedMethodCall
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
+import de.platon42.intellij.plugins.cajon.firstArg
+import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
+
+class RemoveUnaryExpressionQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
+
+    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
+        val element = descriptor.startElement
+        val methodCallExpression = element as? PsiMethodCallExpression ?: return
+        val assertExpression = methodCallExpression.firstArg as? PsiUnaryExpression ?: return
+        var operand = assertExpression.operand ?: return
+        while (operand is PsiParenthesizedExpression) {
+            operand = operand.expression ?: return
+        }
+        assertExpression.replace(operand)
+
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod)
+        expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
+        oldExpectedExpression.replace(expectedExpression)
+    }
+}

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/ReplaceJUnitAssertMethodCallQuickFix.kt

@@ -2,17 +2,12 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
+import com.intellij.psi.PsiExpression
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.codeStyle.CodeStyleManager
+import de.platon42.intellij.plugins.cajon.*
-import com.intellij.psi.codeStyle.JavaCodeStyleManager
 import de.platon42.intellij.plugins.cajon.AssertJClassNames.Companion.GUAVA_ASSERTIONS_CLASSNAME
-import de.platon42.intellij.plugins.cajon.MethodNames
-import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.map
-import de.platon42.intellij.plugins.cajon.replaceQualifier
 
-class ReplaceJUnitAssertMethodCallQuickFix(description: String, private val noExpectedExpression: Boolean, private val replacementMethod: String) :
+class ReplaceJUnitAssertMethodCallQuickFix(description: String, private val replacementMethod: String, private val noExpectedExpression: Boolean) :
     AbstractCommonQuickFix(description) {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
@@ -22,39 +17,26 @@ class ReplaceJUnitAssertMethodCallQuickFix(description: String, private val noEx
         val count = args.expressions.size
         val actualExpression = args.expressions[count - 1] ?: return
         val (expectedExpression, messageExpression) = if (noExpectedExpression) {
-            val message = if (count > 1) args.expressions[0] else null
+            val message = args.expressions.getOrNull(count - 2)
-            null to message
+            emptyArray<PsiExpression>() to message
         } else {
             val expected = args.expressions[count - 2] ?: return
-            val message = if (count > 2) args.expressions[0] else null
+            val message = args.expressions.getOrNull(count - 3)
-            expected to message
+            arrayOf(expected) to message
-        }
-
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedMethodCall = factory.createExpressionFromText(
-            "a.$replacementMethod${noExpectedExpression.map("()", "(e)")}", element
-        ) as PsiMethodCallExpression
-        if (!noExpectedExpression) {
-            expectedMethodCall.firstArg.replace(expectedExpression!!)
         }
 
+        val expectedMethodCall = createExpectedMethodCall(element, replacementMethod, *expectedExpression)
         val newMethodCall = createAssertThat(element, actualExpression)
 
         if (messageExpression != null) {
-            val asExpression = factory.createExpressionFromText("a.${MethodNames.AS}(desc)", element) as PsiMethodCallExpression
+            val asExpression = createExpectedMethodCall(element, MethodNames.AS, messageExpression)
-            asExpression.firstArg.replace(messageExpression)
             asExpression.replaceQualifier(newMethodCall)
             expectedMethodCall.replaceQualifier(asExpression)
         } else {
             expectedMethodCall.replaceQualifier(newMethodCall)
         }
 
-        val assertThatMethod = newMethodCall.resolveMethod() ?: return
+        newMethodCall.resolveMethod()?.addAsStaticImport(element, GUAVA_ASSERTIONS_CLASSNAME)
-        addStaticImport(assertThatMethod, element, factory, GUAVA_ASSERTIONS_CLASSNAME)
+        element.replace(expectedMethodCall).shortenAndReformat()
-
-        val codeStyleManager = JavaCodeStyleManager.getInstance(element.project)
-        val newElement = element.replace(expectedMethodCall)
-        val shortened = codeStyleManager.shortenClassReferences(newElement)
-        CodeStyleManager.getInstance(element.project).reformat(shortened)
     }
 }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/ReplaceJUnitDeltaAssertMethodCallQuickFix.kt

@@ -2,14 +2,9 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.codeStyle.CodeStyleManager
+import de.platon42.intellij.plugins.cajon.*
-import com.intellij.psi.codeStyle.JavaCodeStyleManager
 import de.platon42.intellij.plugins.cajon.AssertJClassNames.Companion.GUAVA_ASSERTIONS_CLASSNAME
-import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.getArg
-import de.platon42.intellij.plugins.cajon.replaceQualifier
 
 class ReplaceJUnitDeltaAssertMethodCallQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
 
@@ -18,44 +13,25 @@ class ReplaceJUnitDeltaAssertMethodCallQuickFix(description: String, private val
         val methodCallExpression = element as? PsiMethodCallExpression ?: return
         val args = methodCallExpression.argumentList
         val count = args.expressions.size
-        val actualExpression = args.expressions[count - 2] ?: return
+        val messageExpression = args.expressions.getOrNull(count - 4)
-        val messageExpression = if (count > 3) args.expressions[0] else null
         val expectedExpression = args.expressions[count - 3] ?: return
+        val actualExpression = args.expressions[count - 2] ?: return
         val deltaExpression = args.expressions[count - 1] ?: return
 
-        val factory = JavaPsiFacade.getElementFactory(element.project)
+        val offsetMethodCall = createMethodCall(element, "org.assertj.core.data.Offset.offset", deltaExpression)
-        val offsetMethodCall = factory.createExpressionFromText(
+        val expectedMethodCall = createExpectedMethodCall(element, replacementMethod, expectedExpression, offsetMethodCall)
-            "org.assertj.core.data.Offset.offset(c)", element
-        ) as PsiMethodCallExpression
-
-        offsetMethodCall.firstArg.replace(deltaExpression)
-
-        val expectedMethodCall = factory.createExpressionFromText(
-            "a.$replacementMethod(e, offs)", element
-        ) as PsiMethodCallExpression
-
-        expectedMethodCall.firstArg.replace(expectedExpression)
-        expectedMethodCall.getArg(1).replace(offsetMethodCall)
-
         val newMethodCall = createAssertThat(element, actualExpression)
 
         if (messageExpression != null) {
-            val asExpression = factory.createExpressionFromText("a.as(desc)", element) as PsiMethodCallExpression
+            val asExpression = createExpectedMethodCall(element, MethodNames.AS, messageExpression)
-            asExpression.firstArg.replace(messageExpression)
             asExpression.replaceQualifier(newMethodCall)
             expectedMethodCall.replaceQualifier(asExpression)
         } else {
             expectedMethodCall.replaceQualifier(newMethodCall)
         }
 
-        val assertThatMethod = newMethodCall.resolveMethod() ?: return
+        newMethodCall.resolveMethod()?.addAsStaticImport(element, GUAVA_ASSERTIONS_CLASSNAME)
-        addStaticImport(assertThatMethod, element, factory, GUAVA_ASSERTIONS_CLASSNAME)
+        offsetMethodCall.resolveMethod()?.addAsStaticImport(element)
-        val offsetMethod = offsetMethodCall.resolveMethod() ?: return
+        element.replace(expectedMethodCall).shortenAndReformat()
-        addStaticImport(offsetMethod, element, factory)
-
-        val codeStyleManager = JavaCodeStyleManager.getInstance(element.project)
-        val newElement = element.replace(expectedMethodCall)
-        val shortened = codeStyleManager.shortenClassReferences(newElement)
-        CodeStyleManager.getInstance(element.project).reformat(shortened)
     }
 }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/ReplaceSimpleMethodCallQuickFix.kt

@@ -2,8 +2,8 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiMethodCallExpression
+import de.platon42.intellij.plugins.cajon.createExpectedMethodCall
 import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
 
 class ReplaceSimpleMethodCallQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
@@ -11,10 +11,7 @@ class ReplaceSimpleMethodCallQuickFix(description: String, private val replaceme
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
         val element = descriptor.startElement
         val methodCallExpression = element as? PsiMethodCallExpression ?: return
-
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod)
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedExpression =
-            factory.createExpressionFromText("a.$replacementMethod()", element) as PsiMethodCallExpression
         expectedExpression.replaceQualifierFromMethodCall(methodCallExpression)
         element.replace(expectedExpression)
     }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/ReplaceSizeMethodCallQuickFix.kt

@@ -2,18 +2,16 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.*
+import com.intellij.psi.PsiExpression
-import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.psi.PsiMethodCallExpression
-import de.platon42.intellij.plugins.cajon.firstArg
+import com.intellij.psi.PsiReferenceExpression
-import de.platon42.intellij.plugins.cajon.map
+import de.platon42.intellij.plugins.cajon.*
-import de.platon42.intellij.plugins.cajon.qualifierExpression
-import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
 
 class ReplaceSizeMethodCallQuickFix(
     description: String,
     private val replacementMethod: String,
-    private val noExpectedExpression: Boolean,
+    private val noExpectedExpression: Boolean = false,
-    private val expectedIsCollection: Boolean
+    private val expectedIsCollection: Boolean = false
 ) : AbstractCommonQuickFix(description) {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
@@ -21,19 +19,15 @@ class ReplaceSizeMethodCallQuickFix(
         val methodCallExpression = element as? PsiMethodCallExpression ?: return
         val assertExpression = methodCallExpression.firstArg
         replaceCollectionSizeOrArrayLength(assertExpression)
-        val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
-        val oldExpectedExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
 
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedExpression = factory.createExpressionFromText(
-            "a.$replacementMethod${noExpectedExpression.map("()", "(e)")}", element
-        ) as PsiMethodCallExpression
-        if (!noExpectedExpression) {
         if (expectedIsCollection) {
             replaceCollectionSizeOrArrayLength(oldExpectedExpression.firstArg)
         }
-            expectedExpression.firstArg.replace(oldExpectedExpression.firstArg)
+
-        }
+        val args = if (noExpectedExpression) emptyArray() else arrayOf(oldExpectedExpression.firstArg)
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, *args)
+
         expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
         oldExpectedExpression.replace(expectedExpression)
     }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/SplitBinaryExpressionMethodCallQuickFix.kt

@@ -2,20 +2,18 @@ package de.platon42.intellij.plugins.cajon.quickfixes
 
 import com.intellij.codeInspection.ProblemDescriptor
 import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
 import com.intellij.psi.PsiBinaryExpression
 import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.PsiStatement
+import de.platon42.intellij.plugins.cajon.createExpectedMethodCall
-import com.intellij.psi.util.PsiTreeUtil
+import de.platon42.intellij.plugins.cajon.findOutmostMethodCall
 import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.map
 import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
 
 class SplitBinaryExpressionMethodCallQuickFix(
     description: String,
     private val replacementMethod: String,
-    private val pickRightOperand: Boolean,
+    private val pickRightOperand: Boolean = false,
-    private val noExpectedExpression: Boolean
+    private val noExpectedExpression: Boolean = false
 ) : AbstractCommonQuickFix(description) {
 
     override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
@@ -25,16 +23,9 @@ class SplitBinaryExpressionMethodCallQuickFix(
         val expectedArgument = (if (pickRightOperand) binaryExpression.lOperand else binaryExpression.rOperand)?.copy() ?: return
         binaryExpression.replace(if (pickRightOperand) binaryExpression.rOperand!! else binaryExpression.lOperand)
 
-        val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return
+        val oldExpectedExpression = element.findOutmostMethodCall() ?: return
-        val oldExpectedExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
+        val args = if (noExpectedExpression) emptyArray() else arrayOf(expectedArgument)
-
+        val expectedExpression = createExpectedMethodCall(element, replacementMethod, *args)
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedExpression = factory.createExpressionFromText(
-            "a.$replacementMethod${noExpectedExpression.map("()", "(e)")}", element
-        ) as PsiMethodCallExpression
-        if (!noExpectedExpression) {
-            expectedExpression.firstArg.replace(expectedArgument)
-        }
         expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
         oldExpectedExpression.replace(expectedExpression)
     }

src/main/java/de/platon42/intellij/plugins/cajon/quickfixes/SplitEqualsExpressionMethodCallQuickFix.kt

@@ -1,33 +0,0 @@
-package de.platon42.intellij.plugins.cajon.quickfixes
-
-import com.intellij.codeInspection.ProblemDescriptor
-import com.intellij.openapi.project.Project
-import com.intellij.psi.JavaPsiFacade
-import com.intellij.psi.PsiMethodCallExpression
-import com.intellij.psi.PsiStatement
-import com.intellij.psi.util.PsiTreeUtil
-import de.platon42.intellij.plugins.cajon.firstArg
-import de.platon42.intellij.plugins.cajon.qualifierExpression
-import de.platon42.intellij.plugins.cajon.replaceQualifierFromMethodCall
-
-class SplitEqualsExpressionMethodCallQuickFix(description: String, private val replacementMethod: String) : AbstractCommonQuickFix(description) {
-
-    override fun applyFix(project: Project, descriptor: ProblemDescriptor) {
-        val element = descriptor.startElement
-        val methodCallExpression = element as? PsiMethodCallExpression ?: return
-        val equalsMethodCall = methodCallExpression.firstArg as? PsiMethodCallExpression ?: return
-        val expectedArgument = equalsMethodCall.firstArg.copy()
-        equalsMethodCall.replace(equalsMethodCall.qualifierExpression)
-
-        val statement = PsiTreeUtil.getParentOfType(element, PsiStatement::class.java) ?: return
-        val oldExpectedExpression = PsiTreeUtil.findChildOfType(statement, PsiMethodCallExpression::class.java) ?: return
-
-        val factory = JavaPsiFacade.getElementFactory(element.project)
-        val expectedExpression = factory.createExpressionFromText(
-            "a.$replacementMethod(e)", element
-        ) as PsiMethodCallExpression
-        expectedExpression.firstArg.replace(expectedArgument)
-        expectedExpression.replaceQualifierFromMethodCall(oldExpectedExpression)
-        oldExpectedExpression.replace(expectedExpression)
-    }
-}

src/main/java/de/platon42/intellij/plugins/cajon/references/ExtractorReferenceContributor.kt

@@ -0,0 +1,167 @@
+package de.platon42.intellij.plugins.cajon.references
+
+import com.intellij.lang.jvm.JvmModifier
+import com.intellij.openapi.util.TextRange
+import com.intellij.patterns.PlatformPatterns
+import com.intellij.psi.*
+import com.intellij.psi.util.PropertyUtilBase
+import com.intellij.psi.util.PsiTreeUtil
+import com.intellij.psi.util.PsiTypesUtil
+import com.intellij.util.ArrayUtil
+import com.intellij.util.ProcessingContext
+import com.siyeh.ig.callMatcher.CallMatcher
+import de.platon42.intellij.plugins.cajon.AssertJClassNames
+import de.platon42.intellij.plugins.cajon.CORE_ASSERT_THAT_MATCHER
+import de.platon42.intellij.plugins.cajon.firstArg
+
+class ExtractorReferenceContributor : PsiReferenceContributor() {
+
+    companion object {
+
+        private val EXTRACTING_FROM_OBJECT = CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_OBJECT_ASSERT_CLASSNAME, "extracting")
+        private val EXTRACTING_FROM_ITERABLE = CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_ITERABLE_ASSERT_CLASSNAME, "extracting")
+        private val FLAT_EXTRACTING_FROM_ITERABLE = CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_ITERABLE_ASSERT_CLASSNAME, "flatExtracting")
+        private val EXTRACTING_RESULT_OF_FROM_ITERABLE = CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_ITERABLE_ASSERT_CLASSNAME, "extractingResultOf")
+
+        private val BY_NAME = CallMatcher.staticCall(AssertJClassNames.EXTRACTORS_CLASSNAME, "byName")
+        private val RESULT_OF = CallMatcher.staticCall(AssertJClassNames.EXTRACTORS_CLASSNAME, "resultOf")
+            .parameterTypes(CommonClassNames.JAVA_LANG_STRING)!!
+
+        private val propertyOrFieldReferenceProvider = PropertyOrFieldReferenceProvider()
+        private val iterablePropertyOrFieldReferenceProvider = IterablePropertyOrFieldReferenceProvider()
+        private val iterableResultOfReferenceProvider = IterableResultOfReferenceProvider()
+
+        private fun lookupFieldOrProperty(containingClass: PsiClass, path: String, startOffset: Int): List<Pair<TextRange, List<PsiElement>>> {
+            val partName = path.substring(startOffset).substringBefore(".")
+            val nextOffset = startOffset + partName.length + 1
+
+            val matchedGetter = PropertyUtilBase.findPropertyGetter(containingClass, partName, false, true)
+            val fieldResult = PropertyUtilBase.findPropertyField(containingClass, partName, false)
+            val textRange = TextRange(startOffset + 1, nextOffset)
+            val matchedBareMethod = containingClass.allMethods.find { (it.name == partName) && !it.hasModifier(JvmModifier.STATIC) }
+            val targets = listOfNotNull<PsiElement>(fieldResult, matchedGetter, matchedBareMethod)
+            if (targets.isNotEmpty()) {
+                val results = listOf(textRange to targets)
+                if (nextOffset >= path.length) {
+                    return results
+                }
+                val nextClass = PsiTypesUtil.getPsiClass(matchedGetter?.returnType ?: fieldResult?.type) ?: return results
+                return listOf(results, lookupFieldOrProperty(nextClass, path, nextOffset)).flatten()
+            }
+            return emptyList()
+        }
+
+        private fun lookupMethod(containingClass: PsiClass, methodName: String): List<Pair<TextRange, List<PsiElement>>>? {
+            val matchedMethod = containingClass.allMethods.find { (it.name == methodName) && !it.hasModifier(JvmModifier.STATIC) } ?: return null
+            val textRange = TextRange(1, methodName.length + 1)
+            return listOf(textRange to listOf(matchedMethod))
+        }
+
+        private fun findActualType(element: PsiElement): PsiClassType? {
+            val assertThatCall = PsiTreeUtil.findChildrenOfType(element, PsiMethodCallExpression::class.java)
+                .find { CORE_ASSERT_THAT_MATCHER.test(it) } ?: return null
+            return assertThatCall.firstArg.type as? PsiClassType
+        }
+
+        private fun findAndCreateReferences(element: PsiElement, finder: (PsiLiteralExpression) -> List<Pair<TextRange, List<PsiElement>>>?): Array<PsiReference> {
+            val literal = element as PsiLiteralExpression
+            val results = finder(literal)
+            if (results != null) {
+                return results.map { ExtractorReference(literal, it.first, it.second) }.toTypedArray()
+            }
+            return PsiReference.EMPTY_ARRAY
+        }
+    }
+
+    override fun registerReferenceProviders(registrar: PsiReferenceRegistrar) {
+        registrar.registerReferenceProvider(PlatformPatterns.psiElement(PsiLiteralExpression::class.java), propertyOrFieldReferenceProvider)
+        registrar.registerReferenceProvider(PlatformPatterns.psiElement(PsiLiteralExpression::class.java), iterablePropertyOrFieldReferenceProvider)
+        registrar.registerReferenceProvider(PlatformPatterns.psiElement(PsiLiteralExpression::class.java), iterableResultOfReferenceProvider)
+    }
+
+    class ExtractorReference(literal: PsiLiteralExpression, range: TextRange, private val targets: List<PsiElement>) :
+        PsiPolyVariantReferenceBase<PsiLiteralExpression>(literal, range, true) {
+
+        override fun getVariants(): Array<Any> {
+            return ArrayUtil.EMPTY_OBJECT_ARRAY
+        }
+
+        override fun resolve(): PsiElement? {
+            return multiResolve(false).map(ResolveResult::getElement).firstOrNull()
+        }
+
+        override fun multiResolve(incompleteCode: Boolean): Array<ResolveResult> {
+            return PsiElementResolveResult.createResults(targets)
+        }
+    }
+
+    class PropertyOrFieldReferenceProvider : PsiReferenceProvider() {
+
+        override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
+            return findAndCreateReferences(element, ::findReferences)
+        }
+
+        fun findReferences(element: PsiLiteralExpression): List<Pair<TextRange, List<PsiElement>>>? {
+            val literal = element.value as? String ?: return null
+            var methodCallExpression = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression::class.java) ?: return null
+            var isResultOf = false
+            if (BY_NAME.test(methodCallExpression)) {
+                methodCallExpression = PsiTreeUtil.getParentOfType(methodCallExpression, PsiMethodCallExpression::class.java) ?: return null
+            } else if (RESULT_OF.test(methodCallExpression)) {
+                methodCallExpression = PsiTreeUtil.getParentOfType(methodCallExpression, PsiMethodCallExpression::class.java) ?: return null
+                isResultOf = true
+            }
+            if (!EXTRACTING_FROM_OBJECT.test(methodCallExpression)) {
+                return emptyList()
+            }
+            val containingClass = PsiTypesUtil.getPsiClass(findActualType(methodCallExpression)) ?: return null
+            return if (isResultOf) lookupMethod(containingClass, literal) else lookupFieldOrProperty(containingClass, literal, 0)
+        }
+    }
+
+    class IterablePropertyOrFieldReferenceProvider : PsiReferenceProvider() {
+
+        override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
+            return findAndCreateReferences(element, ::findReferences)
+        }
+
+        fun findReferences(element: PsiLiteralExpression): List<Pair<TextRange, List<PsiElement>>>? {
+            val literal = element.value as? String ?: return null
+            var methodCallExpression = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression::class.java) ?: return null
+            var isResultOf = false
+            if (BY_NAME.test(methodCallExpression)) {
+                methodCallExpression = PsiTreeUtil.getParentOfType(methodCallExpression, PsiMethodCallExpression::class.java) ?: return null
+            } else if (RESULT_OF.test(methodCallExpression)) {
+                methodCallExpression = PsiTreeUtil.getParentOfType(methodCallExpression, PsiMethodCallExpression::class.java) ?: return null
+                isResultOf = true
+            }
+
+            if (!CallMatcher.anyOf(EXTRACTING_FROM_ITERABLE, FLAT_EXTRACTING_FROM_ITERABLE).test(methodCallExpression)) {
+                return null
+            }
+            val iterableType = findActualType(methodCallExpression) ?: return null
+            val innerType = iterableType.resolveGenerics().substitutor.substitute(iterableType.parameters[0])
+            val containingClass = PsiTypesUtil.getPsiClass(innerType) ?: return null
+            return if (isResultOf) lookupMethod(containingClass, literal) else lookupFieldOrProperty(containingClass, literal, 0)
+        }
+    }
+
+    class IterableResultOfReferenceProvider : PsiReferenceProvider() {
+
+        override fun getReferencesByElement(element: PsiElement, context: ProcessingContext): Array<PsiReference> {
+            return findAndCreateReferences(element, ::findReferences)
+        }
+
+        fun findReferences(element: PsiLiteralExpression): List<Pair<TextRange, List<PsiElement>>>? {
+            val literal = element.value as? String ?: return null
+            val methodCallExpression = PsiTreeUtil.getParentOfType(element, PsiMethodCallExpression::class.java) ?: return null
+            if (!EXTRACTING_RESULT_OF_FROM_ITERABLE.test(methodCallExpression)) {
+                return null
+            }
+            val iterableType = findActualType(methodCallExpression) ?: return null
+            val innerType = iterableType.resolveGenerics().substitutor.substitute(iterableType.parameters[0])
+            val containingClass = PsiTypesUtil.getPsiClass(innerType) ?: return null
+            return lookupMethod(containingClass, literal)
+        }
+    }
+}

src/main/resources/META-INF/plugin.xml

@@ -5,12 +5,14 @@
 
     <description><![CDATA[
     Cajon is an IntelliJ IDEA Plugin for shortening and optimizing AssertJ assertions.
-    It adds inspections and quick fixes to fully make use of the AssertJ methods
+    It adds several inspections and quick fixes to fully use the fluent assertion methods
-    to make the intention clear and concise. It can also convert JUnit 4 assertions to AssertJ.
+    and thus makes the intention clear and concise, also generating better messages on test failures.
+    It can also be used to convert JUnit 4 assertions to AssertJ.
+    It supports referencing inside extracting()-methods with strings, adding refactoring safety.
     ]]></description>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
-    <idea-version since-build="172.0"/>
+    <idea-version since-build="173.2696.26"/>
 
     <!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
          on how to target different products -->
@@ -19,10 +21,15 @@
     <depends>com.intellij.modules.java</depends>
 
     <extensions defaultExtensionNs="com.intellij">
+        <psi.referenceContributor implementation="de.platon42.intellij.plugins.cajon.references.ExtractorReferenceContributor"/>
         <localInspection groupPath="Java" shortName="AssertThatObjectIsNullOrNotNull" enabledByDefault="true" level="WARNING"
                          implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatObjectIsNullOrNotNullInspection"/>
-        <localInspection groupPath="Java" shortName="AssertThatBooleanIsTrueOrFalse" enabledByDefault="true" level="WARNING"
+        <localInspection groupPath="Java" shortName="AssertThatBooleanCondition" enabledByDefault="true" level="WARNING"
-                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatBooleanIsTrueOrFalseInspection"/>
+                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatBooleanConditionInspection"/>
+        <localInspection groupPath="Java" shortName="AssertThatInvertedBooleanCondition" enabledByDefault="true" level="WARNING"
+                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatInvertedBooleanConditionInspection"/>
+        <localInspection groupPath="Java" shortName="AssertThatInstanceOf" enabledByDefault="true" level="WARNING"
+                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatInstanceOfInspection"/>
         <localInspection groupPath="Java" shortName="AssertThatStringIsEmpty" enabledByDefault="true" level="WARNING"
                          implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatStringIsEmptyInspection"/>
         <localInspection groupPath="Java" shortName="AssertThatEnumerableIsEmpty" enabledByDefault="true" level="WARNING"
@@ -31,8 +38,10 @@
         <localInspection groupPath="Java" shortName="AssertThatSize" enabledByDefault="true" level="WARNING"
                          implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatSizeInspection"/>
 
-        <localInspection groupPath="Java" shortName="AssertThatBinaryExpressionIsTrueOrFalse" enabledByDefault="true" level="WARNING"
+        <localInspection groupPath="Java" shortName="AssertThatBinaryExpression" enabledByDefault="true" level="WARNING"
-                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatBinaryExpressionIsTrueOrFalseInspection"/>
+                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatBinaryExpressionInspection"/>
+        <localInspection groupPath="Java" shortName="AssertThatStringExpression" enabledByDefault="true" level="WARNING"
+                         implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatStringExpressionInspection"/>
 
         <localInspection groupPath="Java" shortName="AssertThatJava8Optional" enabledByDefault="true" level="WARNING"
                          implementationClass="de.platon42.intellij.plugins.cajon.inspections.AssertThatJava8OptionalInspection"/>

src/main/resources/inspectionDescriptions/AssertThatInstanceOf.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+Turns assertThat(object instanceof classname).isEqualTo(true/false) into assertThat(object).is(Not)InstanceOf(classname.class).
+<!-- tooltip end -->
+Also works with constant expressions and Boolean.TRUE/FALSE.
+</body>
+</html>

src/main/resources/inspectionDescriptions/AssertThatInvertedBooleanCondition.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+Turns assertThat(!condition).isEqualTo(true/false) into assertThat(condition).isFalse()/isTrue().
+<!-- tooltip end -->
+Also works with constant expressions and Boolean.TRUE/FALSE.
+</body>
+</html>

src/main/resources/inspectionDescriptions/AssertThatSize.html

@@ -1,6 +1,7 @@
 <html>
 <body>
-Makes assertions on sizes of arrays or collections more concise by replacing them with isEmpty(), isNotEmpty(), hasSize(), or hasSameSizeAs().
+Makes assertions on sizes of arrays, collections, strings, or CharSequences more concise by replacing them with isEmpty(), isNotEmpty(), hasSize(), or hasSameSizeAs().
 <!-- tooltip end -->
+Several more conversions are available with AssertJ 13.2.0 or later.
 </body>
 </html>

src/main/resources/inspectionDescriptions/AssertThatStringExpression.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+Turns assertThat(string.someMethod(arg)).isTrue/isFalse() into assertThat(string).someMethod(arg).
+<!-- tooltip end -->
+<br>someMethod() can be equals(), equalsIgnoreCase(), contentEquals(), contains(), startsWith(), and endsWith().
+</body>
+</html>

src/test/java/de/platon42/intellij/playground/Playground.java

@@ -2,8 +2,11 @@ package de.platon42.intellij.playground;
 
 import org.assertj.core.api.ListAssert;
 import org.assertj.core.data.Offset;
+import org.assertj.core.extractor.Extractors;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -32,6 +35,7 @@ public class Playground {
         assertThat(new ArrayList<String>()).hasSizeGreaterThan(1);
         assertThat(new ArrayList<String>()).hasSameSizeAs(new ArrayList<>());
         assertThat(new Long[1]).as("etc").hasSameSizeAs(new Long[2]);
+        assertThat(new Long[1]).as("etc").hasSameSizeAs(new Long[2]);
     }
 
     private void sizeOfArray() {
@@ -122,10 +126,62 @@ public class Playground {
         assertThat(!false).isTrue();
     }
 
-    private void stringIsEmpty() {
+    private void stringStuff() {
         String foo = "bar";
         assertThat(foo).isEqualTo("");
         assertThat(foo).hasSize(0);
+        assertThat(foo.contains("foobar")).isTrue();
+        assertThat(foo).contains("foobar");
+        assertThat(foo.startsWith("foobar")).isTrue();
+        assertThat(foo).startsWith("foobar");
+        assertThat(foo.endsWith("foobar")).isTrue();
+        assertThat(foo).endsWith("foobar");
+        assertThat(foo.equalsIgnoreCase("foo")).isTrue();
+        assertThat(foo).isEqualToIgnoringCase("foo");
+
+        assertThat(foo.contains("foobar")).isFalse();
+        assertThat(foo).doesNotContain("foobar");
+        assertThat(foo.startsWith("foobar")).isFalse();
+        assertThat(foo).doesNotStartWith("foobar");
+        assertThat(foo.endsWith("foobar")).isFalse();
+        assertThat(foo).doesNotEndWith("foobar");
+        assertThat(foo.equalsIgnoreCase("foo")).isFalse();
+        assertThat(foo).isNotEqualToIgnoringCase("foo");
+
+        ArrayList<String> list = new ArrayList<>();
+        long[] otherArray = new long[4];
+
+        String string = "string";
+        assertThat(string.length()).isEqualTo(0);
+        assertThat(string.length()).isZero();
+        assertThat(string.length()).isNotZero();
+        assertThat(string.length()).as("hi").isGreaterThan(0);
+        assertThat(string.length()).isGreaterThanOrEqualTo(1);
+        assertThat(string.length()).isLessThan(1);
+        assertThat(string.length()).isLessThanOrEqualTo(0);
+        assertThat(string.length()).isEqualTo(list.size());
+        assertThat(string.length()).isEqualTo(otherArray.length);
+        assertThat(string.length()).isEqualTo(1);
+        assertThat(string.length()).isGreaterThan(otherArray.length - 1);
+        assertThat(string.length()).isGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(string.length()).isLessThan(otherArray.length - 3);
+        assertThat(string.length()).isLessThanOrEqualTo(1 - otherArray.length);
+
+        StringBuilder stringBuilder = new StringBuilder();
+        assertThat(stringBuilder.length()).isEqualTo(0);
+        assertThat(stringBuilder.length()).isZero();
+        assertThat(stringBuilder.length()).isNotZero();
+        assertThat(stringBuilder.length()).as("hi").isGreaterThan(0);
+        assertThat(stringBuilder.length()).isGreaterThanOrEqualTo(1);
+        assertThat(stringBuilder.length()).isLessThan(1);
+        assertThat(stringBuilder.length()).isLessThanOrEqualTo(0);
+        assertThat(stringBuilder.length()).isEqualTo(list.size());
+        assertThat(stringBuilder.length()).isEqualTo(otherArray.length);
+        assertThat(stringBuilder.length()).isEqualTo(1);
+        assertThat(stringBuilder.length()).isGreaterThan(otherArray.length - 1);
+        assertThat(stringBuilder.length()).isGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(stringBuilder.length()).isLessThan(otherArray.length - 3);
+        assertThat(stringBuilder.length()).isLessThanOrEqualTo(1 - otherArray.length);
     }
 
     private void java8Optional() {
@@ -186,7 +242,20 @@ public class Playground {
         assertThat(opt).isAbsent();
     }
 
+    private void assertThatInstance() {
+        String foo = "foo";
+        assertThat(foo instanceof String).isTrue();
+        assertThat(foo).isInstanceOf(String.class);
+        assertThat(foo).isNotInstanceOf(String.class);
+    }
+
     private void junitAssertions() {
+        assertFalse(!(new int[3].length == new ArrayList<Integer>().size()));
+        assertThat(!(new int[3].length == new ArrayList<Integer>().size())).isFalse();
+        assertThat((new int[3].length == new ArrayList<Integer>().size())).isTrue();
+        assertThat(new int[3].length).isEqualTo(new ArrayList<Integer>().size());
+        assertThat(new int[3]).hasSameSizeAs(new ArrayList<Integer>());
+
         assertTrue(true);
         assertTrue("message", true);
         assertFalse(true);
@@ -291,6 +360,59 @@ public class Playground {
         assertThat(new float[1]).containsExactly(new float[2], offset(1.0f));
         assertThat(new float[1]).as("array equals").containsExactly(new float[2], offset(1.0f));
 
+        assertThat(new Object()).extracting("toString");
         assertThat(new Object()).extracting(Object::toString, Object::hashCode);
     }
+
+    private void findReferences() {
+        Contact contact = new Contact();
+        List<Contact> contactList = Collections.emptyList();
+
+        assertThat(contact).extracting("name").isEqualTo("foo");
+        assertThat(contact).extracting("age", "country", "address.street", "street", "address.noMailings", "address.REALLYnoMAILINGS").containsExactly(1, "Elmst. 42");
+        assertThat(contact).extracting(Extractors.byName("name")).isEqualTo("foo");
+        assertThat(contact).extracting(Extractors.resultOf("getStreet")).isEqualTo("foo");
+        assertThat(contact).extracting(Extractors.resultOf("getStreet"), Extractors.byName("narf")).isEqualTo("foo");
+
+        assertThat(contactList).extracting("name").isEqualTo("foo");
+        assertThat(contactList).extracting("name", "moar").isEqualTo("foo");
+        assertThat(contactList).extracting("name", String.class).isEqualTo("foo");
+        assertThat(contactList).extracting(Extractors.byName("name")).isEqualTo("foo");
+        assertThat(contactList).extracting(Extractors.resultOf("getStreet"), Extractors.byName("narf")).isEqualTo("foo");
+        assertThat(contactList).extractingResultOf("getStreet").isEqualTo("foo");
+        assertThat(contactList).extractingResultOf("getStreet", String.class).isEqualTo("foo");
+        assertThat(contactList).flatExtracting("age", "address.street", "street").containsExactly(1, "Elmst. 42");
+        assertThat(contactList).flatExtracting("age").containsExactly(1, "Elmst. 42");
+    }
+
+    public class Contact {
+        private String name;
+        private Integer age;
+        private Address address;
+
+        public String getStreet() {
+            return address.getStreet();
+        }
+    }
+
+    public class Address {
+        private String street;
+        private String country;
+
+        public String getStreet() {
+            return street;
+        }
+
+        public String getCountry() {
+            return country;
+        }
+
+        public boolean isNoMailings() {
+            return true;
+        }
+
+        public Boolean getREALLYnoMAILINGS() {
+            return true;
+        }
+    }
 }

src/test/java/de/platon42/intellij/plugins/cajon/AbstractCajonTest.kt

@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException
 @AddLocalJarToModule(Assertions::class)
 abstract class AbstractCajonTest {
 
-    // See https://github.com/junit-team/junit5/issues/157
+    // See https://github.com/junit-team/junit5/issues/157, should be resolved with junit5 5.5 M2
     protected fun runTest(body: () -> Unit) {
         val throwables = arrayOfNulls<Throwable>(1)
 

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatBinaryExpressionInspectionTest.kt

@@ -6,13 +6,13 @@ import de.platon42.intellij.jupiter.TestDataSubPath
 import de.platon42.intellij.plugins.cajon.AbstractCajonTest
 import org.junit.jupiter.api.Test
 
-internal class AssertThatBinaryExpressionIsTrueOrFalseInspectionTest : AbstractCajonTest() {
+internal class AssertThatBinaryExpressionInspectionTest : AbstractCajonTest() {
 
     @Test
     @TestDataSubPath("inspections/BinaryExpression")
     internal fun assertThat_of_binary_expression_can_be_moved_out(@MyFixture myFixture: JavaCodeInsightTestFixture) {
         runTest {
-            myFixture.enableInspections(AssertThatBinaryExpressionIsTrueOrFalseInspection::class.java)
+            myFixture.enableInspections(AssertThatBinaryExpressionInspection::class.java)
             myFixture.configureByFile("BinaryExpressionBefore.java")
             executeQuickFixes(myFixture, Regex.fromLiteral("Split binary expression out of assertThat()"), 148)
             executeQuickFixes(myFixture, Regex.fromLiteral("Split equals() expression out of assertThat()"), 12)

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatBooleanConditionInspectionTest.kt

@@ -6,19 +6,19 @@ import de.platon42.intellij.jupiter.TestDataSubPath
 import de.platon42.intellij.plugins.cajon.AbstractCajonTest
 import org.junit.jupiter.api.Test
 
-internal class AssertThatBooleanIsTrueOrFalseInspectionTest : AbstractCajonTest() {
+internal class AssertThatBooleanConditionInspectionTest : AbstractCajonTest() {
 
     @Test
-    @TestDataSubPath("inspections/BooleanIsTrueOrFalse")
+    @TestDataSubPath("inspections/BooleanCondition")
     internal fun assertThat_with_isEqualTo_true_or_false_can_use_isTrue_or_isFalse(@MyFixture myFixture: JavaCodeInsightTestFixture) {
         runTest {
-            myFixture.enableInspections(AssertThatBooleanIsTrueOrFalseInspection::class.java)
+            myFixture.enableInspections(AssertThatBooleanConditionInspection::class.java)
-            myFixture.configureByFile("BooleanIsTrueOrFalseBefore.java")
+            myFixture.configureByFile("BooleanConditionBefore.java")
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isTrue()"), 4)
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isFalse()"), 5)
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isTrue()"), 4)
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isFalse()"), 4)
-            myFixture.checkResultByFile("BooleanIsTrueOrFalseAfter.java")
+            myFixture.checkResultByFile("BooleanConditionAfter.java")
         }
     }
 }

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspectionTest.kt

@@ -9,22 +9,46 @@ import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
 
 @AddLocalJarToModule(com.google.common.base.Optional::class, org.assertj.guava.api.Assertions::class, Assertions::class)
+@TestDataSubPath("inspections/GuavaOptional")
 internal class AssertThatGuavaOptionalInspectionTest : AbstractCajonTest() {
 
     @Test
-    @TestDataSubPath("inspections/AssertThatGuavaOptional")
     internal fun assertThat_get_or_isPresent_for_Guava_Optional_can_be_simplified(@MyFixture myFixture: JavaCodeInsightTestFixture) {
         runTest {
             myFixture.enableInspections(AssertThatGuavaOptionalInspection::class.java)
-            myFixture.configureByFile("AssertThatGuavaOptionalBefore.java")
+            myFixture.configureByFile("GuavaOptionalBefore.java")
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isPresent()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with isPresent()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isNotEqualTo() with isPresent()"), 2)
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isPresent()"), 3)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with isAbsent()"), 2)
             executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isAbsent()"), 3)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isAbsent()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isNotEqualTo() with isAbsent()"), 2)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isTrue() with isPresent()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isTrue() with isPresent()"), 1)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isFalse() with isAbsent()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isFalse() with isAbsent()"), 1)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with contains()"), 3)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with contains()"), 1)
-            myFixture.checkResultByFile("AssertThatGuavaOptionalAfter.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove unwrapping of expected expression and replace isEqualTo() with contains()"), 6)
+            myFixture.checkResultByFile("GuavaOptionalAfter.java")
+        }
+    }
+
+    @Test
+    internal fun adds_missing_Guava_import_any_order(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.enableInspections(AssertThatGuavaOptionalInspection::class.java)
+            myFixture.configureByFile("WithoutPriorGuavaImportBefore.java")
+            executeQuickFixes(myFixture, Regex(".*eplace .* with .*"), 7)
+            myFixture.checkResultByFile("WithoutPriorGuavaImportAfter.java")
+        }
+    }
+
+    @Test
+    internal fun adds_missing_Guava_import_isAbsent_first(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.enableInspections(AssertThatGuavaOptionalInspection::class.java)
+            myFixture.configureByFile("WithoutPriorGuavaImportBefore.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isAbsent()"), 1)
+            executeQuickFixes(myFixture, Regex(".*eplace .* with .*"), 6)
+            myFixture.checkResultByFile("WithoutPriorGuavaImportAfter.java")
         }
     }
 }

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatInstanceOfInspectionTest.kt

@@ -0,0 +1,22 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
+import de.platon42.intellij.jupiter.MyFixture
+import de.platon42.intellij.jupiter.TestDataSubPath
+import de.platon42.intellij.plugins.cajon.AbstractCajonTest
+import org.junit.jupiter.api.Test
+
+internal class AssertThatInstanceOfInspectionTest : AbstractCajonTest() {
+
+    @Test
+    @TestDataSubPath("inspections/InstanceOf")
+    internal fun assertThat_with_instanceof_can_be_moved_out(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.enableInspections(AssertThatInstanceOfInspection::class.java)
+            myFixture.configureByFile("InstanceOfBefore.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace instanceof expression by assertThat().isInstanceOf()"), 5)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace instanceof expression by assertThat().isNotInstanceOf()"), 6)
+            myFixture.checkResultByFile("InstanceOfAfter.java")
+        }
+    }
+}

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatInvertedBooleanConditionInspectionTest.kt

@@ -0,0 +1,21 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
+import de.platon42.intellij.jupiter.MyFixture
+import de.platon42.intellij.jupiter.TestDataSubPath
+import de.platon42.intellij.plugins.cajon.AbstractCajonTest
+import org.junit.jupiter.api.Test
+
+internal class AssertThatInvertedBooleanConditionInspectionTest : AbstractCajonTest() {
+
+    @Test
+    @TestDataSubPath("inspections/InvertedBooleanCondition")
+    internal fun assertThat_with_inverted_boolean_condition_can_be_inverted(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.enableInspections(AssertThatInvertedBooleanConditionInspection::class.java)
+            myFixture.configureByFile("InvertedBooleanConditionBefore.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Invert condition in assertThat()"), 21)
+            myFixture.checkResultByFile("InvertedBooleanConditionAfter.java")
+        }
+    }
+}

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatJava8OptionalInspectionTest.kt

@@ -9,20 +9,23 @@ import org.junit.jupiter.api.Test
 internal class AssertThatJava8OptionalInspectionTest : AbstractCajonTest() {
 
     @Test
-    @TestDataSubPath("inspections/AssertThatJava8Optional")
+    @TestDataSubPath("inspections/Java8Optional")
     internal fun assertThat_get_or_isPresent_for_Java8_Optional_can_be_simplified(@MyFixture myFixture: JavaCodeInsightTestFixture) {
         runTest {
             myFixture.enableInspections(AssertThatJava8OptionalInspection::class.java)
-            myFixture.configureByFile("AssertThatJava8OptionalBefore.java")
+            myFixture.configureByFile("Java8OptionalBefore.java")
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isPresent()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with isPresent()"), 2)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isPresent()"), 3)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isNotEqualTo() with isPresent()"), 2)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isNotPresent()"), 3)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with isNotPresent()"), 2)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isNotPresent()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isNotEqualTo() with isNotPresent()"), 2)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isTrue() with isPresent()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isTrue() with isPresent()"), 1)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isFalse() with isNotPresent()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isNotPresent()"), 1)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with contains()"), 3)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotEqualTo() with isPresent()"), 1)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isSameAs() with containsSame()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isFalse() with isNotPresent()"), 1)
-            myFixture.checkResultByFile("AssertThatJava8OptionalAfter.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove unwrapping of expected expression and replace isEqualTo() with contains()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isEqualTo() with contains()"), 1)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Unwrap actual expression and replace isSameAs() with containsSame()"), 1)
+            myFixture.checkResultByFile("Java8OptionalAfter.java")
         }
     }
 }

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatSizeInspectionTest.kt

@@ -9,25 +9,25 @@ import org.junit.jupiter.api.Test
 internal class AssertThatSizeInspectionTest : AbstractCajonTest() {
 
     @Test
-    @TestDataSubPath("inspections/AssertThatSize")
+    @TestDataSubPath("inspections/Size")
     internal fun assertThat_size_of_array_or_collection_can_be_simplified(@MyFixture myFixture: JavaCodeInsightTestFixture) {
         runTest {
             myFixture.enableInspections(AssertThatSizeInspection::class.java)
-            myFixture.configureByFile("AssertThatSizeBefore.java")
+            myFixture.configureByFile("SizeBefore.java")
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with isEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isZero() with isEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isZero() with isEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotZero() with isNotEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isNotZero() with isNotEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThan() with isNotEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThan() with isNotEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThanOrEqualTo() with isNotEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThanOrEqualTo() with isNotEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThan() with isEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThan() with isEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThanOrEqualTo() with isEmpty()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThanOrEqualTo() with isEmpty()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with hasSameSizeAs()"), 4)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with hasSameSizeAs()"), 12)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with hasSize()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isEqualTo() with hasSize()"), 8)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThan() with hasSizeGreaterThan()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThan() with hasSizeGreaterThan()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThanOrEqualTo() with hasSizeGreaterThanOrEqualTo()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isGreaterThanOrEqualTo() with hasSizeGreaterThanOrEqualTo()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThan() with hasSizeLessThan()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThan() with hasSizeLessThan()"), 4)
-            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThanOrEqualTo() with hasSizeLessThanOrEqualTo()"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Replace isLessThanOrEqualTo() with hasSizeLessThanOrEqualTo()"), 4)
-            myFixture.checkResultByFile("AssertThatSizeAfter.java")
+            myFixture.checkResultByFile("SizeAfter.java")
         }
     }
 }

src/test/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringExpressionInspectionTest.kt

@@ -0,0 +1,34 @@
+package de.platon42.intellij.plugins.cajon.inspections
+
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
+import de.platon42.intellij.jupiter.MyFixture
+import de.platon42.intellij.jupiter.TestDataSubPath
+import de.platon42.intellij.plugins.cajon.AbstractCajonTest
+import org.junit.jupiter.api.Test
+
+internal class AssertThatStringExpressionInspectionTest : AbstractCajonTest() {
+
+    @Test
+    @TestDataSubPath("inspections/StringExpression")
+    internal fun assertThat_with_certain_String_methods(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.enableInspections(AssertThatStringExpressionInspection::class.java)
+            myFixture.configureByFile("StringExpressionBefore.java")
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove isEmpty() of expected expression and use assertThat().isEmpty() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove equals() of expected expression and use assertThat().isEqualTo() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove equalsIgnoreCase() of expected expression and use assertThat().isEqualToIgnoringCase() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove contentEquals() of expected expression and use assertThat().isEqualTo() instead"), 4)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove contains() of expected expression and use assertThat().contains() instead"), 4)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove startsWith() of expected expression and use assertThat().startsWith() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove endsWith() of expected expression and use assertThat().endsWith() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove isEmpty() of expected expression and use assertThat().isNotEmpty() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove equals() of expected expression and use assertThat().isNotEqualTo() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove equalsIgnoreCase() of expected expression and use assertThat().isNotEqualToIgnoringCase() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove contentEquals() of expected expression and use assertThat().isNotEqualTo() instead"), 4)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove contains() of expected expression and use assertThat().doesNotContain() instead"), 4)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove startsWith() of expected expression and use assertThat().doesNotStartWith() instead"), 2)
+            executeQuickFixes(myFixture, Regex.fromLiteral("Remove endsWith() of expected expression and use assertThat().doesNotEndWith() instead"), 2)
+            myFixture.checkResultByFile("StringExpressionAfter.java")
+        }
+    }
+}

src/test/java/de/platon42/intellij/plugins/cajon/references/ExtractorReferenceContributorTest.kt

@@ -0,0 +1,93 @@
+package de.platon42.intellij.plugins.cajon.references
+
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
+import de.platon42.intellij.jupiter.MyFixture
+import de.platon42.intellij.jupiter.TestDataSubPath
+import de.platon42.intellij.plugins.cajon.AbstractCajonTest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+
+@TestDataSubPath("references")
+internal class ExtractorReferenceContributorTest : AbstractCajonTest() {
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_field_extracting(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference1.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).isEqualTo("private String name;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_first_part_of_a_path(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference2.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).isEqualTo("protected Address address;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_second_part_of_a_path_and_both_getter_and_field(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference3.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("private String street;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_on_a_bare_method_call(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference4.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("public Boolean getREALLYnoMAILINGS()")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_with_only_Getter_on_second_part(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference5.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("public boolean isNoMailings()")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_using_byName_extractor(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference6.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).isEqualTo("private String name;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_using_resultOf_extractor(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference7.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("public String getStreetName()")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_field_extraction_on_list(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference8.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).isEqualTo("private String name;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_field_flat_extraction_of_path_on_list(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference9.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("private String street;")
+        }
+    }
+
+    @Test
+    internal fun extractor_is_able_to_find_reference_for_extraction_on_result_of_method(@MyFixture myFixture: JavaCodeInsightTestFixture) {
+        runTest {
+            myFixture.configureByFiles("FindReference10.java", "Address.java", "Contact.java")
+            assertThat(myFixture.elementAtCaret.text).startsWith("public String getStreetName()")
+        }
+    }
+}

src/test/resources/inspections/AssertThatSize/AssertThatSizeAfter.java

@@ -1,43 +0,0 @@
-import java.util.ArrayList;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class AssertThatSize {
-
-    private void assertThatSize() {
-        ArrayList<String> list = new ArrayList<>();
-        ArrayList<String> otherList = new ArrayList<>();
-        long[] array = new long[5];
-        long[] otherArray = new long[4];
-
-        assertThat(list).isEmpty();
-        assertThat(list).isEmpty();
-        assertThat(list).isNotEmpty();
-        assertThat(list).as("hi").isNotEmpty();
-        assertThat(list).isNotEmpty();
-        assertThat(list).isEmpty();
-        assertThat(list).isEmpty();
-        assertThat(list).hasSameSizeAs(otherList);
-        assertThat(list).hasSameSizeAs(array);
-        assertThat(list).hasSize(1);
-        assertThat(list).hasSizeGreaterThan(list.size() * 2);
-        assertThat(list).hasSizeGreaterThanOrEqualTo(list.size() * 2);
-        assertThat(list).hasSizeLessThan(list.size() * 2);
-        assertThat(list).hasSizeLessThanOrEqualTo(list.size() * 2);
-
-        assertThat(array).isEmpty();
-        assertThat(array).isEmpty();
-        assertThat(array).isNotEmpty();
-        assertThat(array).as("hi").isNotEmpty();
-        assertThat(array).isNotEmpty();
-        assertThat(array).isEmpty();
-        assertThat(array).isEmpty();
-        assertThat(array).hasSameSizeAs(list);
-        assertThat(array).hasSameSizeAs(otherArray);
-        assertThat(array).hasSize(1);
-        assertThat(array).hasSizeGreaterThan(otherArray.length - 1);
-        assertThat(array).hasSizeGreaterThanOrEqualTo(otherArray.length + 1);
-        assertThat(array).hasSizeLessThan(otherArray.length - 3);
-        assertThat(array).hasSizeLessThanOrEqualTo(1 - otherArray.length);
-    }
-}

src/test/resources/inspections/AssertThatSize/AssertThatSizeBefore.java

@@ -1,43 +0,0 @@
-import java.util.ArrayList;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class AssertThatSize {
-
-    private void assertThatSize() {
-        ArrayList<String> list = new ArrayList<>();
-        ArrayList<String> otherList = new ArrayList<>();
-        long[] array = new long[5];
-        long[] otherArray = new long[4];
-
-        assertThat(list.size()).isEqualTo(0);
-        assertThat(list.size()).isZero();
-        assertThat(list.size()).isNotZero();
-        assertThat(list.size()).as("hi").isGreaterThan(0);
-        assertThat(list.size()).isGreaterThanOrEqualTo(1);
-        assertThat(list.size()).isLessThan(1);
-        assertThat(list.size()).isLessThanOrEqualTo(0);
-        assertThat(list.size()).isEqualTo(otherList.size());
-        assertThat(list.size()).isEqualTo(array.length);
-        assertThat(list.size()).isEqualTo(1);
-        assertThat(list.size()).isGreaterThan(list.size() * 2);
-        assertThat(list.size()).isGreaterThanOrEqualTo(list.size() * 2);
-        assertThat(list.size()).isLessThan(list.size() * 2);
-        assertThat(list.size()).isLessThanOrEqualTo(list.size() * 2);
-
-        assertThat(array.length).isEqualTo(0);
-        assertThat(array.length).isZero();
-        assertThat(array.length).isNotZero();
-        assertThat(array.length).as("hi").isGreaterThan(0);
-        assertThat(array.length).isGreaterThanOrEqualTo(1);
-        assertThat(array.length).isLessThan(1);
-        assertThat(array.length).isLessThanOrEqualTo(0);
-        assertThat(array.length).isEqualTo(list.size());
-        assertThat(array.length).isEqualTo(otherArray.length);
-        assertThat(array.length).isEqualTo(1);
-        assertThat(array.length).isGreaterThan(otherArray.length - 1);
-        assertThat(array.length).isGreaterThanOrEqualTo(otherArray.length + 1);
-        assertThat(array.length).isLessThan(otherArray.length - 3);
-        assertThat(array.length).isLessThanOrEqualTo(1 - otherArray.length);
-    }
-}

src/test/resources/inspections/BooleanCondition/BooleanConditionAfter.java

@@ -1,8 +1,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BooleanIsTrueOrFalse {
+public class BooleanCondition {
 
-    private void booleanIsTrueOrFalse() {
+    private void booleanCondition() {
         boolean primitive = false;
         Boolean object = Boolean.TRUE;
 

src/test/resources/inspections/BooleanCondition/BooleanConditionBefore.java

@@ -1,8 +1,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class BooleanIsTrueOrFalse {
+public class BooleanCondition {
 
-    private void booleanIsTrueOrFalse() {
+    private void booleanCondition() {
         boolean primitive = false;
         Boolean object = Boolean.TRUE;
 

src/test/resources/inspections/GuavaOptional/GuavaOptionalAfter.java

@@ -0,0 +1,52 @@
+import com.google.common.base.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.guava.api.Assertions.assertThat;
+
+public class GuavaOptional {
+
+    private void guavaOptional() {
+        Optional<String> opt = Optional.absent();
+
+        assertThat(opt).isPresent();
+        assertThat(opt).isPresent();
+        assertThat(opt).isPresent();
+        assertThat(opt).isPresent();
+        assertThat(opt).isPresent();
+
+        assertThat(opt).isAbsent();
+        assertThat(opt).isAbsent();
+        assertThat(opt).isAbsent();
+        assertThat(opt).isAbsent();
+        assertThat(opt).isAbsent();
+
+        assertThat(opt).contains("foo");
+        assertThat(opt.get()).isSameAs("foo");
+        assertThat(opt.get()).isNotEqualTo("foo");
+        assertThat(opt.get()).isNotSameAs("foo");
+
+        assertThat(opt).contains("foo");
+        assertThat(opt).contains("foo");
+        assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        assertThat(opt).isAbsent();
+        assertThat(opt).isPresent();
+
+        org.assertj.guava.api.Assertions.assertThat(opt).contains("foo");
+        org.assertj.guava.api.Assertions.assertThat(opt).contains("foo");
+        org.assertj.guava.api.Assertions.assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        org.assertj.guava.api.Assertions.assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        org.assertj.guava.api.Assertions.assertThat(opt).isAbsent();
+        org.assertj.guava.api.Assertions.assertThat(opt).isPresent();
+
+        assertThat(opt).contains("foo");
+        assertThat(opt).contains("foo");
+        org.assertj.core.api.Assertions.assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        org.assertj.core.api.Assertions.assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        assertThat(opt).isAbsent();
+        assertThat(opt).isPresent();
+    }
+}

src/test/resources/inspections/GuavaOptional/GuavaOptionalBefore.java

@@ -0,0 +1,52 @@
+import com.google.common.base.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.guava.api.Assertions.assertThat;
+
+public class GuavaOptional {
+
+    private void guavaOptional() {
+        Optional<String> opt = Optional.absent();
+
+        assertThat(opt.isPresent()).isEqualTo(true);
+        assertThat(opt.isPresent()).isEqualTo(Boolean.TRUE);
+        assertThat(opt.isPresent()).isNotEqualTo(false);
+        assertThat(opt.isPresent()).isNotEqualTo(Boolean.FALSE);
+        assertThat(opt.isPresent()).isTrue();
+
+        assertThat(opt.isPresent()).isEqualTo(false);
+        assertThat(opt.isPresent()).isEqualTo(Boolean.FALSE);
+        assertThat(opt.isPresent()).isNotEqualTo(true);
+        assertThat(opt.isPresent()).isNotEqualTo(Boolean.TRUE);
+        assertThat(opt.isPresent()).isFalse();
+
+        assertThat(opt.get()).isEqualTo("foo");
+        assertThat(opt.get()).isSameAs("foo");
+        assertThat(opt.get()).isNotEqualTo("foo");
+        assertThat(opt.get()).isNotSameAs("foo");
+
+        assertThat(opt).isEqualTo(Optional.of("foo"));
+        assertThat(opt).isEqualTo(Optional.fromNullable("foo"));
+        assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        assertThat(opt).isEqualTo(Optional.absent());
+        assertThat(opt).isNotEqualTo(Optional.absent());
+
+        org.assertj.guava.api.Assertions.assertThat(opt).isEqualTo(Optional.of("foo"));
+        org.assertj.guava.api.Assertions.assertThat(opt).isEqualTo(Optional.fromNullable("foo"));
+        org.assertj.guava.api.Assertions.assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        org.assertj.guava.api.Assertions.assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        org.assertj.guava.api.Assertions.assertThat(opt).isEqualTo(Optional.absent());
+        org.assertj.guava.api.Assertions.assertThat(opt).isNotEqualTo(Optional.absent());
+
+        org.assertj.core.api.Assertions.assertThat(opt).isEqualTo(Optional.of("foo"));
+        org.assertj.core.api.Assertions.assertThat(opt).isEqualTo(Optional.fromNullable("foo"));
+        org.assertj.core.api.Assertions.assertThat(opt).isNotEqualTo(Optional.of("foo"));
+        org.assertj.core.api.Assertions.assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
+
+        org.assertj.core.api.Assertions.assertThat(opt).isEqualTo(Optional.absent());
+        org.assertj.core.api.Assertions.assertThat(opt).isNotEqualTo(Optional.absent());
+    }
+}

src/test/resources/inspections/GuavaOptional/WithoutPriorGuavaImportAfter.java

@@ -3,21 +3,17 @@ import com.google.common.base.Optional;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.guava.api.Assertions.assertThat;
 
-public class AssertThatGuavaOptional {
+public class GuavaOptional {
 
-    private void assertThatGuavaOptional() {
+    private void guavaOptional() {
         Optional<String> opt = Optional.absent();
 
-        assertThat(opt).isPresent();
+        assertThat(opt).contains("foo");
-        assertThat(opt).isPresent();
+        assertThat(opt).contains("foo");
-        assertThat(opt).isPresent();
+        assertThat(opt).isNotEqualTo(Optional.of("foo"));
-        assertThat(opt).isPresent();
+        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
-        assertThat(opt).isPresent();
 
-        assertThat(opt).isAbsent();
+        assertThat(opt).isPresent();
-        assertThat(opt).isAbsent();
-        assertThat(opt).isAbsent();
-        assertThat(opt).isAbsent();
         assertThat(opt).isAbsent();
 
         assertThat(opt).contains("foo");
@@ -25,11 +21,6 @@ public class AssertThatGuavaOptional {
         assertThat(opt.get()).isNotEqualTo("foo");
         assertThat(opt.get()).isNotSameAs("foo");
 
-        assertThat(opt).contains("foo");
-        assertThat(opt).contains("foo");
-        assertThat(opt).isNotEqualTo(Optional.of("foo"));
-        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
-
         assertThat(opt).isAbsent();
         assertThat(opt).isPresent();
     }

src/test/resources/inspections/GuavaOptional/WithoutPriorGuavaImportBefore.java

@@ -1,23 +1,18 @@
 import com.google.common.base.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.guava.api.Assertions.assertThat;
 
-public class AssertThatGuavaOptional {
+public class GuavaOptional {
 
-    private void assertThatGuavaOptional() {
+    private void guavaOptional() {
         Optional<String> opt = Optional.absent();
 
-        assertThat(opt.isPresent()).isEqualTo(true);
+        assertThat(opt).isEqualTo(Optional.of("foo"));
-        assertThat(opt.isPresent()).isEqualTo(Boolean.TRUE);
+        assertThat(opt).isEqualTo(Optional.fromNullable("foo"));
-        assertThat(opt.isPresent()).isNotEqualTo(false);
+        assertThat(opt).isNotEqualTo(Optional.of("foo"));
-        assertThat(opt.isPresent()).isNotEqualTo(Boolean.FALSE);
+        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
-        assertThat(opt.isPresent()).isTrue();
 
-        assertThat(opt.isPresent()).isEqualTo(false);
+        assertThat(opt.isPresent()).isTrue();
-        assertThat(opt.isPresent()).isEqualTo(Boolean.FALSE);
-        assertThat(opt.isPresent()).isNotEqualTo(true);
-        assertThat(opt.isPresent()).isNotEqualTo(Boolean.TRUE);
         assertThat(opt.isPresent()).isFalse();
 
         assertThat(opt.get()).isEqualTo("foo");
@@ -25,11 +20,6 @@ public class AssertThatGuavaOptional {
         assertThat(opt.get()).isNotEqualTo("foo");
         assertThat(opt.get()).isNotSameAs("foo");
 
-        assertThat(opt).isEqualTo(Optional.of("foo"));
-        assertThat(opt).isEqualTo(Optional.fromNullable("foo"));
-        assertThat(opt).isNotEqualTo(Optional.of("foo"));
-        assertThat(opt).isNotEqualTo(Optional.fromNullable("foo"));
-
         assertThat(opt).isEqualTo(Optional.absent());
         assertThat(opt).isNotEqualTo(Optional.absent());
     }

src/test/resources/inspections/InstanceOf/InstanceOfAfter.java

@@ -0,0 +1,22 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InstanceOf {
+
+    private void instanceOf() {
+        Boolean object = Boolean.TRUE;
+
+        assertThat(object).isInstanceOf(Boolean.class);
+        assertThat(object).isInstanceOf(Boolean.class);
+        assertThat(object).isInstanceOf(Boolean.class);
+        assertThat(object).isInstanceOf(Boolean.class);
+        assertThat(object).isInstanceOf(Boolean.class);
+
+        assertThat(object).isNotInstanceOf(Boolean.class);
+        assertThat(object).isNotInstanceOf(Boolean.class);
+        assertThat(object).isNotInstanceOf(Boolean.class);
+        assertThat(object).isNotInstanceOf(Boolean.class);
+        assertThat(object).isNotInstanceOf(Boolean.class);
+
+        assertThat(object).as("nah").isNotInstanceOf(Boolean.class);
+    }
+}

src/test/resources/inspections/InstanceOf/InstanceOfBefore.java

@@ -0,0 +1,22 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InstanceOf {
+
+    private void instanceOf() {
+        Boolean object = Boolean.TRUE;
+
+        assertThat(object instanceof Boolean).isEqualTo(Boolean.TRUE);
+        assertThat(object instanceof Boolean).isEqualTo(true);
+        assertThat(object instanceof Boolean).isNotEqualTo(Boolean.FALSE);
+        assertThat(object instanceof Boolean).isNotEqualTo(false);
+        assertThat(object instanceof Boolean).isTrue();
+
+        assertThat(object instanceof Boolean).isEqualTo(Boolean.FALSE);
+        assertThat(object instanceof Boolean).isEqualTo(false);
+        assertThat(object instanceof Boolean).isNotEqualTo(Boolean.TRUE);
+        assertThat(object instanceof Boolean).isNotEqualTo(true);
+        assertThat(object instanceof Boolean).isFalse();
+
+        assertThat(((object)) instanceof Boolean).as("nah").isEqualTo(true && !true);
+    }
+}

src/test/resources/inspections/InvertedBooleanCondition/InvertedBooleanConditionAfter.java

@@ -0,0 +1,34 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InvertedBooleanCondition {
+
+    private void invertedBooleanCondition() {
+        boolean primitive = false;
+        Boolean object = Boolean.TRUE;
+
+        assertThat(primitive).isFalse();
+        assertThat(primitive).isFalse();
+        assertThat(primitive).isFalse();
+        assertThat(primitive).isFalse();
+        assertThat(primitive).isFalse();
+        assertThat(object).isFalse();
+        assertThat(object).isFalse();
+        assertThat(object).isFalse();
+        assertThat(object).isFalse();
+        assertThat(object).isFalse();
+
+        assertThat(primitive).isTrue();
+        assertThat(primitive).isTrue();
+        assertThat(primitive).isTrue();
+        assertThat(primitive).isTrue();
+        assertThat(primitive).isTrue();
+        assertThat(object).isTrue();
+        assertThat(object).isTrue();
+        assertThat(object).isTrue();
+        assertThat(object).isTrue();
+        assertThat(object).isTrue();
+
+        assertThat(!((primitive))).as("nah").isTrue();
+        assertThat(!object).isEqualTo(Boolean.TRUE && !Boolean.TRUE);
+    }
+}

src/test/resources/inspections/InvertedBooleanCondition/InvertedBooleanConditionBefore.java

@@ -0,0 +1,34 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class InvertedBooleanCondition {
+
+    private void invertedBooleanCondition() {
+        boolean primitive = false;
+        Boolean object = Boolean.TRUE;
+
+        assertThat(!primitive).isEqualTo(Boolean.TRUE);
+        assertThat(!primitive).isEqualTo(true);
+        assertThat(!primitive).isNotEqualTo(Boolean.FALSE);
+        assertThat(!primitive).isNotEqualTo(false);
+        assertThat(!primitive).isTrue();
+        assertThat(!object).isEqualTo(Boolean.TRUE);
+        assertThat(!object).isEqualTo(true);
+        assertThat(!object).isNotEqualTo(Boolean.FALSE);
+        assertThat(!object).isNotEqualTo(false);
+        assertThat(!object).isTrue();
+
+        assertThat(!primitive).isEqualTo(Boolean.FALSE);
+        assertThat(!primitive).isEqualTo(false);
+        assertThat(!primitive).isNotEqualTo(Boolean.TRUE);
+        assertThat(!primitive).isNotEqualTo(true);
+        assertThat(!primitive).isFalse();
+        assertThat(!object).isEqualTo(Boolean.FALSE);
+        assertThat(!object).isEqualTo(false);
+        assertThat(!object).isNotEqualTo(Boolean.TRUE);
+        assertThat(!object).isNotEqualTo(true);
+        assertThat(!object).isFalse();
+
+        assertThat(!(((!((primitive)))))).as("nah").isEqualTo(true && !true);
+        assertThat(!object).isEqualTo(Boolean.TRUE && !Boolean.TRUE);
+    }
+}

src/test/resources/inspections/Java8Optional/Java8OptionalAfter.java

@@ -2,9 +2,9 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AssertThatJava8Optional {
+public class Java8Optional {
 
-    private void assertThatJava8Optional() {
+    private void java8Optional() {
         Optional<String> opt = Optional.empty();
 
         assertThat(opt).isPresent();

src/test/resources/inspections/Java8Optional/Java8OptionalBefore.java

@@ -2,9 +2,9 @@ import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class AssertThatJava8Optional {
+public class Java8Optional {
 
-    private void assertThatJava8Optional() {
+    private void java8Optional() {
         Optional<String> opt = Optional.empty();
 
         assertThat(opt.isPresent()).isEqualTo(true);

src/test/resources/inspections/Size/SizeAfter.java

@@ -0,0 +1,83 @@
+import java.util.ArrayList;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class Size {
+
+    private void size() {
+        ArrayList<String> list = new ArrayList<>();
+        ArrayList<String> otherList = new ArrayList<>();
+        long[] array = new long[5];
+        long[] otherArray = new long[4];
+        String string = "string";
+        StringBuilder stringBuilder = new StringBuilder();
+
+        assertThat(list).isEmpty();
+        assertThat(list).isEmpty();
+        assertThat(list).isNotEmpty();
+        assertThat(list).as("hi").isNotEmpty();
+        assertThat(list).isNotEmpty();
+        assertThat(list).isEmpty();
+        assertThat(list).isEmpty();
+        assertThat(list).hasSameSizeAs(otherList);
+        assertThat(list).hasSameSizeAs(array);
+        assertThat(list).hasSize(string.length());
+        assertThat(list).hasSize(stringBuilder.length());
+        assertThat(list).hasSize(1);
+        assertThat(list).hasSizeGreaterThan(list.size() * 2);
+        assertThat(list).hasSizeGreaterThanOrEqualTo(list.size() * 2);
+        assertThat(list).hasSizeLessThan(list.size() * 2);
+        assertThat(list).hasSizeLessThanOrEqualTo(list.size() * 2);
+
+        assertThat(array).isEmpty();
+        assertThat(array).isEmpty();
+        assertThat(array).isNotEmpty();
+        assertThat(array).as("hi").isNotEmpty();
+        assertThat(array).isNotEmpty();
+        assertThat(array).isEmpty();
+        assertThat(array).isEmpty();
+        assertThat(array).hasSameSizeAs(list);
+        assertThat(array).hasSameSizeAs(otherArray);
+        assertThat(array).hasSize(string.length());
+        assertThat(array).hasSize(stringBuilder.length());
+        assertThat(array).hasSize(1);
+        assertThat(array).hasSizeGreaterThan(otherArray.length - 1);
+        assertThat(array).hasSizeGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(array).hasSizeLessThan(otherArray.length - 3);
+        assertThat(array).hasSizeLessThanOrEqualTo(1 - otherArray.length);
+
+        assertThat(string).isEmpty();
+        assertThat(string).isEmpty();
+        assertThat(string).isNotEmpty();
+        assertThat(string).as("hi").isNotEmpty();
+        assertThat(string).isNotEmpty();
+        assertThat(string).isEmpty();
+        assertThat(string).isEmpty();
+        assertThat(string).hasSameSizeAs(list);
+        assertThat(string).hasSameSizeAs(otherArray);
+        assertThat(string).hasSameSizeAs(string);
+        assertThat(string).hasSameSizeAs(stringBuilder);
+        assertThat(string).hasSize(1);
+        assertThat(string).hasSizeGreaterThan(otherArray.length - 1);
+        assertThat(string).hasSizeGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(string).hasSizeLessThan(otherArray.length - 3);
+        assertThat(string).hasSizeLessThanOrEqualTo(1 - otherArray.length);
+
+        assertThat(stringBuilder).isEmpty();
+        assertThat(stringBuilder).isEmpty();
+        assertThat(stringBuilder).isNotEmpty();
+        assertThat(stringBuilder).as("hi").isNotEmpty();
+        assertThat(stringBuilder).isNotEmpty();
+        assertThat(stringBuilder).isEmpty();
+        assertThat(stringBuilder).isEmpty();
+        assertThat(stringBuilder).hasSameSizeAs(list);
+        assertThat(stringBuilder).hasSameSizeAs(otherArray);
+        assertThat(stringBuilder).hasSameSizeAs(string);
+        assertThat(stringBuilder).hasSameSizeAs(stringBuilder);
+        assertThat(stringBuilder).hasSize(1);
+        assertThat(stringBuilder).hasSizeGreaterThan(otherArray.length - 1);
+        assertThat(stringBuilder).hasSizeGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(stringBuilder).hasSizeLessThan(otherArray.length - 3);
+        assertThat(stringBuilder).hasSizeLessThanOrEqualTo(1 - otherArray.length);
+    }
+}

src/test/resources/inspections/Size/SizeBefore.java

@@ -0,0 +1,83 @@
+import java.util.ArrayList;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class Size {
+
+    private void size() {
+        ArrayList<String> list = new ArrayList<>();
+        ArrayList<String> otherList = new ArrayList<>();
+        long[] array = new long[5];
+        long[] otherArray = new long[4];
+        String string = "string";
+        StringBuilder stringBuilder = new StringBuilder();
+
+        assertThat(list.size()).isEqualTo(0);
+        assertThat(list.size()).isZero();
+        assertThat(list.size()).isNotZero();
+        assertThat(list.size()).as("hi").isGreaterThan(0);
+        assertThat(list.size()).isGreaterThanOrEqualTo(1);
+        assertThat(list.size()).isLessThan(1);
+        assertThat(list.size()).isLessThanOrEqualTo(0);
+        assertThat(list.size()).isEqualTo(otherList.size());
+        assertThat(list.size()).isEqualTo(array.length);
+        assertThat(list.size()).isEqualTo(string.length());
+        assertThat(list.size()).isEqualTo(stringBuilder.length());
+        assertThat(list.size()).isEqualTo(1);
+        assertThat(list.size()).isGreaterThan(list.size() * 2);
+        assertThat(list.size()).isGreaterThanOrEqualTo(list.size() * 2);
+        assertThat(list.size()).isLessThan(list.size() * 2);
+        assertThat(list.size()).isLessThanOrEqualTo(list.size() * 2);
+
+        assertThat(array.length).isEqualTo(0);
+        assertThat(array.length).isZero();
+        assertThat(array.length).isNotZero();
+        assertThat(array.length).as("hi").isGreaterThan(0);
+        assertThat(array.length).isGreaterThanOrEqualTo(1);
+        assertThat(array.length).isLessThan(1);
+        assertThat(array.length).isLessThanOrEqualTo(0);
+        assertThat(array.length).isEqualTo(list.size());
+        assertThat(array.length).isEqualTo(otherArray.length);
+        assertThat(array.length).isEqualTo(string.length());
+        assertThat(array.length).isEqualTo(stringBuilder.length());
+        assertThat(array.length).isEqualTo(1);
+        assertThat(array.length).isGreaterThan(otherArray.length - 1);
+        assertThat(array.length).isGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(array.length).isLessThan(otherArray.length - 3);
+        assertThat(array.length).isLessThanOrEqualTo(1 - otherArray.length);
+
+        assertThat(string.length()).isEqualTo(0);
+        assertThat(string.length()).isZero();
+        assertThat(string.length()).isNotZero();
+        assertThat(string.length()).as("hi").isGreaterThan(0);
+        assertThat(string.length()).isGreaterThanOrEqualTo(1);
+        assertThat(string.length()).isLessThan(1);
+        assertThat(string.length()).isLessThanOrEqualTo(0);
+        assertThat(string.length()).isEqualTo(list.size());
+        assertThat(string.length()).isEqualTo(otherArray.length);
+        assertThat(string.length()).isEqualTo(string.length());
+        assertThat(string.length()).isEqualTo(stringBuilder.length());
+        assertThat(string.length()).isEqualTo(1);
+        assertThat(string.length()).isGreaterThan(otherArray.length - 1);
+        assertThat(string.length()).isGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(string.length()).isLessThan(otherArray.length - 3);
+        assertThat(string.length()).isLessThanOrEqualTo(1 - otherArray.length);
+
+        assertThat(stringBuilder.length()).isEqualTo(0);
+        assertThat(stringBuilder.length()).isZero();
+        assertThat(stringBuilder.length()).isNotZero();
+        assertThat(stringBuilder.length()).as("hi").isGreaterThan(0);
+        assertThat(stringBuilder.length()).isGreaterThanOrEqualTo(1);
+        assertThat(stringBuilder.length()).isLessThan(1);
+        assertThat(stringBuilder.length()).isLessThanOrEqualTo(0);
+        assertThat(stringBuilder.length()).isEqualTo(list.size());
+        assertThat(stringBuilder.length()).isEqualTo(otherArray.length);
+        assertThat(stringBuilder.length()).isEqualTo(string.length());
+        assertThat(stringBuilder.length()).isEqualTo(stringBuilder.length());
+        assertThat(stringBuilder.length()).isEqualTo(1);
+        assertThat(stringBuilder.length()).isGreaterThan(otherArray.length - 1);
+        assertThat(stringBuilder.length()).isGreaterThanOrEqualTo(otherArray.length + 1);
+        assertThat(stringBuilder.length()).isLessThan(otherArray.length - 3);
+        assertThat(stringBuilder.length()).isLessThanOrEqualTo(1 - otherArray.length);
+    }
+}

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

@@ -0,0 +1,47 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class StringExpression {
+
+    private void stringExpression() {
+        String string = "string";
+        StringBuilder stringBuilder = new StringBuilder();
+
+        assertThat(string).isEmpty();
+        assertThat(string).isEmpty();
+        assertThat(string).isEqualTo("foo");
+        assertThat(string).isEqualTo("foo");
+        assertThat(string).isEqualToIgnoringCase("foo");
+        assertThat(string).isEqualToIgnoringCase("foo");
+        assertThat(string).isEqualTo("foo");
+        assertThat(string).isEqualTo("foo");
+        assertThat(string).isEqualTo(stringBuilder);
+        assertThat(string).isEqualTo(stringBuilder);
+        assertThat(string).contains("foo");
+        assertThat(string).contains("foo");
+        assertThat(string).contains(stringBuilder);
+        assertThat(string).contains(stringBuilder);
+        assertThat(string).startsWith("foo");
+        assertThat(string).startsWith("foo");
+        assertThat(string).endsWith("foo");
+        assertThat(string).endsWith("foo");
+
+        assertThat(string).isNotEmpty();
+        assertThat(string).isNotEmpty();
+        assertThat(string).isNotEqualTo("foo");
+        assertThat(string).isNotEqualTo("foo");
+        assertThat(string).isNotEqualToIgnoringCase("foo");
+        assertThat(string).isNotEqualToIgnoringCase("foo");
+        assertThat(string).isNotEqualTo("foo");
+        assertThat(string).isNotEqualTo("foo");
+        assertThat(string).isNotEqualTo(stringBuilder);
+        assertThat(string).isNotEqualTo(stringBuilder);
+        assertThat(string).doesNotContain("foo");
+        assertThat(string).doesNotContain("foo");
+        assertThat(string).doesNotContain(stringBuilder);
+        assertThat(string).doesNotContain(stringBuilder);
+        assertThat(string).doesNotStartWith("foo");
+        assertThat(string).doesNotStartWith("foo");
+        assertThat(string).doesNotEndWith("foo");
+        assertThat(string).doesNotEndWith("foo");
+    }
+}

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

@@ -0,0 +1,47 @@
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class StringExpression {
+
+    private void stringExpression() {
+        String string = "string";
+        StringBuilder stringBuilder = new StringBuilder();
+
+        assertThat(string.isEmpty()).isEqualTo(true);
+        assertThat(string.isEmpty()).isTrue();
+        assertThat(string.equals("foo")).isEqualTo(true);
+        assertThat(string.equals("foo")).isTrue();
+        assertThat(string.equalsIgnoreCase("foo")).isEqualTo(true);
+        assertThat(string.equalsIgnoreCase("foo")).isTrue();
+        assertThat(string.contentEquals("foo")).isEqualTo(true);
+        assertThat(string.contentEquals("foo")).isTrue();
+        assertThat(string.contentEquals(stringBuilder)).isTrue();
+        assertThat(string.contentEquals(stringBuilder)).isEqualTo(true);
+        assertThat(string.contains("foo")).isEqualTo(true);
+        assertThat(string.contains("foo")).isTrue();
+        assertThat(string.contains(stringBuilder)).isEqualTo(true);
+        assertThat(string.contains(stringBuilder)).isTrue();
+        assertThat(string.startsWith("foo")).isEqualTo(true);
+        assertThat(string.startsWith("foo")).isTrue();
+        assertThat(string.endsWith("foo")).isEqualTo(true);
+        assertThat(string.endsWith("foo")).isTrue();
+
+        assertThat(string.isEmpty()).isEqualTo(false);
+        assertThat(string.isEmpty()).isFalse();
+        assertThat(string.equals("foo")).isEqualTo(false);
+        assertThat(string.equals("foo")).isFalse();
+        assertThat(string.equalsIgnoreCase("foo")).isEqualTo(false);
+        assertThat(string.equalsIgnoreCase("foo")).isFalse();
+        assertThat(string.contentEquals("foo")).isEqualTo(false);
+        assertThat(string.contentEquals("foo")).isFalse();
+        assertThat(string.contentEquals(stringBuilder)).isFalse();
+        assertThat(string.contentEquals(stringBuilder)).isEqualTo(false);
+        assertThat(string.contains("foo")).isEqualTo(false);
+        assertThat(string.contains("foo")).isFalse();
+        assertThat(string.contains(stringBuilder)).isEqualTo(false);
+        assertThat(string.contains(stringBuilder)).isFalse();
+        assertThat(string.startsWith("foo")).isEqualTo(false);
+        assertThat(string.startsWith("foo")).isFalse();
+        assertThat(string.endsWith("foo")).isEqualTo(false);
+        assertThat(string.endsWith("foo")).isFalse();
+    }
+}

src/test/resources/references/Address.java

@@ -0,0 +1,20 @@
+public class Address {
+    private String street;
+    private String country;
+
+    private String getStreet() {
+        return street;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public boolean isNoMailings() {
+        return true;
+    }
+
+    public Boolean getREALLYnoMAILINGS() {
+        return true;
+    }
+}

src/test/resources/references/Contact.java

@@ -0,0 +1,9 @@
+public class Contact {
+    private String name;
+    public Integer age;
+    protected Address address;
+    public String getStreetName()
+    {
+        return address.getStreet();
+    }
+}

src/test/resources/references/FindReference1.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference1 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting("name<caret>").isEqualTo("foo");
+    }
+}

src/test/resources/references/FindReference10.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference10 {
+
+    private void findReferences() {
+        List<Contact> contactList = Collections.emptyList();
+
+        assertThat(contactList).extractingResultOf("getStreetName<caret>").isEqualTo("foo");
+    }
+}

src/test/resources/references/FindReference2.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference2 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting("address<caret>.street", "streetName").containsExactly(1, "Elmst. 42");
+    }
+}

src/test/resources/references/FindReference3.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference3 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting("address.street<caret>", "address.REALLYnoMAILINGS").containsExactly(1, "Elmst. 42");
+    }
+}

src/test/resources/references/FindReference4.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference4 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting("address.getREALLYnoMAILINGS<caret>", "address.country").containsExactly(1, "Elmst. 42");
+    }
+}

src/test/resources/references/FindReference5.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference5 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting("address.noMailings<caret>").containsExactly(1, "Elmst. 42");
+    }
+}

src/test/resources/references/FindReference6.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference6 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting(Extractors.byName("name<caret>")).isEqualTo("foo");
+    }
+}

src/test/resources/references/FindReference7.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference7 {
+
+    private void findReferences() {
+        Contact contact = new Contact();
+
+        assertThat(contact).extracting(Extractors.resultOf("getStreetName<caret>")).isEqualTo("foo");
+    }
+}

src/test/resources/references/FindReference8.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference8 {
+
+    private void findReferences() {
+        List<Contact> contactList = Collections.emptyList();
+
+        assertThat(contactList).extracting("name<caret>").isEqualTo("foo");
+    }
+}

src/test/resources/references/FindReference9.java

@@ -0,0 +1,15 @@
+import org.assertj.core.extractor.Extractors;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FindReference9 {
+
+    private void findReferences() {
+        List<Contact> contactList = Collections.emptyList();
+
+        assertThat(contactList).flatExtracting("age", "address.street<caret>", "streetName").containsExactly(1, "Elmst. 42");
+    }
+}