]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8e079ff)
Move test app to the right package and add test script
authorLeif Åstrand <leif@vaadin.com>
Thu, 19 Apr 2012 09:04:28 +0000 (12:04 +0300)
committerLeif Åstrand <leif@vaadin.com>
Thu, 19 Apr 2012 09:04:42 +0000 (12:04 +0300)
tests/testbench/com/vaadin/tests/components/gridlayout/MarginsInLabels.java [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.java [new file with mode: 0644] patch | blob

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 (file)
index 1cbed2a..0000000
--- 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("<h1>Vertical layout</h1>",
-                ContentMode.XHTML));
-        layout.addComponent(new Label("Next row"));
-        addComponent(layout);
-
-        layout = new GridLayout(1, 2);
-        layout.setWidth("100%");
-        layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.XHTML));
-        layout.addComponent(new Label("Next row"));
-        addComponent(layout);
-
-        TabSheet tabSheet = new TabSheet();
-        tabSheet.addTab(new Label("<h1>Tabsheet</h1>", ContentMode.XHTML),
-                "Label");
-        addComponent(tabSheet);
-
-        Accordion accordion = new Accordion();
-        accordion.addTab(new Label("<h1>Accordion</h1>", 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 (file)
index 0000000..0802000
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/label/MarginsInLabels.html
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head profile="http://selenium-ide.openqa.org/profiles/test-case"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><link rel="selenium.base" href="" /><title>com.vaadin.tests.components.accordion.AccordionInactiveTabSize</title></head><body><table cellpadding="1" cellspacing="1" border="1"><thead><tr><td rowspan="1" colspan="3">com.vaadin.tests.components.accordion.AccordionInactiveTabSize</td></tr></thead><tbody><tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.label.MarginsInLabels?restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
+</tbody></table></body></html>
\ 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 (file)
index 0000000..699f94b
--- /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("<h1>Vertical layout</h1>",
+                ContentMode.XHTML));
+        layout.addComponent(new Label("Next row"));
+        addComponent(layout);
+
+        layout = new GridLayout(1, 2);
+        layout.setWidth("100%");
+        layout.addComponent(new Label("<h1>Grid layout</h1>", ContentMode.XHTML));
+        layout.addComponent(new Label("Next row"));
+        addComponent(layout);
+
+        TabSheet tabSheet = new TabSheet();
+        tabSheet.addTab(new Label("<h1>Tabsheet</h1>", ContentMode.XHTML),
+                "Label");
+        addComponent(tabSheet);
+
+        Accordion accordion = new Accordion();
+        accordion.addTab(new Label("<h1>Accordion</h1>", 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);
+    }
+
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework