aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-06-08 08:42:34 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2015-06-09 11:48:48 +0300
commit7892592d037f7070bbe89d939756f7f82cb505a4 (patch)
tree42ff8b0b1b90d2dfa9865605b0a9185e1c218aab
parentf006ad333aaef4dad541ed639a7ccc49c6dcda50 (diff)
downloadvaadin-framework-7892592d037f7070bbe89d939756f7f82cb505a4.tar.gz
vaadin-framework-7892592d037f7070bbe89d939756f7f82cb505a4.zip
Fix test broken by #16556
Change-Id: I4e0883c58c425fc6287212a97f740016223914b5
-rw-r--r--uitest/src/com/vaadin/tests/components/FileDownloaderUI.java (renamed from uitest/src/com/vaadin/tests/components/FileDownloaderTest.java)2
-rw-r--r--uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java36
-rw-r--r--uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java20
-rw-r--r--uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html36
4 files changed, 57 insertions, 37 deletions
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.java b/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java
index 9eb6806d13..b1379080e9 100644
--- a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.java
+++ b/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java
@@ -48,7 +48,7 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.NativeButton;
-public class FileDownloaderTest extends AbstractTestUIWithLog {
+public class FileDownloaderUI extends AbstractTestUIWithLog {
private AbstractComponent firstDownloadComponent;
diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java b/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java
new file mode 100644
index 0000000000..73d1ba6f52
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/FileDownloaderUITest.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.components;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class FileDownloaderUITest extends MultiBrowserTest {
+
+ @Test
+ public void ensureButtonWithDownloaderCanBeRemoved() {
+ openTestURL();
+ By id = By.id("com.vaadin.ui.ButtonDynamicimage");
+ assertElementPresent(id);
+ $(ButtonElement.class).caption("Remove first download button").first()
+ .click();
+ assertElementNotPresent(id);
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index eda7d5b815..1c395c1805 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -956,4 +956,24 @@ public abstract class AbstractTB3Test extends ParallelTest {
protected void click(CheckBoxElement checkbox) {
checkbox.findElement(By.xpath("input")).click();
}
+
+ /**
+ * Asserts that an element is present
+ *
+ * @param by
+ * the locatore for the element
+ */
+ protected void assertElementPresent(By by) {
+ Assert.assertTrue("Element is not present", isElementPresent(by));
+ }
+
+ /**
+ * Asserts that an element is not present
+ *
+ * @param by
+ * the locatore for the element
+ */
+ protected void assertElementNotPresent(By by) {
+ Assert.assertFalse("Element is present", isElementPresent(by));
+ }
}
diff --git a/uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html b/uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html
deleted file mode 100644
index bfe87091cc..0000000000
--- a/uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html
+++ /dev/null
@@ -1,36 +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://arturwin.office.itmill.com:8888/" />
-<title>New Test</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">New Test</td></tr>
-</thead><tbody>
-<tr>
- <td>open</td>
- <td>/run/com.vaadin.tests.components.FileDownloaderTest?restartApplication</td>
- <td></td>
-</tr>
-<tr>
- <td>assertElementPresent</td>
- <td>vaadin=runcomvaadintestscomponentsFileDownloaderTest::PID_Scom.vaadin.ui.ButtonDynamicimage/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>click</td>
- <td>vaadin=runcomvaadintestscomponentsFileDownloaderTest::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[4]/VButton[0]/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-<tr>
- <td>assertElementNotPresent</td>
- <td>vaadin=runcomvaadintestscomponentsFileDownloaderTest::PID_Scom.vaadin.ui.ButtonDynamicimage/domChild[0]/domChild[0]</td>
- <td></td>
-</tr>
-</tbody></table>
-</body>
-</html>