Fix label widths in several tests

Change-Id: I70f296fc5d1d2957698a169e501dcd1c43589503

diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
index 3f5a5ae46d25edab70da0fd8e95f76838300727e..f0e56069957cf1f87057136c188f4fe4f046ef00 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridDetailsLayoutExpand.java
@@ -70,10 +70,12 @@ public class GridDetailsLayoutExpand extends AbstractTestUI {
 
                 // 2 Labels added to the layout2
                 final Label lbl2 = new Label("test2");
+                lbl2.setWidth("100%");
                 lbl2.setId("lbl2");
                 layout2.addComponent(lbl2);
 
                 final Label lbl3 = new Label("test3");
+                lbl3.setWidth("100%");
                 lbl3.setId("lbl3");
                 layout2.addComponent(lbl3);
 

diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
index 3124806a2e7bd3e730f5ce1994e93b08145b9db0..4326866e0209124b54687e12a389fd07b3fdb9a2 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java
@@ -16,12 +16,12 @@
 package com.vaadin.tests.layouts.layouttester;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.AbstractLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 /**
@@ -54,9 +54,11 @@ public class BaseLayoutForSpacingMargin extends BaseLayoutTestUI {
         l2.setMargin(false);
         l2.setSpacing(false);
         // Must add something around the hr to avoid the margins collapsing
-        l2.addComponent(new Label(
+        Label spacer = new Label(
                 "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
-                ContentMode.HTML));
+                ContentMode.HTML);
+        spacer.setWidth("100%");
+        l2.addComponent(spacer);
         l2.addComponent(t2);
         final Button btn1 = new Button("Toggle margin on/off");
         btn1.addClickListener(new ClickListener() {

diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
index e10c3974f8c392b2a7f108674a6bfe75176ba2c5..67a38cf7a2471eba5c30682855e75932ed507f52 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java
@@ -19,6 +19,7 @@ import com.vaadin.server.Resource;
 import com.vaadin.server.ThemeResource;
 import com.vaadin.server.UserError;
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.components.AbstractTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.AbstractLayout;
@@ -32,7 +33,6 @@ import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.TabSheet;
 import com.vaadin.ui.VerticalLayout;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 import com.vaadin.v7.ui.TextField;
 
@@ -141,14 +141,17 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI {
         Button btn3 = new SetSizeButton("75%");
         Button btn4 = new SetSizeButton("100%");
 
+        Label spacer = new Label(
+                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
+                ContentMode.HTML);
+        spacer.setWidth("100%");
+
         l1.addComponent(btn1);
         l1.addComponent(btn2);
         l1.addComponent(btn3);
         l1.addComponent(btn4);
         l2.addComponent(c1);
-        l2.addComponent(new Label(
-                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
-                ContentMode.HTML));
+        l2.addComponent(spacer);
         l2.addComponent(c2);
         l2.setExpandRatio(c1, 0.5f);
         l2.setExpandRatio(c2, 0.5f);

diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
index b6e88ea18eb7245383f39577ede3a503110f603c..7c826eeab9ded8cc1ca899ee171f53ab9f6bebb4 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java
@@ -16,12 +16,12 @@
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.tests.layouts.layouttester.BaseLayoutTestUI;
 import com.vaadin.ui.AbstractComponent;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.Label;
 
@@ -86,14 +86,17 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI {
         Button btn3 = new SetSizeButton("75%");
         Button btn4 = new SetSizeButton("100%");
 
+        Label spacer = new Label(
+                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
+                ContentMode.HTML);
+        spacer.setWidth("100%");
+
         layout.addComponent(btn1);
         layout.addComponent(btn2);
         layout.addComponent(btn3);
         layout.addComponent(btn4);
         layout.addComponent(c1);
-        layout.addComponent(new Label(
-                "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
-                ContentMode.HTML));
+        layout.addComponent(spacer);
         layout.addComponent(c2);
         btn2.addClickListener(new ClickListener() {
 

diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
index 3a56e2397867fc8a6c2a4a559fae8ea7e1ae9a31..af719b56f7df722e16a2965d980f4209dca0c056 100644 (file)
--- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
+++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java
@@ -16,11 +16,11 @@
 package com.vaadin.tests.layouts.layouttester.GridLayout;
 
 import com.vaadin.server.VaadinRequest;
+import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.Label;
-import com.vaadin.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Table;
 
 /**
@@ -66,9 +66,11 @@ public class GridLayoutMarginSpacing extends GridBaseLayoutTestUI {
         layout.setMargin(false);
         layout.setSpacing(false);
         // Must add something around the hr to avoid the margins collapsing
-        layout.addComponent(new Label(
+        Label spacer = new Label(
                 "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>",
-                ContentMode.HTML));
+                ContentMode.HTML);
+        spacer.setWidth("100%");
+        layout.addComponent(spacer);
         layout.addComponent(t2);
     }
 }