From 818634f34abb486d5e7ccc4f268fccc70cdbdf2e Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Mon, 27 Aug 2012 21:10:37 +0200 Subject: [PATCH] warn about more JUnit and TestNG assert methods --- .../ig/junit/AssertsWithoutMessagesInspection.java | 10 ++++++---- .../AssertsWithoutMessagesTestNGInspection.java | 12 ++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java index 2b05a972e67e..69561f1e7e1c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertsWithoutMessagesInspection.java @@ -58,13 +58,15 @@ public class AssertsWithoutMessagesInspection extends BaseInspection { @NonNls private static final Set s_assertMethods = new HashSet(8); static { - s_assertMethods.add("assertTrue"); - s_assertMethods.add("assertFalse"); + s_assertMethods.add("assertArrayEquals"); s_assertMethods.add("assertEquals"); - s_assertMethods.add("assertNull"); + s_assertMethods.add("assertFalse"); s_assertMethods.add("assertNotNull"); - s_assertMethods.add("assertSame"); s_assertMethods.add("assertNotSame"); + s_assertMethods.add("assertNull"); + s_assertMethods.add("assertSame"); + s_assertMethods.add("assertThat"); + s_assertMethods.add("assertTrue"); s_assertMethods.add("fail"); } diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspection.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspection.java index c0fac924c781..3c8534511ab9 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspection.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/AssertsWithoutMessagesTestNGInspection.java @@ -27,6 +27,9 @@ import org.jetbrains.annotations.NotNull; import java.util.HashSet; import java.util.Set; +/** + * @author Bas Leijdekkers + */ public class AssertsWithoutMessagesTestNGInspection extends BaseJavaLocalInspectionTool { @NotNull @@ -45,15 +48,16 @@ public class AssertsWithoutMessagesTestNGInspection extends BaseJavaLocalInspect } static { - ourAssertMethods.add("assertTrue"); - ourAssertMethods.add("assertFalse"); + ourAssertMethods.add("assertArrayEquals"); ourAssertMethods.add("assertEquals"); ourAssertMethods.add("assertEqualsNoOrder"); - ourAssertMethods.add("assertNull"); + ourAssertMethods.add("assertFalse"); ourAssertMethods.add("assertNotEquals"); ourAssertMethods.add("assertNotNull"); - ourAssertMethods.add("assertSame"); ourAssertMethods.add("assertNotSame"); + ourAssertMethods.add("assertNull"); + ourAssertMethods.add("assertSame"); + ourAssertMethods.add("assertTrue"); ourAssertMethods.add("fail"); }