Renamed ListenerMethods to AbstractListenerMethodsTest to avoid it being run as a...

svn changeset:18457/svn branch:6.6

diff --git a/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java b/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
index d2e046895629f20ec6a1e371b68854eab843d0b9..2dc0caade3631feb75e4d227d2867bdddf39dcb8 100644 (file)
--- a/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
+++ b/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
@@ -5,9 +5,9 @@ import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;\r
 import com.vaadin.data.Property.ValueChangeListener;\r
 import com.vaadin.data.util.IndexedContainer;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class IndexedContainerListeners extends ListenerMethods {\r
+public class IndexedContainerListeners extends AbstractListenerMethodsTest {\r
     public void testValueChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(IndexedContainer.class,\r
                 ValueChangeEvent.class, ValueChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java b/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
index 0e0192bf1183abdc9526e19d11c2944e69a5c42e..69cbbbfb7cc8b0a2f643a68c344abb5be26839fa 100644 (file)
--- a/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
+++ b/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Item.PropertySetChangeEvent;\r
 import com.vaadin.data.Item.PropertySetChangeListener;\r
 import com.vaadin.data.util.PropertysetItem;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class PropertysetItemListeners extends ListenerMethods {\r
+public class PropertysetItemListeners extends AbstractListenerMethodsTest {\r
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(PropertysetItem.class,\r
                 PropertySetChangeEvent.class, PropertySetChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
index 40b451b5572431fd618d5b6784952d9b2fef3844..ae70757b3ee9718322af1f16433ab837cd106cbb 100644 (file)
--- a/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
+++ b/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.PropertySetChangeEvent;\r
 import com.vaadin.data.Container.PropertySetChangeListener;\r
 import com.vaadin.data.util.BeanItemContainer;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class TestAbstractBeanContainerListeners extends ListenerMethods {\r
+public class TestAbstractBeanContainerListeners extends AbstractListenerMethodsTest {\r
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(BeanItemContainer.class,\r
                 PropertySetChangeEvent.class, PropertySetChangeListener.class,\r

diff --git a/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java b/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
index fdd2de389b18d52fefbc687c579c0cd3cdd237af..d10c5d77911c6afe1b37c9bc4aaaa9f59e26ee82 100644 (file)
--- a/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
+++ b/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
@@ -5,9 +5,9 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;\r
 import com.vaadin.data.Container.PropertySetChangeListener;\r
 import com.vaadin.data.util.IndexedContainer;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class TestAbstractContainerListeners extends ListenerMethods {\r
+public class TestAbstractContainerListeners extends AbstractListenerMethodsTest {\r
 \r
     public void testItemSetChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(IndexedContainer.class,\r

diff --git a/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
index 4ea32c71fb063a4e19b30d50da69047e6b8d3d56..754f152936ce985d4d82ce8fbed25f70717dc035 100644 (file)
--- a/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
+++ b/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
@@ -3,9 +3,9 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.ItemSetChangeEvent;\r
 import com.vaadin.data.Container.ItemSetChangeListener;\r
 import com.vaadin.data.util.IndexedContainer;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class TestAbstractInMemoryContainerListeners extends ListenerMethods {\r
+public class TestAbstractInMemoryContainerListeners extends AbstractListenerMethodsTest {\r
     public void testItemSetChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(IndexedContainer.class,\r
                 ItemSetChangeEvent.class, ItemSetChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java b/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
index dacaedb34132706a918bfb31cf2a7848feb3c937..58dee08643945d6f95965d3fdc9cbe663705ae78 100644 (file)
--- a/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
+++ b/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
@@ -6,9 +6,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;\r
 import com.vaadin.data.util.AbstractProperty;\r
 import com.vaadin.data.util.ObjectProperty;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 \r
-public class TestAbstractPropertyListeners extends ListenerMethods {\r
+public class TestAbstractPropertyListeners extends AbstractListenerMethodsTest {\r
     public void testValueChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(AbstractProperty.class,\r
                 ValueChangeEvent.class, ValueChangeListener.class,\r

diff --git a/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
new file mode 100644 (file)
index 0000000..355f516
--- /dev/null
+++ b/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
@@ -0,0 +1,170 @@
+package com.vaadin.tests.server.component;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import junit.framework.TestCase;
+
+import org.easymock.EasyMock;
+import org.junit.Assert;
+
+import com.vaadin.tests.VaadinClasses;
+import com.vaadin.ui.Component;
+
+public abstract class AbstractListenerMethodsTest extends TestCase {
+
+    public static void main(String[] args) {
+        findAllListenerMethods();
+    }
+
+    private static void findAllListenerMethods() {
+        Set<Class<?>> classes = new HashSet<Class<?>>();
+        for (Class<?> c : VaadinClasses.getAllServerSideClasses()) {
+            while (c != null && c.getName().startsWith("com.vaadin.")) {
+                classes.add(c);
+                c = c.getSuperclass();
+            }
+        }
+
+        for (Class<?> c : classes) {
+            boolean found = false;
+            for (Method m : c.getDeclaredMethods()) {
+                if (m.getName().equals("addListener")) {
+                    if (m.getParameterTypes().length != 1) {
+                        continue;
+                    }
+                    String packageName = "com.vaadin.tests.server";
+                    if (Component.class.isAssignableFrom(c)) {
+                        packageName += ".component."
+                                + c.getSimpleName().toLowerCase();
+                        continue;
+                    }
+
+                    if (!found) {
+                        found = true;
+                        System.out.println("package " + packageName + ";");
+
+                        System.out.println("import "
+                                + AbstractListenerMethodsTest.class.getName() + ";");
+                        System.out.println("import " + c.getName() + ";");
+                        System.out.println("public class " + c.getSimpleName()
+                                + "Listeners extends "
+                                + AbstractListenerMethodsTest.class.getSimpleName() + " {");
+                    }
+
+                    String listenerClassName = m.getParameterTypes()[0]
+                            .getSimpleName();
+                    String eventClassName = listenerClassName.replaceFirst(
+                            "Listener$", "Event");
+                    System.out.println("public void test" + listenerClassName
+                            + "() throws Exception {");
+                    System.out.println("    testListener(" + c.getSimpleName()
+                            + ".class, " + eventClassName + ".class, "
+                            + listenerClassName + ".class);");
+                    System.out.println("}");
+                }
+            }
+            if (found) {
+                System.out.println("}");
+                System.out.println();
+            }
+        }
+    }
+
+    protected void testListenerAddGetRemove(Class<?> testClass,
+            Class<?> eventClass, Class<?> listenerClass) throws Exception {
+        // Create a component for testing
+        Object c = testClass.newInstance();
+        testListenerAddGetRemove(testClass, eventClass, listenerClass, c);
+
+    }
+
+    protected void testListenerAddGetRemove(Class<?> cls, Class<?> eventClass,
+            Class<?> listenerClass, Object c) throws Exception {
+
+        Object mockListener1 = EasyMock.createMock(listenerClass);
+        Object mockListener2 = EasyMock.createMock(listenerClass);
+
+        // Verify we start from no listeners
+        verifyListeners(c, eventClass);
+
+        // Add one listener and verify
+        addListener(c, mockListener1, listenerClass);
+        verifyListeners(c, eventClass, mockListener1);
+
+        // Add another listener and verify
+        addListener(c, mockListener2, listenerClass);
+        verifyListeners(c, eventClass, mockListener1, mockListener2);
+
+        // Ensure we can fetch using parent class also
+        if (eventClass.getSuperclass() != null) {
+            verifyListeners(c, eventClass.getSuperclass(), mockListener1,
+                    mockListener2);
+        }
+
+        // Remove the first and verify
+        removeListener(c, mockListener1, listenerClass);
+        verifyListeners(c, eventClass, mockListener2);
+
+        // Remove the remaining and verify
+        removeListener(c, mockListener2, listenerClass);
+        verifyListeners(c, eventClass);
+
+    }
+
+    private void removeListener(Object c, Object listener,
+            Class<?> listenerClass) throws IllegalArgumentException,
+            IllegalAccessException, InvocationTargetException,
+            SecurityException, NoSuchMethodException {
+        Method method = getRemoveListenerMethod(c.getClass(), listenerClass);
+        method.invoke(c, listener);
+
+    }
+
+    private void addListener(Object c, Object listener1, Class<?> listenerClass)
+            throws IllegalArgumentException, IllegalAccessException,
+            InvocationTargetException, SecurityException, NoSuchMethodException {
+        Method method = getAddListenerMethod(c.getClass(), listenerClass);
+        method.invoke(c, listener1);
+    }
+
+    private Collection<?> getListeners(Object c, Class<?> eventType)
+            throws IllegalArgumentException, IllegalAccessException,
+            InvocationTargetException, SecurityException, NoSuchMethodException {
+        Method method = getGetListenersMethod(c.getClass());
+        return (Collection<?>) method.invoke(c, eventType);
+    }
+
+    private Method getGetListenersMethod(Class<? extends Object> cls)
+            throws SecurityException, NoSuchMethodException {
+        return cls.getMethod("getListeners", Class.class);
+    }
+
+    private Method getAddListenerMethod(Class<?> cls, Class<?> listenerClass)
+            throws SecurityException, NoSuchMethodException {
+        return cls.getMethod("addListener", listenerClass);
+
+    }
+
+    private Method getRemoveListenerMethod(Class<?> cls, Class<?> listenerClass)
+            throws SecurityException, NoSuchMethodException {
+        return cls.getMethod("removeListener", listenerClass);
+
+    }
+
+    private void verifyListeners(Object c, Class<?> eventClass,
+            Object... expectedListeners) throws IllegalArgumentException,
+            SecurityException, IllegalAccessException,
+            InvocationTargetException, NoSuchMethodException {
+        Collection<?> registeredListeners = getListeners(c, eventClass);
+        assertEquals("Number of listeners", expectedListeners.length,
+                registeredListeners.size());
+
+        Assert.assertArrayEquals(expectedListeners,
+                registeredListeners.toArray());
+
+    }
+}

diff --git a/tests/src/com/vaadin/tests/server/component/ListenerMethods.java b/tests/src/com/vaadin/tests/server/component/ListenerMethods.java
deleted file mode 100644 (file)
index 45f44e6..0000000
--- a/tests/src/com/vaadin/tests/server/component/ListenerMethods.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package com.vaadin.tests.server.component;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.TestCase;
-
-import org.easymock.EasyMock;
-import org.junit.Assert;
-
-import com.vaadin.tests.VaadinClasses;
-import com.vaadin.ui.Component;
-
-public abstract class ListenerMethods extends TestCase {
-
-    public void testDummy() {
-    }
-
-    public static void main(String[] args) {
-        findAllListenerMethods();
-    }
-
-    private static void findAllListenerMethods() {
-        Set<Class<?>> classes = new HashSet<Class<?>>();
-        for (Class<?> c : VaadinClasses.getAllServerSideClasses()) {
-            while (c != null && c.getName().startsWith("com.vaadin.")) {
-                classes.add(c);
-                c = c.getSuperclass();
-            }
-        }
-
-        for (Class<?> c : classes) {
-            boolean found = false;
-            for (Method m : c.getDeclaredMethods()) {
-                if (m.getName().equals("addListener")) {
-                    if (m.getParameterTypes().length != 1) {
-                        continue;
-                    }
-                    String packageName = "com.vaadin.tests.server";
-                    if (Component.class.isAssignableFrom(c)) {
-                        packageName += ".component."
-                                + c.getSimpleName().toLowerCase();
-                        continue;
-                    }
-
-                    if (!found) {
-                        found = true;
-                        System.out.println("package " + packageName + ";");
-
-                        System.out.println("import "
-                                + ListenerMethods.class.getName() + ";");
-                        System.out.println("import " + c.getName() + ";");
-                        System.out.println("public class " + c.getSimpleName()
-                                + "Listeners extends "
-                                + ListenerMethods.class.getSimpleName() + " {");
-                    }
-
-                    String listenerClassName = m.getParameterTypes()[0]
-                            .getSimpleName();
-                    String eventClassName = listenerClassName.replaceFirst(
-                            "Listener$", "Event");
-                    System.out.println("public void test" + listenerClassName
-                            + "() throws Exception {");
-                    System.out.println("    testListener(" + c.getSimpleName()
-                            + ".class, " + eventClassName + ".class, "
-                            + listenerClassName + ".class);");
-                    System.out.println("}");
-                }
-            }
-            if (found) {
-                System.out.println("}");
-                System.out.println();
-            }
-        }
-    }
-
-    protected void testListenerAddGetRemove(Class<?> testClass,
-            Class<?> eventClass, Class<?> listenerClass) throws Exception {
-        // Create a component for testing
-        Object c = testClass.newInstance();
-        testListenerAddGetRemove(testClass, eventClass, listenerClass, c);
-
-    }
-
-    protected void testListenerAddGetRemove(Class<?> cls, Class<?> eventClass,
-            Class<?> listenerClass, Object c) throws Exception {
-
-        Object mockListener1 = EasyMock.createMock(listenerClass);
-        Object mockListener2 = EasyMock.createMock(listenerClass);
-
-        // Verify we start from no listeners
-        verifyListeners(c, eventClass);
-
-        // Add one listener and verify
-        addListener(c, mockListener1, listenerClass);
-        verifyListeners(c, eventClass, mockListener1);
-
-        // Add another listener and verify
-        addListener(c, mockListener2, listenerClass);
-        verifyListeners(c, eventClass, mockListener1, mockListener2);
-
-        // Ensure we can fetch using parent class also
-        if (eventClass.getSuperclass() != null) {
-            verifyListeners(c, eventClass.getSuperclass(), mockListener1,
-                    mockListener2);
-        }
-
-        // Remove the first and verify
-        removeListener(c, mockListener1, listenerClass);
-        verifyListeners(c, eventClass, mockListener2);
-
-        // Remove the remaining and verify
-        removeListener(c, mockListener2, listenerClass);
-        verifyListeners(c, eventClass);
-
-    }
-
-    private void removeListener(Object c, Object listener,
-            Class<?> listenerClass) throws IllegalArgumentException,
-            IllegalAccessException, InvocationTargetException,
-            SecurityException, NoSuchMethodException {
-        Method method = getRemoveListenerMethod(c.getClass(), listenerClass);
-        method.invoke(c, listener);
-
-    }
-
-    private void addListener(Object c, Object listener1, Class<?> listenerClass)
-            throws IllegalArgumentException, IllegalAccessException,
-            InvocationTargetException, SecurityException, NoSuchMethodException {
-        Method method = getAddListenerMethod(c.getClass(), listenerClass);
-        method.invoke(c, listener1);
-    }
-
-    private Collection<?> getListeners(Object c, Class<?> eventType)
-            throws IllegalArgumentException, IllegalAccessException,
-            InvocationTargetException, SecurityException, NoSuchMethodException {
-        Method method = getGetListenersMethod(c.getClass());
-        return (Collection<?>) method.invoke(c, eventType);
-    }
-
-    private Method getGetListenersMethod(Class<? extends Object> cls)
-            throws SecurityException, NoSuchMethodException {
-        return cls.getMethod("getListeners", Class.class);
-    }
-
-    private Method getAddListenerMethod(Class<?> cls, Class<?> listenerClass)
-            throws SecurityException, NoSuchMethodException {
-        return cls.getMethod("addListener", listenerClass);
-
-    }
-
-    private Method getRemoveListenerMethod(Class<?> cls, Class<?> listenerClass)
-            throws SecurityException, NoSuchMethodException {
-        return cls.getMethod("removeListener", listenerClass);
-
-    }
-
-    private void verifyListeners(Object c, Class<?> eventClass,
-            Object... expectedListeners) throws IllegalArgumentException,
-            SecurityException, IllegalAccessException,
-            InvocationTargetException, NoSuchMethodException {
-        Collection<?> registeredListeners = getListeners(c, eventClass);
-        assertEquals("Number of listeners", expectedListeners.length,
-                registeredListeners.size());
-
-        Assert.assertArrayEquals(expectedListeners,
-                registeredListeners.toArray());
-
-    }
-}

diff --git a/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java b/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
index 194df865b4e7660f82c3b769191078eb67a6ae3a..a569ea03e98022c652af1d372e6955e0d9c12008 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.absolutelayout;
 \r
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;\r
 import com.vaadin.event.LayoutEvents.LayoutClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.AbsoluteLayout;\r
 \r
-public class AbsoluteLayoutListeners extends ListenerMethods {\r
+public class AbsoluteLayoutListeners extends AbstractListenerMethodsTest {\r
     public void testLayoutClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(AbsoluteLayout.class, LayoutClickEvent.class,\r
                 LayoutClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
index 51cc9fe1f844cacb27410faae21fc961d8a45763..adf9c8d72ecfed00973917123acc6fa516b36de1 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
@@ -1,6 +1,6 @@
 package com.vaadin.tests.server.component.abstractcomponentcontainer;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.ComponentContainer.ComponentAttachEvent;\r
 import com.vaadin.ui.ComponentContainer.ComponentAttachListener;\r
 import com.vaadin.ui.ComponentContainer.ComponentDetachEvent;\r
@@ -8,7 +8,7 @@ import com.vaadin.ui.ComponentContainer.ComponentDetachListener;
 import com.vaadin.ui.HorizontalLayout;\r
 import com.vaadin.ui.VerticalLayout;\r
 \r
-public class TestAbstractComponentContainerListeners extends ListenerMethods {\r
+public class TestAbstractComponentContainerListeners extends AbstractListenerMethodsTest {\r
     public void testComponentDetachListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(HorizontalLayout.class,\r
                 ComponentDetachEvent.class, ComponentDetachListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
index be48310e0a5cc425cf6a42199356f60acf913727..63536baf68dd1e36833320fa86161fa1e4cb8e84 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
@@ -4,10 +4,10 @@ import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;\r
 import com.vaadin.data.Property.ValueChangeEvent;\r
 import com.vaadin.data.Property.ValueChangeListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Button;\r
 \r
-public class TestAbstractFieldListeners extends ListenerMethods {\r
+public class TestAbstractFieldListeners extends AbstractListenerMethodsTest {\r
     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Button.class, ReadOnlyStatusChangeEvent.class,\r
                 ReadOnlyStatusChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
index 86ead8052760e16d7a0b85c6cb3645fd80ff7db5..05dfc471265fad634d9811d96243230bae2e9c70 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.abstractorderedlayout;
 \r
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;\r
 import com.vaadin.event.LayoutEvents.LayoutClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.VerticalLayout;\r
 \r
-public class TestAbstractOrderedLayoutListeners extends ListenerMethods {\r
+public class TestAbstractOrderedLayoutListeners extends AbstractListenerMethodsTest {\r
     public void testLayoutClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(VerticalLayout.class, LayoutClickEvent.class,\r
                 LayoutClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java b/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
index 7e225da7076773953091584180ba38f7e85daa47..c1886943fd5fb8929c279aa62cd4226930825fbb 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
@@ -4,10 +4,10 @@ import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;\r
 import com.vaadin.data.Container.PropertySetChangeEvent;\r
 import com.vaadin.data.Container.PropertySetChangeListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.ComboBox;\r
 \r
-public class TestAbstractSelectListeners extends ListenerMethods {\r
+public class TestAbstractSelectListeners extends AbstractListenerMethodsTest {\r
     public void testItemSetChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(ComboBox.class, ItemSetChangeEvent.class,\r
                 ItemSetChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
index b33f5c7eac420e7989be5e8cdadffa07a41e7147..4f66d1446b9370072ce99d4b9ac699f1de6635e6 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.abstractsplitpanel;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickEvent;\r
 import com.vaadin.ui.AbstractSplitPanel.SplitterClickListener;\r
 import com.vaadin.ui.HorizontalSplitPanel;\r
 \r
-public class TestAbstractSplitPanelListeners extends ListenerMethods {\r
+public class TestAbstractSplitPanelListeners extends AbstractListenerMethodsTest {\r
     public void testSplitterClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(HorizontalSplitPanel.class,\r
                 SplitterClickEvent.class, SplitterClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java b/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
index f360d39547513dc9029cb9b32998778aeaf726ee..fb8eb65f5507e8e985cd658a68e3e2e0fdabdb2a 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
@@ -6,10 +6,10 @@ import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;\r
 import com.vaadin.event.FieldEvents.TextChangeEvent;\r
 import com.vaadin.event.FieldEvents.TextChangeListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.TextField;\r
 \r
-public class TestAbstractTextFieldListeners extends ListenerMethods {\r
+public class TestAbstractTextFieldListeners extends AbstractListenerMethodsTest {\r
     public void testTextChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(TextField.class, TextChangeEvent.class,\r
                 TextChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java b/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
index e33b69adc5cf7b90764a123ce6c90137db790f7f..59ddad4efeec450ef9a3d2f3e1e7e473c171ed9a 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
@@ -4,12 +4,12 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;\r
 import com.vaadin.event.FieldEvents.FocusEvent;\r
 import com.vaadin.event.FieldEvents.FocusListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Button;\r
 import com.vaadin.ui.Button.ClickEvent;\r
 import com.vaadin.ui.Button.ClickListener;\r
 \r
-public class ButtonListeners extends ListenerMethods {\r
+public class ButtonListeners extends AbstractListenerMethodsTest {\r
     public void testFocusListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Button.class, FocusEvent.class,\r
                 FocusListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
index 040b9938dc9b5cf1179a7895437b9d38bb328f5a..e646467cb2ea8da9f30bc54fb1b03ed5a3db9ee7 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.csslayout;
 \r
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;\r
 import com.vaadin.event.LayoutEvents.LayoutClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.CssLayout;\r
 \r
-public class CssLayoutListeners extends ListenerMethods {\r
+public class CssLayoutListeners extends AbstractListenerMethodsTest {\r
     public void testLayoutClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(CssLayout.class, LayoutClickEvent.class,\r
                 LayoutClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java b/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
index 2a698e7d0996a5d404ba3bcd79a09c889d0d75bb..1d7f72986887ddb62e74fb3de5bd15e2d7eacf6a 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;\r
 import com.vaadin.event.FieldEvents.FocusEvent;\r
 import com.vaadin.event.FieldEvents.FocusListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.DateField;\r
 \r
-public class DateFieldListeners extends ListenerMethods {\r
+public class DateFieldListeners extends AbstractListenerMethodsTest {\r
     public void testFocusListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(DateField.class, FocusEvent.class,\r
                 FocusListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java b/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
index 687dc71849b94a011e8e20c37f2864c89eead068..66a9a2b5d5f4f97239e4ae72cd97dcad9b987904 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.embedded;
 \r
 import com.vaadin.event.MouseEvents.ClickEvent;\r
 import com.vaadin.event.MouseEvents.ClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Embedded;\r
 \r
-public class EmbeddedListeners extends ListenerMethods {\r
+public class EmbeddedListeners extends AbstractListenerMethodsTest {\r
     public void testClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Embedded.class, ClickEvent.class,\r
                 ClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java b/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
index 5f667d225e604ebb82df3ed4cc39b216f53ecc0f..24db0856dabfcef1600a069795f4ae8f893731ae 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.gridlayout;
 \r
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;\r
 import com.vaadin.event.LayoutEvents.LayoutClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.GridLayout;\r
 \r
-public class GridLayoutListeners extends ListenerMethods {\r
+public class GridLayoutListeners extends AbstractListenerMethodsTest {\r
     public void testLayoutClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(GridLayout.class, LayoutClickEvent.class,\r
                 LayoutClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java b/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
index 86628e1de84214d45165564d8dda0c27f8dac020..a25309b32fe16bbf4d4fa6f6102c95127cb98d22 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.label;\r
 \r
 import com.vaadin.data.Property.ValueChangeListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Label;\r
 import com.vaadin.ui.Label.ValueChangeEvent;\r
 \r
-public class LabelListeners extends ListenerMethods {\r
+public class LabelListeners extends AbstractListenerMethodsTest {\r
     public void testValueChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Label.class, ValueChangeEvent.class,\r
                 ValueChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java b/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
index 8a7629664cd8d23cc62aa0d7a1ca486ac660e461..a8e7d76710b0b272718f68a1a769e70a0f6efea2 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.loginform;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.LoginForm;\r
 import com.vaadin.ui.LoginForm.LoginEvent;\r
 import com.vaadin.ui.LoginForm.LoginListener;\r
 \r
-public class LoginFormListeners extends ListenerMethods {\r
+public class LoginFormListeners extends AbstractListenerMethodsTest {\r
     public void testLoginListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(LoginForm.class, LoginEvent.class,\r
                 LoginListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java b/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
index 1ce7cf76c64c583804cc4d5d568e91d8a95b194f..a4c2289da4c8493a9f96e13a893410cbd2b0f87f 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;\r
 import com.vaadin.event.FieldEvents.FocusEvent;\r
 import com.vaadin.event.FieldEvents.FocusListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.OptionGroup;\r
 \r
-public class OptionGroupListeners extends ListenerMethods {\r
+public class OptionGroupListeners extends AbstractListenerMethodsTest {\r
     public void testFocusListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(OptionGroup.class, FocusEvent.class,\r
                 FocusListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java b/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
index fe6f4bd3020a0f7a3dbf9f755048a0fc8afd9d45..e6094225e2b43e6b1bb309b3ab74dd99320f2a36 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.panel;
 \r
 import com.vaadin.event.MouseEvents.ClickEvent;\r
 import com.vaadin.event.MouseEvents.ClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Panel;\r
 \r
-public class PanelListeners extends ListenerMethods {\r
+public class PanelListeners extends AbstractListenerMethodsTest {\r
     public void testClickListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Panel.class, ClickEvent.class,\r
                 ClickListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java b/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
index 3d3d5546da0f13d7e9483cd3e95358f73f29244d..5b5fc2eb317e4829cb5048726a39f8df8b607cb0 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
@@ -1,12 +1,12 @@
 package com.vaadin.tests.server.component.popupview;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Label;\r
 import com.vaadin.ui.PopupView;\r
 import com.vaadin.ui.PopupView.PopupVisibilityEvent;\r
 import com.vaadin.ui.PopupView.PopupVisibilityListener;\r
 \r
-public class PopupViewListeners extends ListenerMethods {\r
+public class PopupViewListeners extends AbstractListenerMethodsTest {\r
     public void testPopupVisibilityListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(PopupView.class, PopupVisibilityEvent.class,\r
                 PopupVisibilityListener.class, new PopupView("", new Label()));\r

diff --git a/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java b/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
index 63d857e3b67ddd2b391dfaf5f411749eaf2fd4cb..8f90f2021edfc203b3f9817201bd6066d90c8391 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
@@ -4,10 +4,10 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;\r
 import com.vaadin.event.FieldEvents.FocusEvent;\r
 import com.vaadin.event.FieldEvents.FocusListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Select;\r
 \r
-public class SelectListeners extends ListenerMethods {\r
+public class SelectListeners extends AbstractListenerMethodsTest {\r
     public void testFocusListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Select.class, FocusEvent.class,\r
                 FocusListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/table/TableListeners.java b/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
index 46291c5b9acee515d96c02614130ddfcfb9b4f0b..75ec839823f5fc1fb55a08177d1711972a233b35 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
@@ -2,7 +2,7 @@ package com.vaadin.tests.server.component.table;
 \r
 import com.vaadin.event.ItemClickEvent;\r
 import com.vaadin.event.ItemClickEvent.ItemClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Table;\r
 import com.vaadin.ui.Table.ColumnReorderEvent;\r
 import com.vaadin.ui.Table.ColumnReorderListener;\r
@@ -13,7 +13,7 @@ import com.vaadin.ui.Table.FooterClickListener;
 import com.vaadin.ui.Table.HeaderClickEvent;\r
 import com.vaadin.ui.Table.HeaderClickListener;\r
 \r
-public class TableListeners extends ListenerMethods {\r
+public class TableListeners extends AbstractListenerMethodsTest {\r
     public void testColumnResizeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Table.class, ColumnResizeEvent.class,\r
                 ColumnResizeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java b/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
index 36cbf2d0b096007eea7d3ea080e622bfb33dbfd8..30dcbca1556a50a2522044fe4fbbc548ce844cf6 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.tabsheet;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.TabSheet;\r
 import com.vaadin.ui.TabSheet.SelectedTabChangeEvent;\r
 import com.vaadin.ui.TabSheet.SelectedTabChangeListener;\r
 \r
-public class TabSheetListeners extends ListenerMethods {\r
+public class TabSheetListeners extends AbstractListenerMethodsTest {\r
     public void testSelectedTabChangeListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(TabSheet.class, SelectedTabChangeEvent.class,\r
                 SelectedTabChangeListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java b/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
index 43651b7445c43f920f3f7b87b389d48d73b6d172..8ba2e1de4dc44b91572aaeea36dd46256fb90e32 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
@@ -2,14 +2,14 @@ package com.vaadin.tests.server.component.tree;
 \r
 import com.vaadin.event.ItemClickEvent;\r
 import com.vaadin.event.ItemClickEvent.ItemClickListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Tree;\r
 import com.vaadin.ui.Tree.CollapseEvent;\r
 import com.vaadin.ui.Tree.CollapseListener;\r
 import com.vaadin.ui.Tree.ExpandEvent;\r
 import com.vaadin.ui.Tree.ExpandListener;\r
 \r
-public class TreeListeners extends ListenerMethods {\r
+public class TreeListeners extends AbstractListenerMethodsTest {\r
     public void testExpandListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Tree.class, ExpandEvent.class,\r
                 ExpandListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java b/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
index 07dc64e34e88a7968929dd0ffea3b51a25c73e24..ea5fa9432649731e199072672886588f30260cce 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.server.component.upload;\r
 \r
 import com.vaadin.terminal.StreamVariable.StreamingProgressEvent;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Upload;\r
 import com.vaadin.ui.Upload.FailedEvent;\r
 import com.vaadin.ui.Upload.FailedListener;\r
@@ -13,7 +13,7 @@ import com.vaadin.ui.Upload.StartedListener;
 import com.vaadin.ui.Upload.SucceededEvent;\r
 import com.vaadin.ui.Upload.SucceededListener;\r
 \r
-public class UploadListeners extends ListenerMethods {\r
+public class UploadListeners extends AbstractListenerMethodsTest {\r
     public void testProgressListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Upload.class, StreamingProgressEvent.class,\r
                 ProgressListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java b/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
index fa5c0872758df48a66305e3a382e3967313a2689..fe400e55b9dd9714dfec9527f4a2fd4397315b93 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/urifragmentutility/UriFragmentUtilityListeners.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.server.component.urifragmentutility;\r
 \r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.UriFragmentUtility;\r
 import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent;\r
 import com.vaadin.ui.UriFragmentUtility.FragmentChangedListener;\r
 \r
-public class UriFragmentUtilityListeners extends ListenerMethods {\r
+public class UriFragmentUtilityListeners extends AbstractListenerMethodsTest {\r
     public void testFragmentChangedListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(UriFragmentUtility.class,\r
                 FragmentChangedEvent.class, FragmentChangedListener.class);\r

diff --git a/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java b/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
index 349d53c311ddd472115184ea7e3d56a989171f9e..b8d9579daea6460e799bde5229f6408c09e8f0a0 100644 (file)
--- a/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
+++ b/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
@@ -4,14 +4,14 @@ import com.vaadin.event.FieldEvents.BlurEvent;
 import com.vaadin.event.FieldEvents.BlurListener;\r
 import com.vaadin.event.FieldEvents.FocusEvent;\r
 import com.vaadin.event.FieldEvents.FocusListener;\r
-import com.vaadin.tests.server.component.ListenerMethods;\r
+import com.vaadin.tests.server.component.AbstractListenerMethodsTest;\r
 import com.vaadin.ui.Window;\r
 import com.vaadin.ui.Window.CloseEvent;\r
 import com.vaadin.ui.Window.CloseListener;\r
 import com.vaadin.ui.Window.ResizeEvent;\r
 import com.vaadin.ui.Window.ResizeListener;\r
 \r
-public class WindowListeners extends ListenerMethods {\r
+public class WindowListeners extends AbstractListenerMethodsTest {\r
     public void testFocusListenerAddGetRemove() throws Exception {\r
         testListenerAddGetRemove(Window.class, FocusEvent.class,\r
                 FocusListener.class);\r