Skip to content

Commit 216b55c

Browse files
author
Vasyl Vavrychuk
committed
TestWaiter class was deleted
See commit SeleniumHQ/selenium@77866e8
1 parent 5c34cff commit 216b55c

22 files changed

+27
-55
lines changed

java/client/test/org/openqa/selenium/qtwebkit/hybridtests/EmbeddedWebViewTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
import static org.junit.Assert.assertThat;
5353
import static org.junit.Assert.assertTrue;
5454
import static org.junit.Assert.fail;
55-
import static org.openqa.selenium.TestWaiter.waitFor;
5655
import static org.junit.Assume.assumeFalse;
56+
import static org.openqa.selenium.support.ui.ExpectedConditions.titleIs;
5757

5858
public class EmbeddedWebViewTest extends JUnit4TestBase {
5959

@@ -93,15 +93,15 @@ public void testCanClickOnALinkAndFollowIt() {
9393
driver.get(pages.clicksPage);
9494
driver.findElement(By.id("normal")).click();
9595

96-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
96+
wait.until(titleIs("XHTML Test Page"));
9797
}
9898

9999
@Test
100100
public void testCanClickOnALinkThatOverflowsAndFollowIt() {
101101
driver.get(pages.clicksPage);
102102
driver.findElement(By.id("overflowLink")).click();
103103

104-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
104+
wait.until(titleIs("XHTML Test Page"));
105105
}
106106

107107
@Test
@@ -112,7 +112,7 @@ public void testCanClickOnALinkThatUpdatesAnotherFrame() {
112112
driver.findElement(By.id("otherframe")).click();
113113
driver.switchTo().defaultContent().switchTo().frame("target");
114114

115-
waitFor(WaitingConditions.pageSourceToContain(driver, "Hello WebDriver"));
115+
wait.until(WaitingConditions.pageSourceToContain( "Hello WebDriver"));
116116
}
117117

118118
@JavascriptEnabled
@@ -168,7 +168,7 @@ public void testCanClickOnAnElementWithTopSetToANegativeNumber() {
168168
public void testShouldClickOnFirstBoundingClientRectWithNonZeroSize() {
169169
driver.get(pages.clicksPage);
170170
driver.findElement(By.id("twoClientRects")).click();
171-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
171+
wait.until(titleIs("XHTML Test Page"));
172172
}
173173

174174
@Test
@@ -187,7 +187,7 @@ public void testCanClickOnALinkWithEnclosedImage() {
187187
driver.get(pages.clicksPage);
188188
driver.findElement(By.id("link-with-enclosed-image")).click();
189189

190-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
190+
wait.until(titleIs("XHTML Test Page"));
191191
}
192192

193193
@Test
@@ -196,22 +196,22 @@ public void testCanClickOnAnImageEnclosedInALink() {
196196
driver.findElement(By.id("link-with-enclosed-image")).findElement(By.tagName("img"))
197197
.click();
198198

199-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
199+
wait.until(titleIs("XHTML Test Page"));
200200
}
201201

202202
@Test
203203
public void testCanClickOnALinkThatContainsTextWrappedInASpan() {
204204
driver.get(pages.clicksPage);
205205
driver.findElement(By.id("link-with-enclosed-span")).click();
206206

207-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
207+
wait.until(titleIs("XHTML Test Page"));
208208
}
209209

210210
@Test
211211
public void testCanClickOnALinkThatContainsEmbeddedBlockElements() {
212212
driver.get(pages.clicksPage);
213213
driver.findElement(By.id("embeddedBlock")).click();
214-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
214+
wait.until(titleIs("XHTML Test Page"));
215215
}
216216

217217
@Test
@@ -220,7 +220,7 @@ public void testCanClickOnAnElementEnclosedInALink() {
220220
driver.findElement(By.id("link-with-enclosed-span")).findElement(By.tagName("span"))
221221
.click();
222222

223-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
223+
wait.until(titleIs("XHTML Test Page"));
224224
}
225225

226226
// See http://code.google.com/p/selenium/issues/attachmentText?id=2700
@@ -242,7 +242,7 @@ public void testShouldBeAbleToClickOnAnElementInTheViewport() {
242242
public void testClicksASurroundingStrongTag() {
243243
driver.get(appServer.whereIs("ClickTest_testClicksASurroundingStrongTag.html"));
244244
driver.findElement(By.tagName("a")).click();
245-
waitFor(WaitingConditions.pageTitleToBe(driver, "XHTML Test Page"));
245+
wait.until(titleIs("XHTML Test Page"));
246246
}
247247

248248
@Test
@@ -254,7 +254,7 @@ public void testShouldBeAbleToClickOnAnElementGreaterThanTwoViewports() {
254254

255255
element.click();
256256

257-
waitFor(WaitingConditions.pageTitleToBe(driver, "clicks"));
257+
wait.until(titleIs("clicks"));
258258
}
259259

260260
@Test
@@ -268,7 +268,7 @@ public void testShouldBeAbleToClickOnAnElementInFrameGreaterThanTwoViewports() {
268268
WebElement element = driver.findElement(By.id("click"));
269269
element.click();
270270

271-
waitFor(WaitingConditions.pageTitleToBe(driver, "clicks"));
271+
wait.until(titleIs("clicks"));
272272
}
273273

274274
@Test

java/client/test/org/openqa/selenium/qtwebkit/hybridtests/InternalWebViewTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.util.concurrent.Callable;
3636

3737
import static org.junit.Assert.fail;
38-
import static org.openqa.selenium.TestWaiter.waitFor;
3938

4039
public class InternalWebViewTest extends JUnit4TestBase {
4140

@@ -73,7 +72,7 @@ public void testCanGetTitleFromInternalWebView() {
7372
for (String winHandle : driver.getWindowHandles()) {
7473
if (!currentWindow.equals(winHandle)) {
7574
driver.switchTo().window(winHandle);
76-
waitFor(WaitingConditions.pageTitleToBe(driver, "Color Page"));
75+
wait.until(titleIs("Color Page"));
7776
break;
7877
}
7978
}

java/client/test/org/openqa/selenium/qtwebkit/hybridtests/WidgetAndWebViewTest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.util.concurrent.Callable;
3333

3434
import static org.junit.Assert.assertEquals;
35-
import static org.openqa.selenium.TestWaiter.waitFor;
3635

3736
public class WidgetAndWebViewTest extends JUnit4TestBase {
3837

@@ -52,7 +51,7 @@ public void testCanSwitchToNeededWebView() {
5251
for (String winHandle : driver.getWindowHandles()) {
5352
if (!currentWindow.equals(winHandle)) {
5453
driver.switchTo().window(winHandle);
55-
waitFor(WaitingConditions.pageTitleToBe(driver, "Color Page"));
54+
wait.until(titleIs("Color Page"));
5655
break;
5756
}
5857
}
@@ -85,7 +84,7 @@ public void testCanGetTitleFromWebView() {
8584
for (String winHandle : driver.getWindowHandles()) {
8685
if (!currentWindow.equals(winHandle)) {
8786
driver.switchTo().window(winHandle);
88-
waitFor(WaitingConditions.pageTitleToBe(driver, "Color Page"));
87+
wait.until(titleIs("Color Page"));
8988
break;
9089
}
9190
}

java/client/test/org/openqa/selenium/qtwebkit/hybridtests/WindowWithDeclarativeViewTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.concurrent.Callable;
3535

3636
import static org.junit.Assert.fail;
37-
import static org.openqa.selenium.TestWaiter.waitFor;
3837

3938
public class WindowWithDeclarativeViewTest extends JUnit4TestBase {
4039

java/client/test/org/openqa/selenium/qtwebkit/hybridtests/WindowWithSeparatedDeclarativeAndWebViewsTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import static org.junit.Assert.assertNotNull;
3939
import static org.junit.Assert.assertTrue;
4040
import static org.junit.Assert.fail;
41-
import static org.openqa.selenium.TestWaiter.waitFor;
4241

4342
public class WindowWithSeparatedDeclarativeAndWebViewsTest extends JUnit4TestBase {
4443

@@ -118,7 +117,7 @@ public void testCanSwitchBetweenQmlViewAndWebView() {
118117
}
119118
assertNotNull(webWindow);
120119
driver.switchTo().window(currentWindow);
121-
waitFor(WaitingConditions.pageTitleToBe(driver, "Test Widget"));
120+
wait.until(titleIs("Test Widget"));
122121

123122
inputQmlURL.sendKeys(appServer.whereIs("quick1/ClickTest.qml"));
124123
buttonToQml.click();

java/client/test/org/openqa/selenium/qtwebkit/nativetests/ClickScrollingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import static org.junit.Assert.assertThat;
3232
import static org.junit.Assert.assertTrue;
3333
import static org.junit.Assert.fail;
34-
import static org.openqa.selenium.TestWaiter.waitFor;
3534
import static org.openqa.selenium.testing.Ignore.Driver.ANDROID;
3635
import static org.openqa.selenium.testing.Ignore.Driver.HTMLUNIT;
3736

java/client/test/org/openqa/selenium/qtwebkit/nativetests/ClickTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
import org.openqa.selenium.*;
3232
import org.openqa.selenium.testing.JUnit4TestBase;
3333

34-
import static org.openqa.selenium.TestWaiter.waitFor;
35-
3634
public class ClickTest extends JUnit4TestBase {
3735

3836

@@ -45,20 +43,20 @@ public void setUp() throws Exception {
4543
public void testCanClickOnAPushButton() {
4644
driver.findElement(By.id("pushBtn")).click();
4745

48-
waitFor(WaitingConditions.pageTitleToBe(driver, "CLick Test Window"));
46+
wait.until(titleIs("CLick Test Window"));
4947
}
5048

5149
@Test
5250
public void testCanClickOnACheckBox() {
5351
driver.findElement(By.id("checkBox")).click();
5452

55-
waitFor(WaitingConditions.pageTitleToBe(driver, "CLick Test Window"));
53+
wait.until(titleIs("CLick Test Window"));
5654
}
5755

5856
@Test
5957
public void testClickingOnButtonInScrollArea() {
6058
driver.findElement(By.id("btnOnScroll")).click();
6159

62-
waitFor(WaitingConditions.pageTitleToBe(driver, "CLick Test Window"));
60+
wait.until(titleIs("CLick Test Window"));
6361
}
6462
}

java/client/test/org/openqa/selenium/qtwebkit/nativetests/ElementSelectingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static org.junit.Assert.assertEquals;
2727
import static org.junit.Assert.assertThat;
2828
import static org.junit.Assert.assertTrue;
29-
import static org.openqa.selenium.TestWaiter.waitFor;
3029
import static org.openqa.selenium.WaitingConditions.elementSelectionToBe;
3130

3231
import static org.hamcrest.Matchers.is;

java/client/test/org/openqa/selenium/qtwebkit/nativetests/MenuTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
3939
import static org.hamcrest.Matchers.is;
4040
import static org.junit.Assert.assertThat;
41-
import static org.openqa.selenium.TestWaiter.waitFor;
4241
import static org.openqa.selenium.testing.Ignore.Driver.CHROME;
4342
import static org.openqa.selenium.testing.Ignore.Driver.PHANTOMJS;
4443
import static org.openqa.selenium.testing.Ignore.Driver.SAFARI;

java/client/test/org/openqa/selenium/qtwebkit/nativetests/TextHandlingTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import static org.junit.Assert.*;
3636
import static org.junit.Assert.assertEquals;
3737
import static org.junit.Assert.assertNotSame;
38-
import static org.openqa.selenium.TestWaiter.waitFor;
3938

4039
import static org.hamcrest.Matchers.containsString;
4140
import static org.hamcrest.Matchers.endsWith;

0 commit comments

Comments
 (0)