MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 17:20:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

[jvm] IDEA-297284 Support member imports in hamcrest assertions converter

Browse Source 
GitOrigin-RevId: 2113c5b9270f7a77c40f5ca265ef69b36866e407
This commit is contained in:
Bart van Helvert
2022-07-05 21:31:24 +02:00
committed by intellij-monorepo-bot
parent ff1cddf460
commit a50be7401c
3 changed files with 90 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/JavaHamcrestAssertionsConverterInspectionTest.kt
View File

@@ -72,21 +72,24 @@ class JavaHamcrestAssertionsConverterInspectionTest : HamcrestAssertionsConverte
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
class MigrationTest {
void migrate() {
MatcherAssert.assertThat(2, Matchers.not(Matchers.is(3)));
MatcherAssert.assertThat(2, Matchers.is(3));
MatcherAssert.assertThat(2, Matchers.greaterThan(3));
MatcherAssert.assertThat(2, Matchers.lessThan(3));
MatcherAssert.assertThat(2, Matchers.greaterThanOrEqualTo(3));
MatcherAssert.assertThat(2, Matchers.lessThanOrEqualTo(3));
MatcherAssert.assertThat(2, Matchers.is(3));
MatcherAssert.assertThat(2, Matchers.not(Matchers.is(3)));
MatcherAssert.assertThat(2, Matchers.lessThanOrEqualTo(3));
MatcherAssert.assertThat(2, Matchers.greaterThanOrEqualTo(3));
MatcherAssert.assertThat(2, Matchers.lessThan(3));
MatcherAssert.assertThat(2, Matchers.greaterThan(3));
assertThat(2, not(is(3)));
assertThat(2, is(3));
assertThat(2, greaterThan(3));
assertThat(2, lessThan(3));
assertThat(2, greaterThanOrEqualTo(3));
assertThat(2, lessThanOrEqualTo(3));
assertThat(2, is(3));
assertThat(2, not(is(3)));
assertThat(2, lessThanOrEqualTo(3));
assertThat(2, greaterThanOrEqualTo(3));
assertThat(2, lessThan(3));
assertThat(2, greaterThan(3));
}
}
""".trimIndent(), "Replace with 'assertThat()'")
@@ -107,12 +110,15 @@ class JavaHamcrestAssertionsConverterInspectionTest : HamcrestAssertionsConverte
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
class Foo {
void migrate() {
MatcherAssert.assertThat("asd", Matchers.is("zxc"));
MatcherAssert.assertThat("asd", Matchers.sameInstance("zxc"));
MatcherAssert.assertThat("asd", Matchers.containsString("qwe"));
assertThat("asd", is("zxc"));
assertThat("asd", sameInstance("zxc"));
assertThat("asd", containsString("qwe"));
}
}
""".trimIndent(), "Replace with 'assertThat()'")
@@ -122,6 +128,9 @@ class JavaHamcrestAssertionsConverterInspectionTest : HamcrestAssertionsConverte
myFixture.testAllQuickfixes(ULanguage.JAVA, """
import org.junit.Assert;
import java.util.Collection;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
class Foo {
void migrate(Collection<String> c, String o) {
@@ -134,19 +143,20 @@ class JavaHamcrestAssertionsConverterInspectionTest : HamcrestAssertionsConverte
}
}
""".trimIndent(), """
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import java.util.Collection;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
class Foo {
void migrate(Collection<String> c, String o) {
MatcherAssert.assertThat(c, Matchers.hasItem(o));
MatcherAssert.assertThat(o, Matchers.is(c));
MatcherAssert.assertThat("msg", o, Matchers.is(c));
MatcherAssert.assertThat(c, Matchers.notNullValue());
MatcherAssert.assertThat(c, Matchers.nullValue());
MatcherAssert.assertThat(c, Matchers.not(Matchers.hasItem(o)));
assertThat(c, hasItem(o));
assertThat(o, is(c));
assertThat("msg", o, is(c));
assertThat(c, notNullValue());
assertThat(c, nullValue());
assertThat(c, not(hasItem(o)));
}
}
""".trimIndent(), "Replace with 'assertThat()'")
@@ -165,10 +175,13 @@ class JavaHamcrestAssertionsConverterInspectionTest : HamcrestAssertionsConverte
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.Assert;
import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
class Foo {
void migrate(int[] a, int[] b) {
MatcherAssert.assertThat(b, Matchers.is(a));
assertThat(b, is(a));
}
}
""".trimIndent(), "Replace with 'assertThat()'")