summaryrefslogtreecommitdiffstats
path: root/uitest/src/com/vaadin/tests/push
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-01 14:19:50 +0300
committerArtur Signell <artur@vaadin.com>2015-09-03 11:43:27 +0300
commit379c6679879cf69ef4253da97f7d557bc33673e4 (patch)
treeb773fc2cdce5d2b0f90f3b1ac4922505c063f676 /uitest/src/com/vaadin/tests/push
parent29175d10b275a6e87dbbec8fe703a640f5f6a37f (diff)
downloadvaadin-framework-379c6679879cf69ef4253da97f7d557bc33673e4.tar.gz
vaadin-framework-379c6679879cf69ef4253da97f7d557bc33673e4.zip
Nginx + Wildfly 9 test for various proxy configurations (#11733)
* /nonbuffering a proxy without any buffering * /buffering tests a buffering proxy * /nonbuffering-timeout tests a proxy without any buffering but with a 10s timeout set * /buffering-timeout tests a buffering proxy with a 10s timeout set Change-Id: I5d99cc29364e3ed888371fa18ee404f912d73223
Diffstat (limited to 'uitest/src/com/vaadin/tests/push')
-rw-r--r--uitest/src/com/vaadin/tests/push/BasicPushTest.java15
1 files changed, 8 insertions, 7 deletions
diff --git a/uitest/src/com/vaadin/tests/push/BasicPushTest.java b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
index 5bac54f0f7..0e86902b50 100644
--- a/uitest/src/com/vaadin/tests/push/BasicPushTest.java
+++ b/uitest/src/com/vaadin/tests/push/BasicPushTest.java
@@ -16,6 +16,7 @@
package com.vaadin.tests.push;
import org.junit.Test;
+import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedCondition;
@@ -52,8 +53,8 @@ public abstract class BasicPushTest extends MultiBrowserTest {
}
public static int getClientCounter(AbstractTB3Test t) {
- WebElement clientCounterElem = t
- .vaadinElementById(BasicPush.CLIENT_COUNTER_ID);
+ WebElement clientCounterElem = t.findElement(By
+ .id(BasicPush.CLIENT_COUNTER_ID));
return Integer.parseInt(clientCounterElem.getText());
}
@@ -66,21 +67,21 @@ public abstract class BasicPushTest extends MultiBrowserTest {
}
public static int getServerCounter(AbstractTB3Test t) {
- WebElement serverCounterElem = t
- .vaadinElementById(BasicPush.SERVER_COUNTER_ID);
+ WebElement serverCounterElem = t.findElement(By
+ .id(BasicPush.SERVER_COUNTER_ID));
return Integer.parseInt(serverCounterElem.getText());
}
public static WebElement getServerCounterStartButton(AbstractTB3Test t) {
- return t.vaadinElementById(BasicPush.START_TIMER_ID);
+ return t.findElement(By.id(BasicPush.START_TIMER_ID));
}
public static WebElement getServerCounterStopButton(AbstractTB3Test t) {
- return t.vaadinElementById(BasicPush.STOP_TIMER_ID);
+ return t.findElement(By.id(BasicPush.STOP_TIMER_ID));
}
public static WebElement getIncrementButton(AbstractTB3Test t) {
- return t.vaadinElementById(BasicPush.INCREMENT_BUTTON_ID);
+ return t.findElement(By.id(BasicPush.INCREMENT_BUTTON_ID));
}
private void waitUntilClientCounterChanges(final int expectedValue) {