From aaf6e1a07a1d6a475008ef3ca6c9334280d92e63 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 19 Apr 2012 12:04:28 +0300 Subject: Move test app to the right package and add test script --- .../components/gridlayout/MarginsInLabels.java | 50 ---------------------- .../tests/components/label/MarginsInLabels.html | 11 +++++ .../tests/components/label/MarginsInLabels.java | 50 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 50 deletions(-) delete mode 100644 tests/testbench/com/vaadin/tests/components/gridlayout/MarginsInLabels.java create mode 100644 tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html create mode 100644 tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java (limited to 'tests') diff --git a/tests/testbench/com/vaadin/tests/components/gridlayout/MarginsInLabels.java b/tests/testbench/com/vaadin/tests/components/gridlayout/MarginsInLabels.java deleted file mode 100644 index 1cbed2a17d..0000000000 --- a/tests/testbench/com/vaadin/tests/components/gridlayout/MarginsInLabels.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.vaadin.tests.components.gridlayout; - -import com.vaadin.terminal.WrappedRequest; -import com.vaadin.tests.components.AbstractTestRoot; -import com.vaadin.ui.AbstractLayout; -import com.vaadin.ui.Accordion; -import com.vaadin.ui.GridLayout; -import com.vaadin.ui.Label; -import com.vaadin.ui.Label.ContentMode; -import com.vaadin.ui.TabSheet; -import com.vaadin.ui.VerticalLayout; - -public class MarginsInLabels extends AbstractTestRoot { - - @Override - protected void setup(WrappedRequest request) { - AbstractLayout layout = new VerticalLayout(); - layout.addComponent(new Label("

Vertical layout

", - ContentMode.XHTML)); - layout.addComponent(new Label("Next row")); - addComponent(layout); - - layout = new GridLayout(1, 2); - layout.setWidth("100%"); - layout.addComponent(new Label("

Grid layout

", ContentMode.XHTML)); - layout.addComponent(new Label("Next row")); - addComponent(layout); - - TabSheet tabSheet = new TabSheet(); - tabSheet.addTab(new Label("

Tabsheet

", ContentMode.XHTML), - "Label"); - addComponent(tabSheet); - - Accordion accordion = new Accordion(); - accordion.addTab(new Label("

Accordion

", ContentMode.XHTML), - "Label"); - addComponent(accordion); - } - - @Override - protected String getTestDescription() { - return "Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label."; - } - - @Override - protected Integer getTicketNumber() { - return Integer.valueOf(8671); - } - -} diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html new file mode 100644 index 0000000000..080200092d --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html @@ -0,0 +1,11 @@ +com.vaadin.tests.components.accordion.AccordionInactiveTabSize + + + + + + + + + +

com.vaadin.tests.components.accordion.AccordionInactiveTabSize
open	/run/com.vaadin.tests.components.label.MarginsInLabels?restartApplication
screenCapture

\ No newline at end of file diff --git a/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java new file mode 100644 index 0000000000..699f94bb7e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java @@ -0,0 +1,50 @@ +package com.vaadin.tests.components.label; + +import com.vaadin.terminal.WrappedRequest; +import com.vaadin.tests.components.AbstractTestRoot; +import com.vaadin.ui.AbstractLayout; +import com.vaadin.ui.Accordion; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Label.ContentMode; +import com.vaadin.ui.TabSheet; +import com.vaadin.ui.VerticalLayout; + +public class MarginsInLabels extends AbstractTestRoot { + + @Override + protected void setup(WrappedRequest request) { + AbstractLayout layout = new VerticalLayout(); + layout.addComponent(new Label("

Vertical layout

", + ContentMode.XHTML)); + layout.addComponent(new Label("Next row")); + addComponent(layout); + + layout = new GridLayout(1, 2); + layout.setWidth("100%"); + layout.addComponent(new Label("

Grid layout

", ContentMode.XHTML)); + layout.addComponent(new Label("Next row")); + addComponent(layout); + + TabSheet tabSheet = new TabSheet(); + tabSheet.addTab(new Label("

Tabsheet

", ContentMode.XHTML), + "Label"); + addComponent(tabSheet); + + Accordion accordion = new Accordion(); + accordion.addTab(new Label("

Accordion

", ContentMode.XHTML), + "Label"); + addComponent(accordion); + } + + @Override + protected String getTestDescription() { + return "Margins inside labels should not be allowed to collapse out of the label as it causes problems with layotus measuring the label."; + } + + @Override + protected Integer getTicketNumber() { + return Integer.valueOf(8671); + } + +} -- cgit v1.2.3