Show caption for PopupView (#10618).

Change-Id: I00ae9444b5b7720ad19473ea3fe05ed764c95bf9

2 files changed, 102 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaption.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaption.java
new file mode 100644
index 0000000000..8cb9f01d93
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaption.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2000-2013 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.popupview;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.PopupView;
+
+/**
+ * 
+ * @author Vaadin Ltd
+ */
+public class PopupViewCaption extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        FormLayout layout = new FormLayout();
+        addComponent(layout);
+        Label label = new Label("Label");
+        PopupView popup = new PopupView("Popup short text", label);
+        popup.setCaption("Popup Caption:");
+        layout.addComponent(popup);
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Caption for popup view should be shown by layout";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 10618;
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
new file mode 100644
index 0000000000..9c59e2ca6e
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewCaptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2000-2013 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.popupview;
+
+import java.util.List;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * 
+ * @author Vaadin Ltd
+ */
+public class PopupViewCaptionTest extends MultiBrowserTest {
+
+    @Test
+    public void testCaption() {
+        openTestURL();
+
+        WebElement caption = driver.findElement(By.className("v-caption"));
+        Assert.assertNotNull(caption);
+
+        List<WebElement> elements = caption.findElements(By.xpath("*"));
+
+        boolean foundCaptionText = false;
+        for (WebElement element : elements) {
+            if ("Popup Caption:".equals(element.getText())) {
+                foundCaptionText = true;
+                break;
+            }
+        }
+        Assert.assertTrue("Unable to find caption text", foundCaptionText);
+    }
+
+}