Issue #10562: Update inputs for OuterTypeFilenameCheckTest

checkstyle · Aug 5, 2021 · a1338ac · a1338ac
1 parent c350a32
commit a1338ac
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 74 deletions.
diff --git a/config/checkstyle_input_suppressions.xml b/config/checkstyle_input_suppressions.xml
@@ -620,32 +620,6 @@
   <suppress id="ConfigCommentOnTopInputs"
             files="nocodeinfile[\\/]InputNoCodeInFile5.java"/>
 
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename15Extensions.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename1a.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename1.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename2.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename3.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename5.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameCheckPublic.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameIllegalTokens.java"/>
-
-  <suppress id="ConfigCommentOnTopInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameNoPublic.java"/>
 
   <suppress id="ConfigCommentOnTopInputs"
             files="packagenamesloader[\\/]InputPackageNamesLoaderNotXml.java"/>
@@ -1296,32 +1270,6 @@
   <suppress id="StyleValidationCommentInInputs"
             files="nocodeinfile[\\/]InputNoCodeInFile5.java"/>
 
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename15Extensions.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename1a.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename1.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename2.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename3.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilename5.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameCheckPublic.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameIllegalTokens.java"/>
-
-  <suppress id="StyleValidationCommentInInputs"
-            files="outertypefilename[\\/]InputOuterTypeFilenameNoPublic.java"/>
 
   <suppress id="StyleValidationCommentInInputs"
             files="packagenamesloader[\\/]InputPackageNamesLoaderNotXml.java"/>

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java
@@ -91,7 +91,7 @@ public void testNestedClass() throws Exception {
     public void testNestedClass2() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
         final String[] expected = {
-            "3:1: " + getCheckMessage(MSG_KEY),
+            "9:1: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputOuterTypeFilename1a.java"), expected);
     }
@@ -114,7 +114,7 @@ public void testPublicClassIsNotFirst() throws Exception {
     public void testNoPublicClasses() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
         final String[] expected = {
-            "3:1: " + getCheckMessage(MSG_KEY),
+            "9:1: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputOuterTypeFilenameNoPublic.java"), expected);
     }
@@ -130,7 +130,7 @@ public void testFineDefault() throws Exception {
     public void testWrongDefault() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
         final String[] expected = {
-            "4:2: " + getCheckMessage(MSG_KEY),
+            "10:2: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig, getPath("InputOuterTypeFilename5.java"), expected);
     }
@@ -149,18 +149,19 @@ public void testOuterTypeFilenameRecords() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
 
         final String[] expected = {
-            "7:1: " + getCheckMessage(MSG_KEY),
+            "10:1: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig,
-                getNonCompilablePath("InputOuterTypeFilenameRecord.java"), expected);
+                getNonCompilablePath("InputOuterTypeFilenameRecordMethodRecordDef.java"),
+                expected);
     }
 
     @Test
     public void testOuterTypeFilenameRecordsMethodRecordDef() throws Exception {
         final DefaultConfiguration checkConfig = createModuleConfig(OuterTypeFilenameCheck.class);
 
         final String[] expected = {
-            "7:1: " + getCheckMessage(MSG_KEY),
+            "10:1: " + getCheckMessage(MSG_KEY),
         };
         verify(checkConfig,
                 getNonCompilablePath("InputOuterTypeFilenameRecord.java"), expected);

diff --git a/...om/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecord.java b/...om/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecord.java
@@ -1,8 +1,11 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 //non-compiled with javac: contains different class name by demand of test
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-/* Config:
- * default
- */
 public record IncorrectName1(int x, int y, String str) { // violation
 }
diff --git a/...ools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecordMethodRecordDef.java b/...ools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecordMethodRecordDef.java
@@ -1,9 +1,12 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 //non-compiled with javac: contains different class name by demand of test
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-/* Config:
- * default
- */
 public record IncorrectName2(int x, int y, String str) { // violation
     class LocalRecordHelper {
         Record recordMethod(int x) {

diff --git a/...-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java b/...-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java
@@ -1,3 +1,9 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 @Deprecated
-package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
+package com.puppycrawl.tools.checkstyle.checks.outertypefilename; // ok
 
diff --git a/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java b/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilename1 {
+public class InputOuterTypeFilename1 { // ok
 
     public class UnicClassName {
 

diff --git a/...pycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java b/...pycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-@interface MyAnnotation1 {
+@interface MyAnnotation1 { // ok
     String name();
     int version();
 }

diff --git a/...es/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1a.java b/...es/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1a.java
@@ -1,6 +1,12 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class Class1 {
+class Class1 { // violation
     public interface NestedInterface {}
     public enum NestedEnum {}
     class NestedClass {}

diff --git a/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java b/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilename2 {
+public class InputOuterTypeFilename2 { // ok
 
 
 }
diff --git a/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java b/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class InputOuterTypeFilename3 {
+class InputOuterTypeFilename3 { // ok
 
 
 }
diff --git a/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename5.java b/...ces/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename5.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
- class InputOuterTypeFilename5NameMismatch {
+ class InputOuterTypeFilename5NameMismatch { // violation
 
 
 }
diff --git a/...ppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java b/...ppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java
@@ -1,7 +1,13 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 // someexamples of 1.5 extensions
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class UnicClassName {
+class UnicClassName { // ok
 
 }
 

diff --git a/...ycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java b/...ycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java
@@ -1,6 +1,12 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-public class InputOuterTypeFilenameIllegalTokens
+public class InputOuterTypeFilenameIllegalTokens // ok
 {
     public void methodWithPreviouslyIllegalTokens()
     {

diff --git a/.../puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameNoPublic.java b/.../puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameNoPublic.java
@@ -1,4 +1,10 @@
+/*
+OuterTypeFilename
+
+
+*/
+
 package com.puppycrawl.tools.checkstyle.checks.outertypefilename;
 
-class Foo {}
+class Foo {} // violation
 enum FooEnum {}