summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-05-12 22:30:48 +0300
committerVaadin Code Review <review@vaadin.com>2014-05-15 10:31:48 +0000
commitf993f1a6e514919cf555105403d59c6214eb6d61 (patch)
treed37f8ee75f5fbe27964a34289892ce4eaa70c397 /uitest
parent9bf7fa0d1da706cbb4ae7aa3995c80124954a9ae (diff)
downloadvaadin-framework-f993f1a6e514919cf555105403d59c6214eb6d61.tar.gz
vaadin-framework-f993f1a6e514919cf555105403d59c6214eb6d61.zip
PopupViewAndFragment TB2 -> TB4
Change-Id: I9299d8c78e92816e368208f1cbc07b8c969a9600
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html32
-rw-r--r--uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java33
2 files changed, 33 insertions, 32 deletions
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html
deleted file mode 100644
index 28af578bac..0000000000
--- a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="http://localhost:8888/" />
-<title>PopupViewAndFragment</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">PopupViewAndFragment</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/run/PopupViewAndFragment?restartApplication#</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=runPopupViewAndFragment::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>screenCapture</td>
- <td></td>
- <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
new file mode 100644
index 0000000000..510cc7c883
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragmentTest.java
@@ -0,0 +1,33 @@
+/*
+ * 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.popupview;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class PopupViewAndFragmentTest extends MultiBrowserTest {
+
+ @Test
+ public void changeFragmentAndOpenPopupView() throws Exception {
+ openTestURL();
+ $(ButtonElement.class).first().click();
+ // Wait for popup view to fully open
+ sleep(1000);
+ compareScreen("changedFragment");
+ }
+}