Issue checkstyle#3958: Modified GenericWhitespaceCheckTest.java and m…

…oved its input files to genericwhitespace subdirectory
Luolc · Mar 14, 2017 · 069bf8e · 069bf8e
1 parent 1e46f09
commit 069bf8e
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 24 deletions.
diff --git a/...st/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java b/...st/java/com/puppycrawl/tools/checkstyle/checks/whitespace/GenericWhitespaceCheckTest.java
@@ -56,13 +56,13 @@ public void setUp() {
     @Override
     protected String getPath(String filename) throws IOException {
         return super.getPath("checks" + File.separator
-                + "whitespace" + File.separator + filename);
+                + "whitespace" + File.separator + "genericwhitespace" + File.separator + filename);
     }
 
     @Override
     protected String getNonCompilablePath(String filename) throws IOException {
         return super.getNonCompilablePath("checks" + File.separator
-                + "whitespace" + File.separator + filename);
+                + "whitespace" + File.separator + "genericwhitespace" + File.separator + filename);
     }
 
     @Test
@@ -105,13 +105,13 @@ public void testDefault() throws Exception {
             "60:60: " + getCheckMessage(MSG_WS_NOT_PRECEDED, "&"),
             "63:60: " + getCheckMessage(MSG_WS_FOLLOWED, ">"),
         };
-        verify(checkConfig, getPath("InputGenericWhitespace.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespaceDefault.java"), expected);
     }
 
     @Test
-    public void testGh47() throws Exception {
+    public void testList() throws Exception {
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputGh47.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespaceList.java"), expected);
     }
 
     @Test
@@ -123,15 +123,15 @@ public void testInnerClass() throws Exception {
     @Test
     public void testMethodReferences() throws Exception {
         final String[] expected = CommonUtils.EMPTY_STRING_ARRAY;
-        verify(checkConfig, getPath("InputMethodReferences3.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespaceMethodRef1.java"), expected);
     }
 
     @Test
     public void testMethodReferences2() throws Exception {
         final String[] expected = {
             "10:70: " + getCheckMessage(MSG_WS_FOLLOWED, ">"),
         };
-        verify(checkConfig, getPath("InputGenericWhitespaceMethodRef.java"), expected);
+        verify(checkConfig, getPath("InputGenericWhitespaceMethodRef2.java"), expected);
     }
 
     @Test

diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGh47.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/InputGh47.java
diff --git a/...ks/whitespace/InputGenericWhitespace.java → ...espace/InputGenericWhitespaceDefault.java b/...ks/whitespace/InputGenericWhitespace.java → ...espace/InputGenericWhitespaceDefault.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.Collections;
-class InputGenericWhitespace implements Comparable<InputGenericWhitespace>, Serializable
+class InputGenericWhitespaceDefault implements Comparable<InputGenericWhitespaceDefault>, Serializable
 {
     void meth()
     {
@@ -17,7 +17,7 @@ void meth()
         List < List < Integer > > b = new ArrayList < List < Integer > > ();
     }
     //always 0
-    public int compareTo(InputGenericWhitespace aObject)
+    public int compareTo(InputGenericWhitespaceDefault aObject)
     {
         return 0;
     }
@@ -43,11 +43,11 @@ public int getConstructor(Class<?>... parameterTypes)
         return 666;
     }
 
-    <T> InputGenericWhitespace(List<T> things, int i)
+    <T> InputGenericWhitespaceDefault(List<T> things, int i)
     {
     }
 
-    public <T> InputGenericWhitespace(List<T> things)
+    public <T> InputGenericWhitespaceDefault(List<T> things)
     {
     }
 

diff --git a/...ce/InputGenericWhitespaceEndsTheLine.java → ...ce/InputGenericWhitespaceEndsTheLine.java b/...ce/InputGenericWhitespaceEndsTheLine.java → ...ce/InputGenericWhitespaceEndsTheLine.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
 public class InputGenericWhitespaceEndsTheLine {
     public boolean returnsGenericObjectAtEndOfLine(Object otherObject) {

diff --git a/...ace/InputGenericWhitespaceInnerClass.java → ...ace/InputGenericWhitespaceInnerClass.java b/...ace/InputGenericWhitespaceInnerClass.java → ...ace/InputGenericWhitespaceInnerClass.java
@@ -1,4 +1,4 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
 import java.util.List;
 

diff --git a/...rawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java b/...rawl/tools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceList.java
@@ -0,0 +1,8 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
+
+import java.util.List;
+
+public class InputGenericWhitespaceList
+{
+    public List<List<String>[]> listOfListOFArrays;
+}
diff --git a/...ools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java b/...ools/checkstyle/checks/whitespace/genericwhitespace/InputGenericWhitespaceMethodRef1.java
@@ -0,0 +1,20 @@
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
+import java.util.function.Supplier;
+public class InputGenericWhitespaceMethodRef1
+{
+  public static class SomeClass {
+    public static class Nested<V> {
+      private Nested() {
+      }
+    }
+  }
+
+  public static class Nested2<V> {
+  }
+
+  public <V> void methodName(V value) {
+    Supplier<?> t = Nested2<V>::new;
+    Supplier<SomeClass.Nested<V>> passes = SomeClass.Nested::new;
+    Supplier<SomeClass.Nested<V>> fails = SomeClass.Nested<V>::new;
+  }
+}
diff --git a/...pace/InputGenericWhitespaceMethodRef.java → ...ace/InputGenericWhitespaceMethodRef2.java b/...pace/InputGenericWhitespaceMethodRef.java → ...ace/InputGenericWhitespaceMethodRef2.java
@@ -1,10 +1,10 @@
-package com.puppycrawl.tools.checkstyle.checks.whitespace;
+package com.puppycrawl.tools.checkstyle.checks.whitespace.genericwhitespace;
 
 import java.util.Optional;
 import java.util.function.Supplier;
 
 
-public class InputGenericWhitespaceMethodRef
+public class InputGenericWhitespaceMethodRef2
 {
     final Supplier<Optional<Integer>> function1 = Optional::<Integer>empty;
     final Supplier<Optional<Integer>> function2 = Optional::<Integer> empty;