summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorJohn Ahlroos <john@vaadin.com>2013-01-21 15:02:56 +0200
committerJohn Ahlroos <john@vaadin.com>2013-01-22 13:19:28 +0200
commit308d75a1d7c3c5c975c90b579fb7d4622bac064a (patch)
tree381890540b494f557e155355c511bfc4a734e66d /uitest/src
parent84b0df6f6b731d055a5451be07bb76f73accdef9 (diff)
downloadvaadin-framework-308d75a1d7c3c5c975c90b579fb7d4622bac064a.tar.gz
vaadin-framework-308d75a1d7c3c5c975c90b579fb7d4622bac064a.zip
Hide components if width 100% + expand ratio 0 #10783
Change-Id: I5ca5eac5fbfeec744078ebcb83f08192c1bf2af8
Diffstat (limited to 'uitest/src')
-rwxr-xr-xuitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html27
-rwxr-xr-xuitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java51
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java36
-rw-r--r--uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html46
-rwxr-xr-xuitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html27
-rwxr-xr-xuitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java53
6 files changed, 238 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.html
new file mode 100755
index 0000000000..06de880bcf
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.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.HorizontalRelativeSizeWithoutExpand?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>spacing-and-panel</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
new file mode 100755
index 0000000000..8c5953104f
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/HorizontalRelativeSizeWithoutExpand.java
@@ -0,0 +1,51 @@
+package com.vaadin.tests.components.orderedlayout;
+
+import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+public class HorizontalRelativeSizeWithoutExpand extends UI {
+
+ @Override
+ protected void init(VaadinRequest request) {
+
+ final HorizontalLayout layout = new HorizontalLayout();
+ layout.setSizeFull();
+ layout.setMargin(true);
+ layout.setSpacing(true);
+ setContent(layout);
+
+ Panel panel1 = new Panel("This should not be seen");
+ panel1.setSizeFull();
+ VerticalLayout verticalLayout1 = new VerticalLayout();
+ verticalLayout1.setSizeFull();
+ Tree tree = new Tree();
+ tree.setSizeFull();
+ tree.setContainerDataSource(new BeanItemContainer<String>(String.class));
+ String a = "aaaaaaaaaaaaaaaaaaaaaaaa";
+ String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
+ String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc";
+ tree.addItem(a);
+ tree.addItem(b);
+ tree.addItem(c);
+ tree.setChildrenAllowed(a, true);
+ tree.setChildrenAllowed(b, true);
+ tree.setParent(b, a);
+ tree.setParent(c, b);
+ verticalLayout1.addComponent(tree);
+ panel1.setContent(verticalLayout1);
+ layout.addComponent(panel1);
+
+ final Panel panel2 = new Panel("This should use all space");
+ panel2.setSizeFull();
+
+ layout.addComponent(panel2);
+ layout.setExpandRatio(panel2, 1);
+
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
index fe1dfe3e6d..d7dbe11769 100644
--- a/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/OrderedLayoutCases.java
@@ -179,8 +179,15 @@ public class OrderedLayoutCases extends AbstractTestUI {
}
while (currentLayout.getComponentCount() > 0) {
- newLayout.addComponent(currentLayout
- .getComponent(0));
+ Component child = currentLayout.getComponent(0);
+ Alignment alignment = currentLayout
+ .getComponentAlignment(child);
+ float expRatio = currentLayout
+ .getExpandRatio(child);
+ newLayout.addComponent(child);
+ newLayout.setExpandRatio(child, expRatio);
+ newLayout.setComponentAlignment(child, alignment);
+
}
newLayout.setStyleName("theLayout");
@@ -337,6 +344,24 @@ public class OrderedLayoutCases extends AbstractTestUI {
setChildState(2, 4, 7);
}
}));
+ caseBar.addComponent(new Button("Relative child without expand",
+ new ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ resetState();
+ // Width 800px
+ setState(sizeBar, 0, 3);
+ // First child 100% wide
+ setChildState(0, 0, 4);
+ // Second child expand 1
+ setChildState(1, 3, 1);
+ }
+ }));
+ /*
+ * Hidden for not to avoid changing screenshots, functionality is still
+ * available by adding case=9 to the query string...
+ */
+ caseBar.getComponent(9).setVisible(false);
caseBar.setSpacing(true);
@@ -348,6 +373,13 @@ public class OrderedLayoutCases extends AbstractTestUI {
getContent().setSizeFull();
getLayout().setSizeFull();
getLayout().setExpandRatio(currentLayout, 1);
+
+ String caseParameter = request.getParameter("case");
+ if (caseParameter != null) {
+ int caseIndex = Integer.parseInt(caseParameter);
+ Button button = (Button) caseBar.getComponent(caseIndex);
+ button.click();
+ }
}
private void resetState() {
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html b/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html
new file mode 100644
index 0000000000..c7f75ff55a
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/RelativeChildWithoutExpand.html
@@ -0,0 +1,46 @@
+<?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>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.OrderedLayoutCases?case=9</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>first-child-hidden-two-visible</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>vaadin=runcomvaadintestscomponentsorderedlayoutOrderedLayoutCases::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VHorizontalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VNativeSelect[0]/domChild[0]</td>
+ <td>label=0</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>three-children-visible</td>
+</tr>
+<tr>
+ <td>select</td>
+ <td>vaadin=runcomvaadintestscomponentsorderedlayoutOrderedLayoutCases::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VHorizontalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[3]/VNativeSelect[0]/domChild[0]</td>
+ <td>label=1</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>first-child-hidden-two-visible-again</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.html
new file mode 100755
index 0000000000..caf4347b45
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.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.VerticalRelativeSizeWithoutExpand?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>spacing-and-panel</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
new file mode 100755
index 0000000000..86525da3ef
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/orderedlayout/VerticalRelativeSizeWithoutExpand.java
@@ -0,0 +1,53 @@
+package com.vaadin.tests.components.orderedlayout;
+import com.vaadin.data.util.BeanItemContainer;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Tree;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * The Application's "main" class
+ */
+@SuppressWarnings("serial")
+public class VerticalRelativeSizeWithoutExpand extends UI {
+
+ @Override
+ protected void init(VaadinRequest request) {
+
+ final VerticalLayout layout = new VerticalLayout();
+ layout.setSizeFull();
+ layout.setMargin(true);
+ layout.setSpacing(true);
+ setContent(layout);
+
+ Panel panel1 = new Panel("This should not be seen");
+ panel1.setSizeFull();
+ VerticalLayout verticalLayout1 = new VerticalLayout();
+ verticalLayout1.setSizeFull();
+ Tree tree = new Tree();
+ tree.setSizeFull();
+ tree.setContainerDataSource(new BeanItemContainer<String>(String.class));
+ String a = "aaaaaaaaaaaaaaaaaaaaaaaa";
+ String b = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
+ String c = "ccccccccccccccccccccccccccccccccccccccccccccccccc";
+ tree.addItem(a);
+ tree.addItem(b);
+ tree.addItem(c);
+ tree.setChildrenAllowed(a, true);
+ tree.setChildrenAllowed(b, true);
+ tree.setParent(b, a);
+ tree.setParent(c, b);
+ verticalLayout1.addComponent(tree);
+ panel1.setContent(verticalLayout1);
+ layout.addComponent(panel1);
+
+ final Panel panel2 = new Panel("This should use all space");
+ panel2.setSizeFull();
+
+ layout.addComponent(panel2);
+ layout.setExpandRatio(panel2, 1);
+
+ }
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 08:38:09 +0000