Skip to content

Migrate SWT suites to JUnit 5 #1888

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
Mar 20, 2025
Merged

Migrate SWT suites to JUnit 5 #1888

Show file tree
Hide file tree
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
16 changes: 4 additions & 12 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,12 @@
package org.eclipse.swt.tests.junit;


import org.eclipse.test.TracingSuite;
import org.eclipse.test.TracingSuite.TracingOptions;
import org.junit.runner.JUnitCore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

@RunWith(TracingSuite.class)
@TracingOptions(stackDumpTimeoutSeconds = 60)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
Test_org_eclipse_swt_browser_Browser.class,
})
public class AllBrowserTests {

public static void main(String[] args) {
JUnitCore.main(AllBrowserTests.class.getName());
}
}
14 changes: 5 additions & 9 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -13,15 +13,14 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;

import org.junit.runner.JUnitCore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* Suite for testing all of the graphics test cases.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({ Test_org_eclipse_swt_graphics_Color.class,
@Suite
@SelectClasses({ Test_org_eclipse_swt_graphics_Color.class,
Test_org_eclipse_swt_graphics_Cursor.class,
Test_org_eclipse_swt_graphics_DeviceData.class,
Test_org_eclipse_swt_graphics_Font.class,
Expand All @@ -42,7 +41,4 @@
Test_org_eclipse_swt_graphics_ImageLoaderEvent.class,
Test_org_eclipse_swt_graphics_Transform.class })
public class AllGraphicsTests {
public static void main(String[] args) {
JUnitCore.main(AllGraphicsTests.class.getName());
}
}
23 changes: 9 additions & 14 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2022 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -18,17 +18,16 @@
import java.util.List;

import org.eclipse.swt.graphics.Resource;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.runner.JUnitCore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* Suite for running most SWT test cases (all except for browser tests).
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({ Test_org_eclipse_swt_SWT.class, Test_org_eclipse_swt_SWTException.class,
@Suite
@SelectClasses({ Test_org_eclipse_swt_SWT.class, Test_org_eclipse_swt_SWTException.class,
Test_org_eclipse_swt_SWTError.class, Test_org_eclipse_swt_widgets_Display.class, AllGraphicsTests.class,
AllWidgetTests.class, Test_org_eclipse_swt_layout_GridData.class,
Test_org_eclipse_swt_events_ControlEvent.class, Test_org_eclipse_swt_events_ModifyEvent.class,
Expand All @@ -50,7 +49,7 @@
public class AllNonBrowserTests {
private static List<Error> leakedResources;

@BeforeClass
@BeforeAll
public static void beforeClass() {
// Set up ResourceTracked to detect any leaks
leakedResources = new ArrayList<> ();
Expand All @@ -67,7 +66,7 @@ public static void beforeClass() {
* through a test and not through @AfterClass, but this is a
* suite class and not a test class, so it can't have tests.
*/
@AfterClass
@AfterAll
public static void afterClass() {
// Run GC in order do detect any outstanding leaks
System.gc ();
Expand All @@ -93,10 +92,6 @@ public static void afterClass() {
}
}

public static void main(String[] args) {
JUnitCore.main(AllNonBrowserTests.class.getName());
}

/*
* The logical order to run the tests in is: - SWT, SWTError, SWTException -
* Display - graphics classes - items and Caret, etc - widgets - dialogs -
Expand Down
14 changes: 5 additions & 9 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2015 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,21 +14,17 @@
package org.eclipse.swt.tests.junit;


import org.junit.runner.JUnitCore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* Suite for running all SWT test cases.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
@Suite
@SelectClasses({
AllNonBrowserTests.class,
AllBrowserTests.class
})
public class AllTests {

public static void main(String[] args) {
JUnitCore.main(AllTests.class.getName());
}
}
14 changes: 5 additions & 9 deletions tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000 2015 IBM Corporation and others.
* Copyright (c) 2000, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -14,15 +14,14 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;

import org.junit.runner.JUnitCore;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.platform.suite.api.SelectClasses;
import org.junit.platform.suite.api.Suite;

/**
* Suite for testing all of the widget test cases.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({ Test_org_eclipse_swt_widgets_Shell.class,
@Suite
@SelectClasses({ Test_org_eclipse_swt_widgets_Shell.class,
Test_org_eclipse_swt_widgets_ExpandItem.class, Test_org_eclipse_swt_widgets_MenuItem.class,
Test_org_eclipse_swt_widgets_ToolItem.class, Test_org_eclipse_swt_widgets_TabItem.class,
Test_org_eclipse_swt_widgets_TableItem.class, Test_org_eclipse_swt_widgets_TableColumn.class,
Expand Down Expand Up @@ -53,7 +52,4 @@
Test_org_eclipse_swt_widgets_ScrolledComposite.class,
Test_org_eclipse_swt_custom_BusyIndicator.class})
public class AllWidgetTests {
public static void main(String[] args) {
JUnitCore.main(AllWidgetTests.class.getName());
}
}
Loading
Loading