From: Artur Signell <artur.signell@itmill.com>
Date: Thu, 13 Jan 2011 11:21:29 +0000 (+0000)
Subject: Fixed invalid layouts in layout test
X-Git-Tag: 6.7.0.beta1~507
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=90e36ebcfd06e1dc36d6e507858d87c6d20620e1;p=vaadin-framework.git

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 8985f1cf97..6b56d93a30 100644
--- 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() {
         TabSheet tabsheet = new TabSheet();
         tabsheet.setSizeUndefined();
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(
                 GLOBE_16_PNG));
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);
         return tabsheet;
     }
 
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index 9db1f7f44f..35c813293f 100644
--- 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() {
         TabSheet tabsheet = new TabSheet();
         tabsheet.setSizeUndefined();
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(
                 GLOBE_16_PNG));
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);
         return tabsheet;
     }
 
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java
index b4314e487e..6f73a42497 100644
--- 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
index 0000000000..c998ce458a
--- /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 cb52ab1051..8019ae5aca 100644
--- 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() {
         TabSheet tabsheet = new TabSheet();
         tabsheet.setSizeUndefined();
-        tabsheet.addTab(new Label("TAB1"), "TAB1", new ThemeResource(
+        tabsheet.addTab(new UndefWideLabel("TAB1"), "TAB1", new ThemeResource(
                 GLOBE_16_PNG));
-        tabsheet.addTab(new Label("TAB2"), "TAB2", null);
+        tabsheet.addTab(new UndefWideLabel("TAB2"), "TAB2", null);
         return tabsheet;
     }