Unify test class naming.

Unit tests are now run for *Test.java and *Tests.java.

Change-Id: Iffff1d9a79c7c9b9317ffd19b5a46715b1442909

client/tests/src/com/vaadin/client/ApplicationConnectionTestURLGeneration.java → client/tests/src/com/vaadin/client/ApplicationConnectionURLGenerationTest.java

@@ -4,7 +4,7 @@ import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
-public class ApplicationConnectionTestURLGeneration {
+public class ApplicationConnectionURLGenerationTest {
 
     private static final String[] URIS = new String[] {
             "http://demo.vaadin.com/", //

client/tests/src/com/vaadin/client/TestVBrowserDetailsUserAgentParser.java → client/tests/src/com/vaadin/client/VBrowserDetailsUserAgentParserTest.java

@@ -6,7 +6,7 @@ import org.junit.Assert;
 
 import com.vaadin.shared.VBrowserDetails;
 
-public class TestVBrowserDetailsUserAgentParser extends TestCase {
+public class VBrowserDetailsUserAgentParserTest extends TestCase {
 
     private static final String FIREFOX30_WINDOWS = "Mozilla/5.0 (Windows; U; Windows NT 6.1; en-GB; rv:1.9.0.6) Gecko/2009011913 Firefox/3.0.6";
     private static final String FIREFOX30_LINUX = "Mozilla/5.0 (X11; U; Linux x86_64; es-ES; rv:1.9.0.12) Gecko/2009070811 Ubuntu/9.04 (jaunty) Firefox/3.0.12";

common.xml

@@ -353,14 +353,8 @@
 
             <batchtest fork="yes" todir="${report.dir}">
                 <fileset dir="${test.src}">
-                    <exclude name="**/Abstract*" />
-                    <exclude name="**/Mock*" />
-                    <exclude name="com/vaadin/tests/data/bean/*" />
-                    <exclude name="com/vaadin/tests/util/*" />
-                    <exclude name="com/vaadin/benchmarks/*" />
-                    <exclude name="**/VaadinClasses.java" />
-                    <exclude name="**/*TestRunner.java" />
-                    <exclude name="**/SQLTestsConstants.java" />
+                    <include name="**/*Test.java" />
+                    <include name="**/*Tests.java" />
                 </fileset>
             </batchtest>
         </junit>

server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDate.java → server/tests/src/com/vaadin/data/fieldgroup/FieldGroupDateTest.java

@@ -25,7 +25,7 @@ import com.vaadin.data.util.BeanItem;
 import com.vaadin.ui.Field;
 import com.vaadin.ui.PopupDateField;
 
-public class FieldGroupDate {
+public class FieldGroupDateTest {
 
     private FieldGroup fieldGroup;
 

server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java → server/tests/src/com/vaadin/data/util/AbstractBeanContainerTestBase.java

@@ -6,8 +6,8 @@ package com.vaadin.data.util;
  * Only a limited subset of the functionality is tested here, the rest in tests
  * of subclasses including {@link BeanItemContainer} and {@link BeanContainer}.
  */
-public abstract class AbstractBeanContainerTest extends
-        AbstractInMemoryContainerTest {
+public abstract class AbstractBeanContainerTestBase extends
+        AbstractInMemoryContainerTestBase {
 
     public static class Person {
         private String name;
@@ -34,7 +34,7 @@ public abstract class AbstractBeanContainerTest extends
 
         public ClassName(String fullyQualifiedName, Integer idNumber) {
             this.fullyQualifiedName = fullyQualifiedName;
-            simpleName = AbstractContainerTest
+            simpleName = AbstractContainerTestBase
                     .getSimpleName(fullyQualifiedName);
             reverseFullyQualifiedName = reverse(fullyQualifiedName);
             this.idNumber = idNumber;

server/tests/src/com/vaadin/data/util/AbstractContainerTest.java → server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java

@@ -15,7 +15,7 @@ import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.filter.SimpleStringFilter;
 
-public abstract class AbstractContainerTest extends TestCase {
+public abstract class AbstractContainerTestBase extends TestCase {
 
     /**
      * Helper class for testing e.g. listeners expecting events to be fired.

server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java → server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTestBase.java

@@ -7,8 +7,8 @@ import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.Container.Sortable;
 import com.vaadin.data.Item;
 
-public abstract class AbstractHierarchicalContainerTest extends
-        AbstractContainerTest {
+public abstract class AbstractHierarchicalContainerTestBase extends
+        AbstractContainerTestBase {
 
     /**
      * @param container

server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java

@@ -1,6 +0,0 @@
-package com.vaadin.data.util;
-
-public abstract class AbstractInMemoryContainerTest extends
-        AbstractContainerTest {
-
-}

server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTestBase.java

@@ -0,0 +1,6 @@
+package com.vaadin.data.util;
+
+public abstract class AbstractInMemoryContainerTestBase extends
+        AbstractContainerTestBase {
+
+}

server/tests/src/com/vaadin/data/util/BeanContainerTest.java

@@ -13,7 +13,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.AbstractBeanContainer.BeanIdResolver;
 
-public class BeanContainerTest extends AbstractBeanContainerTest {
+public class BeanContainerTest extends AbstractBeanContainerTestBase {
 
     protected static class PersonNameResolver implements
             BeanIdResolver<String, Person> {
@@ -345,7 +345,7 @@ public class BeanContainerTest extends AbstractBeanContainerTest {
                 Person.class);
         // resolver that returns null as item id
         container
-                .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTest.Person>() {
+                .setBeanIdResolver(new BeanIdResolver<String, AbstractBeanContainerTestBase.Person>() {
 
                     @Override
                     public String getIdForBean(Person bean) {

server/tests/src/com/vaadin/data/util/BeanItemContainerGenerator.java

@@ -3,9 +3,6 @@ package com.vaadin.data.util;
 import java.util.Date;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.junit.Ignore;
-
-@Ignore
 public class BeanItemContainerGenerator {
 
     public static class PortableRandom {

server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java

@@ -19,7 +19,7 @@ import com.vaadin.data.util.NestedMethodPropertyTest.Address;
  * 
  * Most sorting related tests are in {@link BeanItemContainerSortTest}.
  */
-public class BeanItemContainerTest extends AbstractBeanContainerTest {
+public class BeanItemContainerTest extends AbstractBeanContainerTestBase {
 
     // basics from the common container test
 

server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java → server/tests/src/com/vaadin/data/util/ContainerHierarchicalWrapperTest.java

@@ -2,8 +2,8 @@ package com.vaadin.data.util;
 
 import java.util.Collection;
 
-public class TestContainerHierarchicalWrapper extends
-        AbstractHierarchicalContainerTest {
+public class ContainerHierarchicalWrapperTest extends
+        AbstractHierarchicalContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new ContainerHierarchicalWrapper(

server/tests/src/com/vaadin/data/util/TestContainerSorting.java → server/tests/src/com/vaadin/data/util/ContainerSortingTest.java

@@ -10,7 +10,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.tests.util.TestUtil;
 
-public class TestContainerSorting extends TestCase {
+public class ContainerSortingTest extends TestCase {
 
     private static final String ITEM_DATA_MINUS2_NULL = "Data -2 null";
     private static final String ITEM_DATA_MINUS2 = "Data -2";

server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java → server/tests/src/com/vaadin/data/util/HierarchicalContainerTest.java

@@ -3,8 +3,8 @@ package com.vaadin.data.util;
 import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 
-public class TestHierarchicalContainer extends
-        AbstractHierarchicalContainerTest {
+public class HierarchicalContainerTest extends
+        AbstractHierarchicalContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new HierarchicalContainer());

server/tests/src/com/vaadin/data/util/TestIndexedContainer.java → server/tests/src/com/vaadin/data/util/IndexedContainerTest.java

@@ -6,7 +6,7 @@ import org.junit.Assert;
 
 import com.vaadin.data.Item;
 
-public class TestIndexedContainer extends AbstractInMemoryContainerTest {
+public class IndexedContainerTest extends AbstractInMemoryContainerTestBase {
 
     public void testBasicOperations() {
         testBasicContainerOperations(new IndexedContainer());

server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumption.java → server/tests/src/com/vaadin/data/util/MethodPropertyMemoryConsumptionTest.java

@@ -32,7 +32,7 @@ import org.junit.Test;
  * @since 7.2
  * @author Vaadin Ltd
  */
-public class MethodPropertyMemoryConsumption {
+public class MethodPropertyMemoryConsumptionTest {
 
     @Test
     public void testSetArguments() throws NoSuchFieldException,

server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java → server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainerTest.java

@@ -10,7 +10,7 @@ import junit.framework.TestCase;
 
 import org.junit.Assert;
 
-public class PerformanceTestIndexedContainer extends TestCase {
+public class PerformanceTestIndexedContainerTest extends TestCase {
 
     private static final int REPEATS = 10;
     private final static int ITEMS = 50000;

server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperField.java → server/tests/src/com/vaadin/data/util/ReflectToolsGetSuperFieldTest.java

@@ -8,7 +8,7 @@ import com.vaadin.data.fieldgroup.FieldGroup;
 import com.vaadin.data.fieldgroup.PropertyId;
 import com.vaadin.ui.TextField;
 
-public class ReflectToolsGetSuperField {
+public class ReflectToolsGetSuperFieldTest {
 
     @Test
     public void getFieldFromSuperClass() {

server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java → server/tests/src/com/vaadin/data/util/filter/AbstractFilterTestBase.java

@@ -8,7 +8,7 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public abstract class AbstractFilterTest<FILTERTYPE extends Filter> extends
+public abstract class AbstractFilterTestBase<FILTERTYPE extends Filter> extends
         TestCase {
 
     protected static final String PROPERTY1 = "property1";

server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java

@@ -6,7 +6,7 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 
-public class AndOrFilterTest extends AbstractFilterTest<AbstractJunctionFilter> {
+public class AndOrFilterTest extends AbstractFilterTestBase<AbstractJunctionFilter> {
 
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);

server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java

@@ -15,7 +15,7 @@ import com.vaadin.data.util.filter.Compare.GreaterOrEqual;
 import com.vaadin.data.util.filter.Compare.Less;
 import com.vaadin.data.util.filter.Compare.LessOrEqual;
 
-public class CompareFilterTest extends AbstractFilterTest<Compare> {
+public class CompareFilterTest extends AbstractFilterTestBase<Compare> {
 
     protected Item itemNull;
     protected Item itemEmpty;

server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java

@@ -7,7 +7,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public class IsNullFilterTest extends AbstractFilterTest<IsNull> {
+public class IsNullFilterTest extends AbstractFilterTestBase<IsNull> {
 
     public void testIsNull() {
         Item item1 = new PropertysetItem();

server/tests/src/com/vaadin/data/util/filter/LikeFilterTest.java

@@ -22,7 +22,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertysetItem;
 
-public class LikeFilterTest extends AbstractFilterTest<Like> {
+public class LikeFilterTest extends AbstractFilterTestBase<Like> {
 
     protected Item item1 = new PropertysetItem();
     protected Item item2 = new PropertysetItem();

server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java

@@ -6,7 +6,7 @@ import com.vaadin.data.Container.Filter;
 import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 
-public class NotFilterTest extends AbstractFilterTest<Not> {
+public class NotFilterTest extends AbstractFilterTestBase<Not> {
 
     protected Item item1 = new BeanItem<Integer>(1);
     protected Item item2 = new BeanItem<Integer>(2);

server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java

@@ -3,7 +3,7 @@ package com.vaadin.data.util.filter;
 import org.junit.Assert;
 
 public class SimpleStringFilterTest extends
-        AbstractFilterTest<SimpleStringFilter> {
+        AbstractFilterTestBase<SimpleStringFilter> {
 
     protected static TestItem<String, String> createTestItem() {
         return new TestItem<String, String>("abcde", "TeSt");

server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java

@@ -13,12 +13,6 @@ import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool;
 
 public class DataGenerator {
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static void addPeopleToDatabase(JDBCConnectionPool connectionPool)
             throws SQLException {
         Connection conn = connectionPool.reserveConnection();

server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java

@@ -11,12 +11,6 @@ import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
 
 public class FreeformQueryUtil {
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static StatementHelper getQueryWithFilters(List<Filter> filters,
             int offset, int limit) {
         StatementHelper sh = new StatementHelper();

server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java

@@ -12,12 +12,6 @@ import org.junit.Test;
 public class MockInitialContextFactory implements InitialContextFactory {
     private static Context mockCtx = null;
 
-    @Test
-    public void testDummy() {
-        // Added dummy test so JUnit will not complain about
-        // "No runnable methods".
-    }
-
     public static void setMockContext(Context ctx) {
         mockCtx = ctx;
     }

server/tests/src/com/vaadin/tests/data/converter/TestAnyEnumToStringConverter.java → server/tests/src/com/vaadin/tests/data/converter/AnyEnumToStringConverterTest.java

@@ -29,7 +29,7 @@ import com.vaadin.tests.data.bean.AnotherTestEnum;
 import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
-public class TestAnyEnumToStringConverter {
+public class AnyEnumToStringConverterTest {
 
     public class AnyEnumToStringConverter implements Converter<Enum, String> {
 

server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java → server/tests/src/com/vaadin/tests/data/converter/ConverterFactoryTest.java

@@ -25,7 +25,7 @@ import com.vaadin.server.VaadinSession;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class ConverterFactory extends TestCase {
+public class ConverterFactoryTest extends TestCase {
 
     public static class ConvertTo42 implements Converter<String, Integer> {
 

server/tests/src/com/vaadin/tests/data/converter/TestDateToLongConverter.java → server/tests/src/com/vaadin/tests/data/converter/DateToLongConverterTest.java

@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.DateToLongConverter;
 
-public class TestDateToLongConverter extends TestCase {
+public class DateToLongConverterTest extends TestCase {
 
     DateToLongConverter converter = new DateToLongConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java → server/tests/src/com/vaadin/tests/data/converter/DateToSqlDateConverterTest.java

@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.DateToSqlDateConverter;
 
-public class TestDateToSqlDateConverter extends TestCase {
+public class DateToSqlDateConverterTest extends TestCase {
 
     DateToSqlDateConverter converter = new DateToSqlDateConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestDefaultConverterFactory.java → server/tests/src/com/vaadin/tests/data/converter/DefaultConverterFactoryTest.java

@@ -25,7 +25,7 @@ import org.junit.Test;
 
 import com.vaadin.data.util.converter.DefaultConverterFactory;
 
-public class TestDefaultConverterFactory {
+public class DefaultConverterFactoryTest {
 
     private DefaultConverterFactory factory = new DefaultConverterFactory();
 

server/tests/src/com/vaadin/tests/data/converter/TestSpecificEnumToStringConverter.java → server/tests/src/com/vaadin/tests/data/converter/SpecificEnumToStringConverterTest.java

@@ -29,7 +29,7 @@ import com.vaadin.tests.data.bean.AnotherTestEnum;
 import com.vaadin.tests.data.bean.TestEnum;
 import com.vaadin.ui.TextField;
 
-public class TestSpecificEnumToStringConverter {
+public class SpecificEnumToStringConverterTest {
 
     public class SpecificEnumToStringConverter implements
             Converter<Enum, String> {

server/tests/src/com/vaadin/tests/data/converter/TestStringToBigDecimalConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToBigDecimalConverterTest.java

@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBigDecimalConverter;
 
-public class TestStringToBigDecimalConverter extends TestCase {
+public class StringToBigDecimalConverterTest extends TestCase {
 
     StringToBigDecimalConverter converter = new StringToBigDecimalConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToBigIntegerConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToBigIntegerConverterTest.java

@@ -22,7 +22,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBigIntegerConverter;
 
-public class TestStringToBigIntegerConverter extends TestCase {
+public class StringToBigIntegerConverterTest extends TestCase {
 
     StringToBigIntegerConverter converter = new StringToBigIntegerConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToBooleanConverterTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToBooleanConverter;
 
-public class TestStringToBooleanConverter extends TestCase {
+public class StringToBooleanConverterTest extends TestCase {
 
     StringToBooleanConverter converter = new StringToBooleanConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToByteConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToByteConverterTest.java

@@ -9,7 +9,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToByteConverter;
 
-public class TestStringToByteConverter extends TestCase {
+public class StringToByteConverterTest extends TestCase {
 
     StringToByteConverter converter = new StringToByteConverter();
     Converter<Byte, String> reverseConverter = new ReverseConverter<Byte, String>(

server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToDateConverterTest.java

@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToDateConverter;
 
-public class TestStringToDateConverter extends TestCase {
+public class StringToDateConverterTest extends TestCase {
 
     StringToDateConverter converter = new StringToDateConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToDoubleConverterTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToDoubleConverter;
 
-public class TestStringToDoubleConverter extends TestCase {
+public class StringToDoubleConverterTest extends TestCase {
 
     StringToDoubleConverter converter = new StringToDoubleConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToEnumConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToEnumConverterTest.java

@@ -7,7 +7,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToEnumConverter;
 
-public class TestStringToEnumConverter extends TestCase {
+public class StringToEnumConverterTest extends TestCase {
 
     public static enum FooEnum {
         VALUE1, SOME_VALUE, FOO_BAR_BAZ, Bar, nonStandardCase, _HUGH;

server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToFloatConverterTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.util.converter.StringToFloatConverter;
 
-public class TestStringToFloatConverter extends TestCase {
+public class StringToFloatConverterTest extends TestCase {
 
     StringToFloatConverter converter = new StringToFloatConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToIntegerConverterTest.java

@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 
-public class TestStringToIntegerConverter extends TestCase {
+public class StringToIntegerConverterTest extends TestCase {
 
     StringToIntegerConverter converter = new StringToIntegerConverter();
 

server/tests/src/com/vaadin/tests/data/converter/TestStringToLongConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToLongConverterTest.java

@@ -10,7 +10,7 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToLongConverter;
 
-public class TestStringToLongConverter extends TestCase {
+public class StringToLongConverterTest extends TestCase {
 
     StringToLongConverter converter = new StringToLongConverter();
     Converter<Long, String> reverseConverter = new ReverseConverter<Long, String>(

server/tests/src/com/vaadin/tests/data/converter/TestStringToShortConverter.java → server/tests/src/com/vaadin/tests/data/converter/StringToShortConverterTest.java

@@ -9,7 +9,7 @@ import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.ReverseConverter;
 import com.vaadin.data.util.converter.StringToShortConverter;
 
-public class TestStringToShortConverter extends TestCase {
+public class StringToShortConverterTest extends TestCase {
 
     StringToShortConverter converter = new StringToShortConverter();
     Converter<Short, String> reverseConverter = new ReverseConverter<Short, String>(

server/tests/src/com/vaadin/tests/data/validator/TestBigDecimalRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/BigDecimalRangeValidatorTest.java

@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.BigDecimalRangeValidator;
 
-public class TestBigDecimalRangeValidator extends TestCase {
+public class BigDecimalRangeValidatorTest extends TestCase {
 
     private BigDecimalRangeValidator cleanValidator = new BigDecimalRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestBigIntegerRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/BigIntegerRangeValidatorTest.java

@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.BigIntegerRangeValidator;
 
-public class TestBigIntegerRangeValidator extends TestCase {
+public class BigIntegerRangeValidatorTest extends TestCase {
 
     private BigIntegerRangeValidator cleanValidator = new BigIntegerRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestByteRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/ByteRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.ByteRangeValidator;
 
-public class TestByteRangeValidator extends TestCase {
+public class ByteRangeValidatorTest extends TestCase {
 
     private ByteRangeValidator cleanValidator = new ByteRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestCompositeValidator.java → server/tests/src/com/vaadin/tests/data/validator/CompositeValidatorTest.java

@@ -8,7 +8,7 @@ import com.vaadin.data.validator.CompositeValidator.CombinationMode;
 import com.vaadin.data.validator.EmailValidator;
 import com.vaadin.data.validator.RegexpValidator;
 
-public class TestCompositeValidator extends TestCase {
+public class CompositeValidatorTest extends TestCase {
 
     CompositeValidator and = new CompositeValidator(CombinationMode.AND,
             "One validator not valid");

server/tests/src/com/vaadin/tests/data/validator/TestDateRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/DateRangeValidatorTest.java

@@ -10,7 +10,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.validator.DateRangeValidator;
 import com.vaadin.shared.ui.datefield.Resolution;
 
-public class TestDateRangeValidator extends TestCase {
+public class DateRangeValidatorTest extends TestCase {
     Calendar startDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),
             Locale.ENGLISH);
     Calendar endDate = new GregorianCalendar(TimeZone.getTimeZone("GMT"),

server/tests/src/com/vaadin/tests/data/validator/TestDoubleRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/DoubleRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.DoubleRangeValidator;
 
-public class TestDoubleRangeValidator extends TestCase {
+public class DoubleRangeValidatorTest extends TestCase {
 
     private DoubleRangeValidator cleanValidator = new DoubleRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestEmailValidator.java → server/tests/src/com/vaadin/tests/data/validator/EmailValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.EmailValidator;
 
-public class TestEmailValidator extends TestCase {
+public class EmailValidatorTest extends TestCase {
 
     private EmailValidator validator = new EmailValidator("Error");
 

server/tests/src/com/vaadin/tests/data/validator/TestFloatRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/FloatRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.FloatRangeValidator;
 
-public class TestFloatRangeValidator extends TestCase {
+public class FloatRangeValidatorTest extends TestCase {
 
     private FloatRangeValidator cleanValidator = new FloatRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestIntegerRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/IntegerRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.IntegerRangeValidator;
 
-public class TestIntegerRangeValidator extends TestCase {
+public class IntegerRangeValidatorTest extends TestCase {
 
     private IntegerRangeValidator cleanValidator = new IntegerRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestLongRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/LongRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.LongRangeValidator;
 
-public class TestLongRangeValidator extends TestCase {
+public class LongRangeValidatorTest extends TestCase {
 
     private LongRangeValidator cleanValidator = new LongRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestNullValidator.java → server/tests/src/com/vaadin/tests/data/validator/NullValidatorTest.java

@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.data.Validator;
 import com.vaadin.data.validator.NullValidator;
 
-public class TestNullValidator extends TestCase {
+public class NullValidatorTest extends TestCase {
 
     NullValidator notNull = new NullValidator("Null not accepted", false);
     NullValidator onlyNull = new NullValidator("Only null accepted", true);

server/tests/src/com/vaadin/tests/data/validator/TestRegexpValidator.java → server/tests/src/com/vaadin/tests/data/validator/RegexpValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.RegexpValidator;
 
-public class TestRegexpValidator extends TestCase {
+public class RegexpValidatorTest extends TestCase {
 
     private RegexpValidator completeValidator = new RegexpValidator("pattern",
             true, "Complete match validator error");

server/tests/src/com/vaadin/tests/data/validator/TestShortRangeValidator.java → server/tests/src/com/vaadin/tests/data/validator/ShortRangeValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.ShortRangeValidator;
 
-public class TestShortRangeValidator extends TestCase {
+public class ShortRangeValidatorTest extends TestCase {
 
     private ShortRangeValidator cleanValidator = new ShortRangeValidator(
             "no values", null, null);

server/tests/src/com/vaadin/tests/data/validator/TestStringLengthValidator.java → server/tests/src/com/vaadin/tests/data/validator/StringLengthValidatorTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.data.validator.StringLengthValidator;
 
-public class TestStringLengthValidator extends TestCase {
+public class StringLengthValidatorTest extends TestCase {
 
     private StringLengthValidator validator = new StringLengthValidator("Error");
     private StringLengthValidator validatorNoNull = new StringLengthValidator(

server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java → server/tests/src/com/vaadin/tests/server/AbstractBeanContainerListenersTest.java

@@ -3,10 +3,10 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.util.BeanItemContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractBeanContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractBeanContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(BeanItemContainer.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class,

server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java → server/tests/src/com/vaadin/tests/server/AbstractContainerListenersTest.java

@@ -5,9 +5,9 @@ import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.Container.PropertySetChangeEvent;
 import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractContainerListeners extends AbstractListenerMethodsTest {
+public class AbstractContainerListenersTest extends AbstractListenerMethodsTestBase {
 
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,

server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java → server/tests/src/com/vaadin/tests/server/AbstractInMemoryContainerListenersTest.java

@@ -3,10 +3,10 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.Container.ItemSetChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractInMemoryContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractInMemoryContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testItemSetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ItemSetChangeEvent.class, ItemSetChangeListener.class);

server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java → server/tests/src/com/vaadin/tests/server/AbstractPropertyListenersTest.java

@@ -6,9 +6,9 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.AbstractProperty;
 import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class TestAbstractPropertyListeners extends AbstractListenerMethodsTest {
+public class AbstractPropertyListenersTest extends AbstractListenerMethodsTestBase {
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbstractProperty.class,
                 ValueChangeEvent.class, ValueChangeListener.class,

server/tests/src/com/vaadin/tests/server/TestAssertionsEnabled.java → server/tests/src/com/vaadin/tests/server/AssertionsEnabledTest.java

@@ -18,7 +18,7 @@ package com.vaadin.tests.server;
 
 import junit.framework.TestCase;
 
-public class TestAssertionsEnabled extends TestCase {
+public class AssertionsEnabledTest extends TestCase {
     public void testAssertionsEnabled() {
         boolean assertFailed = false;
         try {

server/tests/src/com/vaadin/tests/server/TestAtmosphereVersion.java → server/tests/src/com/vaadin/tests/server/AtmosphereVersionTest.java

@@ -6,7 +6,7 @@ import org.atmosphere.util.Version;
 
 import com.vaadin.server.Constants;
 
-public class TestAtmosphereVersion extends TestCase {
+public class AtmosphereVersionTest extends TestCase {
     /**
      * Test that the atmosphere version constant matches the version on our
      * classpath

server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java → server/tests/src/com/vaadin/tests/server/ClassesSerializableTest.java

@@ -19,7 +19,7 @@ import junit.framework.TestCase;
 import org.junit.Ignore;
 import org.junit.Test;
 
-public class TestClassesSerializable extends TestCase {
+public class ClassesSerializableTest extends TestCase {
 
     /**
      * JARs that will be scanned for classes to test, in addition to classpath
@@ -63,6 +63,10 @@ public class TestClassesSerializable extends TestCase {
             "com\\.vaadin\\.buildhelpers.*", //
             "com\\.vaadin\\.util\\.ReflectTools.*", //
             "com\\.vaadin\\.data\\.util\\.ReflectTools.*", //
+            "com\\.vaadin\\.data\\.util.BeanItemContainerGenerator.*",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.connection\\.MockInitialContextFactory",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.DataGenerator",
+            "com\\.vaadin\\.data\\.util\\.sqlcontainer\\.FreeformQueryUtil",
             "com\\.vaadin\\.sass.*", //
             "com\\.vaadin\\.testbench.*", //
             "com\\.vaadin\\.util\\.CurrentInstance\\$1", //
@@ -149,11 +153,6 @@ public class TestClassesSerializable extends TestCase {
     }
 
     private boolean isTestClass(Class<?> cls) {
-        // @Ignore is used on test util classes
-        if (cls.isAnnotationPresent(Ignore.class)) {
-            return true;
-        }
-
         if (cls.getEnclosingClass() != null
                 && isTestClass(cls.getEnclosingClass())) {
             return true;

server/tests/src/com/vaadin/tests/server/TestClientMethodSerialization.java → server/tests/src/com/vaadin/tests/server/ClientMethodSerializationTest.java

@@ -33,18 +33,18 @@ import elemental.json.Json;
 import elemental.json.JsonArray;
 import elemental.json.impl.JsonUtil;
 
-public class TestClientMethodSerialization extends TestCase {
+public class ClientMethodSerializationTest extends TestCase {
 
     private static final Method JAVASCRIPT_CALLBACK_METHOD = ReflectTools
             .findMethod(JavaScriptCallbackRpc.class, "call", String.class,
                     JsonArray.class);
 
     private static final Method BASIC_PARAMS_CALL_METHOD = ReflectTools
-            .findMethod(TestClientMethodSerialization.class,
+            .findMethod(ClientMethodSerializationTest.class,
                     "basicParamsMethodForTesting", String.class, Integer.class);
 
     private static final Method NO_PARAMS_CALL_METHOD = ReflectTools
-            .findMethod(TestClientMethodSerialization.class,
+            .findMethod(ClientMethodSerializationTest.class,
                     "noParamsMethodForTesting");
 
     public void basicParamsMethodForTesting(String stringParam,

server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTestServer.java → server/tests/src/com/vaadin/tests/server/CsrfTokenMissingTest.java

@@ -47,7 +47,7 @@ import elemental.json.JsonException;
  * @since
  * @author Vaadin Ltd
  */
-public class CsrfTokenMissingTestServer {
+public class CsrfTokenMissingTest {
 
     // Dummy fields just to run the test.
     private VaadinServlet mockServlet;
@@ -185,7 +185,7 @@ public class CsrfTokenMissingTestServer {
     }
 
     private static Logger LOGGER = Logger
-            .getLogger(CsrfTokenMissingTestServer.class.getName());
+            .getLogger(CsrfTokenMissingTest.class.getName());
     static {
         LOGGER.setLevel(Level.ALL);
     }

server/tests/src/com/vaadin/tests/server/TestEventRouter.java → server/tests/src/com/vaadin/tests/server/EventRouterTest.java

@@ -6,7 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.ui.TextField;
 
-public class TestEventRouter extends TestCase {
+public class EventRouterTest extends TestCase {
 
     int innerListenerCalls = 0;
 

server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java → server/tests/src/com/vaadin/tests/server/FileTypeResolverTest.java

@@ -6,7 +6,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.util.FileTypeResolver;
 
-public class TestFileTypeResolver extends TestCase {
+public class FileTypeResolverTest extends TestCase {
 
     private static final String FLASH_MIME_TYPE = "application/x-shockwave-flash";
     private static final String TEXT_MIME_TYPE = "text/plain";

server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java → server/tests/src/com/vaadin/tests/server/IndexedContainerListenersTest.java

@@ -5,9 +5,9 @@ import com.vaadin.data.Container.PropertySetChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.IndexedContainer;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class IndexedContainerListeners extends AbstractListenerMethodsTest {
+public class IndexedContainerListenersTest extends AbstractListenerMethodsTestBase {
     public void testValueChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(IndexedContainer.class,
                 ValueChangeEvent.class, ValueChangeListener.class);

server/tests/src/com/vaadin/tests/server/TestKeyMapper.java → server/tests/src/com/vaadin/tests/server/KeyMapperTest.java

@@ -7,7 +7,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.server.KeyMapper;
 
-public class TestKeyMapper extends TestCase {
+public class KeyMapperTest extends TestCase {
 
     public void testAdd() {
         KeyMapper<Object> mapper = new KeyMapper<Object>();

server/tests/src/com/vaadin/tests/server/TestMimeTypes.java → server/tests/src/com/vaadin/tests/server/MimeTypesTest.java

@@ -5,7 +5,7 @@ import junit.framework.TestCase;
 import com.vaadin.server.ClassResource;
 import com.vaadin.ui.Embedded;
 
-public class TestMimeTypes extends TestCase {
+public class MimeTypesTest extends TestCase {
 
     public void testEmbeddedPDF() {
         Embedded e = new Embedded("A pdf", new ClassResource("file.pddf"));

server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java → server/tests/src/com/vaadin/tests/server/PropertyFormatterTest.java

@@ -10,7 +10,7 @@ import com.vaadin.data.util.ObjectProperty;
 import com.vaadin.data.util.PropertyFormatter;
 
 @SuppressWarnings("unchecked")
-public class TestPropertyFormatter extends TestCase {
+public class PropertyFormatterTest extends TestCase {
 
     class TestFormatter extends PropertyFormatter {
 

server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java → server/tests/src/com/vaadin/tests/server/PropertysetItemListenersTest.java

@@ -3,9 +3,9 @@ package com.vaadin.tests.server;
 import com.vaadin.data.Item.PropertySetChangeEvent;
 import com.vaadin.data.Item.PropertySetChangeListener;
 import com.vaadin.data.util.PropertysetItem;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 
-public class PropertysetItemListeners extends AbstractListenerMethodsTest {
+public class PropertysetItemListenersTest extends AbstractListenerMethodsTestBase {
     public void testPropertySetChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(PropertysetItem.class,
                 PropertySetChangeEvent.class, PropertySetChangeListener.class);

server/tests/src/com/vaadin/tests/server/TestSerialization.java → server/tests/src/com/vaadin/tests/server/SerializationTest.java

@@ -17,7 +17,7 @@ import com.vaadin.data.validator.RegexpValidator;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.ui.Form;
 
-public class TestSerialization extends TestCase {
+public class SerializationTest extends TestCase {
 
     public void testValidators() throws Exception {
         RegexpValidator validator = new RegexpValidator(".*", "Error");

server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java → server/tests/src/com/vaadin/tests/server/SimpleMultiPartInputStreamTest.java

@@ -9,7 +9,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.server.communication.FileUploadHandler.SimpleMultiPartInputStream;
 
-public class TestSimpleMultiPartInputStream extends TestCase {
+public class SimpleMultiPartInputStreamTest extends TestCase {
 
     /**
      * Check that the output for a given stream until boundary is as expected.

server/tests/src/com/vaadin/tests/server/TestStreamResource.java → server/tests/src/com/vaadin/tests/server/StreamResourceTest.java

@@ -26,7 +26,7 @@ import com.vaadin.server.StreamResource.StreamSource;
  * 
  * @author Vaadin Ltd
  */
-public class TestStreamResource {
+public class StreamResourceTest {
 
     @Test
     public void testEqualsWithNullFields() {

server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java → server/tests/src/com/vaadin/tests/server/StreamVariableMappingTest.java

@@ -17,7 +17,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.UI;
 import com.vaadin.ui.Upload;
 
-public class TestStreamVariableMapping extends TestCase {
+public class StreamVariableMappingTest extends TestCase {
     private static final String variableName = "myName";
 
     private Upload owner;

server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListeners.java → server/tests/src/com/vaadin/tests/server/clientconnector/AttachDetachListenersTest.java

@@ -25,7 +25,7 @@ import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.UI;
 
-public class AttachDetachListeners {
+public class AttachDetachListenersTest {
 
     private IMocksControl control;
 

server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java → server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTestBase.java

@@ -14,7 +14,7 @@ import org.junit.Assert;
 import com.vaadin.tests.VaadinClasses;
 import com.vaadin.ui.Component;
 
-public abstract class AbstractListenerMethodsTest extends TestCase {
+public abstract class AbstractListenerMethodsTestBase extends TestCase {
 
     public static void main(String[] args) {
         findAllListenerMethods();
@@ -48,13 +48,13 @@ public abstract class AbstractListenerMethodsTest extends TestCase {
                         System.out.println("package " + packageName + ";");
 
                         System.out.println("import "
-                                + AbstractListenerMethodsTest.class.getName()
+                                + AbstractListenerMethodsTestBase.class.getName()
                                 + ";");
                         System.out.println("import " + c.getName() + ";");
                         System.out.println("public class "
                                 + c.getSimpleName()
                                 + "Listeners extends "
-                                + AbstractListenerMethodsTest.class
+                                + AbstractListenerMethodsTestBase.class
                                         .getSimpleName() + " {");
                     }
 

server/tests/src/com/vaadin/tests/server/component/TestReadEmptyDesign.java → server/tests/src/com/vaadin/tests/server/component/ReadEmptyDesignTest.java

@@ -34,7 +34,7 @@ import com.vaadin.ui.declarative.DesignException;
  * Test cases for checking that reading a design with no elements in the html
  * body produces null as the root component.
  */
-public class TestReadEmptyDesign extends TestCase {
+public class ReadEmptyDesignTest extends TestCase {
     InputStream is;
 
     @Override

server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirty.java → server/tests/src/com/vaadin/tests/server/component/StateGetDoesNotMarkDirtyTest.java

@@ -17,7 +17,7 @@ import com.vaadin.ui.ConnectorTracker;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.UI;
 
-public class StateGetDoesNotMarkDirty extends TestCase {
+public class StateGetDoesNotMarkDirtyTest extends TestCase {
 
     private Set<String> excludedMethods = new HashSet<String>();
 

server/tests/src/com/vaadin/tests/server/component/TestWriteEmptyDesign.java → server/tests/src/com/vaadin/tests/server/component/WriteEmptyDesignTest.java

@@ -33,7 +33,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * Test cases for checking that writing a component hierarchy with null root
  * produces an html document that has no elements in the html body.
  */
-public class TestWriteEmptyDesign extends TestCase {
+public class WriteEmptyDesignTest extends TestCase {
 
     public void testWriteComponent() throws IOException {
         OutputStream os = new ByteArrayOutputStream();

server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java → server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListenersTest.java

@@ -2,10 +2,10 @@ package com.vaadin.tests.server.component.absolutelayout;
 
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.AbsoluteLayout;
 
-public class AbsoluteLayoutListeners extends AbstractListenerMethodsTest {
+public class AbsoluteLayoutListenersTest extends AbstractListenerMethodsTestBase {
     public void testLayoutClickListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(AbsoluteLayout.class, LayoutClickEvent.class,
                 LayoutClickListener.class);

server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java → server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPositionTest.java

@@ -7,7 +7,7 @@ import com.vaadin.server.Sizeable.Unit;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 
-public class ComponentPosition extends TestCase {
+public class ComponentPositionTest extends TestCase {
 
     private static final String CSS = "top:7.0px;right:7.0%;bottom:7.0pc;left:7.0em;z-index:7;";
     private static final String PARTIAL_CSS = "top:7.0px;left:7.0em;";

server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestReadDesign.java → server/tests/src/com/vaadin/tests/server/component/absolutelayout/ReadDesignTest.java

@@ -35,7 +35,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private AbsoluteLayout root;
 

server/tests/src/com/vaadin/tests/server/component/absolutelayout/TestWriteDesign.java → server/tests/src/com/vaadin/tests/server/component/absolutelayout/WriteDesignTest.java

@@ -31,7 +31,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * @since
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     public void testSynchronizeEmptyLayout() {
         AbsoluteLayout layout = createTestLayout();

server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java → server/tests/src/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentStyleNamesTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 
 import com.vaadin.ui.AbstractComponent;
 
-public class TestAbstractComponentStyleNames extends TestCase {
+public class AbstractComponentStyleNamesTest extends TestCase {
 
     public void testSetMultiple() {
         AbstractComponent component = getComponent();

server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestReadDesign.java → server/tests/src/com/vaadin/tests/server/component/abstractcomponent/ReadDesignTest.java

@@ -36,7 +36,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestReadDesign extends TestCase {
+public class ReadDesignTest extends TestCase {
 
     private DesignContext ctx;
 

server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestWriteDesign.java → server/tests/src/com/vaadin/tests/server/component/abstractcomponent/WriteDesignTest.java

@@ -42,7 +42,7 @@ import com.vaadin.ui.declarative.DesignContext;
  * 
  * @author Vaadin Ltd
  */
-public class TestWriteDesign extends TestCase {
+public class WriteDesignTest extends TestCase {
 
     private DesignContext ctx;
 

server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java → server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AbstractComponentContainerListenersTest.java

@@ -1,6 +1,6 @@
 package com.vaadin.tests.server.component.abstractcomponentcontainer;
 
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.HasComponents.ComponentAttachEvent;
 import com.vaadin.ui.HasComponents.ComponentAttachListener;
 import com.vaadin.ui.HasComponents.ComponentDetachEvent;
@@ -8,8 +8,8 @@ import com.vaadin.ui.HasComponents.ComponentDetachListener;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.VerticalLayout;
 
-public class TestAbstractComponentContainerListeners extends
-        AbstractListenerMethodsTest {
+public class AbstractComponentContainerListenersTest extends
+        AbstractListenerMethodsTestBase {
     public void testComponentDetachListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(HorizontalLayout.class,
                 ComponentDetachEvent.class, ComponentDetachListener.class);

server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChild.java → server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/AddParentAsChildTest.java

@@ -30,7 +30,7 @@ import com.vaadin.ui.HasComponents;
  * 
  * @author Vaadin Ltd
  */
-public class AddParentAsChild {
+public class AddParentAsChildTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testAddComponent() {

server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidators.java → server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java

@@ -8,7 +8,7 @@ import com.vaadin.data.Validator;
 import com.vaadin.ui.AbstractField;
 import com.vaadin.ui.Field;
 
-public class AbsFieldValidators extends TestCase {
+public class AbsFieldValidatorsTest extends TestCase {
 
     Field<Object> field = new AbstractField<Object>() {
         @Override

server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionError.java → server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java

@@ -14,7 +14,7 @@ import com.vaadin.tests.data.bean.Person;
 import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversionError extends TestCase {
+public class AbsFieldValueConversionErrorTest extends TestCase {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",

server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversions.java → server/tests/src/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java

@@ -21,7 +21,7 @@ import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.TextField;
 
-public class AbsFieldValueConversions extends TestCase {
+public class AbsFieldValueConversionsTest extends TestCase {
 
     Person paulaBean = new Person("Paula", "Brilliant", "paula@brilliant.com",
             34, Sex.FEMALE, new Address("Paula street 1", 12345, "P-town",

server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java → server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldListenersTest.java

@@ -4,10 +4,10 @@ import com.vaadin.data.Property.ReadOnlyStatusChangeEvent;
 import com.vaadin.data.Property.ReadOnlyStatusChangeListener;
 import com.vaadin.data.Property.ValueChangeEvent;
 import com.vaadin.data.Property.ValueChangeListener;
-import com.vaadin.tests.server.component.AbstractListenerMethodsTest;
+import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase;
 import com.vaadin.ui.CheckBox;
 
-public class TestAbstractFieldListeners extends AbstractListenerMethodsTest {
+public class AbstractFieldListenersTest extends AbstractListenerMethodsTestBase {
     public void testReadOnlyStatusChangeListenerAddGetRemove() throws Exception {
         testListenerAddGetRemove(CheckBox.class,
                 ReadOnlyStatusChangeEvent.class,

server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java → server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java

@@ -14,7 +14,7 @@ import com.vaadin.tests.data.bean.Sex;
 import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.TextField;
 
-public class DefaultConverterFactory extends TestCase {
+public class DefaultConverterFactoryTest extends TestCase {
 
     public static class FloatBean {
         float f1;