From 23b313075f997b074d6549fbbf80c0f0037c6d8f Mon Sep 17 00:00:00 2001
From: Andreas Dangel <adangel@users.sourceforge.net>
Date: Fri, 9 Sep 2011 16:45:46 +0000
Subject: [PATCH] Fixing some unit tests

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7234 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java  | 2 +-
 .../pmd/lang/java/rule/typeresolution/xml/MyTestCase.java   | 6 +++---
 pmd/rulesets/java/unnecessary.xml                           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java b/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java
index 61521eb4e9..5b26538e22 100644
--- a/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java
+++ b/pmd/regress/test/net/sourceforge/pmd/AbstractRuleTest.java
@@ -197,7 +197,7 @@ public class AbstractRuleTest {
         MyRule r2 = new MyRule();
         r2.setMessage("another message");
         assertEquals("Rules with different messages are still equal", r1, r2);
-        assertSame("Rules that are equal must have the same hashcode", r1.hashCode(), r2.hashCode());
+        assertEquals("Rules that are equal must have the an equal hashcode", r1.hashCode(), r2.hashCode());
     }
 
 
diff --git a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
index f77b7861c7..9739ddd493 100644
--- a/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
+++ b/pmd/regress/test/net/sourceforge/pmd/lang/java/rule/typeresolution/xml/MyTestCase.java
@@ -3,9 +3,9 @@ package test.net.sourceforge.pmd.lang.java.rule.typeresolution.xml;
 import junit.framework.TestCase;
 
 /**
- * 	Warning, this class ARE not useless. 
- * 	It is used by the some of regression
- * 	tests.
+ * 	Warning, this class IS NOT useless. 
+ * 	It is used by the some regression tests.
+ * 
  *      See file: SignatureDeclareThrowsException.xml
  *      
  *      The file is already excluded from maven/surefire.
diff --git a/pmd/rulesets/java/unnecessary.xml b/pmd/rulesets/java/unnecessary.xml
index aee0a7c21d..7c2e8824a8 100644
--- a/pmd/rulesets/java/unnecessary.xml
+++ b/pmd/rulesets/java/unnecessary.xml
@@ -157,7 +157,7 @@ After checking an object reference for null, you should invoke equals() on that
         <property name="xpath">
         <value>
         <![CDATA[
-(//PrimaryPrefix[ends-with(Name/@Image, '.equals')] | //PrimarySuffix[@Image='equals' and not(../PrimaryPrefix/Literal)])
+(//PrimaryPrefix[ends-with(Name/@Image, '.equals') and Name/@Image != 'Arrays.equals'] | //PrimarySuffix[@Image='equals' and not(../PrimaryPrefix/Literal)])
  /following-sibling::PrimarySuffix/Arguments/ArgumentList/Expression
  /PrimaryExpression[count(PrimarySuffix)=0]/PrimaryPrefix
  /Name[@Image = ./../../../../../../../../../../Expression/ConditionalAndExpression