From 2e01fac0223c9bcede01d03c3141b76cc7fa922a Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Mon, 29 Dec 2014 13:21:58 +0100
Subject: [PATCH] IDEA-134841 (Inspection: Misordered 'assertEquals' does not
 consider null as a literal)

---
 .../ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java | 2 +-
 .../junit/misordered_assert_equals_parameters/Simple.java       | 2 ++
 .../junit/MisorderedAssertEqualsParametersInspectionTest.java   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java
index 234ba77d668b..b80de89d8c53 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MisorderedAssertEqualsArgumentsInspectionBase.java
@@ -188,7 +188,7 @@ public abstract class MisorderedAssertEqualsArgumentsInspectionBase extends Base
     }
 
     private boolean looksLikeExpectedArgument(PsiExpression expression) {
-      if (ExpressionUtils.computeConstantExpression(expression) != null) {
+      if (ExpressionUtils.computeConstantExpression(expression) != null || PsiType.NULL.equals(expression.getType())) {
         return true;
       }
       if (expression instanceof PsiReferenceExpression) {
diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/misordered_assert_equals_parameters/Simple.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/misordered_assert_equals_parameters/Simple.java
index ab7901da4c8d..93b14e5a03b8 100644
--- a/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/misordered_assert_equals_parameters/Simple.java
+++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/junit/misordered_assert_equals_parameters/Simple.java
@@ -19,6 +19,8 @@ class Simple {
       TimeUnit timeUnit = TimeUnit.HOURS;
       Assert.<warning descr="Arguments to 'assertEquals()' in wrong order">assertEquals</warning>(timeUnit, TimeUnit.HOURS);
       Assert.<warning descr="Arguments to 'assertEquals()' in wrong order">assertEquals</warning>(test, map);
+
+      Assert.<warning descr="Arguments to 'assertEquals()' in wrong order">assertEquals</warning><error descr="'assertEquals(java.lang.String, long, long)' in 'org.junit.Assert' cannot be applied to '(java.lang.String, java.lang.Object, null)'">("message", new Object(), null)</error>;
       return null;
     }
   }
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/junit/MisorderedAssertEqualsParametersInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/junit/MisorderedAssertEqualsParametersInspectionTest.java
index d822720565d2..40ade6238de1 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/junit/MisorderedAssertEqualsParametersInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/junit/MisorderedAssertEqualsParametersInspectionTest.java
@@ -31,6 +31,7 @@ public class MisorderedAssertEqualsParametersInspectionTest extends LightInspect
       "package org.junit;" +
       "public class Assert {" +
       "  static public void assertEquals(long expected, long actual) {}" +
+      "  static public void assertEquals(String message, long expected, long actual) {}" +
       "  static public void assertEquals(Object expected, Object actual){}" +
       "  static public void assertSame(Object expected, Object actual) {}" +
       "}",