wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 946366 - Aggregate timeout for events waited on in WaitHelper.waitForPageLoad. r=mcomella

Browse Source
This commit is contained in:
Isura Edirisinghe 2014-04-30 14:08:53 -07:00
parent 1d5e4fda0c
commit d372ad486f
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mobile/android/base/tests/helpers/WaitHelper.java
View File

@ -7,6 +7,7 @@ package org.mozilla.gecko.tests.helpers;
import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertNotNull;
import static org.mozilla.gecko.tests.helpers.AssertionHelper.fAssertTrue;
import android.os.SystemClock;
import java.util.regex.Pattern;
import org.mozilla.gecko.Actions;
@ -84,15 +85,20 @@ public final class WaitHelper {
}
// Wait for the page load and title changed event.
final EventExpecter contentEventExpecter = sActions.expectGeckoEvent("DOMContentLoaded");
final EventExpecter titleEventExpecter = sActions.expectGeckoEvent("DOMTitleChanged");
final EventExpecter[] eventExpecters = new EventExpecter[] {
sActions.expectGeckoEvent("DOMContentLoaded"),
sActions.expectGeckoEvent("DOMTitleChanged")
};
initiatingAction.run();
contentEventExpecter.blockForEventDataWithTimeout(PAGE_LOAD_WAIT_MS);
contentEventExpecter.unregisterListener();
titleEventExpecter.blockForEventDataWithTimeout(PAGE_LOAD_WAIT_MS);
titleEventExpecter.unregisterListener();
// PAGE_LOAD_WAIT_MS is the total time we wait for all events to finish.
final long expecterStartMillis = SystemClock.uptimeMillis();
for (final EventExpecter expecter : eventExpecters) {
final int eventWaitTimeMillis = PAGE_LOAD_WAIT_MS - (int)(SystemClock.uptimeMillis() - expecterStartMillis);
expecter.blockForEventDataWithTimeout(eventWaitTimeMillis);
expecter.unregisterListener();
}
// Verify remaining state has changed.
for (final ChangeVerifier verifier : pageLoadVerifiers) {