Issue checkstyle#3931: Split and Organize Checkstyle inputs by Test f…

…or NoWhitespaceAfter - completed
Kietzmann · Apr 12, 2017 · 93985ce · 93985ce
1 parent d876c65
commit 93985ce
Show file tree

Hide file tree

Showing 8 changed files with 319 additions and 28 deletions.
diff --git a/...st/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java b/...st/java/com/puppycrawl/tools/checkstyle/checks/whitespace/NoWhitespaceAfterCheckTest.java
@@ -42,7 +42,9 @@ public class NoWhitespaceAfterCheckTest
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "whitespace" + File.separator + filename);
+                + "whitespace" + File.separator
+                + "nowhitespaceafter" + File.separator
+                + filename);
     }
 
     @Override
@@ -73,7 +75,7 @@ public void testDefault() throws Exception {
             "136:12: " + getCheckMessage(MSG_KEY, "."),
             "264:2: " + getCheckMessage(MSG_KEY, "."),
         };
-        verify(checkConfig, getPath("InputWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputNoWhitespaceAfterWhitespace.java"), expected);
     }
 
     @Test
@@ -84,7 +86,7 @@ public void testDotAllowLineBreaks() throws Exception {
             "129:24: " + getCheckMessage(MSG_KEY, "."),
             "136:12: " + getCheckMessage(MSG_KEY, "."),
         };
-        verify(checkConfig, getPath("InputWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputNoWhitespaceAfterWhitespace.java"), expected);
     }
 
     @Test
@@ -95,7 +97,7 @@ public void testTypecast() throws Exception {
             "89:23: " + getCheckMessage(MSG_KEY, ")"),
             "241:22: " + getCheckMessage(MSG_KEY, ")"),
         };
-        verify(checkConfig, getPath("InputWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputNoWhitespaceAfterWhitespace.java"), expected);
     }
 
     @Test
@@ -184,7 +186,7 @@ public void testSynchronized() throws Exception {
 
     @Test
     public void testNpe() throws Exception {
-        verify(checkConfig, getPath("InputNoWhiteSpaceAfterFormerNpe.java"));
+        verify(checkConfig, getPath("InputNoWhitespaceAfterFormerNpe.java"));
     }
 
     @Test

diff --git a/...es/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterFormerNpe.java b/...es/com/puppycrawl/tools/checkstyle/checks/whitespace/InputNoWhiteSpaceAfterFormerNpe.java
diff --git a/...utNoWhitespaceAfterArrayDeclarations.java → ...utNoWhitespaceAfterArrayDeclarations.java b/...utNoWhitespaceAfterArrayDeclarations.java → ...utNoWhitespaceAfterArrayDeclarations.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
 
 public class InputNoWhitespaceAfterArrayDeclarations
 {

diff --git a/...tNoWhitespaceAfterArrayDeclarations2.java → ...tNoWhitespaceAfterArrayDeclarations2.java b/...tNoWhitespaceAfterArrayDeclarations2.java → ...tNoWhitespaceAfterArrayDeclarations2.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
 
 import java.util.List;
 
@@ -9,28 +9,28 @@ public class InputNoWhitespaceAfterArrayDeclarations2
 
     public class A {
         public int[][] create(int i, int j) {
-            return new int[3] [3];//incorrect, 12:30 
+            return new int[3] [3];//incorrect, 12:30
         }
     }
-    
+
     public class B {
         public int create(int i, int j) [][] {//incorrect, 17:40
             return new int     [3][i + j] ;//incorrect,18:27
         }
     }
-    
+
     public class C {
         public int[][] create(int i, int j) {
             return new int[i + j][i + j];//correct
         }
     }
-    
+
     public class D {
         public int[][]   [] create(int i, int j) {//incorrect, 29:23
             return new int  [ i + j ]    [ i + j ]               [ 0 ]     ;//incorrect 30:27,38,51
         }
     }
-    
+
     public class E {
         public int create(int i, int j, int   [][] k)[] [][] {//incorrect, 35:44,56
             int e [][] [] = new int[i + j] [2][i + j];//incorrect, 36:18,23,43
@@ -63,23 +63,23 @@ public List<Integer> create(int i, int j)     []      [][] {//incorrect, 62:46,5
             return null;
         }
     }
-    
+
     Object someStuff4 = boolean [].class;//incorrect, 67:32
     String[][] someStuff5 = new String[4][9];
     String[][] someStuff6 = (java.lang.String  []  []) someStuff5;//incorrect, 69:46,50
     String[][] someStuff7 = (String [][]) someStuff5;//incorrect, 70:36
-    
-    //this is legal until allowLineBreaks is set to false 
+
+    //this is legal until allowLineBreaks is set to false
     int someStuff8
     [];
-    
+
     //this is legal until allowLineBreaks is set to false
     int[]
     someStuff81;
-    
+
     //incorrect 81:40
     Integer someStuff9[][][] = (Integer [][][]) InputNoWhitespaceAfterArrayDeclarations2.F.create(1,2);
-    
+
     //type arguments
     List<char[]> someStuff10;//correct
     List<char [][]> someStuff11;//incorrect 85:14

diff --git a/...tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterFormerNpe.java b/...tools/checkstyle/checks/whitespace/nowhitespaceafter/InputNoWhitespaceAfterFormerNpe.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
+
+public class InputNoWhitespaceAfterFormerNpe
+{
+    private int[] getSome() {
+        return new int[4];
+    }
+}
diff --git a/...pace/InputNoWhitespaceAfterMethodRef.java → ...fter/InputNoWhitespaceAfterMethodRef.java b/...pace/InputNoWhitespaceAfterMethodRef.java → ...fter/InputNoWhitespaceAfterMethodRef.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
 
 import java.util.function.Function;
 import java.util.function.IntFunction;

diff --git a/...e/InputNoWhitespaceAfterSynchronized.java → ...r/InputNoWhitespaceAfterSynchronized.java b/...e/InputNoWhitespaceAfterSynchronized.java → ...r/InputNoWhitespaceAfterSynchronized.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.nowhitespaceafter;
 
 class InputNoWhitespaceAfterSynchronized {
     void method2()