diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-06 10:08:14 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-06 10:08:29 +0300 |
| commit | 4d2031b1278ae78be7b35ae1e27971b98524ee91 (patch) | |
| tree | 89deca69f45463564647b27a01cfbd4e26552e53 | |
| parent | 4710cbf7d6a73490ff292319af82b4746e509e4b (diff) | |
| download | vaadin-framework-4d2031b1278ae78be7b35ae1e27971b98524ee91.tar.gz vaadin-framework-4d2031b1278ae78be7b35ae1e27971b98524ee91.zip | |
Moved tests applications which got placed in the wrong folder at merge
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java (renamed from tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java) | 8 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java (renamed from tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java) | 4 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java (renamed from tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java) | 0 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java (renamed from tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java) | 0 |
4 files changed, 4 insertions, 8 deletions
diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index bacfc62b40..01d67ae377 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -3,6 +3,7 @@ package com.vaadin.tests.components.orderedlayout; import java.util.ArrayList; import java.util.Arrays; +import com.vaadin.annotations.PreserveOnRefresh; import com.vaadin.annotations.Theme; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; @@ -30,6 +31,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; @Theme("tests-components") +@PreserveOnRefresh public class BoxLayoutTest extends AbstractTestUI { protected AbstractOrderedLayout view; @@ -53,20 +55,14 @@ public class BoxLayoutTest extends AbstractTestUI { protected void setup(WrappedRequest request) { view = new VerticalLayout(); - // view.setSizeFull(); view.setMargin(true); view.setSpacing(true); - // view.addComponent(createControls(false)); - // view.addComponent(createTestLayout(false)); - // view.setExpandRatio(view.getComponent(1), 1); - for (int i = 0; i < 20; i++) { view.addComponent(createHorizontalTest()); } setContent(view); - getApplication().setUiPreserved(true); } private Component createHorizontalTest() { diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java index 64eea46b64..32840b6412 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/LayoutRenderTimeTest.java @@ -1,6 +1,6 @@ package com.vaadin.tests.components.orderedlayout; -import com.vaadin.Application.LegacyApplication; +import com.vaadin.Application; import com.vaadin.server.ThemeResource; import com.vaadin.ui.Button; import com.vaadin.ui.Embedded; @@ -10,7 +10,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; -public class LayoutRenderTimeTest extends LegacyApplication { +public class LayoutRenderTimeTest extends Application { @Override public void init() { diff --git a/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java index a14f37f95e..a14f37f95e 100644 --- a/tests/testbench/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java +++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VaadinTunesLayout.java diff --git a/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java b/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java index 6640134326..6640134326 100644 --- a/tests/testbench/com/vaadin/tests/themes/LiferayThemeTest.java +++ b/uitest/src/com/vaadin/tests/themes/LiferayThemeTest.java |