Fix duplicate id issue in test and test more corner cases

Change-Id: I4bacfe7353968df7b0f1a8786ae4e488dffa3565

2 files changed, 22 insertions, 1 deletions

diff --git a/uitest/src/com/vaadin/tests/push/BasicPush.java b/uitest/src/com/vaadin/tests/push/BasicPush.java
index f9e29492dd..8e8f418c5f 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPush.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPush.java
@@ -38,7 +38,7 @@ public class BasicPush extends AbstractTestUI {
 
     public static final String SERVER_COUNTER_ID = "serverCounter";
 
-    public static final String INCREMENT_BUTTON_ID = "clientCounter";
+    public static final String INCREMENT_BUTTON_ID = "incrementCounter";
 
     private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0);
 
diff --git a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
index 951e1eb576..8f131a5051 100644
--- a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
@@ -53,6 +53,15 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
         waitUntilServerCounterChanges();
         // The change should have appeared when reconnected
         Assert.assertEquals(1, getClientCounter());
+
+        // IE has problems with another reconnect
+        disconnectProxy();
+        getIncrementClientCounterButton().click();
+        Assert.assertEquals(1, getClientCounter());
+        Thread.sleep(1000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+        Assert.assertEquals(2, getClientCounter());
     }
 
     @Test
@@ -68,6 +77,18 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
     }
 
     @Test
+    public void testReallyLongDisconnect() throws Exception {
+        setDebug(true);
+        openTestURL();
+        startTimer();
+        waitUntilServerCounterChanges();
+        disconnectProxy();
+        Thread.sleep(120000);
+        connectProxy();
+        waitUntilServerCounterChanges();
+    }
+
+    @Test
     public void testMultipleDisconnects() throws Exception {
         setDebug(true);
         openTestURL();