From 41e921531a4a19fc8ac0a79b15fbd13c509bbba1 Mon Sep 17 00:00:00 2001
From: Robert Whitebit <robert.whitebit@gmail.com>
Date: Wed, 18 Feb 2015 20:30:16 +0100
Subject: [PATCH] Add missing assertions in JUnitAssertionsShouldIncludeMessage
 test

Missing assertions were assertArrayEquals, assertNotSame, assertThat and
fail.
---
 ...nitAssertionsShouldIncludeMessageRule.java |  10 +-
 .../JUnitAssertionsShouldIncludeMessage.xml   | 190 ++++++++++++++----
 2 files changed, 158 insertions(+), 42 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
index b215c35bd2..7a4bd3b7ad 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/junit/JUnitAssertionsShouldIncludeMessageRule.java
@@ -26,12 +26,16 @@ public class JUnitAssertionsShouldIncludeMessageRule extends AbstractJUnitRule {
     private List<AssertionCall> checks = new ArrayList<AssertionCall>();
 
     public JUnitAssertionsShouldIncludeMessageRule() {
+        checks.add(new AssertionCall(2, "assertArrayEquals"));
         checks.add(new AssertionCall(2, "assertEquals"));
-        checks.add(new AssertionCall(1, "assertTrue"));
+        checks.add(new AssertionCall(1, "assertFalse"));
+        checks.add(new AssertionCall(1, "assertNotNull"));
+        checks.add(new AssertionCall(2, "assertNotSame"));
         checks.add(new AssertionCall(1, "assertNull"));
         checks.add(new AssertionCall(2, "assertSame"));
-        checks.add(new AssertionCall(1, "assertNotNull"));
-        checks.add(new AssertionCall(1, "assertFalse"));
+        checks.add(new AssertionCall(2, "assertThat"));
+        checks.add(new AssertionCall(1, "assertTrue"));
+        checks.add(new AssertionCall(0, "fail"));
     }
 
     public Object visit(ASTArguments node, Object data) {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
index 840166469a..4ecb5f9254 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/junit/xml/JUnitAssertionsShouldIncludeMessage.xml
@@ -2,6 +2,34 @@
 <test-data>
     <test-code>
         <description><![CDATA[
+assertArrayEquals ok
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertArrayEquals("[1] != [1]", new int[] {1}, new int[] {1});
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertArrayEquals bad
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertArrayEquals(new int[] {1}, new int[] {1});
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
 assertEquals ok
      ]]></description>
         <expected-problems>0</expected-problems>
@@ -9,7 +37,7 @@ assertEquals ok
 import junit.framework.TestCase;
 public class Foo extends TestCase {
  public void test1() {
-  assertEquals("1 == 1", 1, 1);
+  assertEquals("1 != 1", 1, 1);
  }
 }
      ]]></code>
@@ -30,28 +58,84 @@ public class Foo extends TestCase {
     </test-code>
     <test-code>
         <description><![CDATA[
-assertTrue ok
+assertFalse ok
      ]]></description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 import junit.framework.TestCase;
 public class Foo extends TestCase {
- public void test1() {
-  assertTrue("foo", "foo".equals("foo"));
+ public void testBar() {
+  assertFalse("foo!", "foo".equals("foo"));
  }
 }
      ]]></code>
     </test-code>
     <test-code>
         <description><![CDATA[
-assertTrue bad
+assertFalse bad
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void testBar() {
+  assertFalse("foo".equals("foo"));
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertNotNull OK
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertNotNull("foo", null);
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertNotNull bad
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
 import junit.framework.TestCase;
 public class Foo extends TestCase {
  public void test1() {
-  assertTrue("foo".equals("foo"));
+  assertNotNull(null);
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertNotSame ok
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertNotSame("1 == 2", 1, 2);
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertNotSame bad
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertNotSame(1, 2);
  }
 }
      ]]></code>
@@ -100,7 +184,7 @@ public class Foo extends TestCase {
     </test-code>
     <test-code>
         <description><![CDATA[
-assertSame badd
+assertSame bad
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
@@ -114,28 +198,84 @@ public class Foo extends TestCase {
     </test-code>
     <test-code>
         <description><![CDATA[
-assertNotNull OK
+assertThat ok
      ]]></description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
 import junit.framework.TestCase;
 public class Foo extends TestCase {
  public void test1() {
-  assertNotNull("foo", null);
+  assertThat("Zero is one", 0, is(not(1)));
  }
 }
      ]]></code>
     </test-code>
     <test-code>
         <description><![CDATA[
-assertNotNull bad
+assertThat bad
      ]]></description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
 import junit.framework.TestCase;
 public class Foo extends TestCase {
  public void test1() {
-  assertNotNull(null);
+  assertThat(0, is(not(1)));
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertTrue ok
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertTrue("foo", "foo".equals("foo"));
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+assertTrue bad
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  assertTrue("foo".equals("foo"));
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+fail ok
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  fail("foo");
+ }
+}
+     ]]></code>
+    </test-code>
+    <test-code>
+        <description><![CDATA[
+fail bad
+     ]]></description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+import junit.framework.TestCase;
+public class Foo extends TestCase {
+ public void test1() {
+  fail();
  }
 }
      ]]></code>
@@ -156,34 +296,6 @@ public class Foo extends TestCase {
     </test-code>
     <test-code>
         <description><![CDATA[
-assertFalse ok
-     ]]></description>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
-import junit.framework.TestCase;
-public class Foo extends TestCase {
- public void testBar() {
-  assertFalse("foo!", "foo".equals("foo"));
- }
-}
-     ]]></code>
-    </test-code>
-    <test-code>
-        <description><![CDATA[
-assertFalse bad
-     ]]></description>
-        <expected-problems>1</expected-problems>
-        <code><![CDATA[
-import junit.framework.TestCase;
-public class Foo extends TestCase {
- public void testBar() {
-  assertFalse("foo".equals("foo"));
- }
-}
-     ]]></code>
-    </test-code>
-    <test-code>
-        <description><![CDATA[
 Not a JUnit test - assertEquals bad
      ]]></description>
         <expected-problems>0</expected-problems>