From 94a943baaef07fd5a9d2e7a5b317ffcc297a1f10 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 8 Jun 2015 08:42:34 +0300 Subject: [PATCH] Fix test broken by #16556 Change-Id: I4e0883c58c425fc6287212a97f740016223914b5 --- ...nloaderTest.java => FileDownloaderUI.java} | 2 +- .../components/FileDownloaderUITest.java | 36 +++++++++++++++++++ .../com/vaadin/tests/tb3/AbstractTB3Test.java | 21 +++++++++++ .../tests/components/FileDownloaderTest.html | 36 ------------------- 4 files changed, 58 insertions(+), 37 deletions(-) rename uitest/src/com/vaadin/tests/components/{FileDownloaderTest.java => FileDownloaderUI.java} (99%) create mode 100644 uitest/src/com/vaadin/tests/components/FileDownloaderUITest.java delete mode 100644 uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html diff --git a/uitest/src/com/vaadin/tests/components/FileDownloaderTest.java b/uitest/src/com/vaadin/tests/components/FileDownloaderUI.java similarity index 99% rename from uitest/src/com/vaadin/tests/components/FileDownloaderTest.java rename to 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 075319103b..2e33cc2741 100644 --- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java +++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java @@ -1044,4 +1044,25 @@ public abstract class AbstractTB3Test extends ParallelTest { } selectMenu(menuCaptions[menuCaptions.length - 1], true); } + + /** + * 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 @@ - - - - - - -New Test - - - - - - - - - - - - - - - - - - - - - - - - - - -
New Test
open/run/com.vaadin.tests.components.FileDownloaderTest?restartApplication
assertElementPresentvaadin=runcomvaadintestscomponentsFileDownloaderTest::PID_Scom.vaadin.ui.ButtonDynamicimage/domChild[0]/domChild[0]
clickvaadin=runcomvaadintestscomponentsFileDownloaderTest::/VVerticalLayout[0]/VOrderedLayout$Slot[1]/VVerticalLayout[0]/VOrderedLayout$Slot[4]/VButton[0]/domChild[0]/domChild[0]
assertElementNotPresentvaadin=runcomvaadintestscomponentsFileDownloaderTest::PID_Scom.vaadin.ui.ButtonDynamicimage/domChild[0]/domChild[0]
- - -- 2.39.5