From: Artur Signell <artur@vaadin.com>
Date: Fri, 2 May 2014 08:06:12 +0000 (+0300)
Subject: Merge changes from origin/7.2
X-Git-Tag: 7.2.0~13^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c1501a5d341082f61398b8e1e6bde4aa7826d7a;p=vaadin-framework.git

Merge changes from origin/7.2

08b0589 Refactored TimeoutRedirectResetsOnActivity tests.

Conflicts:
	uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java

Change-Id: Id2dc47cb5396a24c97a2689c1412b29a421ac400
---

9c1501a5d341082f61398b8e1e6bde4aa7826d7a
diff --cc uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
index dda416ca7c,f4a7a68983..eecefbebe1
--- a/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
+++ b/uitest/src/com/vaadin/tests/components/ui/TimeoutRedirectResetsOnActivityTest.java
@@@ -15,19 -15,30 +15,32 @@@
   */
  package com.vaadin.tests.components.ui;
  
- import static org.junit.Assert.assertTrue;
+ import static org.hamcrest.CoreMatchers.is;
+ import static org.hamcrest.CoreMatchers.not;
+ import static org.hamcrest.MatcherAssert.assertThat;
  
 +import org.junit.Ignore;
+ import org.junit.Rule;
  import org.junit.Test;
- import org.openqa.selenium.By;
- import org.openqa.selenium.NoSuchElementException;
  import org.openqa.selenium.WebElement;
  
  import com.vaadin.tests.tb3.MultiBrowserTest;
+ import com.vaadin.tests.tb3.RetryOnFail;
  
  public class TimeoutRedirectResetsOnActivityTest extends MultiBrowserTest {
+ 
+     @Rule
+     // Timing issues are really hard to resolve in a way that this test would be
+     // 100% reliable on all browsers. Hence we shall allow one retry.
+     public RetryOnFail retry = new RetryOnFail();
+ 
+     private int waitBeforeActivity = 4000;
+     private int communicationOverhead = 2000;
+ 
+     private static int i = 0;
+ 
      @Test
 +    @Ignore("The test modifies the system messages, which are global and the changes will affect other tests")
      public void verifyRedirectWorks() throws Exception {
          setDebug(true);
          openTestURL();