Browse Source

Update to TestBench 4.1.0

Some element methods have been integrated into TestBench and are removed from the
framework element classes

Change-Id: I35c8bf272b7603127816595de8145e68500e22e5
tags/8.0.0.alpha3
Artur Signell 7 years ago
parent
commit
0783541ba3

+ 1
- 1
pom.xml View File

<dependency> <dependency>
<groupId>com.vaadin</groupId> <groupId>com.vaadin</groupId>
<artifactId>vaadin-testbench</artifactId> <artifactId>vaadin-testbench</artifactId>
<version>4.0.3</version>
<version>4.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>

+ 1
- 18
uitest-common/src/main/java/com/vaadin/testbench/customelements/ProgressBarElement.java View File

public class ProgressBarElement public class ProgressBarElement
extends com.vaadin.testbench.elements.ProgressBarElement { extends com.vaadin.testbench.elements.ProgressBarElement {


@Override
public double getValue() { public double getValue() {
WebElement indicator = findElement( WebElement indicator = findElement(
By.className("v-progressbar-indicator")); By.className("v-progressbar-indicator"));
return Double.parseDouble(width.replace("%", "")) / 100.0; return Double.parseDouble(width.replace("%", "")) / 100.0;
} }


/**
* @since 7.5.6
* @param indicator
* @param string
* @return
*/
private String getStyleAttribute(WebElement element, String styleName) {
String style = element.getAttribute("style");
String[] styles = style.split(";");
for (String s : styles) {
if (s.startsWith(styleName + ":")) {
return s.substring(styleName.length() + 1).trim();
}
}

return null;
}

} }

+ 0
- 16
uitest-common/src/main/java/com/vaadin/testbench/customelements/TableElement.java View File

import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;


import com.vaadin.testbench.elementsbase.AbstractElement;
import com.vaadin.testbench.elementsbase.ServerClass; import com.vaadin.testbench.elementsbase.ServerClass;


@ServerClass("com.vaadin.ui.Table") @ServerClass("com.vaadin.ui.Table")
return findElement(By.className("v-table-column-selector")); return findElement(By.className("v-table-column-selector"));
} }


public static class ContextMenuElement extends AbstractElement {

public WebElement getItem(int index) {
return findElement(
By.xpath(".//table//tr[" + (index + 1) + "]//td/*"));
}

}

public ContextMenuElement getContextMenu() {
WebElement cm = getDriver().findElement(By.className("v-contextmenu"));
return wrapElement(cm, getCommandExecutor())
.wrap(ContextMenuElement.class);
}

} }

+ 3
- 4
uitest-common/src/main/java/com/vaadin/testbench/customelements/WindowElement.java View File

private final String maximizeBoxClass = "v-window-maximizebox"; private final String maximizeBoxClass = "v-window-maximizebox";
private final String closeBoxClass = "v-window-closebox"; private final String closeBoxClass = "v-window-closebox";


@Override
public void restore() { public void restore() {
if (isMaximized()) { if (isMaximized()) {
getRestoreButton().click(); getRestoreButton().click();
} }
} }


private boolean isMaximized() {
return isElementPresent(By.className(restoreBoxClass));
}

private WebElement getRestoreButton() { private WebElement getRestoreButton() {
return findElement(By.className("v-window-restorebox")); return findElement(By.className("v-window-restorebox"));
} }


@Override
public void maximize() { public void maximize() {
if (!isMaximized()) { if (!isMaximized()) {
getMaximizeButton().click(); getMaximizeButton().click();
return findElement(By.className(closeBoxClass)); return findElement(By.className(closeBoxClass));
} }


@Override
public void close() { public void close() {
getCloseButton().click(); getCloseButton().click();



+ 1
- 1
uitest/ivy.xml View File

<dependency org="org.hsqldb" name="hsqldb" rev="2.2.6" <dependency org="org.hsqldb" name="hsqldb" rev="2.2.6"
conf="build -> default" /> conf="build -> default" />
<dependency org="com.vaadin" name="vaadin-testbench" <dependency org="com.vaadin" name="vaadin-testbench"
rev="4.0.3" conf="build-provided -> default" />
rev="4.1.0" conf="build-provided -> default" />
<!-- This should be removed once tests have been updated to use lang3 --> <!-- This should be removed once tests have been updated to use lang3 -->
<dependency org="commons-lang" name="commons-lang" <dependency org="commons-lang" name="commons-lang"
rev="2.6" conf="build -> default" /> rev="2.6" conf="build -> default" />

+ 1
- 1
uitest/src/test/java/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansionTest.java View File



import com.vaadin.testbench.TestBenchElement; import com.vaadin.testbench.TestBenchElement;
import com.vaadin.testbench.customelements.TableElement; import com.vaadin.testbench.customelements.TableElement;
import com.vaadin.testbench.customelements.TableElement.ContextMenuElement;
import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.ButtonElement;
import com.vaadin.testbench.elements.TableElement.ContextMenuElement;
import com.vaadin.tests.tb3.MultiBrowserTest; import com.vaadin.tests.tb3.MultiBrowserTest;


public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest { public class ColumnCollapsingAndColumnExpansionTest extends MultiBrowserTest {

Loading…
Cancel
Save