Issue sevntu-checkstyle#610: standardized UTs from CheckstyleTestMake…

…up violations
kariem · Jul 26, 2018 · 1e5c804 · 1e5c804
1 parent f5a128c
commit 1e5c804
Show file tree

Hide file tree

Showing 58 changed files with 717 additions and 653 deletions.
diff --git a/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java b/sevntu-checks/src/test/java/com/github/sevntu/checkstyle/BaseCheckTestSupport.java
@@ -48,7 +48,7 @@ public abstract class BaseCheckTestSupport {
     private final ByteArrayOutputStream baos = new ByteArrayOutputStream();
     private final PrintStream printStream = new PrintStream(baos);
 
-    public static DefaultConfiguration createCheckConfig(Class<?> clazz) {
+    public static DefaultConfiguration createModuleConfig(Class<?> clazz) {
         return new DefaultConfiguration(clazz.getName());
     }
 
@@ -111,7 +111,7 @@ protected Checker createChecker(Configuration checkConfig) throws Exception {
 
     protected DefaultConfiguration createCheckerConfig(Configuration config) {
         final DefaultConfiguration result = new DefaultConfiguration("configuration");
-        final DefaultConfiguration treeWalkerConfig = createCheckConfig(TreeWalker.class);
+        final DefaultConfiguration treeWalkerConfig = createModuleConfig(TreeWalker.class);
         // make sure that the tests always run with this charset
         result.addAttribute("charset", "iso-8859-1");
         result.addChild(treeWalkerConfig);

diff --git a/...c/test/java/com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationCheckTest.java b/...c/test/java/com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationCheckTest.java
@@ -36,7 +36,7 @@ public class ForbidAnnotationCheckTest extends BaseCheckTestSupport {
 
     @Test
     public void testDefaultCheck() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         final String[] expected1 = {};
 
@@ -45,7 +45,7 @@ public void testDefaultCheck() throws Exception {
 
     @Test
     public void testNullProperties() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", null);
         checkConfig.addAttribute("annotationTargets", null);
@@ -57,7 +57,7 @@ public void testNullProperties() throws Exception {
 
     @Test
     public void testFullAnnotationName() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "Test");
 
@@ -68,7 +68,7 @@ public void testFullAnnotationName() throws Exception {
 
     @Test
     public void testVariableIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames",
                 "Edible,Author,Author2,SuppressWarnings");
@@ -86,7 +86,7 @@ public void testVariableIsForbidden() throws Exception {
 
     @Test
     public void testMethodIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "Twizzle,One,Two,Three,B");
         checkConfig.addAttribute("annotationTargets", "METHOD_DEF");
@@ -104,7 +104,7 @@ public void testMethodIsForbidden() throws Exception {
 
     @Test
     public void testClassAndConstuctorIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "Test,ctor,ctor2");
         checkConfig.addAttribute("annotationTargets", "CLASS_DEF,CTOR_DEF");
@@ -120,7 +120,7 @@ public void testClassAndConstuctorIsForbidden() throws Exception {
 
     @Test
     public void testAnnotationIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "Retention,Target");
         checkConfig.addAttribute("annotationTargets", "ANNOTATION_DEF");
@@ -135,7 +135,7 @@ public void testAnnotationIsForbidden() throws Exception {
 
     @Test
     public void testParameterAndInterfaceIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "MyAnnotation,A");
         checkConfig.addAttribute("annotationTargets",
@@ -151,7 +151,7 @@ public void testParameterAndInterfaceIsForbidden() throws Exception {
 
     @Test
     public void testEnumIsForbidden() throws Exception {
-        final DefaultConfiguration checkConfig = createCheckConfig(ForbidAnnotationCheck.class);
+        final DefaultConfiguration checkConfig = createModuleConfig(ForbidAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationNames", "C,int1,int2,int3");
         checkConfig.addAttribute("annotationTargets",

diff --git a/...com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationElementValueCheckTest.java b/...com/github/sevntu/checkstyle/checks/annotation/ForbidAnnotationElementValueCheckTest.java
@@ -30,7 +30,7 @@ public class ForbidAnnotationElementValueCheckTest extends BaseCheckTestSupport
     @Test
     public void testAnnotationWithStringParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
         checkConfig.addAttribute("annotationName", "Anno1");
         checkConfig.addAttribute("elementName", "str");
         checkConfig.addAttribute("forbiddenElementValueRegexp", "someString\\d+");
@@ -45,7 +45,7 @@ public void testAnnotationWithStringParameter() throws Exception {
     @Test
     public void testAnnotationWithIntegerParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Anno2");
         checkConfig.addAttribute("elementName", "intVal");
@@ -61,7 +61,7 @@ public void testAnnotationWithIntegerParameter() throws Exception {
     @Test
     public void testAnnotationWithFloatParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Anno3");
         checkConfig.addAttribute("elementName", "floatVal");
@@ -77,7 +77,7 @@ public void testAnnotationWithFloatParameter() throws Exception {
     @Test
     public void testAnnotationWithBooleanParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Anno4");
         checkConfig.addAttribute("elementName", "boolVal");
@@ -93,7 +93,7 @@ public void testAnnotationWithBooleanParameter() throws Exception {
     @Test
     public void testAnnotationWithDotSplittedParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Bean");
         checkConfig.addAttribute("elementName", "name");
@@ -109,7 +109,7 @@ public void testAnnotationWithDotSplittedParameter() throws Exception {
     @Test
     public void testAnnotationWithSeveralParameters() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Anno5");
         checkConfig.addAttribute("elementName", "stringValue");
@@ -125,7 +125,7 @@ public void testAnnotationWithSeveralParameters() throws Exception {
     @Test
     public void testAnnotationWithSingleParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "SuppressWarnings");
         checkConfig.addAttribute("elementName", "value");
@@ -141,7 +141,7 @@ public void testAnnotationWithSingleParameter() throws Exception {
     @Test
     public void testAnnotationWtithBooleanParameterValueDoesntMatch() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Anno4");
         checkConfig.addAttribute("elementName", "boolVal");
@@ -155,7 +155,7 @@ public void testAnnotationWtithBooleanParameterValueDoesntMatch() throws Excepti
     @Test
     public void testAnnotationWithListAsParameterValue() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "SuppressWarnings");
         checkConfig.addAttribute("elementName", "value");
@@ -172,7 +172,7 @@ public void testAnnotationWithListAsParameterValue() throws Exception {
     @Test
     public void testAnnotationWithAnnotationAsParameter() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "Name");
         checkConfig.addAttribute("elementName", "last");
@@ -188,7 +188,7 @@ public void testAnnotationWithAnnotationAsParameter() throws Exception {
     @Test
     public void testAnnotationWithDefaultValues() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         final String[] expected = {
             "114:11: " + getCheckMessage(MSG_KEY, "expected", "Test"),
@@ -200,7 +200,7 @@ public void testAnnotationWithDefaultValues() throws Exception {
     @Test
     public void testFullAnnotationClasspath() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(ForbidAnnotationElementValueCheck.class);
+                createModuleConfig(ForbidAnnotationElementValueCheck.class);
 
         checkConfig.addAttribute("annotationName", "SuppressWarnings");
         checkConfig.addAttribute("elementName", "value");

diff --git a/...m/github/sevntu/checkstyle/checks/annotation/RequiredParameterForAnnotationCheckTest.java b/...m/github/sevntu/checkstyle/checks/annotation/RequiredParameterForAnnotationCheckTest.java
@@ -33,7 +33,7 @@ public class RequiredParameterForAnnotationCheckTest extends BaseCheckTestSuppor
     public void testValidateRequiredParameter()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(RequiredParameterForAnnotationCheck.class);
+                createModuleConfig(RequiredParameterForAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationName", "testAnnotation1");
         checkConfig.addAttribute("requiredParameters", "firstParameter");
@@ -53,7 +53,7 @@ public void testValidateRequiredParameter()
     public void testMultipleProperties1()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(RequiredParameterForAnnotationCheck.class);
+                createModuleConfig(RequiredParameterForAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationName", "testAnnotation1");
         checkConfig.addAttribute("requiredParameters",
@@ -93,7 +93,7 @@ public void testMultipleProperties1()
     public void testMultipleProperties2()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(RequiredParameterForAnnotationCheck.class);
+                createModuleConfig(RequiredParameterForAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationName", "testAnnotation1");
         checkConfig.addAttribute("requiredParameters", "firstParameter,secondParameter");
@@ -122,7 +122,7 @@ public void testMultipleProperties2()
     public void testForAnnotationWithCanonicalName()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(RequiredParameterForAnnotationCheck.class);
+                createModuleConfig(RequiredParameterForAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationName", "com.github.sevntu.checkstyle.checks"
                 + ".annotation.InputRequiredParameterForAnnotationCheck.testAnnotation2");
@@ -152,7 +152,7 @@ public void testForAnnotationWithCanonicalName()
     public void testMultipleParametersForAnnotationWithCanonicalName()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(RequiredParameterForAnnotationCheck.class);
+                createModuleConfig(RequiredParameterForAnnotationCheck.class);
 
         checkConfig.addAttribute("annotationName", "com.github.sevntu.checkstyle.checks"
                 + ".annotation.InputRequiredParameterForAnnotationCheck.testAnnotation2");

diff --git a/...thub/sevntu/checkstyle/checks/coding/AvoidConstantAsFirstOperandInConditionCheckTest.java b/...thub/sevntu/checkstyle/checks/coding/AvoidConstantAsFirstOperandInConditionCheckTest.java
@@ -31,7 +31,7 @@ public class AvoidConstantAsFirstOperandInConditionCheckTest extends BaseCheckTe
     @Test
     public void testAll() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
+                createModuleConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
         final String[] expected = {
             "24: " + getCheckMessage(MSG_KEY, "=="),
             "25: " + getCheckMessage(MSG_KEY, "=="),
@@ -69,7 +69,7 @@ public void testAll() throws Exception {
     @Test
     public void testAttributes() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
+                createModuleConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
         checkConfig.addAttribute("targetConstantTypes", "LITERAL_FALSE,NUM_INT,NUM_FLOAT");
         final String[] expected = {
             "25: " + getCheckMessage(MSG_KEY, "=="),
@@ -84,7 +84,7 @@ public void testAttributes() throws Exception {
     @Test
     public void testNullProperties() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
+                createModuleConfig(AvoidConstantAsFirstOperandInConditionCheck.class);
 
         checkConfig.addAttribute("targetConstantTypes", null);
 

diff --git a/...thub/sevntu/checkstyle/checks/coding/AvoidDefaultSerializableInInnerClassesCheckTest.java b/...thub/sevntu/checkstyle/checks/coding/AvoidDefaultSerializableInInnerClassesCheckTest.java
@@ -34,7 +34,7 @@ public class AvoidDefaultSerializableInInnerClassesCheckTest extends
     public void testWithAllowPartiaFalse()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
+                createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
 
         final String[] expected = {
             "33: " + warningMessage,
@@ -61,7 +61,7 @@ public void testWithAllowPartiaFalse()
     public void testPrivateNotRealReadObject()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
+                createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
         checkConfig.addAttribute("allowPartialImplementation", "true");
 
         final String[] expected = {
@@ -76,7 +76,7 @@ public void testPrivateNotRealReadObject()
     public void testRealReadObjectNotRealReadObjectRealPrivate()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
+                createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
 
         final String[] expected = {};
 
@@ -88,7 +88,7 @@ public void testRealReadObjectNotRealReadObjectRealPrivate()
     public void testWithAllowPartiaTrue()
             throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
+                createModuleConfig(AvoidDefaultSerializableInInnerClassesCheck.class);
         checkConfig.addAttribute("allowPartialImplementation", "true");
         final String[] expected = {
             "33: " + warningMessage,

diff --git a/...t/java/com/github/sevntu/checkstyle/checks/coding/AvoidHidingCauseExceptionCheckTest.java b/...t/java/com/github/sevntu/checkstyle/checks/coding/AvoidHidingCauseExceptionCheckTest.java
@@ -32,7 +32,7 @@ public class AvoidHidingCauseExceptionCheckTest extends BaseCheckTestSupport {
     @Test
     public final void issue52Test() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidHidingCauseExceptionCheck.class);
+                createModuleConfig(AvoidHidingCauseExceptionCheck.class);
 
         final String[] expected = {};
 
@@ -42,7 +42,7 @@ public final void issue52Test() throws Exception {
     @Test
     public final void test() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidHidingCauseExceptionCheck.class);
+                createModuleConfig(AvoidHidingCauseExceptionCheck.class);
 
         final String[] expected = {
             "18:13: " + getCheckMessage(MSG_KEY, "e"),
@@ -69,7 +69,7 @@ public final void test() throws Exception {
     @Test
     public final void testWrappingException() throws Exception {
         final DefaultConfiguration checkConfig =
-                createCheckConfig(AvoidHidingCauseExceptionCheck.class);
+                createModuleConfig(AvoidHidingCauseExceptionCheck.class);
 
         verify(checkConfig, getPath("InputAvoidHidingCauseExceptionCheckWrapping.java"),
                 CommonUtils.EMPTY_STRING_ARRAY);