Make vanilla SingleBrowserTest work with the runLocally property

Change-Id: I4173dbdb7bb83376177fc680562eca1725d48e36

diff --git a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
index 1c0542b2097f7376ded050b0e8be144450cdb93d..7df65829aea7d4e4c1507ad22698ff951990224a 100644 (file)
--- a/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
+++ b/uitest/src/com/vaadin/tests/tb3/PrivateTB3Configuration.java
@@ -97,7 +97,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
         super.setup();
     }
 
-    private static DesiredCapabilities getRunLocallyCapabilities() {
+    protected static DesiredCapabilities getRunLocallyCapabilities() {
         VaadinBrowserFactory factory = new VaadinBrowserFactory();
         try {
             return factory.create(Browser.valueOf(properties.getProperty(
@@ -159,7 +159,7 @@ public abstract class PrivateTB3Configuration extends ScreenshotTB3Test {
         return getConfiguredDeploymentHostname();
     }
 
-    private boolean isRunLocally() {
+    protected boolean isRunLocally() {
         if (properties.containsKey(RUN_LOCALLY_PROPERTY)) {
             return true;
         }

diff --git a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
index 960d6b8777fb2cc184ff638b819ae275de1e2ae6..b5389d3eec30ca5cfa8a1f04c4a5d522239ef744 100644 (file)
--- a/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
+++ b/uitest/src/com/vaadin/tests/tb3/SingleBrowserTest.java
@@ -25,6 +25,9 @@ import com.vaadin.testbench.parallel.Browser;
 public abstract class SingleBrowserTest extends PrivateTB3Configuration {
     @Override
     public List<DesiredCapabilities> getBrowsersToTest() {
+        if (isRunLocally()) {
+            return Collections.singletonList(getRunLocallyCapabilities());
+        }
         return Collections.singletonList(Browser.PHANTOMJS
                 .getDesiredCapabilities());
     }