Fixed invalid layouts in layout test

svn changeset:16870/svn branch:6.5

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 8985f1cf973bf322966837840a572527784725a7..6b56d93a30b2b3ecdd5656c8fdc229ca3e51ccf4 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -574,9 +574,9 @@ public class GridLayoutTests extends AbstractLayoutTests {
     private AbstractComponent getTestTabsheet() {\r
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(\r
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(\r
                 GLOBE_16_PNG));\r
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);\r
         return tabsheet;\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index 9db1f7f44f115013240a15fbe476d71fd6984e88..35c813293f63e162d6691b1c8508977a594cf5a6 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -550,9 +550,9 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
     private AbstractComponent getTestTabsheet() {\r
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(\r
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(\r
                 GLOBE_16_PNG));\r
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);\r
         return tabsheet;\r
     }\r
 \r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index b4314e487e44007682f02a13e4d9869fa3d21ed4..6f73a42497b462d78487b6ed648fce6021246a4e 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
@@ -9,7 +9,6 @@ import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.GridLayout;
 import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
 import com.vaadin.ui.Layout;
 import com.vaadin.ui.NativeSelect;
 import com.vaadin.ui.VerticalLayout;
@@ -54,7 +53,8 @@ public class LayoutTesterApplication extends AbstractTestCase {
             mainWindow.addComponent(vlo);
             vlo.addComponent(nextButton);
             vlo.addComponent(getLayoutTypeSelect());
-            vlo.addComponent(new Label(layoutGetters[layoutIndex].getName()));
+            vlo.addComponent(new UndefWideLabel(layoutGetters[layoutIndex]
+                    .getName()));
 
             Layout lo = null;
             if (layoutSelector.getValue() == VerticalLayout.class) {

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java b/tests/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
new file mode 100644 (file)
index 0000000..c998ce4
--- /dev/null
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/UndefWideLabel.java
@@ -0,0 +1,12 @@
+package com.vaadin.tests.layouts.layouttester;
+
+import com.vaadin.ui.Label;
+
+public class UndefWideLabel extends Label {
+
+    public UndefWideLabel(String value) {
+        super(value);
+        setWidth(null);
+    }
+
+}

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index cb52ab10519914b6b3eec6b6433fce36bc8f0300..8019ae5aca3860326febecb44dd8e201894eef4e 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -571,9 +571,9 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
     private AbstractComponent getTestTabsheet() {\r
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(\r
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(\r
                 GLOBE_16_PNG));\r
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);\r
         return tabsheet;\r
     }\r
 \r