Browse Source

Add build parameter com.vaadin.testbench.hub.url.

Change-Id: I413c1dfffcba794aeaa33bbfef4b90b22f5f6fb7
tags/7.5.0.alpha1
Sauli Tähkäpää 9 years ago
parent
commit
1321b9f242
2 changed files with 13 additions and 0 deletions
  1. 11
    0
      uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
  2. 2
    0
      uitest/tb3test.xml

+ 11
- 0
uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java View File

@@ -54,6 +54,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
private static final String HOSTNAME_PROPERTY = "com.vaadin.testbench.deployment.hostname";
private static final String PORT_PROPERTY = "com.vaadin.testbench.deployment.port";
private static final String DEPLOYMENT_PROPERTY = "com.vaadin.testbench.deployment.url";
private static final String HUB_URL = "com.vaadin.testbench.hub.url";
private static final Properties properties = new Properties();
private static final File propertiesFile = new File("work",
"eclipse-run-selected-test.properties");
@@ -97,6 +98,16 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
return screenshotDirectory;
}

@Override
protected String getHubURL() {
String hubUrl = getProperty(HUB_URL);
if(hubUrl == null || hubUrl.trim().isEmpty()) {
return super.getHubURL();
}

return hubUrl;
}

@Override
protected String getHubHostname() {
return "tb3-hub.intra.itmill.com";

+ 2
- 0
uitest/tb3test.xml View File

@@ -9,6 +9,7 @@
<property name="categories.exclude" value="" />
<property name="useLocalWebDriver" value="false" />
<property name="com.vaadin.testbench.max.retries" value="0" />
<property name="com.vaadin.testbench.hub.url" value="" />
<property name="junit.test.suite" value="com.vaadin.tests.tb3.AllTB3Tests" />

<ivy:resolve file="${tb3test.dir}/ivy.xml" conf="build, build-provided" />
@@ -39,6 +40,7 @@
<jvmarg value="-Dcategories.exclude=${categories.exclude}" />
<jvmarg value="-DuseLocalWebDriver=${useLocalWebDriver}" />
<jvmarg value="-Dcom.vaadin.testbench.max.retries=${com.vaadin.testbench.max.retries}" />
<jvmarg value="-Dcom.vaadin.testbench.hub.url=${com.vaadin.testbench.hub.url}" />
<test name="${junit.test.suite}" todir="${report.dir}" />
</junit>


Loading…
Cancel
Save