Skip to content

Remove Test_org_eclipse_swt_browser_Browser::ignoreNonDisposedShells #1666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 16, 2024
Merged

Remove Test_org_eclipse_swt_browser_Browser::ignoreNonDisposedShells #1666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions ...t.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_Browser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ private void testLogAppend(String msg) {
static List<String> initialOpenedDescriptors = new ArrayList<>();

List<Browser> createdBroswers = new ArrayList<>();
boolean ignoreNonDisposedShells;
static List<String> descriptors = new ArrayList<>();

private final int swtBrowserSettings;
Expand Down Expand Up @@ -165,7 +164,6 @@ public Test_org_eclipse_swt_browser_Browser(int swtBrowserSettings) {
public void setUp() {
super.setUp();
testNumber ++;
ignoreNonDisposedShells = false;
secondsToWaitTillFail = Math.max(15, debug_show_browser_timeout_seconds);

// If webkit crashes, it's very hard to tell which jUnit caused the JVM crash.
Expand Down Expand Up @@ -207,14 +205,21 @@ protected void afterDispose(Display display) {
Shell[] shells = Display.getDefault().getShells();
int disposedShells = 0;
for (Shell shell : shells) {

if (shell.getParent() == null // top-level shell
|| shell.getText() != null && shell.getText().contains("limbo")) {
// Skip the check for the top-level and the "limbo" shell since they are disposed
// after all tests are finished
continue;
}

if(!shell.isDisposed()) {
System.out.println("Not disposed shell: " + shell);
shell.dispose();
disposedShells ++;
}
}
if(!ignoreNonDisposedShells) {
assertEquals("Found " + disposedShells + " not disposed shells!", 0, disposedShells);
if(disposedShells > 0) {
throw new RuntimeException("Found " + disposedShells + " not disposed shells!");
}

int disposedBrowsers = 0;
Expand Down Expand Up @@ -2151,8 +2156,6 @@ public void test_evaluate_array_mixedTypes () {
*/
@Test
public void test_BrowserFunction_callback () {
// There are shells left opened after this test
ignoreNonDisposedShells = true;
AtomicBoolean javaCallbackExecuted = new AtomicBoolean(false);

class JavascriptCallback extends BrowserFunction { // Note: Local class defined inside method.
Expand Down
Loading