From ba563252994b1e52470633b2dcf355395fb06d0e Mon Sep 17 00:00:00 2001 From: chrisly42 Date: Sat, 6 Apr 2019 16:53:20 +0200 Subject: [PATCH] Internally: Upgraded to AssertJ 13.2.2. Support for hasSizeLessThan(), hasSizeLessThanOrEqualTo(), hasSizeGreaterThanOrEqualTo(), and hasSizeGreaterThan() for AssertThatSizeInspection (with AssertJ >=13.2.0). Really fixed highlighting for JUnit conversion. Sorry. Fixed testing code to work against IDEA 2019.1. --- README.md | 76 ++++++++++++++++++- build.gradle | 13 +++- .../inspections/AbstractAssertJInspection.kt | 13 +++- .../inspections/AssertThatSizeInspection.kt | 13 ++++ .../JUnitAssertToAssertJInspection.kt | 6 -- .../jupiter/LightCodeInsightExtension.java | 1 - .../intellij/playground/Playground.java | 29 +++++++ .../AssertThatSizeInspectionTest.kt | 2 +- .../AssertThatSize/AssertThatSizeAfter.java | 10 ++- .../AssertThatSize/AssertThatSizeBefore.java | 10 ++- 10 files changed, 155 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 74d7a6e..f938c5b 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,22 @@ The plugin also supports the conversion of the most common JUnit 4 assertions to to: assertThat(array).hasSameSizeAs(anotherArray); ``` + with AssertJ 13.2.0 or higher + + ``` + from: assertThat(array.length).isLessThanOrEqualTo(expression); + to: assertThat(array).hasSizeLessThanOrEqualTo(expression); + + from: assertThat(array.length).isLessThan(expression); + to: assertThat(array).hasSizeLessThan(expression); + + from: assertThat(array.length).isGreaterThan(expression); + to: assertThat(array).hasSizeGreaterThan(expression); + + from: assertThat(array.length).isGreaterThanOrEqualTo(expression); + to: assertThat(array).hasSizeGreaterThanOrEqualTo(expression); + ``` + and analogously for collections... - JUnitAssertToAssertJ @@ -107,6 +123,64 @@ The plugin also supports the conversion of the most common JUnit 4 assertions to assertArrayEquals(message, expectedDoubleOrFloatArray, actualDoubleOrFloatArray, delta); ``` +## Development notice + +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. +Feel free to use the code (in package de.platon42.intellij.jupiter) for your projects (with attribution). + ## TODO +- AssertThatBinaryExpressionIsTrueOrFalse + ``` + from: assertThat(actual == expected).isTrue(); + to: assertThat(actual).isEqualTo(expected); (for primitive types) + to: assertThat(actual).isSameAs(expected); (for objects) + + from: assertThat(actual != expected).isFalse(); + to: assertThat(actual).isNotEqualTo(expected); (for primitive types) + to: assertThat(actual).isNotSameAs(expected); (for objects) + ``` +- AssertThatJava8OptionalContains + ``` + from: assertThat(Optional.of("foo").get()).isEqualTo("foo"); + to: assertThat(Optional.of("foo")).contains("foo"); + ``` +- AssertThatJava8OptionalIsPresentOrAbsent + ``` + from: assertThat(Optional.of("foo").isPresent()).isEqualTo(true); + from: assertThat(!Optional.of("foo").isPresent()).isEqualTo(false); + from: assertThat(Optional.of("foo").isPresent()).isTrue(); + from: assertThat(!Optional.of("foo").isPresent()).isFalse(); + to: assertThat(Optional.of("foo")).isPresent(); + + from: assertThat(Optional.of("foo").isPresent()).isEqualTo(false); + from: assertThat(!Optional.of("foo").isPresent()).isEqualTo(true); + from: assertThat(Optional.of("foo").isPresent()).isFalse(); + from: assertThat(!Optional.of("foo").isPresent()).isTrue(); + to: assertThat(Optional.of("foo")).isNotPresent(); + ``` - AssertThatGuavaOptionalContains -- extraction with property names to lambda with Java 8 \ No newline at end of file + ``` + from: assertThat(Optional.of("foo").get()).isEqualTo("foo"); + to: assertThat(Optional.of("foo")).contains("foo"); + ``` +- AssertThatGuavaOptionalIsPresentOrAbsent + ``` + from: assertThat(Optional.of("foo").isPresent()).isEqualTo(true); + from: assertThat(!Optional.of("foo").isPresent()).isEqualTo(false); + from: assertThat(Optional.of("foo").isPresent()).isTrue(); + from: assertThat(!Optional.of("foo").isPresent()).isFalse(); + to: assertThat(Optional.of("foo")).isPresent(); + + from: assertThat(Optional.of("foo").isPresent()).isEqualTo(false); + from: assertThat(!Optional.of("foo").isPresent()).isEqualTo(true); + from: assertThat(Optional.of("foo").isPresent()).isFalse(); + from: assertThat(!Optional.of("foo").isPresent()).isTrue(); + to: assertThat(Optional.of("foo")).isAbsent(); + ``` +- 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())... + ``` diff --git a/build.gradle b/build.gradle index 034885a..650a3b0 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } group 'de.platon42' -version '0.2' +version '0.3' repositories { mavenCentral() @@ -18,7 +18,8 @@ repositories { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" - testCompile "org.assertj:assertj-core:3.11.1" + testCompile "org.assertj:assertj-core:3.12.2" + 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' @@ -33,13 +34,19 @@ compileTestKotlin { kotlinOptions.jvmTarget = "1.8" } intellij { - version '2018.3.4' + version '2019.1' // pluginName 'Concise AssertJ Optimizing Nitpicker (Cajon)' updateSinceUntilBuild false } patchPluginXml { changeNotes """ +

V0.3 (xx-Apr-19)

+

V0.2 (01-Apr-19)