summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--build/build.xml8
-rw-r--r--server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/AbstractContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/AbstractContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/BeanContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/BeanContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java (renamed from tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/BeanItemTest.java (renamed from tests/server-side/com/vaadin/data/util/BeanItemTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/FileSystemContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java (renamed from tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java (renamed from tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java (renamed from tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java (renamed from tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/PropertySetItemTest.java (renamed from tests/server-side/com/vaadin/data/util/PropertySetItemTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java (renamed from tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/TestContainerSorting.java (renamed from tests/server-side/com/vaadin/data/util/TestContainerSorting.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java (renamed from tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/TestIndexedContainer.java (renamed from tests/server-side/com/vaadin/data/util/TestIndexedContainer.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java (renamed from tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java)0
-rw-r--r--server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java (renamed from tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java)0
-rw-r--r--server/tests/src/com/vaadin/server/JSONSerializerTest.java (renamed from tests/server-side/com/vaadin/server/JSONSerializerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java (renamed from tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/VaadinClasses.java (renamed from tests/server-side/com/vaadin/tests/VaadinClasses.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/Address.java (renamed from tests/server-side/com/vaadin/tests/data/bean/Address.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java (renamed from tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/Country.java (renamed from tests/server-side/com/vaadin/tests/data/bean/Country.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/Person.java (renamed from tests/server-side/com/vaadin/tests/data/bean/Person.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java (renamed from tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/bean/Sex.java (renamed from tests/server-side/com/vaadin/tests/data/bean/Sex.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java (renamed from tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java (renamed from tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java (renamed from tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/SourceFileChecker.java (renamed from tests/server-side/com/vaadin/tests/server/SourceFileChecker.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java (renamed from tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java (renamed from tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java (renamed from tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java (renamed from tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java (renamed from tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestEventRouter.java (renamed from tests/server-side/com/vaadin/tests/server/TestEventRouter.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java (renamed from tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestKeyMapper.java (renamed from tests/server-side/com/vaadin/tests/server/TestKeyMapper.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestMimeTypes.java (renamed from tests/server-side/com/vaadin/tests/server/TestMimeTypes.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java (renamed from tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestSerialization.java (renamed from tests/server-side/com/vaadin/tests/server/TestSerialization.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java (renamed from tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java (renamed from tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TestThemeNames.java (renamed from tests/server-side/com/vaadin/tests/server/TestThemeNames.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java (renamed from tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java (renamed from tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java (renamed from tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java (renamed from tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java (renamed from tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java (renamed from tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java (renamed from tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java (renamed from tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TableSerialization.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java (renamed from tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java (renamed from tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java (renamed from tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/tree/TestHasChildren.java (renamed from tests/server-side/com/vaadin/tests/server/component/tree/TestHasChildren.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java (renamed from tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java (renamed from tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java (renamed from tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java (renamed from tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java (renamed from tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java (renamed from tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java (renamed from tests/server-side/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java (renamed from tests/server-side/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java (renamed from tests/server-side/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java (renamed from tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java (renamed from tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java (renamed from tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java (renamed from tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java (renamed from tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/components/TestWindow.java (renamed from tests/server-side/com/vaadin/tests/server/components/TestWindow.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java (renamed from tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java (renamed from tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java (renamed from tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java (renamed from tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java (renamed from tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java (renamed from tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java (renamed from tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/util/TestUtil.java (renamed from tests/server-side/com/vaadin/tests/util/TestUtil.java)0
-rw-r--r--server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java (renamed from tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java)0
144 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml
index 8ebb4e99ff..96ec975ace 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -348,7 +348,7 @@
* src (Vaadin core)
* sass/src (SASS compiler)
* tests/testbench (TestBench test cases)
- * tests/server-side (Server-side JUnit test cases)
+ * server/tests/src (Server-side JUnit test cases)
* client/tests/src (Client-side JUnit test cases)
These are copied to
@@ -449,7 +449,7 @@
</copy>
<copy todir="${result-src-junit}">
<filterset refid="version-and-license"/>
- <fileset dir="tests/server-side">
+ <fileset dir="server/tests/src">
<patternset refid="preprocessable-files" />
</fileset>
<fileset dir="client/tests/src">
@@ -500,7 +500,7 @@
</fileset>
</copy>
<copy todir="${result-src-junit}">
- <fileset dir="tests/server-side">
+ <fileset dir="server/tests/src">
<patternset refid="non-preprocessable-files" />
</fileset>
<fileset dir="client/tests/src">
@@ -1295,7 +1295,7 @@
</classpath>
<batchtest fork="yes">
- <fileset dir="tests/server-side" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" />
+ <fileset dir="server/tests/src" includes="**/*.java" excludes="**/Abstract*.java,com/vaadin/tests/data/bean/*.java,com/vaadin/tests/util/*.java,**/VaadinClasses.java" />
<fileset dir="client/tests/src" includes="**/*.java" excludes="**/Abstract*.java" />
</batchtest>
</junit>
diff --git a/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
index 3c74a45bd7..3c74a45bd7 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractBeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractBeanContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
index b0151a6690..b0151a6690 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
index 772cd250ce..772cd250ce 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractHierarchicalContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
index bbad33c5bc..bbad33c5bc 100644
--- a/tests/server-side/com/vaadin/data/util/AbstractInMemoryContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractInMemoryContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
index 9037e303a8..9037e303a8 100644
--- a/tests/server-side/com/vaadin/data/util/BeanContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
index 38f317fef1..38f317fef1 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemContainerSortTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerSortTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
index 29043b1670..29043b1670 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/BeanItemTest.java b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
index e1ad75796c..e1ad75796c 100644
--- a/tests/server-side/com/vaadin/data/util/BeanItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/BeanItemTest.java
diff --git a/tests/server-side/com/vaadin/data/util/FileSystemContainerTest.java b/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java
index f4bb794e5c..f4bb794e5c 100644
--- a/tests/server-side/com/vaadin/data/util/FileSystemContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/FileSystemContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java b/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
index 640ede8743..640ede8743 100644
--- a/tests/server-side/com/vaadin/data/util/NestedMethodPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/NestedMethodPropertyTest.java
diff --git a/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java b/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
index 99ca58ba42..99ca58ba42 100644
--- a/tests/server-side/com/vaadin/data/util/ObjectPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/ObjectPropertyTest.java
diff --git a/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
index c4ed12efc0..c4ed12efc0 100644
--- a/tests/server-side/com/vaadin/data/util/PerformanceTestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/PerformanceTestIndexedContainer.java
diff --git a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
index 14e70d76d4..14e70d76d4 100644
--- a/tests/server-side/com/vaadin/data/util/PropertyDescriptorTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertyDescriptorTest.java
diff --git a/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
index a3169332ec..a3169332ec 100644
--- a/tests/server-side/com/vaadin/data/util/PropertySetItemTest.java
+++ b/server/tests/src/com/vaadin/data/util/PropertySetItemTest.java
diff --git a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java b/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
index ff6de50651..ff6de50651 100644
--- a/tests/server-side/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
+++ b/server/tests/src/com/vaadin/data/util/TestContainerHierarchicalWrapper.java
diff --git a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java b/server/tests/src/com/vaadin/data/util/TestContainerSorting.java
index 497699605a..497699605a 100644
--- a/tests/server-side/com/vaadin/data/util/TestContainerSorting.java
+++ b/server/tests/src/com/vaadin/data/util/TestContainerSorting.java
diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java
index 10bc71c3a7..10bc71c3a7 100644
--- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java
+++ b/server/tests/src/com/vaadin/data/util/TestHierarchicalContainer.java
diff --git a/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
index 156ff83883..156ff83883 100644
--- a/tests/server-side/com/vaadin/data/util/TestIndexedContainer.java
+++ b/server/tests/src/com/vaadin/data/util/TestIndexedContainer.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java
index 6f96c3a51a..6f96c3a51a 100644
--- a/tests/server-side/com/vaadin/data/util/filter/AbstractFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AbstractFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
index fdd5b8a645..fdd5b8a645 100644
--- a/tests/server-side/com/vaadin/data/util/filter/AndOrFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/AndOrFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
index 99e8429a51..99e8429a51 100644
--- a/tests/server-side/com/vaadin/data/util/filter/CompareFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/CompareFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
index 6f90273de1..6f90273de1 100644
--- a/tests/server-side/com/vaadin/data/util/filter/IsNullFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/IsNullFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
index c3b666e6f7..c3b666e6f7 100644
--- a/tests/server-side/com/vaadin/data/util/filter/NotFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/NotFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
index bc63d57752..bc63d57752 100644
--- a/tests/server-side/com/vaadin/data/util/filter/SimpleStringFilterTest.java
+++ b/server/tests/src/com/vaadin/data/util/filter/SimpleStringFilterTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
index 057527307f..057527307f 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/AllTests.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/AllTests.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
index 09f620cc2a..09f620cc2a 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ColumnPropertyTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
index 489f780d61..489f780d61 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/DataGenerator.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/DataGenerator.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
index b0e2a232ca..b0e2a232ca 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/FreeformQueryUtil.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
index d2b6ee2555..d2b6ee2555 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/ReadOnlyRowIdTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java
index 399db06869..399db06869 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/RowIdTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/RowIdTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
index 438c40823d..438c40823d 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTableQueryTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
index 6649bc16e8..6649bc16e8 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/SQLContainerTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
index a12786f13a..a12786f13a 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/TicketTests.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/TicketTests.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
index 31bdf2b81b..31bdf2b81b 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/UtilTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/UtilTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
index 65a995120e..65a995120e 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/J2EEConnectionPoolTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
index 324899e373..324899e373 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/MockInitialContextFactory.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
index 147319643d..147319643d 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/connection/SimpleJDBCConnectionPoolTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
index da4cfe4522..da4cfe4522 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/BetweenTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
index f1130aad80..f1130aad80 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/filters/LikeTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
index e62a06e6e1..e62a06e6e1 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
index 9b38655186..9b38655186 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
index f635b23ebd..f635b23ebd 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/QueryBuilderTest.java
diff --git a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
index e135894013..e135894013 100644
--- a/tests/server-side/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
+++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java
diff --git a/tests/server-side/com/vaadin/server/JSONSerializerTest.java b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
index 05139e6f1a..05139e6f1a 100644
--- a/tests/server-side/com/vaadin/server/JSONSerializerTest.java
+++ b/server/tests/src/com/vaadin/server/JSONSerializerTest.java
diff --git a/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
index df16e98bba..df16e98bba 100644
--- a/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
+++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java
diff --git a/tests/server-side/com/vaadin/tests/VaadinClasses.java b/server/tests/src/com/vaadin/tests/VaadinClasses.java
index 15e1283e47..15e1283e47 100644
--- a/tests/server-side/com/vaadin/tests/VaadinClasses.java
+++ b/server/tests/src/com/vaadin/tests/VaadinClasses.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Address.java b/server/tests/src/com/vaadin/tests/data/bean/Address.java
index 15cdf34ae5..15cdf34ae5 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Address.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Address.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java b/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java
index 416563baba..416563baba 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/BeanToValidate.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/BeanToValidate.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Country.java b/server/tests/src/com/vaadin/tests/data/bean/Country.java
index afdf8dcfa1..afdf8dcfa1 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Country.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Country.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Person.java b/server/tests/src/com/vaadin/tests/data/bean/Person.java
index f7bad31d0e..f7bad31d0e 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Person.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Person.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java b/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
index 93b2273263..93b2273263 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/PersonWithBeanValidationAnnotations.java
diff --git a/tests/server-side/com/vaadin/tests/data/bean/Sex.java b/server/tests/src/com/vaadin/tests/data/bean/Sex.java
index a4e3f20a11..a4e3f20a11 100644
--- a/tests/server-side/com/vaadin/tests/data/bean/Sex.java
+++ b/server/tests/src/com/vaadin/tests/data/bean/Sex.java
diff --git a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
index 6393d61981..6393d61981 100644
--- a/tests/server-side/com/vaadin/tests/data/converter/ConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/ConverterFactory.java
diff --git a/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java b/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
index 8334c7f183..8334c7f183 100644
--- a/tests/server-side/com/vaadin/tests/server/IndexedContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/IndexedContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java b/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
index d493f22779..d493f22779 100644
--- a/tests/server-side/com/vaadin/tests/server/PropertysetItemListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/PropertysetItemListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java b/server/tests/src/com/vaadin/tests/server/SourceFileChecker.java
index 1ab742427d..1ab742427d 100644
--- a/tests/server-side/com/vaadin/tests/server/SourceFileChecker.java
+++ b/server/tests/src/com/vaadin/tests/server/SourceFileChecker.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
index 0d8433d1c6..0d8433d1c6 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractBeanContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
index b63e4f809a..b63e4f809a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
index a8e2a4aa2a..a8e2a4aa2a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractInMemoryContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java b/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
index a1d01d1930..a1d01d1930 100644
--- a/tests/server-side/com/vaadin/tests/server/TestAbstractPropertyListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/TestAbstractPropertyListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
index e98be99cbc..e98be99cbc 100644
--- a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java
+++ b/server/tests/src/com/vaadin/tests/server/TestClassesSerializable.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java b/server/tests/src/com/vaadin/tests/server/TestEventRouter.java
index a8f5039042..a8f5039042 100644
--- a/tests/server-side/com/vaadin/tests/server/TestEventRouter.java
+++ b/server/tests/src/com/vaadin/tests/server/TestEventRouter.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
index 8a368ead53..8a368ead53 100644
--- a/tests/server-side/com/vaadin/tests/server/TestFileTypeResolver.java
+++ b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java b/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java
index 1c1f9624c8..1c1f9624c8 100644
--- a/tests/server-side/com/vaadin/tests/server/TestKeyMapper.java
+++ b/server/tests/src/com/vaadin/tests/server/TestKeyMapper.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java b/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java
index dc730f6cc4..dc730f6cc4 100644
--- a/tests/server-side/com/vaadin/tests/server/TestMimeTypes.java
+++ b/server/tests/src/com/vaadin/tests/server/TestMimeTypes.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java
index 48c60c83c4..48c60c83c4 100644
--- a/tests/server-side/com/vaadin/tests/server/TestPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/TestPropertyFormatter.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestSerialization.java b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
index 84ff5ad6fa..84ff5ad6fa 100644
--- a/tests/server-side/com/vaadin/tests/server/TestSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/TestSerialization.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
index 84247c81c1..84247c81c1 100644
--- a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
+++ b/server/tests/src/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
index f3b367483a..f3b367483a 100644
--- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java
+++ b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java
diff --git a/tests/server-side/com/vaadin/tests/server/TestThemeNames.java b/server/tests/src/com/vaadin/tests/server/TestThemeNames.java
index 22fe315730..22fe315730 100644
--- a/tests/server-side/com/vaadin/tests/server/TestThemeNames.java
+++ b/server/tests/src/com/vaadin/tests/server/TestThemeNames.java
diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/server/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java
index 0cacccd08a..0cacccd08a 100644
--- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java
+++ b/server/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
index e189ffc77d..e189ffc77d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/AbstractListenerMethodsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java b/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
index ad80007882..ad80007882 100644
--- a/tests/server-side/com/vaadin/tests/server/component/FinalMethodTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/FinalMethodTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
index 7d6db42d1a..7d6db42d1a 100644
--- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/AbsoluteLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
index d76dcffa2f..d76dcffa2f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
+++ b/server/tests/src/com/vaadin/tests/server/component/absolutelayout/ComponentPosition.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
index 1903e66f92..1903e66f92 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponent/TestAbstractComponentStyleNames.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
index f9f170eb2a..f9f170eb2a 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractcomponentcontainer/TestAbstractComponentContainerListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
index 57af748247..57af748247 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValueConversions.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
index 25430fc9a5..25430fc9a5 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactory.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index 5dbab8467e..5dbab8467e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
index 9937bf92d5..9937bf92d5 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/TestAbstractFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
index 1971fb6d0e..1971fb6d0e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
index a0b34aca78..a0b34aca78 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/TestAbstractOrderedLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
index 75c19b0517..75c19b0517 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractselect/TestAbstractSelectListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
index 2b6cdaa6cc..2b6cdaa6cc 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstractsplitpanel/TestAbstractSplitPanelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
index 9868d6ebfd..9868d6ebfd 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/abstracttextfield/TestAbstractTextFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java
index 4fe499a0a0..4fe499a0a0 100644
--- a/tests/server-side/com/vaadin/tests/server/component/button/ButtonClick.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonClick.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
index dc37312eea..dc37312eea 100644
--- a/tests/server-side/com/vaadin/tests/server/component/button/ButtonListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/button/ButtonListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
index c0d739b597..c0d739b597 100644
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
index 21a48888d6..21a48888d6 100644
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/CssLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
index 0f4aee35c7..0f4aee35c7 100644
--- a/tests/server-side/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/DateFieldListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java b/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java
index 00b5c60dad..00b5c60dad 100644
--- a/tests/server-side/com/vaadin/tests/server/component/datefield/ResolutionTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/datefield/ResolutionTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
index 7512f0f499..7512f0f499 100644
--- a/tests/server-side/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/embedded/EmbeddedListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
index ce3a9faa65..ce3a9faa65 100644
--- a/tests/server-side/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/gridlayout/GridLayoutListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
index 48279c7c88..48279c7c88 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelConverters.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelConverters.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java b/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
index 3ed79f5010..3ed79f5010 100644
--- a/tests/server-side/com/vaadin/tests/server/component/label/LabelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/label/LabelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
index fd3e02994c..fd3e02994c 100644
--- a/tests/server-side/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/loginform/LoginFormListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
index f304315ebc..f304315ebc 100644
--- a/tests/server-side/com/vaadin/tests/server/component/menubar/MenuBarIds.java
+++ b/server/tests/src/com/vaadin/tests/server/component/menubar/MenuBarIds.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
index 7eb35c3882..7eb35c3882 100644
--- a/tests/server-side/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/optiongroup/OptionGroupListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
index 6a9d55d7e4..6a9d55d7e4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
+++ b/server/tests/src/com/vaadin/tests/server/component/orderedlayout/TestOrderedLayout.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
index 275e90f5d1..275e90f5d1 100644
--- a/tests/server-side/com/vaadin/tests/server/component/panel/PanelListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/panel/PanelListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
index 12a5a0f520..12a5a0f520 100644
--- a/tests/server-side/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/popupview/PopupViewListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
index 906d6ccebd..906d6ccebd 100644
--- a/tests/server-side/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
+++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
index c7703303d3..c7703303d3 100644
--- a/tests/server-side/com/vaadin/tests/server/component/select/SelectListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/select/SelectListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
index b969bf5e53..b969bf5e53 100644
--- a/tests/server-side/com/vaadin/tests/server/component/slider/SliderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/slider/SliderTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
index 299f9c79d4..299f9c79d4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableColumnAlignments.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableColumnAlignments.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java b/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
index 0e63049944..0e63049944 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableGenerator.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableGenerator.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
index 6cc522f8c7..6cc522f8c7 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableSerialization.java b/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java
index ee6349093c..ee6349093c 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableSerialization.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableSerialization.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
index be312044db..be312044db 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TableVisibleColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TableVisibleColumns.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java b/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
index 647d13855b..647d13855b 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TestFooter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TestFooter.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java b/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
index 767b651b68..767b651b68 100644
--- a/tests/server-side/com/vaadin/tests/server/component/table/TestMultipleSelection.java
+++ b/server/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
index 5c01a1c99f..5c01a1c99f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TabSheetListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
index 0ef8ae5a76..0ef8ae5a76 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tabsheet/TestTabSheet.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
index 4bb0177a18..4bb0177a18 100644
--- a/tests/server-side/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
+++ b/server/tests/src/com/vaadin/tests/server/component/textfield/TextFieldWithPropertyFormatter.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TestHasChildren.java b/server/tests/src/com/vaadin/tests/server/component/tree/TestHasChildren.java
index 66535d3ffb..66535d3ffb 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TestHasChildren.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TestHasChildren.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
index 4984cf161b..4984cf161b 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TestListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TestListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
index e14ebe739d..e14ebe739d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/tree/TreeListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/tree/TreeListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
index 535ed8e860..535ed8e860 100644
--- a/tests/server-side/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
+++ b/server/tests/src/com/vaadin/tests/server/component/treetable/EmptyTreeTable.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
index 265e5382d4..265e5382d4 100644
--- a/tests/server-side/com/vaadin/tests/server/component/upload/UploadListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/upload/UploadListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
index 88bc28bbc8..88bc28bbc8 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AddRemoveSubWindow.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
index 0fb0765c9f..0fb0765c9f 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/AttachDetachWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java
diff --git a/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java b/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
index c33871cbd8..c33871cbd8 100644
--- a/tests/server-side/com/vaadin/tests/server/component/window/WindowListeners.java
+++ b/server/tests/src/com/vaadin/tests/server/component/window/WindowListeners.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
index e3e743d02a..e3e743d02a 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
index 828404bd5a..828404bd5a 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/AddRemoveComponentTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
index dc9667c38e..dc9667c38e 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/CssLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
index 71a813d423..71a813d423 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/FormLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
index 0e3a1d5734..0e3a1d5734 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
+++ b/server/tests/src/com/vaadin/tests/server/componentcontainer/VerticalLayoutTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
index f2de4f3c04..f2de4f3c04 100644
--- a/tests/server-side/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/AbstractTestFieldValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java b/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
index 3ba1c4c7f1..3ba1c4c7f1 100644
--- a/tests/server-side/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/components/ComponentAttachDetachListenerTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
index 308889fa33..308889fa33 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestComboBoxValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestComboBoxValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
index 92664917fd..92664917fd 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
index de838e339c..de838e339c 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestTextFieldValueChange.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestTextFieldValueChange.java
diff --git a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java b/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
index 12d3a3c8f5..12d3a3c8f5 100644
--- a/tests/server-side/com/vaadin/tests/server/components/TestWindow.java
+++ b/server/tests/src/com/vaadin/tests/server/components/TestWindow.java
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
index 5db0df4280..5db0df4280 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/ClassBasedViewProviderTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
index 595ddb95db..595ddb95db 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 18ed52cc2a..18ed52cc2a 100644
--- a/tests/server-side/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java b/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
index e3320b8699..e3320b8699 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/RangeValidatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/RangeValidatorTest.java
diff --git a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java
index 8f6928fc35..8f6928fc35 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/TestBeanValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java
diff --git a/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java b/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
index e37b97e02c..e37b97e02c 100644
--- a/tests/server-side/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
+++ b/server/tests/src/com/vaadin/tests/server/validation/TestReadOnlyValidation.java
diff --git a/tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java b/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
index 9e791500b0..9e791500b0 100644
--- a/tests/server-side/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
+++ b/server/tests/src/com/vaadin/tests/util/GraphVizClassHierarchyCreator.java
diff --git a/tests/server-side/com/vaadin/tests/util/TestUtil.java b/server/tests/src/com/vaadin/tests/util/TestUtil.java
index e84f9dd8b9..e84f9dd8b9 100644
--- a/tests/server-side/com/vaadin/tests/util/TestUtil.java
+++ b/server/tests/src/com/vaadin/tests/util/TestUtil.java
diff --git a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java
index d62f0df332..d62f0df332 100644
--- a/tests/server-side/com/vaadin/tests/util/UniqueSerializableTest.java
+++ b/server/tests/src/com/vaadin/tests/util/UniqueSerializableTest.java