Made test more stable and added Firefox reconnect test (#12492)

Waits longer for push message as at least Firefox has some kind of built in back off for websocket reconnects

Change-Id: Iaab2e09e8364f0b6247b3b39c19be439a4995800

2 files changed, 50 insertions, 10 deletions

diff --git a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
index 44cf069402..e6acad780f 100644
--- a/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
+++ b/uitest/src/com/vaadin/tests/tb3/AbstractTB3Test.java
@@ -306,18 +306,31 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
     }
 
     /**
-     * Waits a short while for the given condition to become true. Use e.g. as
+     * Waits up to 10s for the given condition to become true. Use e.g. as
      * {@link #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
      * 
      * @param condition
      *            the condition to wait for to become true
      */
     protected void waitUntil(ExpectedCondition<Boolean> condition) {
-        new WebDriverWait(driver, 10).until(condition);
+        waitUntil(condition, 10);
     }
 
     /**
-     * Waits a short while for the given condition to become false. Use e.g. as
+     * Waits the given number of seconds for the given condition to become true.
+     * Use e.g. as {@link
+     * #waitUntil(ExpectedConditions.textToBePresentInElement(by, text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become true
+     */
+    protected void waitUntil(ExpectedCondition<Boolean> condition,
+            long timeoutInSeconds) {
+        new WebDriverWait(driver, timeoutInSeconds).until(condition);
+    }
+
+    /**
+     * Waits up to 10s for the given condition to become false. Use e.g. as
      * {@link #waitUntilNot(ExpectedConditions.textToBePresentInElement(by,
      * text))}
      * 
@@ -325,7 +338,20 @@ public abstract class AbstractTB3Test extends TestBenchTestCase {
      *            the condition to wait for to become false
      */
     protected void waitUntilNot(ExpectedCondition<Boolean> condition) {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.not(condition));
+        waitUntilNot(condition, 10);
+    }
+
+    /**
+     * Waits the given number of seconds for the given condition to become
+     * false. Use e.g. as {@link
+     * #waitUntilNot(ExpectedConditions.textToBePresentInElement(by, text))}
+     * 
+     * @param condition
+     *            the condition to wait for to become false
+     */
+    protected void waitUntilNot(ExpectedCondition<Boolean> condition,
+            long timeoutInSeconds) {
+        waitUntil(ExpectedConditions.not(condition), timeoutInSeconds);
     }
 
     protected void waitForElementToBePresent(By by) {
diff --git a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
index d3488a98c4..0bb76889a0 100755
--- a/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
+++ b/uitest/src/com/vaadin/tests/tb3/MultiBrowserTestWithProxy.java
@@ -15,6 +15,7 @@
  */
 package com.vaadin.tests.tb3;
 
+import java.io.File;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.After;
@@ -29,6 +30,11 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
     private static AtomicInteger availablePort = new AtomicInteger(2000);
     private Session proxySession;
     private Integer proxyPort = null;
+    private JSch jsch;
+    private static String sshDir = System.getProperty("user.home") + "/.ssh/";
+    private String[] publicKeys = new String[] {
+            System.getProperty("sshkey.file"), sshDir + "id_rsa",
+            sshDir + "id_dsa", sshDir + "id_rsa2" };
 
     @Before
     public void setupInitialProxy() throws JSchException {
@@ -71,13 +77,21 @@ public abstract class MultiBrowserTestWithProxy extends MultiBrowserTest {
     }
 
     private void createProxy(int proxyPort) throws JSchException {
-        JSch j = new JSch();
-        String keyFile = System.getProperty("sshkey.file");
-        if (keyFile == null) {
-            keyFile = "~/.ssh/id_rsa";
+        if (jsch == null) {
+            jsch = new JSch();
+
+            String keyFile = null;
+            for (String publicKey : publicKeys) {
+                if (publicKey != null) {
+                    if (new File(publicKey).exists()) {
+                        keyFile = publicKey;
+                        break;
+                    }
+                }
+            }
+            jsch.addIdentity(keyFile);
         }
-        j.addIdentity(keyFile);
-        proxySession = j.getSession("localhost");
+        proxySession = jsch.getSession("localhost");
         proxySession.setConfig("StrictHostKeyChecking", "no");
         proxySession.setPortForwardingL("0.0.0.0", proxyPort,
                 super.getDeploymentHostname(), super.getDeploymentPort());