Skip to content

Commit

Permalink
Fix test broken by #16556
Browse files Browse the repository at this point in the history
Change-Id: I4e0883c58c425fc6287212a97f740016223914b5
  • Loading branch information
Artur- authored and Vaadin Code Review committed Jun 9, 2015
1 parent 479f1c5 commit 94a943b
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 37 deletions.
Expand Up @@ -48,7 +48,7 @@
import com.vaadin.ui.Layout;
import com.vaadin.ui.NativeButton;

public class FileDownloaderTest extends AbstractTestUIWithLog {
public class FileDownloaderUI extends AbstractTestUIWithLog {

private AbstractComponent firstDownloadComponent;

Expand Down
36 changes: 36 additions & 0 deletions 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);
}

}
21 changes: 21 additions & 0 deletions uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
Expand Up @@ -1044,4 +1044,25 @@ protected void selectMenuPath(String... menuCaptions) {
}
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));
}

}
36 changes: 0 additions & 36 deletions uitest/tb2/com/vaadin/tests/components/FileDownloaderTest.html

This file was deleted.

0 comments on commit 94a943b

Please sign in to comment.