From cf1f89072dcd820248474a36cfc2f60e5f3f9a1b Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 27 Sep 2012 15:59:39 +0300 Subject: Global code cleanup --- .../data/util/sqlcontainer/generator/SQLGeneratorsTest.java | 2 +- .../vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java | 4 ++-- .../com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java | 4 ++-- .../src/com/vaadin/tests/server/TestStreamVariableMapping.java | 2 +- .../server/component/abstractfield/RemoveListenersOnDetach.java | 2 +- .../server/component/abstractorderedlayout/AddComponentsTest.java | 8 ++++---- .../tests/server/component/csslayout/AddComponentsTest.java | 4 ++-- .../vaadin/tests/server/component/root/CustomUIClassLoader.java | 3 +-- .../vaadin/tests/server/component/window/AttachDetachWindow.java | 2 +- server/tests/src/com/vaadin/ui/LabelDataSource.java | 2 +- 10 files changed, 16 insertions(+), 17 deletions(-) (limited to 'server/tests') diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java index 2db31dc13f..59e879a8e0 100644 --- a/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/generator/SQLGeneratorsTest.java @@ -13,10 +13,10 @@ import org.junit.Test; import com.vaadin.data.Container.Filter; import com.vaadin.data.util.filter.Like; import com.vaadin.data.util.filter.Or; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; import com.vaadin.data.util.sqlcontainer.DataGenerator; import com.vaadin.data.util.sqlcontainer.RowItem; import com.vaadin.data.util.sqlcontainer.SQLContainer; +import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.query.OrderBy; diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java index acb3651bd4..195911475e 100644 --- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/FreeformQueryTest.java @@ -16,12 +16,12 @@ import org.junit.Test; import com.vaadin.data.Container.Filter; import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; import com.vaadin.data.util.sqlcontainer.DataGenerator; import com.vaadin.data.util.sqlcontainer.RowId; import com.vaadin.data.util.sqlcontainer.RowItem; import com.vaadin.data.util.sqlcontainer.SQLContainer; +import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; +import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; diff --git a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java index 2b0e484b06..54db34dfd2 100644 --- a/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java +++ b/server/tests/src/com/vaadin/data/util/sqlcontainer/query/TableQueryTest.java @@ -17,12 +17,12 @@ import org.junit.Test; import com.vaadin.data.Container.Filter; import com.vaadin.data.util.filter.Compare.Equal; import com.vaadin.data.util.filter.Like; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; -import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; import com.vaadin.data.util.sqlcontainer.DataGenerator; import com.vaadin.data.util.sqlcontainer.OptimisticLockException; import com.vaadin.data.util.sqlcontainer.RowItem; import com.vaadin.data.util.sqlcontainer.SQLContainer; +import com.vaadin.data.util.sqlcontainer.SQLTestsConstants; +import com.vaadin.data.util.sqlcontainer.SQLTestsConstants.DB; import com.vaadin.data.util.sqlcontainer.connection.JDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.connection.SimpleJDBCConnectionPool; import com.vaadin.data.util.sqlcontainer.query.generator.DefaultSQLGenerator; diff --git a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java index b929ce5d9d..5078dd2f66 100644 --- a/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java +++ b/server/tests/src/com/vaadin/tests/server/TestStreamVariableMapping.java @@ -6,8 +6,8 @@ import org.easymock.EasyMock; import com.vaadin.server.CommunicationManager; import com.vaadin.server.StreamVariable; -import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinSession; import com.vaadin.ui.UI; import com.vaadin.ui.Upload; diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java index 693fcd0580..462eec2239 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java @@ -7,8 +7,8 @@ import org.junit.Test; import com.vaadin.data.Property; import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.converter.Converter.ConversionException; -import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinSession; import com.vaadin.ui.AbstractField; import com.vaadin.ui.UI; diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java index 81c29995f5..36e54a2826 100644 --- a/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java @@ -113,11 +113,11 @@ public class AddComponentsTest { HorizontalLayout layout1 = new HorizontalLayout(); layout1.addComponents(children); assertOrder(layout1, new int[] { 0, 1, 2, 3 }); - + Label extra = new Label("Extra"); layout1.addComponents(extra); assertSame(extra, layout1.getComponent(4)); - + layout1.removeAllComponents(); layout1.addComponents(children[3], children[2], children[1], children[0]); @@ -126,10 +126,10 @@ public class AddComponentsTest { VerticalLayout layout2 = new VerticalLayout(children); layout2.addComponents(children); assertOrder(layout2, new int[] { 0, 1, 2, 3 }); - + layout2.addComponents(extra); assertSame(extra, layout2.getComponent(4)); - + layout2.removeAllComponents(); layout2.addComponents(children[3], children[2], children[1], children[0]); diff --git a/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java index 120cf20070..441f743214 100644 --- a/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java +++ b/server/tests/src/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java @@ -102,11 +102,11 @@ public class AddComponentsTest { CssLayout layout = new CssLayout(); layout.addComponents(children); assertOrder(layout, new int[] { 0, 1, 2, 3 }); - + Label extra = new Label("Extra"); layout.addComponents(extra); assertSame(extra, layout.getComponent(4)); - + layout.removeAllComponents(); layout.addComponents(children[3], children[2], children[1], children[0]); assertOrder(layout, new int[] { 3, 2, 1, 0 }); diff --git a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java index c7730e9294..40ee6604f6 100644 --- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java +++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java @@ -81,8 +81,7 @@ public class CustomUIClassLoader extends TestCase { // Mock a VaadinRequest to give the mocked vaadin service VaadinRequest requestMock = EasyMock.createMock(VaadinRequest.class); - EasyMock.expect(requestMock.getService()).andReturn( - configurationMock); + EasyMock.expect(requestMock.getService()).andReturn(configurationMock); EasyMock.replay(configurationMock, requestMock); return requestMock; diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java index 09cb75a9eb..3eebc7cdf8 100644 --- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -6,8 +6,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import com.vaadin.server.ClientConnector; -import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinSession; import com.vaadin.ui.Label; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/server/tests/src/com/vaadin/ui/LabelDataSource.java b/server/tests/src/com/vaadin/ui/LabelDataSource.java index 932e0cc8ef..fa21fbefc3 100644 --- a/server/tests/src/com/vaadin/ui/LabelDataSource.java +++ b/server/tests/src/com/vaadin/ui/LabelDataSource.java @@ -22,8 +22,8 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.server.VaadinSession; import com.vaadin.server.VaadinRequest; +import com.vaadin.server.VaadinSession; public class LabelDataSource { -- cgit v1.2.3