summaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2013-02-05 11:59:42 +0200
committerVaadin Code Review <review@vaadin.com>2013-02-07 13:57:17 +0000
commit77aed50851264cf89025fcf0a082e83027d90f68 (patch)
treeb36c49e02ac088318c30e5b5ab14cf60d08c9e2e /uitest/src/com
parentfa95bdee6675ad6fc56b0d021227e5e25fe9316e (diff)
downloadvaadin-framework-77aed50851264cf89025fcf0a082e83027d90f68.tar.gz
vaadin-framework-77aed50851264cf89025fcf0a082e83027d90f68.zip
Fixed middle vertical alignments in HorizontalLayout #10852
Change-Id: I85dac7b89ec4ec670cf92e5c760090fbef5929af
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html27
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java44
2 files changed, 71 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html
new file mode 100644
index 0000000000..d16e4a3354
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.html
@@ -0,0 +1,27 @@
+<?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="http://localhost:8888/" />
+<title>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.orderedlayout.HorizontalLayoutVerticalAlign?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>alignments</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
new file mode 100644
index 0000000000..4dc9d8129e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalLayoutVerticalAlign.java
@@ -0,0 +1,44 @@
+package com.vaadin.tests.components.orderedlayout;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextArea;
+
+public class HorizontalLayoutVerticalAlign extends TestBase {
+
+ @Override
+ protected void setup() {
+ HorizontalLayout p = new HorizontalLayout();
+
+ p.addComponent(new TextArea());
+
+ Label top = new Label("top");
+ p.addComponent(top);
+ p.setComponentAlignment(top, Alignment.TOP_CENTER);
+
+ Label middle = new Label("middle");
+ p.addComponent(middle);
+ p.setComponentAlignment(middle, Alignment.MIDDLE_CENTER);
+
+ Label bottom = new Label("bottom");
+ p.addComponent(bottom);
+ p.setComponentAlignment(bottom, Alignment.BOTTOM_CENTER);
+
+ p.addComponent(new TextArea());
+
+ addComponent(p);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "Vertical alignments should be top-middle-bottom";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 10852;
+ }
+
+}