From 76b96737f9e2c87f8e72530afb7bbd03a385518f Mon Sep 17 00:00:00 2001 From: fedejeanne Date: Thu, 3 Apr 2025 15:15:20 +0200 Subject: [PATCH] Add details to test_LocationListener_ProgressListener_cancledLoad Also, use String::isEmpty to check for the size of the location instead of its length --- .../Test_org_eclipse_swt_browser_Browser.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 24de43fb544..b75d08bc6ee 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 @@ -683,6 +683,9 @@ public void test_LocationListener_ProgressListener_cancledLoad () { AtomicBoolean unexpectedLocationChanged = new AtomicBoolean(false); AtomicBoolean unexpectedProgressCompleted = new AtomicBoolean(false); + AtomicReference unexpectedLocationChangedDetails = new AtomicReference<>("(empty)"); + AtomicReference unexpectedProgressCompletedDetails = new AtomicReference<>("(empty)"); + browser.addLocationListener(new LocationListener() { @Override public void changing(LocationEvent event) { @@ -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(); @@ -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);