From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 15 Mar 2012 14:59:53 +0000 (+0200)
Subject: Prevent another case of margin collapse
X-Git-Tag: 7.0.0.alpha2~304^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2dd0568f5bdd42c6385d80745e8e5680527d1223;p=vaadin-framework.git

Prevent another case of margin collapse
---

diff --git a/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/testbench/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 9fe6367d60..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);