aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2014-02-22 01:19:12 +0200
committerJohannes Dahlström <johannesd@vaadin.com>2014-02-21 23:48:19 +0000
commit7782e5d52597f372cdf99cd181956045024aeb21 (patch)
tree803b9c2d69f6976c49966d868ba77100c8570841
parent28a0b2e1cb7157ab43cd940aca5ce3e30caafab5 (diff)
downloadvaadin-framework-7782e5d52597f372cdf99cd181956045024aeb21.tar.gz
vaadin-framework-7782e5d52597f372cdf99cd181956045024aeb21.zip
Rename to follow same scheme as other push tests
Change-Id: I6ea0626ffb88182120f69e0ca988250248e365e1
-rw-r--r--uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java (renamed from uitest/src/com/vaadin/tests/push/LongPollingReconnectTest.java)2
-rwxr-xr-xuitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java (renamed from uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java)2
-rw-r--r--uitest/src/com/vaadin/tests/push/ReconnectTest.java (renamed from uitest/src/com/vaadin/tests/push/PushReconnectTest.java)4
-rw-r--r--uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java (renamed from uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java)2
4 files changed, 5 insertions, 5 deletions
diff --git a/uitest/src/com/vaadin/tests/push/LongPollingReconnectTest.java b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
index 81c974e1e5..6d0c0c53b0 100644
--- a/uitest/src/com/vaadin/tests/push/LongPollingReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectLongPollingTest.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.tests.push;
-public class LongPollingReconnectTest extends PushReconnectTest {
+public class ReconnectLongPollingTest extends ReconnectTest {
@Override
protected Class<?> getUIClass() {
diff --git a/uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
index 24dfdd8ba1..ebacf5be37 100755
--- a/uitest/src/com/vaadin/tests/push/StreamingReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectStreamingTest.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.tests.push;
-public class StreamingReconnectTest extends PushReconnectTest {
+public class ReconnectStreamingTest extends ReconnectTest {
@Override
protected Class<?> getUIClass() {
diff --git a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java b/uitest/src/com/vaadin/tests/push/ReconnectTest.java
index 76a0b547da..69b2ccf22b 100644
--- a/uitest/src/com/vaadin/tests/push/PushReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectTest.java
@@ -23,7 +23,7 @@ import org.openqa.selenium.support.ui.ExpectedCondition;
import com.vaadin.tests.tb3.MultiBrowserTestWithProxy;
-public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
+public abstract class ReconnectTest extends MultiBrowserTestWithProxy {
@Test
public void testShortDisconnect() throws Exception {
@@ -152,7 +152,7 @@ public abstract class PushReconnectTest extends MultiBrowserTestWithProxy {
@Override
public Boolean apply(WebDriver input) {
- return BasicPushTest.getServerCounter(PushReconnectTest.this) > counter;
+ return BasicPushTest.getServerCounter(ReconnectTest.this) > counter;
}
}, 30);
}
diff --git a/uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java b/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
index 075a18c0e7..57fe0a040d 100644
--- a/uitest/src/com/vaadin/tests/push/WebsocketReconnectTest.java
+++ b/uitest/src/com/vaadin/tests/push/ReconnectWebsocketTest.java
@@ -21,7 +21,7 @@ import org.openqa.selenium.remote.DesiredCapabilities;
import com.vaadin.tests.tb3.WebsocketTest;
-public class WebsocketReconnectTest extends PushReconnectTest {
+public class ReconnectWebsocketTest extends ReconnectTest {
@Override
public List<DesiredCapabilities> getBrowsersToTest() {