summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-03-14 14:26:31 +0200
committerLeif Åstrand <leif@vaadin.com>2012-03-14 14:26:31 +0200
commit7e38a68314257e8e26e6c54e5e860c8be6aea314 (patch)
tree90d2d8647a6d566ad324868efea2a6e913989815
parentc5c10151a0b4e47883eff8f94563898b62d67f99 (diff)
downloadvaadin-framework-7e38a68314257e8e26e6c54e5e860c8be6aea314.tar.gz
vaadin-framework-7e38a68314257e8e26e6c54e5e860c8be6aea314.zip
Prevent margin collapse to make a hr visible in the test
-rw-r--r--tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index dd40726ec2..252e8ba82c 100644
--- a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -454,7 +454,10 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
final VerticalLayout vlo2 = getTestLaytout();
vlo2.addComponent(c1);
- vlo2.addComponent(new Label("<hr />", ContentMode.XHTML));
+ // 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>",
+ ContentMode.XHTML));
vlo2.addComponent(c2);
vlo2.setExpandRatio(c1, 0.5f);
vlo2.setExpandRatio(c2, 0.5f);