Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,9 @@ public void test_LocationListener_ProgressListener_cancledLoad () {
AtomicBoolean unexpectedLocationChanged = new AtomicBoolean(false);
AtomicBoolean unexpectedProgressCompleted = new AtomicBoolean(false);

AtomicReference<String> unexpectedLocationChangedDetails = new AtomicReference<>("(empty)");
AtomicReference<String> unexpectedProgressCompletedDetails = new AtomicReference<>("(empty)");

browser.addLocationListener(new LocationListener() {
@Override
public void changing(LocationEvent event) {
Expand All @@ -691,16 +694,19 @@ public void changing(LocationEvent event) {
}
@Override
public void changed(LocationEvent event) {
if (event.location.length() != 0) { // See footnote 1
if (!event.location.isEmpty()) { // See footnote 1
unexpectedLocationChanged.set(true);
unexpectedLocationChangedDetails.set(event.location);
}
}
});

browser.addProgressListener(completedAdapter(event -> {
String location = browser.getUrl();
if (location.length() != 0) { // See footnote 1
if (!location.isEmpty()) { // See footnote 1
unexpectedProgressCompleted.set(true);
unexpectedProgressCompletedDetails.set(location);

}
}));
shell.open();
Expand All @@ -720,8 +726,8 @@ public void changed(LocationEvent event) {
}
String errMsg = "\nUnexpected event fired. \n"
+ "LocationChanging (should be true): " + locationChanging.get() + "\n"
+ "LocationChanged unexpectedly (should be false): " + unexpectedLocationChanged.get() + "\n"
+ "ProgressChanged unexpectedly (should be false): " + unexpectedProgressCompleted.get() + "\n";
+ "LocationChanged unexpectedly (should be false): " + unexpectedLocationChanged.get() + (unexpectedLocationChanged.get() ? " (" +unexpectedLocationChangedDetails.get() +")": "") + "\n"
+ "ProgressChanged unexpectedly (should be false): " + unexpectedProgressCompleted.get() + (unexpectedProgressCompleted.get() ? " (" +unexpectedProgressCompletedDetails.get() +")": "")+ "\n";


assertTrue(errMsg, passed);
Expand Down
Loading