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 @@ -591,7 +591,10 @@ public void test_LocationListener_changed() {
shell.open();
browser.setText("Hello world");
boolean passed = waitForPassCondition(changedFired::get);
assertTrue("LocationListener.changed() event was never fired", passed);
String errorMsg = String.format(
"LocationListener.changed() event was never fired. Browser URL after waitForPassCondition: %s",
browser.getUrl());
assertTrue(errorMsg, passed);
}
@Test
public void test_LocationListener_changed_twoSetTextCycles() {
Expand Down Expand Up @@ -654,10 +657,12 @@ public void test_LocationListener_then_ProgressListener() {
AtomicBoolean locationChanged = new AtomicBoolean(false);
AtomicBoolean progressChanged = new AtomicBoolean(false);
AtomicBoolean progressChangedAfterLocationChanged = new AtomicBoolean(false);
AtomicReference<String> browserTextOnCompletedEvent = new AtomicReference<>();

browser.addLocationListener(changedAdapter(event -> locationChanged.set(true)));

browser.addProgressListener(completedAdapter(event -> {
browserTextOnCompletedEvent.set(browser.getText());
if (locationChanged.get()) {
progressChangedAfterLocationChanged.set(true);
}
Expand All @@ -671,8 +676,9 @@ public void test_LocationListener_then_ProgressListener() {
String errorMsg = "\nUnexpected listener states. Expecting true for all, but have:\n"
+ "Location changed: " + locationChanged.get() + "\n"
+ "ProgressChangedAfterLocationChanged: " + progressChangedAfterLocationChanged.get() + "\n"
+ "progressChanged: " + progressChanged.get();

+ "progressChanged: " + progressChanged.get() + "\n"
+ "browser text on completed event: " + browserTextOnCompletedEvent.get() + "\n"
+ "browser text after waitForPassCondition: " + browser.getText();
assertTrue(errorMsg, progressChangedAfterLocationChanged.get());
}

Expand Down Expand Up @@ -986,6 +992,7 @@ public void completed(ProgressEvent event) {
@Test
public void test_ProgressListener_completed_Called() {
AtomicBoolean childCompleted = new AtomicBoolean(false);
AtomicReference<String> browserTextOnChangedEvent = new AtomicReference<>();
ProgressListener l = new ProgressListener() {

@Override
Expand All @@ -995,14 +1002,16 @@ public void completed(ProgressEvent event) {

@Override
public void changed(ProgressEvent event) {

browserTextOnChangedEvent.set(browser.getText());
}
};
browser.addProgressListener(l);
browser.setText("<html><body>This test ensures that the completed listener is called.</body></html>");
shell.open();
boolean passed = waitForPassCondition(childCompleted::get);
assertTrue(passed);
String errorMsg = "Browser text before completed: " + browserTextOnChangedEvent.get() +
"\nBrowser text after completed: " + browser.getText();
assertTrue(errorMsg, passed);
}

@Test
Expand Down
Loading