Fix Escalator onResize to layout Finally instead of Deferred (#18751)

This patch also corrects a possible issue with calculating columns when
it is not attached.

Change-Id: I616eb0f6d060991d9f461b7e2b1e3f7f30fbd122

2 files changed, 85 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpand.java b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
new file mode 100644
index 0000000000..5333b3698e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpand.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.Grid;
+import com.vaadin.ui.Grid.Column;
+import com.vaadin.ui.VerticalLayout;
+
+public class GridColumnAutoExpand extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        final VerticalLayout layout = new VerticalLayout();
+        layout.setSizeFull();
+        layout.setMargin(true);
+        addComponent(layout);
+
+        Grid grid = new Grid("Broken Grid with Caption");
+        grid.setWidth("100%");
+        grid.setHeight("100px");
+
+        Column col1 = grid.addColumn("Col1");
+        col1.setWidth(100);
+
+        Column col2 = grid.addColumn("Col2");
+        col2.setMinimumWidth(100);
+        col2.setExpandRatio(1);
+
+        layout.addComponent(grid);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
new file mode 100644
index 0000000000..64c56e174e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/GridColumnAutoExpandTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.testbench.elements.GridElement.GridCellElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class GridColumnAutoExpandTest extends MultiBrowserTest {
+
+    @Test
+    public void testSecondColumnHasExpanded() {
+        openTestURL();
+
+        GridCellElement headerCell = $(GridElement.class).first()
+                .getHeaderCell(0, 1);
+
+        assertTrue("Column did not expand as expected", headerCell.getSize()
+                .getWidth() > 400);
+    }
+
+}