From 29e9651960d4f55f9fd7e1a595d47b88520dbbe5 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Mon, 7 Dec 2009 11:44:44 +0000
Subject: [PATCH] Added one more table as a test case for #3793: VScrollTable
 adds horizontal scrollbar on top of rows

svn changeset:10177/svn branch:6.2
---
 .../components/table/TableRowHeight.java      | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight.java b/tests/src/com/vaadin/tests/components/table/TableRowHeight.java
index 7e51226094..637ed89436 100644
--- a/tests/src/com/vaadin/tests/components/table/TableRowHeight.java
+++ b/tests/src/com/vaadin/tests/components/table/TableRowHeight.java
@@ -13,7 +13,7 @@ public class TableRowHeight extends TestBase {
 
     @Override
     protected String getDescription() {
-        return "This test case contains 4 tables in various configurations. All tables have a pageLength of "
+        return "This test case contains 5 tables in various configurations. All tables have a pageLength of "
                 + PAGELENGTH
                 + " and thus should show as many rows without any scrollbars (height is undefined for all tables).";
 
@@ -26,29 +26,35 @@ public class TableRowHeight extends TestBase {
 
     private static final int PAGELENGTH = 2;
 
+    @Override
     public void setup() {
-        Table table1 = initTable(PAGELENGTH, false, false);
+        Table table1 = initTable(PAGELENGTH, false, false, false);
         addComponent(new Label("Plain table"));
         addComponent(table1);
 
-        Table table2 = initTable(PAGELENGTH, true, false);
+        Table table2 = initTable(PAGELENGTH, true, false, false);
         addComponent(new Label("Table with label component in generated column"));
         addComponent(table2);
 
-        Table table3 = initTable(PAGELENGTH, false, true);
+        Table table3 = initTable(PAGELENGTH, false, true, false);
         addComponent(new Label(
                 "Table with layout component in generated column"));
         addComponent(table3);
 
-        Table table4 = initTable(PAGELENGTH, true, true);
+        Table table4 = initTable(PAGELENGTH, true, true, false);
         addComponent(new Label(
                 "Table with both label and layout component in generated column"));
         addComponent(table4);
 
+        Table table5 = initTable(PAGELENGTH, true, false, true);
+        addComponent(new Label(
+                "Table with both label and layout component in generated column"));
+        addComponent(table5);
+
     }
 
     private Table initTable(int pageLength, boolean addLabelColGen,
-            boolean addLayoutColGen) {
+            boolean addLayoutColGen, boolean fixedColWidths) {
         Table table = new Table();
         table.setWidth("100%");
         table.setPageLength(pageLength);
@@ -73,6 +79,10 @@ public class TableRowHeight extends TestBase {
         if (addLayoutColGen) {
             table.addGeneratedColumn("name2", new LayoutColumnGenerator());
         }
+        if (fixedColWidths) {
+            table.setColumnWidth("firstname", 200);
+            table.setColumnWidth("lastname", 300);
+        }
 
         return table;
     }
-- 
2.39.5