diff --git a/config/checkstyle_input_suppressions.xml b/config/checkstyle_input_suppressions.xml index b14039b891b..9390255c62d 100644 --- a/config/checkstyle_input_suppressions.xml +++ b/config/checkstyle_input_suppressions.xml @@ -620,32 +620,6 @@ - - - - - - - - - - - - - - - - - @@ -1296,32 +1270,6 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/OuterTypeFilenameCheckTest.java index 297b1437b02..935108fd2bd 100644 --- 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,10 +149,11 @@ 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 @@ -160,7 +161,7 @@ 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/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecord.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecord.java index bbb2584b485..b40cb083b4c 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecord.java +++ b/src/test/resources-noncompilable/com/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/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecordMethodRecordDef.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecordMethodRecordDef.java index e707ddc19e4..1a13edc9447 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameRecordMethodRecordDef.java +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/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/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java index 4e1f852aedc..45e58ebb606 100644 --- a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/outertypefilename/package-info.java +++ b/src/test/resources-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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java index bb5326462d9..091449c362b 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1.java +++ b/src/test/resources/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java index ab9f09f1c4c..c5861669088 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename15Extensions.java +++ b/src/test/resources/com/puppycrawl/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1a.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1a.java index 52bc378b902..b28c0ec1585 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename1a.java +++ b/src/test/resources/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java index 4efa6108c52..6e332089c40 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename2.java +++ b/src/test/resources/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java index c7c771c3379..f10a168aa96 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename3.java +++ b/src/test/resources/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename5.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename5.java index c16116f7da7..eb7fbb09024 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilename5.java +++ b/src/test/resources/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java index 5626b921e88..a2c6f4f2960 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameCheckPublic.java +++ b/src/test/resources/com/puppycrawl/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java index 074466d1cc4..0db8314ca9f 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameIllegalTokens.java +++ b/src/test/resources/com/puppycrawl/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/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameNoPublic.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameNoPublic.java index 9dd7e67e091..def4430686d 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/outertypefilename/InputOuterTypeFilenameNoPublic.java +++ b/src/test/resources/com/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 {}