Issue #4314: Split and Organize Checkstyle inputs by Test for checks in design package: HideUtilityClassConstructor

15 files changed, 174 insertions, 57 deletions

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_1.java
deleted file mode 100644
index a85565b52..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_1.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-import java.io.Serializable;
-/*input file*/
-public abstract class InputHideUtilityClassConstructor3041574_1 implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_2.java
deleted file mode 100644
index 15c67eb7a..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_2.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-import java.io.Serializable;
-/*input file*/
-public class InputHideUtilityClassConstructor3041574_2 implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputRegression1762702.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputRegression1762702.java
deleted file mode 100644
index a85354192..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputRegression1762702.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-/**
- * Input for HideUtilityClassConstructorCheck, a non utility class that has 
- * 
- * @author lkuehne
- */
-public class InputRegression1762702
-{
-    public long constructionTime = System.currentTimeMillis();
-
-    public static InputRegression1762702 create()
-    {
-        return new InputRegression1762702();
-    }
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPrivate.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPrivate.java
deleted file mode 100644
index f1affa256..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPrivate.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-public class InputUtilityClassConstructorPrivate {
-    private InputUtilityClassConstructorPrivate() {}
-
-    private static int value = 0;
-    public static void foo (int val) { value = val;}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPublic.java
deleted file mode 100644
index 19659b318..000000000
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructorPublic.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
-
-public class InputUtilityClassConstructorPublic {
-    public InputUtilityClassConstructorPublic() {}
-
-    private static int value = 0;
-    public static void foo (int val) { value = val;}
-}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java
index ea677b311..92c4e7c03 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructor.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
 public class InputHideUtilityClassConstructor {
     
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java
new file mode 100644
index 000000000..c0cbeea58
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorAbstractSerializable.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+import java.io.Serializable;
+/*input file*/
+public abstract class InputHideUtilityClassConstructorAbstractSerializable implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java
new file mode 100644
index 000000000..321994941
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorDesignForExtension.java
@@ -0,0 +1,117 @@
+////////////////////////////////////////////////////////////////////////////////
+// Test case file for checkstyle.
+// Created: 2001
+////////////////////////////////////////////////////////////////////////////////
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+/**
+ * Test case for the "design for inheritance" check.
+ * @author Lars Kühne
+ **/
+public abstract class InputHideUtilityClassConstructorDesignForExtension
+{
+    // some methods that are OK
+
+    public interface InterfaceOK
+    {
+        void implicitlyAbstract();
+    }
+
+    final class ClassOK
+    {
+        protected void finalThroughClassDef()
+        {
+            System.identityHashCode("no way to override");
+        }
+    }
+
+    protected void nonFinalButEmpty()
+    {
+    }
+
+    public void nonFinalButEmpty2()
+    {
+        // comments don't count as content...
+    }
+
+    private void aPrivateMethod()
+    {
+        System.identityHashCode("no way to override");
+    }
+
+    protected abstract void nonFinalButAbstract();
+
+    // this one is bad: neither abstract, final, or empty
+
+    protected void doh()
+    {
+        System.identityHashCode("nonempty and overriding possible");
+    }
+    
+    public final void aFinalMethod()
+    {
+    	System.identityHashCode("no way to override");
+    }
+    
+    public static void aStaticMethod()
+    {
+    	System.identityHashCode("no way to override");
+    }
+
+    // tries to trigger bug #884035
+    // MyComparator is a private class, so there cannot be subclasses
+    // and it should not be neccessary to declare compare() as final
+    private class MyComparator implements java.util.Comparator
+    {
+        public int compare(Object o1, Object o2)
+        {
+            // some complex stuff that would normally trigger an error report
+            if (o1.hashCode() > o2.hashCode()) {
+                return -1;
+            }
+            else {
+                return 1;
+            }
+        }
+    }
+    
+    public final class aFinalClass
+    {
+        public void someMethod()
+        {
+        	System.identityHashCode("nonempty and overriding is possible");
+        }
+    }
+    
+    public class nonFinalClass
+    {
+    	//private ctor
+    	private nonFinalClass(){}    	
+        public void someMethod()
+        {
+        	System.identityHashCode("nonempty and overriding is possible");
+        }
+    }
+    
+    public class anotherNonFinalClass
+    {
+    	//nonPrivate ctor
+    	public anotherNonFinalClass(){}    	
+        public void someMethod()
+        {
+        	System.identityHashCode("nonempty and overriding is possible");
+        }
+    }
+    
+    // enums should be skipped
+    public enum TEnum
+    {
+        FIRST,
+        SECOND;
+
+        public int value()
+        {
+            return 3;
+        }
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructor.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorInnerStaticClasses.java
index 98c03f205..19f2b0821 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputUtilityClassConstructor.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorInnerStaticClasses.java
@@ -1,6 +1,6 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
-public class InputUtilityClassConstructor {
+public class InputHideUtilityClassConstructorInnerStaticClasses {
     private static int value = 0;
     public static void foo (int val) { value = val;}
 
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNonUtilityClass.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java
index 68c330722..56fdc48ac 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputNonUtilityClass.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorNonUtilityClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
 import java.awt.Dimension;
 import javax.swing.JPanel;
@@ -6,10 +6,10 @@ import javax.swing.JPanel;
 /**
  * Not a util class because it's not directly derived from java.lang.Object.
  */
-public class InputNonUtilityClass extends JPanel
+public class InputHideUtilityClassConstructorNonUtilityClass extends JPanel
 {
     /** HideUtilityClassConstructorCheck should not report this */
-    public InputNonUtilityClass()
+    public InputHideUtilityClassConstructorNonUtilityClass()
     {
 	this.setPreferredSize(new Dimension(100, 100));
     }
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java
new file mode 100644
index 000000000..3ba4469dd
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPrivate.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+public class InputHideUtilityClassConstructorPrivate {
+    private InputHideUtilityClassConstructorPrivate() {}
+
+    private static int value = 0;
+    public static void foo (int val) { value = val;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPublic.java
new file mode 100644
index 000000000..664c3b933
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorPublic.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+public class InputHideUtilityClassConstructorPublic {
+    public InputHideUtilityClassConstructorPublic() {}
+
+    private static int value = 0;
+    public static void foo (int val) { value = val;}
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java
new file mode 100644
index 000000000..865aa7cbf
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorRegression.java
@@ -0,0 +1,16 @@
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+/**
+ * Input for HideUtilityClassConstructorCheck, a non utility class that has 
+ * 
+ * @author lkuehne
+ */
+public class InputHideUtilityClassConstructorRegression
+{
+    public long constructionTime = System.currentTimeMillis();
+
+    public static InputHideUtilityClassConstructorRegression create()
+    {
+        return new InputHideUtilityClassConstructorRegression();
+    }
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java
new file mode 100644
index 000000000..2e9ade9bf
--- /dev/null
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializable.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
+
+import java.io.Serializable;
+/*input file*/
+public class InputHideUtilityClassConstructorSerializable implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+}
diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java
index c65e3b016..f936bbd11 100644
--- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/InputHideUtilityClassConstructor3041574_3.java
+++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/design/hideutilityclassconstructor/InputHideUtilityClassConstructorSerializableInnerStatic.java
@@ -1,11 +1,11 @@
-package com.puppycrawl.tools.checkstyle.checks.design;
+package com.puppycrawl.tools.checkstyle.checks.design.hideutilityclassconstructor;
 
 import java.io.Serializable;
 
-public class InputHideUtilityClassConstructor3041574_3 implements Serializable {
+public class InputHideUtilityClassConstructorSerializableInnerStatic implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    public InputHideUtilityClassConstructor3041574_3(int i) {
+    public InputHideUtilityClassConstructorSerializableInnerStatic(int i) {
         // no code
     }