From ab971f1c8f99b86c1696df23a3236e84a705997d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sat, 22 Aug 2020 18:34:32 +0200
Subject: [PATCH] Fix tests

---
 .../pmd/lang/java/rule/AbstractJUnitRule.java          | 10 +---------
 .../java/rule/errorprone/MoreThanOneLoggerRule.java    |  4 ++--
 .../sourceforge/pmd/lang/java/types/TypeTestUtil.java  |  2 +-
 .../rule/bestpractices/xml/ForLoopCanBeForeach.xml     |  4 ++++
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJUnitRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJUnitRule.java
index c2997cc85e..874331fbf2 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJUnitRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJUnitRule.java
@@ -95,15 +95,7 @@ public abstract class AbstractJUnitRule extends AbstractJavaRule {
 
     private boolean isJUnit3Class(ASTCompilationUnit node) {
         ASTClassOrInterfaceDeclaration cid = node.getFirstDescendantOfType(ASTClassOrInterfaceDeclaration.class);
-        if (cid == null) {
-            return false;
-        }
-
-        if (TypeTestUtil.isA(JUNIT3_CLASS_NAME, node)) {
-            return true;
-        } else {
-            return cid.getSimpleName().endsWith("Test");
-        }
+        return TypeTestUtil.isA(JUNIT3_CLASS_NAME, cid);
     }
 
     private boolean isJUnit4Class(ASTCompilationUnit node) {
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerRule.java
index d7ffde1209..68f00a99dc 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/errorprone/MoreThanOneLoggerRule.java
@@ -71,10 +71,10 @@ public class MoreThanOneLoggerRule extends AbstractJavaRule {
                 Node classOrIntType = reftypeNode.getChild(0);
                 if (classOrIntType instanceof ASTClassOrInterfaceType) {
                     ASTClassOrInterfaceType classType = (ASTClassOrInterfaceType) classOrIntType;
-                    if ((TypeTestUtil.isA(LOG4J_LOGGER_NAME, classType)
+                    if (TypeTestUtil.isA(LOG4J_LOGGER_NAME, classType)
                         || TypeTestUtil.isA(LOG4J2_LOGGER_NAME, classType)
                         || TypeTestUtil.isA(JAVA_LOGGER_NAME, classType)
-                        || TypeTestUtil.isA(SLF4J_LOGGER_NAME, classType))
+                        || TypeTestUtil.isA(SLF4J_LOGGER_NAME, classType)
                         || "Logger".equals(classOrIntType.getImage())) {
                         ++count;
                     }
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeTestUtil.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeTestUtil.java
index 5967670fb7..a22f21c550 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeTestUtil.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/types/TypeTestUtil.java
@@ -222,7 +222,7 @@ public final class TypeTestUtil {
 
         if (n instanceof ASTAnyTypeDeclaration) {
             ASTAnyTypeDeclaration decl = (ASTAnyTypeDeclaration) n;
-            if ((decl).getBinaryName().equals(canonicalName)) {
+            if (decl.getBinaryName().equals(canonicalName)) {
                 return true;
             } else if (!considerSubtype) { // otherwise fallthrough
                 return false;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
index cdad0dee66..204114fb63 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/ForLoopCanBeForeach.xml
@@ -135,6 +135,7 @@ class Foo {
         <description>Consider iterators</description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
+import java.util.Iterator;
 class Foo {
     void loop() {
         Iterable<DataFlowNode> path = null;
@@ -225,6 +226,7 @@ class StringPropertyTest {
         <description>Consider iterators only if safe</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
+import java.util.Iterator;
 class Foo {
     void loop() {
         Iterable<DataFlowNode> path = null;
@@ -245,6 +247,7 @@ class Foo {
         <description>Do not report iterator loop if we can't find iterator decl</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
+import java.util.Iterator;
 class Foo {
     void loop() {
         for (Iterator<DataFlowNode> i = path.iterator(); i.hasNext();) {
@@ -284,6 +287,7 @@ class Foo<T> implements Iterable<T> {
         <description>Iterating on multiple iterators should whitelist the loop, refs #784</description>
         <expected-problems>0</expected-problems>
         <code><![CDATA[
+import java.util.Iterator;
 class Foo {
     void loop() {
         Iterable<E> it;