From 6692ded98a6c6a980769eda547a6de5613b9ffab Mon Sep 17 00:00:00 2001 From: chrisly42 Date: Thu, 6 May 2021 12:42:23 +0200 Subject: [PATCH] Updated various dependencies (Kotlin 1.50.0) and AssertJ 3.19.0. Fixed issue#3 reported by hankem where usingRecursiveComparison() was not considered a complex transformation. --- .idea/saveactions_settings.xml | 1 + README.md | 12 ++++++-- build.gradle | 28 ++++++++----------- .../intellij/plugins/cajon/CommonMatchers.kt | 16 ++++++++++- .../inspections/AbstractAssertJInspection.kt | 6 ++-- .../AbstractJUnitAssertInspection.kt | 14 +++++++++- .../AssertThatEnumerableIsEmptyInspection.kt | 4 +-- .../AssertThatFileExpressionInspection.kt | 10 +++---- .../AssertThatPathExpressionInspection.kt | 5 ++-- .../AssertThatStringExpressionInspection.kt | 10 +++---- .../inspections/BogusAssertionInspection.kt | 8 +++--- .../ImplicitAssertionInspection.kt | 16 +++++------ .../intellij/jupiter/AddLocalJarToModule.java | 2 +- .../jupiter/LightCodeInsightExtension.java | 12 ++++++-- .../plugins/cajon/AbstractCajonTest.kt | 2 +- .../TwistedAssertionInspectionTest.kt | 2 +- .../TwistedAssertionAfter.java | 4 +++ .../TwistedAssertionBefore.java | 4 +++ 18 files changed, 101 insertions(+), 55 deletions(-) diff --git a/.idea/saveactions_settings.xml b/.idea/saveactions_settings.xml index 77bae82..e81d84f 100644 --- a/.idea/saveactions_settings.xml +++ b/.idea/saveactions_settings.xml @@ -18,6 +18,7 @@ diff --git a/README.md b/README.md index 3a725b7..2a53fd6 100644 --- a/README.md +++ b/README.md @@ -817,13 +817,21 @@ Feel free to use the code (in package ```de.platon42.intellij.jupiter```) for yo ## Changelog +### V1.12 (06-May-21) + +- Maintenance. Updated various dependencies (Kotlin 1.50.0) and AssertJ 3.19.0 +- Fixed issue#3 reported by hankem where usingRecursiveComparison() was not considered a complex transformation. + #### V1.11 (03-Oct-20) Day of German Unity Edition + - Now is being built with JDK 11 (with Java 8 target). - Updated various dependencies (Kotlin 1.40.10) and AssertJ 3.17.2. -- Fixed the ImplicitAssertion inspection that broke the plugin with IntelliJ 2020.3 EAP as reported by Frédéric Thomas. Thanks! +- Fixed the ImplicitAssertion inspection that broke the plugin with IntelliJ 2020.3 EAP as reported by Frédéric Thomas. + Thanks! - Added new singleElement() from AssertJ >= 3.17.0 to ImplicitAssertionInspection. - Added several cases for ```hasSizeGreaterThan/LessThan/OrEqualTo()``` for EnumerablesEmpty inspection. -- Added inversion of boolean conditions inside ```isEqualTo()``` and ```isNotEqualTo()``` for InvertedBooleanCondition inspection. +- Added inversion of boolean conditions inside ```isEqualTo()``` and ```isNotEqualTo()``` for InvertedBooleanCondition + inspection. #### V1.10 (31-Jul-20) Friday the 31st Edition - Updated libraries to the latest versions (including AssertJ 3.16.1 and Kotlin 1.40-rc). diff --git a/build.gradle b/build.gradle index e6ac0b2..f84d5cc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ plugins { id 'java' - id 'org.jetbrains.intellij' version '0.4.26' - id 'org.jetbrains.kotlin.jvm' version '1.4.10' + id 'org.jetbrains.intellij' version '0.7.2' + id 'org.jetbrains.kotlin.jvm' version '1.5.0' id 'jacoco' - id 'com.github.kt3k.coveralls' version '2.10.2' + id 'com.github.kt3k.coveralls' version '2.11.0' } group 'de.platon42' -version '1.11' +version '1.12' sourceCompatibility = "1.8" targetCompatibility = "1.8" @@ -22,10 +22,10 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - testImplementation "org.assertj:assertj-core:3.17.2" + testImplementation "org.assertj:assertj-core:3.19.0" testImplementation "org.assertj:assertj-guava:3.4.0" - testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0' - testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.0-M1' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.0-M1' testImplementation "org.jetbrains.kotlin:kotlin-test" // testImplementation "org.jetbrains.kotlin:kotlin-test-junit" } @@ -39,7 +39,7 @@ compileTestKotlin { } intellij { - version '2020.2.2' // LATEST-EAP-SNAPSHOT + version '2021.1.1' // LATEST-EAP-SNAPSHOT // pluginName 'Concise AssertJ Optimizing Nitpicker (Cajon)' updateSinceUntilBuild false plugins = ['java'] @@ -47,14 +47,10 @@ intellij { patchPluginXml { changeNotes """ -

V1.11 (03-Oct-20) Day of German Unity Edition

+

V1.12 (06-May-21)

Full changelog available at Github project site.

""" @@ -68,7 +64,7 @@ test { } jacoco { - toolVersion = '0.8.6' + toolVersion = '0.8.7' } jacocoTestReport { diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/CommonMatchers.kt b/src/main/java/de/platon42/intellij/plugins/cajon/CommonMatchers.kt index 410f6e0..5f64160 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/CommonMatchers.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/CommonMatchers.kt @@ -21,13 +21,27 @@ val EXTRACTING_CALL_MATCHERS = CallMatcher.anyOf( val DESCRIBED_AS = CallMatcher.instanceCall(AssertJClassNames.DESCRIPTABLE_INTERFACE, MethodNames.DESCRIBED_AS, MethodNames.AS)!! val WITH_REPRESENTATION_AND_SUCH = CallMatcher.instanceCall(AssertJClassNames.ASSERT_INTERFACE, "withRepresentation", "withThreadDumpOnError")!! -val USING_COMPARATOR = CallMatcher.instanceCall(AssertJClassNames.ASSERT_INTERFACE, "usingComparator", "usingDefaultComparator")!! +val USING_COMPARATOR = CallMatcher.anyOf( + CallMatcher.instanceCall( + AssertJClassNames.ASSERT_INTERFACE, + "usingComparator", + "usingDefaultComparator" + ), + CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_ASSERT_CLASSNAME, "usingRecursiveComparison"), + CallMatcher.instanceCall( + AssertJClassNames.ABSTRACT_OBJECT_ASSERT_CLASSNAME, + "usingComparatorForFields", + "usingComparatorForType" + ) +)!! + val IN_HEXADECIMAL_OR_BINARY = CallMatcher.instanceCall(AssertJClassNames.ABSTRACT_ASSERT_CLASSNAME, MethodNames.IN_HEXADECIMAL, MethodNames.IN_BINARY)!! val EXTENSION_POINTS = CallMatcher.instanceCall( AssertJClassNames.EXTENSION_POINTS_INTERFACE, "is", "isNot", "has", "doesNotHave", "satisfies" )!! + val MORE_EXTENSION_POINTS = CallMatcher.instanceCall( AssertJClassNames.OBJECT_ENUMERABLE_ASSERT_INTERFACE, "are", "areNot", "have", "doNotHave", diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractAssertJInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractAssertJInspection.kt index 6f3c85f..84404ab 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractAssertJInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractAssertJInspection.kt @@ -177,12 +177,12 @@ abstract class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() .parameterCount(0)!! val CHAR_SEQUENCE_LENGTH = CallMatcher.instanceCall("java.lang.CharSequence", "length") .parameterCount(0)!! - val OBJECT_EQUALS = CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, "equals") + val OBJECT_EQUALS = CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_OBJECT, MethodNames.EQUALS) .parameterTypes(CommonClassNames.JAVA_LANG_OBJECT)!! val OPTIONAL_GET = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_OPTIONAL, "get") .parameterCount(0)!! - val OPTIONAL_IS_PRESENT = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_OPTIONAL, "isPresent") + val OPTIONAL_IS_PRESENT = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_OPTIONAL, MethodNames.IS_PRESENT) .parameterCount(0)!! val OPTIONAL_OR_ELSE = CallMatcher.instanceCall(CommonClassNames.JAVA_UTIL_OPTIONAL, "orElse") .parameterCount(1)!! @@ -196,7 +196,7 @@ abstract class AbstractAssertJInspection : AbstractBaseJavaLocalInspectionTool() val GUAVA_OPTIONAL_GET = CallMatcher.instanceCall(GUAVA_OPTIONAL_CLASSNAME, "get") .parameterCount(0)!! - val GUAVA_OPTIONAL_IS_PRESENT = CallMatcher.instanceCall(GUAVA_OPTIONAL_CLASSNAME, "isPresent") + val GUAVA_OPTIONAL_IS_PRESENT = CallMatcher.instanceCall(GUAVA_OPTIONAL_CLASSNAME, MethodNames.IS_PRESENT) .parameterCount(0)!! val GUAVA_OPTIONAL_OR_NULL = CallMatcher.instanceCall(GUAVA_OPTIONAL_CLASSNAME, "orNull") .parameterCount(0)!! diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractJUnitAssertInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractJUnitAssertInspection.kt index 3ee7c31..1adcc2a 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractJUnitAssertInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AbstractJUnitAssertInspection.kt @@ -4,39 +4,51 @@ import com.intellij.codeInspection.AbstractBaseJavaLocalInspectionTool import com.intellij.psi.PsiMethodCallExpression import org.jetbrains.annotations.NonNls -open class AbstractJUnitAssertInspection : AbstractBaseJavaLocalInspectionTool() { +abstract class AbstractJUnitAssertInspection : AbstractBaseJavaLocalInspectionTool() { companion object { @NonNls const val JUNIT_ASSERT_CLASSNAME = "org.junit.Assert" + @NonNls const val JUNIT_ASSUME_CLASSNAME = "org.junit.Assume" @NonNls const val ASSERT_TRUE_METHOD = "assertTrue" + @NonNls const val ASSERT_FALSE_METHOD = "assertFalse" + @NonNls const val ASSERT_NULL_METHOD = "assertNull" + @NonNls const val ASSERT_NOT_NULL_METHOD = "assertNotNull" + @NonNls const val ASSERT_EQUALS_METHOD = "assertEquals" + @NonNls const val ASSERT_NOT_EQUALS_METHOD = "assertNotEquals" + @NonNls const val ASSERT_SAME_METHOD = "assertSame" + @NonNls const val ASSERT_NOT_SAME_METHOD = "assertNotSame" + @NonNls const val ASSERT_ARRAY_EQUALS_METHOD = "assertArrayEquals" @NonNls const val ASSUME_TRUE_METHOD = "assumeTrue" + @NonNls const val ASSUME_FALSE_METHOD = "assumeFalse" + @NonNls const val ASSUME_NOT_NULL_METHOD = "assumeNotNull" + @NonNls const val ASSUME_NO_EXCEPTION = "assumeNoException" diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatEnumerableIsEmptyInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatEnumerableIsEmptyInspection.kt index 88b5643..c81f4f2 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatEnumerableIsEmptyInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatEnumerableIsEmptyInspection.kt @@ -27,9 +27,9 @@ class AssertThatEnumerableIsEmptyInspection : AbstractAssertJInspection() { val value = expression.calculateConstantParameterValue(0) ?: return val isEmpty = (CallMatcher.anyOf(HAS_SIZE, HAS_SIZE_LESS_THAN_OR_EQUAL_TO_INT).test(expression) && (value == 0)) || - (HAS_SIZE_LESS_THAN_INT.test(expression) && (value == 1)); + (HAS_SIZE_LESS_THAN_INT.test(expression) && (value == 1)) val isNotEmpty = (HAS_SIZE_GREATER_THAN_INT.test(expression) && (value == 0)) || - (HAS_SIZE_GREATER_THAN_OR_EQUAL_TO_INT.test(expression) && (value == 1)); + (HAS_SIZE_GREATER_THAN_OR_EQUAL_TO_INT.test(expression) && (value == 1)) if (isEmpty && isLastExpression) { registerSimplifyMethod(holder, expression, MethodNames.IS_EMPTY) diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatFileExpressionInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatFileExpressionInspection.kt index 4870d8f..e8a4af2 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatFileExpressionInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatFileExpressionInspection.kt @@ -79,25 +79,25 @@ class AssertThatFileExpressionInspection : AbstractMoveOutInspection() { private val MAPPINGS_SINCE_ASSERTJ_3_14_0 = listOf( MoveOutMapping( CallMatcher.instanceCall(CommonClassNames.JAVA_IO_FILE, "length").parameterCount(0), - "isEmpty", expectedMatcher = IS_ZERO_LONG, noExpectedExpression = true + MethodNames.IS_EMPTY, expectedMatcher = IS_ZERO_LONG, noExpectedExpression = true ), MoveOutMapping( CallMatcher.instanceCall(CommonClassNames.JAVA_IO_FILE, "length").parameterCount(0), - "isEmpty", expectedMatcher = IS_EQUAL_TO_LONG, noExpectedExpression = true, + MethodNames.IS_EMPTY, expectedMatcher = IS_EQUAL_TO_LONG, noExpectedExpression = true, additionalCondition = ARG_IS_ZERO_CONST ), MoveOutMapping( CallMatcher.instanceCall(CommonClassNames.JAVA_IO_FILE, "length").parameterCount(0), - "isNotEmpty", expectedMatcher = IS_NOT_ZERO_LONG, noExpectedExpression = true + MethodNames.IS_NOT_EMPTY, expectedMatcher = IS_NOT_ZERO_LONG, noExpectedExpression = true ), MoveOutMapping( CallMatcher.instanceCall(CommonClassNames.JAVA_IO_FILE, "length").parameterCount(0), - "isNotEmpty", expectedMatcher = IS_NOT_EQUAL_TO_LONG, noExpectedExpression = true, + MethodNames.IS_NOT_EMPTY, expectedMatcher = IS_NOT_EQUAL_TO_LONG, noExpectedExpression = true, additionalCondition = ARG_IS_ZERO_CONST ), MoveOutMapping( CallMatcher.instanceCall(CommonClassNames.JAVA_IO_FILE, "length").parameterCount(0), - "hasSize", expectedMatcher = IS_EQUAL_TO_LONG, + MethodNames.HAS_SIZE, expectedMatcher = IS_EQUAL_TO_LONG, additionalCondition = ARG_IS_NOT_ZERO_CONST ) ) diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatPathExpressionInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatPathExpressionInspection.kt index 24aabbd..f120a41 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatPathExpressionInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatPathExpressionInspection.kt @@ -5,6 +5,7 @@ import com.intellij.psi.JavaElementVisitor import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiExpressionStatement import com.siyeh.ig.callMatcher.CallMatcher +import de.platon42.intellij.plugins.cajon.MethodNames class AssertThatPathExpressionInspection : AbstractMoveOutInspection() { @@ -19,11 +20,11 @@ class AssertThatPathExpressionInspection : AbstractMoveOutInspection() { "isAbsolute", "isRelative", expectBoolean = true ), MoveOutMapping( - CallMatcher.instanceCall(JAVA_NIO_PATH, "startsWith").parameterTypes(JAVA_NIO_PATH), + CallMatcher.instanceCall(JAVA_NIO_PATH, MethodNames.STARTS_WITH).parameterTypes(JAVA_NIO_PATH), "startsWithRaw", expectBoolean = true ), MoveOutMapping( - CallMatcher.instanceCall(JAVA_NIO_PATH, "endsWith").parameterTypes(JAVA_NIO_PATH), + CallMatcher.instanceCall(JAVA_NIO_PATH, MethodNames.ENDS_WITH).parameterTypes(JAVA_NIO_PATH), "endsWithRaw", expectBoolean = true ), MoveOutMapping( diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringExpressionInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringExpressionInspection.kt index f81fa20..9a22b32 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringExpressionInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/AssertThatStringExpressionInspection.kt @@ -22,12 +22,12 @@ class AssertThatStringExpressionInspection : AbstractMoveOutInspection() { private val MAPPINGS = listOf( MoveOutMapping( - CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "isEmpty").parameterCount(0), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, MethodNames.IS_EMPTY).parameterCount(0), MethodNames.IS_EMPTY, MethodNames.IS_NOT_EMPTY, expectBoolean = true ), MoveOutMapping( CallMatcher.anyOf( - CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "equals").parameterCount(1), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, MethodNames.EQUALS).parameterCount(1), CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "contentEquals").parameterCount(1) ), MethodNames.IS_EQUAL_TO, MethodNames.IS_NOT_EQUAL_TO, expectBoolean = true @@ -37,15 +37,15 @@ class AssertThatStringExpressionInspection : AbstractMoveOutInspection() { MethodNames.IS_EQUAL_TO_IC, MethodNames.IS_NOT_EQUAL_TO_IC, expectBoolean = true ), MoveOutMapping( - CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "contains").parameterCount(1), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, MethodNames.CONTAINS).parameterCount(1), MethodNames.CONTAINS, MethodNames.DOES_NOT_CONTAIN, expectBoolean = true ), MoveOutMapping( - CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "startsWith").parameterTypes(CommonClassNames.JAVA_LANG_STRING), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, MethodNames.STARTS_WITH).parameterTypes(CommonClassNames.JAVA_LANG_STRING), MethodNames.STARTS_WITH, MethodNames.DOES_NOT_START_WITH, expectBoolean = true ), MoveOutMapping( - CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, "endsWith").parameterTypes(CommonClassNames.JAVA_LANG_STRING), + CallMatcher.instanceCall(CommonClassNames.JAVA_LANG_STRING, MethodNames.ENDS_WITH).parameterTypes(CommonClassNames.JAVA_LANG_STRING), MethodNames.ENDS_WITH, MethodNames.DOES_NOT_END_WITH, expectBoolean = true ), MoveOutMapping( diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/BogusAssertionInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/BogusAssertionInspection.kt index 5e082c3..170530a 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/BogusAssertionInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/BogusAssertionInspection.kt @@ -25,16 +25,16 @@ class BogusAssertionInspection : AbstractAssertJInspection() { ).parameterCount(1) private val ARRAY_METHODS = arrayOf( - "hasSameSizeAs", + MethodNames.HAS_SAME_SIZE_AS, MethodNames.CONTAINS, "containsAnyOf", - "containsExactly", + MethodNames.CONTAINS_EXACTLY, "containsExactlyInAnyOrder", "containsOnly", "containsSequence", "containsSubsequence", - "startsWith", - "endsWith" + MethodNames.STARTS_WITH, + MethodNames.ENDS_WITH ) private val SAME_BOOLEAN_ARRAY_CONTENTS = diff --git a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/ImplicitAssertionInspection.kt b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/ImplicitAssertionInspection.kt index 9e892b8..1bed5e3 100644 --- a/src/main/java/de/platon42/intellij/plugins/cajon/inspections/ImplicitAssertionInspection.kt +++ b/src/main/java/de/platon42/intellij/plugins/cajon/inspections/ImplicitAssertionInspection.kt @@ -30,13 +30,13 @@ class ImplicitAssertionInspection : AbstractAssertJInspection() { private val OBJECT_ENUMERABLE_ANY_CONTENT_ASSERTIONS = CallMatcher.instanceCall( AssertJClassNames.OBJECT_ENUMERABLE_ASSERT_INTERFACE, MethodNames.CONTAINS, "containsOnly", "containsOnlyNulls", MethodNames.CONTAINS_ONLY_ONCE, - "containsExactly", "containsExactlyInAnyOrder", "containsExactlyInAnyOrderElementsOf", - "containsAll", "containsAnyOf", + MethodNames.CONTAINS_EXACTLY, "containsExactlyInAnyOrder", "containsExactlyInAnyOrderElementsOf", + MethodNames.CONTAINS_ALL, "containsAnyOf", "containsAnyElementsOf", "containsExactlyElementsOf", "containsOnlyElementsOf", "isSubsetOf", "containsSequence", "containsSubsequence", - "doesNotContainSequence", "doesNotContainSubsequence", "doesNotContain", + "doesNotContainSequence", "doesNotContainSubsequence", MethodNames.DOES_NOT_CONTAIN, "doesNotContainAnyElementsOf", "doesNotHaveDuplicates", - "startsWith", "endsWith", "containsNull", "doesNotContainNull", + MethodNames.STARTS_WITH, MethodNames.ENDS_WITH, "containsNull", "doesNotContainNull", "are", "areNot", "have", "doNotHave", "areAtLeastOne", "areAtLeast", "areAtMost", "areExactly", "haveAtLeastOne", "haveAtLeast", "haveAtMost", "haveExactly", "hasAtLeastOneElementOfType", "hasOnlyElementsOfType", "hasOnlyElementsOfTypes", @@ -49,7 +49,7 @@ class ImplicitAssertionInspection : AbstractAssertJInspection() { private val OBJECT_ENUMERABLE_AT_LEAST_ONE_CONTENT_ASSERTIONS = CallMatcher.instanceCall( AssertJClassNames.OBJECT_ENUMERABLE_ASSERT_INTERFACE, "containsOnlyNulls", - "startsWith", "endsWith", "containsNull", + MethodNames.STARTS_WITH, MethodNames.ENDS_WITH, "containsNull", "areAtLeastOne", "haveAtLeastOne", "hasAtLeastOneElementOfType", @@ -72,10 +72,10 @@ class ImplicitAssertionInspection : AbstractAssertJInspection() { private val NON_NULL_CORE_ASSERTIONS = CallMatcher.instanceCall( AssertJClassNames.ASSERT_INTERFACE, - "isInstanceOf", "isInstanceOfSatisfying", "isInstanceOfAny", "isExactlyInstanceOf", "isOfAnyClassIn", - "isNotInstanceOf", "isNotInstanceOfAny", "isNotExactlyInstanceOf", "isNotOfAnyClassIn", + MethodNames.IS_INSTANCE_OF, "isInstanceOfSatisfying", "isInstanceOfAny", "isExactlyInstanceOf", "isOfAnyClassIn", + MethodNames.IS_NOT_INSTANCE_OF, "isNotInstanceOfAny", "isNotExactlyInstanceOf", "isNotOfAnyClassIn", "hasSameClassAs", "doesNotHaveSameClassAs", - "hasToString", "hasSameHashCodeAs" + MethodNames.HAS_TO_STRING, "hasSameHashCodeAs" )!! private val GUAVA_IS_PRESENT = CallMatcher.instanceCall(AssertJClassNames.GUAVA_OPTIONAL_ASSERTIONS_CLASSNAME, MethodNames.IS_PRESENT) diff --git a/src/test/java/de/platon42/intellij/jupiter/AddLocalJarToModule.java b/src/test/java/de/platon42/intellij/jupiter/AddLocalJarToModule.java index 66a5a54..8967788 100644 --- a/src/test/java/de/platon42/intellij/jupiter/AddLocalJarToModule.java +++ b/src/test/java/de/platon42/intellij/jupiter/AddLocalJarToModule.java @@ -6,5 +6,5 @@ import java.lang.annotation.*; @Retention(RetentionPolicy.RUNTIME) @Inherited public @interface AddLocalJarToModule { - Class[] value(); + Class[] value(); } \ No newline at end of file diff --git a/src/test/java/de/platon42/intellij/jupiter/LightCodeInsightExtension.java b/src/test/java/de/platon42/intellij/jupiter/LightCodeInsightExtension.java index cba34c9..0324636 100644 --- a/src/test/java/de/platon42/intellij/jupiter/LightCodeInsightExtension.java +++ b/src/test/java/de/platon42/intellij/jupiter/LightCodeInsightExtension.java @@ -2,6 +2,7 @@ package de.platon42.intellij.jupiter; import com.intellij.jarRepository.JarRepositoryManager; import com.intellij.jarRepository.RemoteRepositoryDescription; +import com.intellij.openapi.Disposable; import com.intellij.openapi.module.Module; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; @@ -133,14 +134,19 @@ public class LightCodeInsightExtension implements ParameterResolver, AfterTestEx @Override public void setUp() throws Exception { super.setUp(); + Store store = getStore(extensionContext); + store.put("disposable", Disposer.newDisposable("LightCodeInsightFixtureTestCaseWrapper")); } @Override public void tearDown() throws Exception { super.tearDown(); + Store store = getStore(extensionContext); + Disposable disposable = (Disposable) store.get("disposable"); UsefulTestCase.clearFields(this); - if (myFixture != null && getProject() != null && !getProject().isDisposed()) { - Disposer.dispose(getProject()); + if (myFixture != null && disposable != null) { + Disposer.dispose(disposable); + store.remove("disposable"); } } @@ -172,7 +178,7 @@ public class LightCodeInsightExtension implements ParameterResolver, AfterTestEx }; } - void addJarContaining(ModifiableRootModel model, Class clazz) { + void addJarContaining(ModifiableRootModel model, Class clazz) { try { Path jarPath = Paths.get(clazz.getProtectionDomain().getCodeSource().getLocation().toURI()); diff --git a/src/test/java/de/platon42/intellij/plugins/cajon/AbstractCajonTest.kt b/src/test/java/de/platon42/intellij/plugins/cajon/AbstractCajonTest.kt index 1a2eb50..8e1c44a 100644 --- a/src/test/java/de/platon42/intellij/plugins/cajon/AbstractCajonTest.kt +++ b/src/test/java/de/platon42/intellij/plugins/cajon/AbstractCajonTest.kt @@ -43,7 +43,7 @@ abstract class AbstractCajonTest { .asSequence() .filter { it.description?.contains(snippet) ?: false } .toList() - assertThat(highlights).hasSize(count); + assertThat(highlights).hasSize(count) } class CutOffFixtureDisplayNameGenerator : DisplayNameGenerator.ReplaceUnderscores() { diff --git a/src/test/java/de/platon42/intellij/plugins/cajon/inspections/TwistedAssertionInspectionTest.kt b/src/test/java/de/platon42/intellij/plugins/cajon/inspections/TwistedAssertionInspectionTest.kt index 1d90cd8..99f2346 100644 --- a/src/test/java/de/platon42/intellij/plugins/cajon/inspections/TwistedAssertionInspectionTest.kt +++ b/src/test/java/de/platon42/intellij/plugins/cajon/inspections/TwistedAssertionInspectionTest.kt @@ -13,7 +13,7 @@ internal class TwistedAssertionInspectionTest : AbstractCajonTest() { internal fun hint_twisted_actual_and_expected_and_provide_quickfix_where_possible(@MyFixture myFixture: JavaCodeInsightTestFixture) { myFixture.enableInspections(TwistedAssertionInspection::class.java) myFixture.configureByFile("TwistedAssertionBefore.java") - assertHighlightings(myFixture, 5, "Actual expression in assertThat() is a constant") + assertHighlightings(myFixture, 9, "Actual expression in assertThat() is a constant") assertHighlightings(myFixture, 10, "Twisted actual and expected expressions") executeQuickFixes(myFixture, Regex.fromLiteral("Swap actual and expected expressions in assertion"), 6) diff --git a/src/test/resources/inspections/TwistedAssertion/TwistedAssertionAfter.java b/src/test/resources/inspections/TwistedAssertion/TwistedAssertionAfter.java index 7b4606b..03454e9 100644 --- a/src/test/resources/inspections/TwistedAssertion/TwistedAssertionAfter.java +++ b/src/test/resources/inspections/TwistedAssertion/TwistedAssertionAfter.java @@ -31,7 +31,11 @@ public class TwistedAssertions { assertThat(bar).isEqualTo(foo); assertThat(4).isEqualTo(number).isNotEqualTo(number * 2); + assertThat(4).usingDefaultComparator().isGreaterThanOrEqualTo(number); + assertThat(4).usingRecursiveComparison().isGreaterThanOrEqualTo(number); assertThat(4).usingComparator(Comparator.reverseOrder()).isGreaterThanOrEqualTo(number); + assertThat(4).usingComparatorForFields().isGreaterThanOrEqualTo(number); + assertThat(4).usingComparatorForType(Integer::compare).isGreaterThanOrEqualTo(number); assertThat(String.class).isEqualTo(Class.forName("java.lang.String")); assertThat("XX").matches(Pattern.compile("..")); diff --git a/src/test/resources/inspections/TwistedAssertion/TwistedAssertionBefore.java b/src/test/resources/inspections/TwistedAssertion/TwistedAssertionBefore.java index d0aeef5..94c0e18 100644 --- a/src/test/resources/inspections/TwistedAssertion/TwistedAssertionBefore.java +++ b/src/test/resources/inspections/TwistedAssertion/TwistedAssertionBefore.java @@ -31,7 +31,11 @@ public class TwistedAssertions { assertThat(bar).isEqualTo(foo); assertThat(4).isEqualTo(number).isNotEqualTo(number * 2); + assertThat(4).usingDefaultComparator().isGreaterThanOrEqualTo(number); + assertThat(4).usingRecursiveComparison().isGreaterThanOrEqualTo(number); assertThat(4).usingComparator(Comparator.reverseOrder()).isGreaterThanOrEqualTo(number); + assertThat(4).usingComparatorForFields().isGreaterThanOrEqualTo(number); + assertThat(4).usingComparatorForType(Integer::compare).isGreaterThanOrEqualTo(number); assertThat(String.class).isEqualTo(Class.forName("java.lang.String")); assertThat("XX").matches(Pattern.compile(".."));