Disallow layoutNow() while updating the state (#13611)

Change-Id: Ic519cbfb6507566a46d0313455695c4a40de55b8

2 files changed, 68 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java b/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
new file mode 100644
index 0000000000..cfebfef004
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdate.java
@@ -0,0 +1,32 @@
+/*
+ * 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.layoutmanager;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.widgetset.TestingWidgetSet;
+import com.vaadin.tests.widgetset.server.LayoutDuringStateUpdateComponent;
+
+@Widgetset(TestingWidgetSet.NAME)
+public class LayoutDuringStateUpdate extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new LayoutDuringStateUpdateComponent());
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java b/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
new file mode 100644
index 0000000000..8c71d460bb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/layoutmanager/LayoutDuringStateUpdateTest.java
@@ -0,0 +1,36 @@
+/*
+ * 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.layoutmanager;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class LayoutDuringStateUpdateTest extends SingleBrowserTest {
+
+    @Test
+    public void layoutDuringStateUpdate() {
+        openTestURL();
+
+        WebElement label = findElement(By.className("gwt-Label"));
+
+        Assert.assertEquals("Layout phase count: 1", label.getText());
+    }
+
+}