From 4420a0a3927214590b3e24aed14a79b6edc254db Mon Sep 17 00:00:00 2001 From: chrisly42 Date: Tue, 30 Jul 2019 20:02:40 +0200 Subject: [PATCH] AssertThatJava8Optional and AssertThatGuavaOptional inspections do not longer try to fix assertThat(optional).isEqualTo(Optional.fromNullable(expression)) to contains() when expression is not a non-null constant expression. --- README.md | 8 +++++++- build.gradle | 9 ++++++--- .../inspections/AssertThatGuavaOptionalInspection.kt | 3 +++ .../inspections/AssertThatJava8OptionalInspection.kt | 3 +++ src/main/resources/META-INF/plugin.xml | 2 +- .../inspections/GuavaOptional/GuavaOptionalAfter.java | 6 ++++++ .../inspections/GuavaOptional/GuavaOptionalBefore.java | 6 ++++++ .../inspections/Java8Optional/Java8OptionalAfter.java | 6 ++++++ .../inspections/Java8Optional/Java8OptionalBefore.java | 6 ++++++ 9 files changed, 44 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 18188d2..1c1c85d 100644 --- a/README.md +++ b/README.md @@ -509,7 +509,7 @@ The IntelliJ framework actually uses the JUnit 3 TestCase for plugin testing and Feel free to use the code (in package ```de.platon42.intellij.jupiter```) for your projects (with attribution). ## Planned features -- Joining .contains() expressions +- Joining ```.contains()``` expressions - Converting ```foo.compareTo(bar) == 0``` to ```isEqualTo()``` (yes, I've *really* seen code like that) - Extraction with property names to lambda with Java 8 @@ -520,6 +520,12 @@ Feel free to use the code (in package ```de.platon42.intellij.jupiter```) for yo ## Changelog +#### V1.3 (02-Aug-19) +- AssertJ 3.13.0 broke some inspections due to new ```AbstractStringAssert::isEqualTo()``` method. +- AssertThatJava8Optional and AssertThatGuavaOptional inspections do not longer try to fix + ```assertThat(optional).isEqualTo(Optional.fromNullable(expression))``` to ```contains()``` + when ```expression``` is not a non-null constant expression. + #### V1.2 (23-Jun-19) - Due to popular demand the JoinAssertThatStatements inspection will now add line breaks on joining statements. The amount of statements joined without causing line breaks can be configured but defaults to 1 (always). diff --git a/build.gradle b/build.gradle index a29a82c..996987e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.jetbrains.intellij' version '0.4.9' id 'org.jetbrains.kotlin.jvm' version '1.3.41' id 'jacoco' - id 'com.github.kt3k.coveralls' version '2.8.2' + id 'com.github.kt3k.coveralls' version '2.8.4' } group 'de.platon42' @@ -43,9 +43,12 @@ intellij { patchPluginXml { changeNotes """ -

V1.3 (01-Aug-19)

+

V1.3 (02-Aug-19)

Full changelog available at Github project site.

""" diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspection.kt index 572e542..1b383fc 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatGuavaOptionalInspection.kt @@ -70,6 +70,9 @@ class AssertThatGuavaOptionalInspection : AbstractAssertJInspection() { if (IS_EQUAL_TO_OBJECT.test(expression)) { val innerExpectedCall = expression.firstArg as? PsiMethodCallExpression ?: return if (CallMatcher.anyOf(GUAVA_OPTIONAL_OF, GUAVA_OPTIONAL_FROM_NULLABLE).test(innerExpectedCall)) { + if (GUAVA_OPTIONAL_FROM_NULLABLE.test(innerExpectedCall)) { + innerExpectedCall.firstArg.calculateConstantValue() ?: return + } registerRemoveExpectedOutmostMethod(holder, expression, expression, MethodNames.CONTAINS) { desc, method -> QuickFixWithPostfixDelegate( UnwrapExpectedStaticMethodCallQuickFix(desc, method), diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatJava8OptionalInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatJava8OptionalInspection.kt index 85d2305..1f70f95 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatJava8OptionalInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatJava8OptionalInspection.kt @@ -60,6 +60,9 @@ class AssertThatJava8OptionalInspection : AbstractAssertJInspection() { if (IS_EQUAL_TO_OBJECT.test(expression)) { val innerExpectedCall = expression.firstArg as? PsiMethodCallExpression ?: return if (CallMatcher.anyOf(OPTIONAL_OF, OPTIONAL_OF_NULLABLE).test(innerExpectedCall)) { + if (OPTIONAL_OF_NULLABLE.test(innerExpectedCall)) { + innerExpectedCall.firstArg.calculateConstantValue() ?: return + } registerRemoveExpectedOutmostMethod(holder, expression, expression, MethodNames.CONTAINS, ::UnwrapExpectedStaticMethodCallQuickFix) } else if (OPTIONAL_EMPTY.test(innerExpectedCall)) { registerSimplifyMethod(holder, expression, MethodNames.IS_NOT_PRESENT) diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 0bcd477..58978f5 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ de.platon42.cajon Concise AssertJ Optimizing Nitpicker (Cajon) - Platon42 + Chris 'platon42' Hodges