From db79567112473030c42c7db1fa6554de15fe50df Mon Sep 17 00:00:00 2001 From: Dmitry Batkovich Date: Thu, 9 Feb 2017 10:38:15 +0300 Subject: [PATCH] assertion -> assertThat inspection: fix template for assertFalse (IDEA-167545) --- .../inspections/MigrateAssertToMatcherAssertInspection.java | 2 +- .../inspections/migrateAssertsToAssertThat/all_after.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java index 4ae32072aaf3..cba205369407 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/inspections/MigrateAssertToMatcherAssertInspection.java @@ -58,7 +58,7 @@ public class MigrateAssertToMatcherAssertInspection extends LocalInspectionTool ASSERT_METHODS.put("assertNotNull", Pair.create("$obj$", "$obj$, org.hamcrest.CoreMatchers.notNullValue()")); ASSERT_METHODS.put("assertNull", Pair.create("$obj$", "$obj$, org.hamcrest.CoreMatchers.nullValue()")); ASSERT_METHODS.put("assertTrue", Pair.create("$cond$", "$cond$, org.hamcrest.CoreMatchers.is(true)")); - ASSERT_METHODS.put("assertFalse", Pair.create("$cond$", "$cond$, org.hamcrest.CoreMatchers.not(org.hamcrest.CoreMatchers.is(false))")); + ASSERT_METHODS.put("assertFalse", Pair.create("$cond$", "$cond$, org.hamcrest.CoreMatchers.is(false)")); } public boolean myStaticallyImportMatchers = true; diff --git a/java/typeMigration/testData/inspections/migrateAssertsToAssertThat/all_after.java b/java/typeMigration/testData/inspections/migrateAssertsToAssertThat/all_after.java index 3dd7024e36e3..974fd94b369c 100644 --- a/java/typeMigration/testData/inspections/migrateAssertsToAssertThat/all_after.java +++ b/java/typeMigration/testData/inspections/migrateAssertsToAssertThat/all_after.java @@ -13,8 +13,8 @@ public class TestCase { Assert.assertThat(2, org.hamcrest.number.OrderingComparison.greaterThanOrEqualTo(3)); Assert.assertThat(2, org.hamcrest.number.OrderingComparison.lessThanOrEqualTo(3)); - Assert.assertThat(2 != 3, not(is(false))); - Assert.assertThat(2 == 3, not(is(false))); + Assert.assertThat(2 != 3, is(false)); + Assert.assertThat(2 == 3, is(false)); Assert.assertThat(2, org.hamcrest.number.OrderingComparison.lessThanOrEqualTo(3)); Assert.assertThat(2, org.hamcrest.number.OrderingComparison.greaterThanOrEqualTo(3)); Assert.assertThat(2, org.hamcrest.number.OrderingComparison.lessThan(3));