Skip to content

Commit feba503

Browse files
committed
small optimizations
1 parent 0d7fd31 commit feba503

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/test/java/org/htmlunit/WebDriverTestCase.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1087,18 +1087,28 @@ protected final WebDriver loadPageVerifyTitle2(final String html, final String..
10871087

10881088
protected final WebDriver verifyTitle2(final long maxWaitTime, final WebDriver driver,
10891089
final String... expectedAlerts) throws Exception {
1090+
1091+
final StringBuilder expected = new StringBuilder();
1092+
for (int i = 0; i < expectedAlerts.length; i++) {
1093+
expected.append(expectedAlerts[i]).append('\u00A7');
1094+
}
1095+
final String expectedTitle = expected.toString();
1096+
10901097
final long maxWait = System.currentTimeMillis() + maxWaitTime;
10911098

10921099
while (System.currentTimeMillis() < maxWait) {
10931100
try {
1094-
return verifyTitle2(driver, expectedAlerts);
1101+
final String title = driver.getTitle();
1102+
assertEquals(expectedTitle, title);
1103+
return driver;
10951104
}
10961105
catch (final AssertionError e) {
10971106
// ignore and wait
10981107
}
10991108
}
11001109

1101-
return verifyTitle2(driver, expectedAlerts);
1110+
assertEquals(expectedTitle, driver.getTitle());
1111+
return driver;
11021112
}
11031113

11041114
protected final WebDriver verifyTitle2(final WebDriver driver,

src/test/java/org/htmlunit/attachment/DownloadingAttachmentHandlerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ public void basicFileNameFromHeader() throws Exception {
164164

165165
final File tmpFolder = new File(System.getProperty("java.io.tmpdir"));
166166
final File downloadFolder = new File(tmpFolder, "downloading-attachment-test");
167+
FileUtils.deleteDirectory(downloadFolder);
167168

168169
try {
169170
FileUtils.forceMkdir(downloadFolder);

0 commit comments

Comments
 (0)