From e8dae134b150c760efae8d7302f8dba754b7a247 Mon Sep 17 00:00:00 2001
From: Artur <artur@vaadin.com>
Date: Thu, 2 Feb 2017 10:53:03 +0200
Subject: Fix caption updating in CustomLayout (#8415)

Fixes #8413
---
 .../customlayout/CustomLayoutUpdateCaption.java    | 40 ++++++++++++++++++++++
 .../CustomLayoutUpdateCaptionTest.java             | 30 ++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaption.java
 create mode 100644 uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaptionTest.java

(limited to 'uitest')

diff --git a/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaption.java b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaption.java
new file mode 100644
index 0000000000..88e6a87bbb
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaption.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.components.customlayout;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CustomLayout;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+
+public class CustomLayoutUpdateCaption extends UI {
+    @Override
+    protected void init(VaadinRequest vaadinRequest) {
+        CustomLayout content = new CustomLayout();
+        content.setTemplateContents("<div>\n"
+                + "        <div location=\"test1\"></div>\n"
+                + "        <div location=\"test2\"></div>\n"
+                + "        <div location=\"okbutton\"></div>\n" + "</div>");
+        content.setSizeUndefined();
+        setContent(content);
+
+        Button loginButton = new Button("Test");
+        final TextField username1 = new TextField();
+        final TextField username2 = new TextField();
+        username1.setCaption("initial");
+        username2.setCaption("initial");
+        content.addComponent(username1, "test1");
+        content.addComponent(new VerticalLayout(username2), "test2");
+        content.addComponent(loginButton, "okbutton");
+
+        loginButton.addClickListener(new ClickListener() {
+            @Override
+            public void buttonClick(ClickEvent e) {
+                username1.setCaption("updated");
+                username2.setCaption("updated");
+            }
+        });
+    }
+}
diff --git a/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaptionTest.java b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaptionTest.java
new file mode 100644
index 0000000000..0a778263b0
--- /dev/null
+++ b/uitest/src/test/java/com/vaadin/tests/components/customlayout/CustomLayoutUpdateCaptionTest.java
@@ -0,0 +1,30 @@
+package com.vaadin.tests.components.customlayout;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class CustomLayoutUpdateCaptionTest extends SingleBrowserTest {
+
+    @Test
+    public void captionUpdated() {
+        openTestURL();
+        List<TextFieldElement> tfs = $(TextFieldElement.class).all();
+        TextFieldElement tf1 = tfs.get(0);
+        TextFieldElement tf2 = tfs.get(1);
+
+        Assert.assertEquals("initial", tf1.getCaption());
+        Assert.assertEquals("initial", tf2.getCaption());
+
+        $(ButtonElement.class).first().click();
+
+        Assert.assertEquals("updated", tf1.getCaption());
+        Assert.assertEquals("updated", tf2.getCaption());
+
+    }
+}
-- 
cgit v1.2.3