Correct all tests that introspect classpath for Vaadin classes.

Fixes vaadin/framework8-issues#399
RemoveListenersDeprecatedTest test is fixed.
Corrections are made to make the test above passes.

Change-Id: I209a4693d241a1488b69b4742f48549dbf4bf0ac

compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java

@@ -57,6 +57,7 @@
 import com.vaadin.server.KeyMapper;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.MouseEventDetails;
+import com.vaadin.shared.Registration;
 import com.vaadin.shared.data.sort.SortDirection;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.AbstractFocusable;
@@ -89,9 +90,9 @@
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.data.util.converter.ConverterUtil;
 import com.vaadin.v7.event.ItemClickEvent;
-import com.vaadin.v7.event.SelectionEvent;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.v7.event.ItemClickEvent.ItemClickNotifier;
+import com.vaadin.v7.event.SelectionEvent;
 import com.vaadin.v7.event.SelectionEvent.SelectionListener;
 import com.vaadin.v7.event.SelectionEvent.SelectionNotifier;
 import com.vaadin.v7.server.communication.data.DataGenerator;
@@ -6155,8 +6156,10 @@ private void sort(boolean userOriginated) {
      *            the sort order change listener to add
      */
     @Override
-    public void addSortListener(SortListener listener) {
+    public Registration addSortListener(SortListener listener) {
         addListener(SortEvent.class, listener, SORT_ORDER_CHANGE_METHOD);
+        return () -> removeListener(SortEvent.class, listener,
+                SORT_ORDER_CHANGE_METHOD);
     }
 
     /**

compatibility-server/src/test/java/com/vaadin/tests/server/ComponentDesignWriterUtility.java

@@ -73,6 +73,8 @@ public class ComponentDesignWriterUtility {
                 "com.vaadin.server.communication.PushAtmosphereHandler$AtmosphereResourceListener");
         WHITE_LIST_FQNS
                 .add("com.vaadin.server.communication.PushAtmosphereHandler");
+        WHITE_LIST_FQNS
+                .add("com.vaadin.server.communication.PushRequestHandler$1");
         WHITE_LIST_FQNS
                 .add("com.vaadin.server.communication.PushRequestHandler$2");
         WHITE_LIST_FQNS.add("com.vaadin.server.LegacyVaadinPortlet");

compatibility-server/src/test/java/com/vaadin/tests/server/DeprecatedTest.java

@@ -34,7 +34,7 @@ public void allTypesAreDeprecated() throws URISyntaxException {
 
         File testRoot = new File(DeprecatedTest.class.getResource("/").toURI());
 
-        new ClasspathHelper(fqn -> false)
+        new ClasspathHelper()
                 .getVaadinClassesFromClasspath(
                         entry -> entry.contains("compatibility-server")
                                 && !testRoot.equals(new File(entry)))
@@ -45,7 +45,8 @@ public void allTypesAreDeprecated() throws URISyntaxException {
                                     + " is in compatability package and it's not deprecated",
                             cls.getAnnotation(Deprecated.class));
                 });
-        Assert.assertNotEquals("Total number of checked classes", 0, count.get());
+        Assert.assertNotEquals("Total number of checked classes", 0,
+                count.get());
     }
 
 }

compatibility-server/src/test/java/com/vaadin/v7/tests/VaadinClasses.java

@@ -1,31 +1,65 @@
 package com.vaadin.v7.tests;
 
-import java.io.IOException;
+import java.io.File;
+import java.lang.reflect.Modifier;
+import java.net.URISyntaxException;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import com.vaadin.tests.server.ClasspathHelper;
 import com.vaadin.ui.Component;
 import com.vaadin.v7.ui.Field;
 
 @SuppressWarnings("deprecation")
 public class VaadinClasses {
 
+    private static final Set<String> WHITE_LIST_FQNS = new HashSet<>();
+
     public static List<Class<? extends Field>> getFields() {
+        return getServerClasses(Field.class::isAssignableFrom)
+                .map(VaadinClasses::castFieldClass)
+                .collect(Collectors.toList());
+    }
+
+    public static Stream<Class<?>> getServerClasses(
+            Predicate<? super Class<?>> predicate) {
         try {
-            return com.vaadin.tests.VaadinClasses.findClasses(Field.class,
-                    "com.vaadin.v7.ui");
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
+            File testRoot = new File(com.vaadin.tests.VaadinClasses.class
+                    .getResource("/").toURI());
+            File compatibilityTestRoot = new File(
+                    VaadinClasses.class.getResource("/").toURI());
+            ClasspathHelper helper = new ClasspathHelper(
+                    fqn -> !fqn.startsWith("com.vaadin.v7.ui"));
+            return helper.getVaadinClassesFromClasspath(
+                    entry -> !compatibilityTestRoot.equals(new File(entry))
+                            && !testRoot.equals(new File(entry)),
+                    cls -> predicate.test(cls) && !cls.isInterface()
+                            && !Modifier.isAbstract(cls.getModifiers()));
+        } catch (URISyntaxException e) {
+            throw new RuntimeException(e);
         }
     }
 
     public static List<Class<? extends Component>> getComponents() {
-        try {
-            return com.vaadin.tests.VaadinClasses.findClasses(Component.class,
-                    "com.vaadin.v7.ui");
-        } catch (IOException e) {
-            throw new RuntimeException(
-                    "Could not find all Vaadin component classes", e);
-        }
+        return getServerClasses(Component.class::isAssignableFrom)
+                .map(VaadinClasses::castComponentClass)
+                .collect(Collectors.toList());
+    }
+
+    private static Class<? extends Field> castFieldClass(Class<?> clazz) {
+        return (Class<? extends Field>) clazz;
+    }
+
+    private static Class<? extends Component> castComponentClass(
+            Class<?> clazz) {
+        return (Class<? extends Component>) clazz;
+    }
+
+    protected static Set<String> getWhiteListFqns() {
+        return WHITE_LIST_FQNS;
     }
 }

compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/FieldDefaultValuesTest.java

@@ -21,9 +21,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.vaadin.ui.Slider;
 import com.vaadin.v7.tests.VaadinClasses;
 import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.Slider;
 
 public class FieldDefaultValuesTest {
 
@@ -45,7 +45,9 @@ public void testFieldsHaveDefaultValueAfterClear() throws Exception {
 
     @Test
     public void testFieldsAreEmptyAfterClear() throws Exception {
+        int count = 0;
         for (Field<?> field : createFields()) {
+            count++;
             field.clear();
 
             if (field instanceof Slider) {
@@ -60,12 +62,13 @@ public void testFieldsAreEmptyAfterClear() throws Exception {
                         field.isEmpty());
             }
         }
+        Assert.assertTrue(count > 0);
     }
 
     @SuppressWarnings("rawtypes")
     private static List<Field<?>> createFields()
             throws InstantiationException, IllegalAccessException {
-        List<Field<?>> fieldInstances = new ArrayList<Field<?>>();
+        List<Field<?>> fieldInstances = new ArrayList<>();
 
         for (Class<? extends Field> fieldType : VaadinClasses.getFields()) {
             fieldInstances.add(fieldType.newInstance());

server/src/main/java/com/vaadin/event/MethodEventSource.java

@@ -141,7 +141,10 @@ public Registration addListener(Class<?> eventType, Object object,
      * @param method
      *            the method owned by the target that's registered to listen to
      *            events of type eventType.
+     * @deprecated use a {@link Registration} returned by
+     *             {@link #addListener(Class, Object, Method)}
      */
+    @Deprecated
     public void removeListener(Class<?> eventType, Object target,
             Method method);
 
@@ -172,7 +175,10 @@ public void removeListener(Class<?> eventType, Object target,
      * @param methodName
      *            the name of the method owned by <code>target</code> that's
      *            registered to listen to events of type <code>eventType</code>.
+     * @deprecated use a {@link Registration} returned by
+     *             {@link #addListener(Class, Object, String)}
      */
+    @Deprecated
     public void removeListener(Class<?> eventType, Object target,
             String methodName);
 }

server/src/main/java/com/vaadin/event/SortEvent.java

@@ -19,6 +19,7 @@
 import java.util.List;
 
 import com.vaadin.data.sort.SortOrder;
+import com.vaadin.shared.Registration;
 import com.vaadin.ui.Component;
 
 /**
@@ -95,16 +96,20 @@ public interface SortNotifier extends Serializable {
          *
          * @param listener
          *            the sort order change listener to add
+         * @return a registration object for removing the listener
          */
-        public void addSortListener(SortListener listener);
+        public Registration addSortListener(SortListener listener);
 
         /**
          * Removes a sort order change listener previously added using
          * {@link #addSortListener(SortListener)}.
          *
          * @param listener
          *            the sort order change listener to remove
+         * @deprecated use a {@link Registration} returned by
+         *             {@link #addSortListener(SortListener)}
          */
+        @Deprecated
         public void removeSortListener(SortListener listener);
     }
 }

server/src/main/java/com/vaadin/navigator/Navigator.java

@@ -41,6 +41,7 @@
 import com.vaadin.server.Page;
 import com.vaadin.server.Page.UriFragmentChangedEvent;
 import com.vaadin.server.Page.UriFragmentChangedListener;
+import com.vaadin.shared.Registration;
 import com.vaadin.shared.util.SharedUtil;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.ComponentContainer;
@@ -345,7 +346,7 @@ public View getView(String viewName) {
                     throw new RuntimeException(e);
                 }
                 // TODO error handling
-                
+
             }
             return null;
         }
@@ -975,16 +976,21 @@ public void setErrorProvider(ViewProvider provider) {
      * @param listener
      *            Listener to invoke during a view change.
      */
-    public void addViewChangeListener(ViewChangeListener listener) {
+    public Registration addViewChangeListener(ViewChangeListener listener) {
         listeners.add(listener);
+        return () -> listeners.remove(listener);
     }
 
     /**
      * Removes a view change listener.
      *
      * @param listener
      *            Listener to remove.
+     * @deprecated use a {@link Registration} object returned by
+     *             {@link #addViewChangeListener(ViewChangeListener)} to remove
+     *             a listener
      */
+    @Deprecated
     public void removeViewChangeListener(ViewChangeListener listener) {
         listeners.remove(listener);
     }

server/src/main/java/com/vaadin/server/AbstractClientConnector.java

@@ -103,6 +103,7 @@ public Registration addAttachListener(AttachListener listener) {
     }
 
     @Override
+    @Deprecated
     public void removeAttachListener(AttachListener listener) {
         removeListener(AttachEvent.ATTACH_EVENT_IDENTIFIER, AttachEvent.class,
                 listener);
@@ -115,6 +116,7 @@ public Registration addDetachListener(DetachListener listener) {
     }
 
     @Override
+    @Deprecated
     public void removeDetachListener(DetachListener listener) {
         removeListener(DetachEvent.DETACH_EVENT_IDENTIFIER, DetachEvent.class,
                 listener);
@@ -940,8 +942,12 @@ public void removeListener(Class<?> eventType, Object target) {
      * @param method
      *            the method owned by <code>target</code> that's registered to
      *            listen to events of type <code>eventType</code>.
+     * @deprecated use a {@link Registration} from
+     *             {@link #addListener(Class, Object, Method)} to remove a
+     *             listener
      */
     @Override
+    @Deprecated
     public void removeListener(Class<?> eventType, Object target,
             Method method) {
         if (eventRouter != null) {

server/src/main/java/com/vaadin/server/VaadinPortletSession.java

@@ -42,6 +42,7 @@
 import javax.xml.namespace.QName;
 
 import com.vaadin.server.communication.PortletListenerNotifier;
+import com.vaadin.shared.Registration;
 import com.vaadin.ui.UI;
 import com.vaadin.util.CurrentInstance;
 
@@ -123,8 +124,9 @@ public PortletConfig getPortletConfig() {
      * @param listener
      *            to add
      */
-    public void addPortletListener(PortletListener listener) {
+    public Registration addPortletListener(PortletListener listener) {
         portletListeners.add(listener);
+        return () -> portletListeners.remove(listener);
     }
 
     /**
@@ -133,7 +135,11 @@ public void addPortletListener(PortletListener listener) {
      *
      * @param listener
      *            to remove
+     * @deprecated Use a {@link Registration} object returned by
+     *             {@link #addPortletListener(PortletListener)} to remove a
+     *             listener
      */
+    @Deprecated
     public void removePortletListener(PortletListener listener) {
         portletListeners.remove(listener);
     }
@@ -143,8 +149,7 @@ public void removePortletListener(PortletListener listener) {
      */
     public void firePortletRenderRequest(UI uI, RenderRequest request,
             RenderResponse response) {
-        for (PortletListener l : new ArrayList<>(
-                portletListeners)) {
+        for (PortletListener l : new ArrayList<>(portletListeners)) {
             l.handleRenderRequest(request,
                     new RestrictedRenderResponse(response), uI);
         }
@@ -172,8 +177,7 @@ public void firePortletActionRequest(UI uI, ActionRequest request,
             sharedParameterActionValueMap.remove(key);
         } else {
             // normal action request, notify listeners
-            for (PortletListener l : new ArrayList<>(
-                    portletListeners)) {
+            for (PortletListener l : new ArrayList<>(portletListeners)) {
                 l.handleActionRequest(request, response, uI);
             }
         }
@@ -184,8 +188,7 @@ public void firePortletActionRequest(UI uI, ActionRequest request,
      */
     public void firePortletEventRequest(UI uI, EventRequest request,
             EventResponse response) {
-        for (PortletListener l : new ArrayList<>(
-                portletListeners)) {
+        for (PortletListener l : new ArrayList<>(portletListeners)) {
             l.handleEventRequest(request, response, uI);
         }
     }
@@ -195,8 +198,7 @@ public void firePortletEventRequest(UI uI, EventRequest request,
      */
     public void firePortletResourceRequest(UI uI, ResourceRequest request,
             ResourceResponse response) {
-        for (PortletListener l : new ArrayList<>(
-                portletListeners)) {
+        for (PortletListener l : new ArrayList<>(portletListeners)) {
             l.handleResourceRequest(request, response, uI);
         }
     }