diff options
| author | Artur Signell <artur@vaadin.com> | 2012-03-16 12:03:01 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-03-16 12:03:01 +0200 |
| commit | 6ff66f4a6a73f7562b13f80eae59378b47b7ba37 (patch) | |
| tree | f02863d5befc000920851b528c9e88380c63f795 /tests/testbench | |
| parent | 2b5941cdc1435b8915ba28cbf891cb1ad32e9314 (diff) | |
| parent | 2dd0568f5bdd42c6385d80745e8e5680527d1223 (diff) | |
| download | vaadin-framework-6ff66f4a6a73f7562b13f80eae59378b47b7ba37.tar.gz vaadin-framework-6ff66f4a6a73f7562b13f80eae59378b47b7ba37.zip | |
Merge branch 'master' into hierarchypaint
Diffstat (limited to 'tests/testbench')
| -rw-r--r-- | tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index 252e8ba82c..fee1807c09 100644 --- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -269,7 +269,9 @@ public class VerticalLayoutTests extends AbstractLayoutTests { button4.setEnabled(false); vlo2.addComponent(c1); - vlo2.addComponent(new Label("<hr />", ContentMode.XHTML)); + vlo2.addComponent(new Label( + "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>", + ContentMode.XHTML)); vlo2.addComponent(c2); vlo2.setExpandRatio(c1, 0.5f); vlo2.setExpandRatio(c2, 0.5f); @@ -456,7 +458,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { vlo2.addComponent(c1); // Must add something around the hr to avoid the margins collapsing vlo2.addComponent(new Label( - "<div style='height: 0.01px'></div><hr /><div style='height: 0.01px'></div>", + "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>", ContentMode.XHTML)); vlo2.addComponent(c2); vlo2.setExpandRatio(c1, 0.5f); |