]> source.dussan.org Git - vaadin-framework.git/commitdiff
Add build parameter com.vaadin.testbench.hub.url.
authorSauli Tähkäpää <sauli@vaadin.com>
Mon, 16 Feb 2015 09:28:07 +0000 (11:28 +0200)
committerVaadin Code Review <review@vaadin.com>
Tue, 17 Feb 2015 19:17:00 +0000 (19:17 +0000)
Change-Id: I413c1dfffcba794aeaa33bbfef4b90b22f5f6fb7

uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
uitest/tb3test.xml

index 32d0f1065c1f6b9ca6de878b264734dd1c6c4f50..a4645262a5ca0b1b17faf04568b5b4d44e10ddf4 100644 (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";
index ecacf43ee234bb47b09c78891cafa953f0c189c5..8ae016f1e296e250043602ca45fb5be4d014f0d3 100644 (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>