Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Issue #4431: Modified ModifierOrderCheckTest.java and moved its input…
… files to the modifierorder subdirectory
- Loading branch information
Showing
6 changed files
with
178 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 0 additions & 9 deletions
9
src/test/resources/com/puppycrawl/tools/checkstyle/checks/modifier/InputModifier2.java
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
...utModifierOrderAnnotationDeclaration.java → ...utModifierOrderAnnotationDeclaration.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
...rawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderDefaultMethods.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder; | ||
| import java.util.Comparator; | ||
|
|
||
| public interface InputModifierOrderDefaultMethods extends Comparator<Integer> { | ||
| @Override | ||
| default int compare(Integer a, Integer b) { | ||
| return 0; | ||
| } | ||
| } |
160 changes: 160 additions & 0 deletions
160
...s/com/puppycrawl/tools/checkstyle/checks/modifier/modifierorder/InputModifierOrderIt.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
| // Test case file for checkstyle. | ||
| // Created: 2001 | ||
| //////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| package com.puppycrawl.tools.checkstyle.checks.modifier.modifierorder; | ||
|
|
||
| /** | ||
| * Test case for Modifier checks: | ||
| * - order of modifiers | ||
| * - use of 'public' in interface definition | ||
| * @author lkuehne | ||
| */ | ||
| strictfp final class InputModifierOrderIt // illegal order of modifiers for class | ||
| { | ||
|
|
||
| /** Illegal order of modifiers for variables */ | ||
| static private boolean sModifierOrderVar = false; | ||
|
|
||
| /** | ||
| * Illegal order of modifiers for methods. Make sure that the | ||
| * first and last modifier from the JLS sequence is used. | ||
| */ | ||
| strictfp private void doStuff() | ||
| { | ||
| } | ||
|
|
||
| /** Single annotation without other modifiers */ | ||
| @MyAnnotation2 void someMethod() | ||
| { | ||
| } | ||
|
|
||
| /** Illegal order of annotation - must come first */ | ||
| private @MyAnnotation2 void someMethod2() | ||
| { | ||
| } | ||
|
|
||
| /** Annotation in middle of other modifiers otherwise in correct order */ | ||
| private @MyAnnotation2 strictfp void someMethod3() | ||
| { | ||
| } | ||
|
|
||
| /** Correct order */ | ||
| @MyAnnotation2 private strictfp void someMethod4() | ||
| { | ||
| } | ||
|
|
||
| /** Annotation in middle of other modifiers otherwise in correct order */ | ||
| @MyAnnotation2 private static @MyAnnotation4 strictfp void someMethod5() | ||
| { | ||
| } | ||
|
|
||
| /** holder for redundant 'public' modifier check. */ | ||
| public static interface InputRedundantPublicModifier // violation | ||
| { | ||
| /** redundant 'public' modifier */ | ||
| public void a(); // violation | ||
|
|
||
| /** all OK */ | ||
| void b(); | ||
|
|
||
| /** redundant abstract modifier */ | ||
| abstract void c(); // violation | ||
|
|
||
| /** redundant 'public' modifier */ | ||
| public float PI_PUBLIC = (float) 3.14; // violation | ||
|
|
||
| /** redundant 'abstract' modifier (field can not be abstract) */ | ||
| // abstract float PI_ABSTRACT = (float) 3.14; | ||
|
|
||
| /** redundant 'final' modifier */ | ||
| final float PI_FINAL = (float) 3.14; // violation | ||
|
|
||
| /** all OK */ | ||
| float PI_OK = (float) 3.14; | ||
| } | ||
|
|
||
| /** redundant 'final' modifier */ | ||
| private final void method() // violation | ||
| { | ||
| } | ||
| } | ||
|
|
||
| /** Holder for redundant 'final' check. */ | ||
| final class RedundantFinalClass | ||
| { | ||
| /** redundant 'final' modifier */ | ||
| public final void finalMethod() // violation | ||
| { | ||
| } | ||
|
|
||
| /** OK */ | ||
| public void method() | ||
| { | ||
| } | ||
| } | ||
|
|
||
| /** Holder for redundant modifiers of inner implementation */ | ||
| abstract interface InnerImplementation // violation | ||
| { | ||
| InnerImplementation inner = | ||
| new InnerImplementation() | ||
| { | ||
| /** compiler requires 'public' modifier */ | ||
| public void method() | ||
| { | ||
| } | ||
| }; | ||
|
|
||
| void method(); | ||
| } | ||
|
|
||
| /** Holder for redundant modifiers of annotation fields/variables */ | ||
| @interface Annotation | ||
| { | ||
| public String s1 = ""; // violation | ||
| final String s2 = ""; // violation | ||
| static String s3 = ""; // violation | ||
| String s4 = ""; | ||
| public String blah(); // violation | ||
| abstract String blah2(); // violation | ||
| } | ||
|
|
||
| @interface MyAnnotation2 { | ||
| } | ||
|
|
||
| @interface MyAnnotation4 { | ||
| } | ||
|
|
||
| class SafeVarargsUsage { | ||
| @Deprecated | ||
| @SafeVarargs | ||
| private final void foo(int... k) {} | ||
|
|
||
| @Deprecated | ||
| @SafeVarargs | ||
| @SuppressWarnings("") | ||
| private final void foo1(Object... obj) {} | ||
| } | ||
|
|
||
| enum TestEnum { | ||
| ; | ||
|
|
||
| public void method() { | ||
| } | ||
| } | ||
|
|
||
| /** holder for interface specific modifier check. */ | ||
| interface InputDefaultPublicModifier | ||
| { | ||
| /** correct order */ | ||
| default strictfp void a() | ||
| { | ||
| } | ||
|
|
||
| /** wrong order */ | ||
| strictfp default void b() // violation | ||
| { | ||
| } | ||
| } |