diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java index b24679ab862..b7a61a4452b 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java @@ -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() { @@ -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 browserTextOnCompletedEvent = new AtomicReference<>(); browser.addLocationListener(changedAdapter(event -> locationChanged.set(true))); browser.addProgressListener(completedAdapter(event -> { + browserTextOnCompletedEvent.set(browser.getText()); if (locationChanged.get()) { progressChangedAfterLocationChanged.set(true); } @@ -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()); } @@ -986,6 +992,7 @@ public void completed(ProgressEvent event) { @Test public void test_ProgressListener_completed_Called() { AtomicBoolean childCompleted = new AtomicBoolean(false); + AtomicReference browserTextOnChangedEvent = new AtomicReference<>(); ProgressListener l = new ProgressListener() { @Override @@ -995,14 +1002,16 @@ public void completed(ProgressEvent event) { @Override public void changed(ProgressEvent event) { - + browserTextOnChangedEvent.set(browser.getText()); } }; browser.addProgressListener(l); browser.setText("This test ensures that the completed listener is called."); 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