Fixes for #6720

- Fixes based on review
- Fix for possible NPE
- Fixed bug where resizing columns would throw off the header/column width sync
- Fixed bug where column reordering would fail due to element not found exception

svn changeset:20544/svn branch:6.7

1 files changed, 3 insertions, 1 deletions

diff --git a/tests/src/com/vaadin/tests/components/table/Tables.java b/tests/src/com/vaadin/tests/components/table/Tables.java
index 621ef60abc..2b8f646c1f 100644
--- a/tests/src/com/vaadin/tests/components/table/Tables.java
+++ b/tests/src/com/vaadin/tests/components/table/Tables.java
@@ -342,7 +342,7 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                             GeneratedRow generatedRow = new GeneratedRow(

                                     generatedRowInfo.text);

                             generatedRow

-                                    .setRenderAsHtml(generatedRowInfo.isHtml);

+                                    .setHtmlContentAllowed(generatedRowInfo.isHtml);

                             return generatedRow;

                         }

                         return null;

@@ -462,6 +462,8 @@ public class Tables<T extends Table> extends AbstractSelectTestCase<T>
                 "Every eight row, spanned, html formatted",

                 new GeneratedRowInfo(8, true,

                         "<b>foo</b> <i>bar</i> <span style='color:red;text-size:0.5em;'>baz</span>"));

+        options.put("Every row, spanned", new GeneratedRowInfo(1, false,

+                "spanned"));

         createSelectAction("Row generator", categoryFeatures, options, "None",

                 rowGeneratorCommand, true);

     }