Bug 462631 - Adapt to JUnit 4 style tests

Convert suites to JUnit 4.

Change-Id: Ic5bdf30dcac34a43b89c1fa90c011f5e6f5218e5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 69 insertions, 142 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
index 1745c10fbe..068feb5bac 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllNonBrowserTests.java
@@ -11,86 +11,49 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Suite for running most SWT test cases (all except for browser tests).
  */
-public class AllNonBrowserTests extends TestSuite {
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
-public static Test suite() {
-	return new AllNonBrowserTests();
-}
-
-public AllNonBrowserTests() {
-	super(AllNonBrowserTests.class.getName());
-	/* The logical order to run the tests in is:
-	 * - SWT, SWTError, SWTException
-	 * - Display
-	 * - graphics classes
-	 * - items and Caret, etc
-	 * - widgets
-	 * - dialogs
-	 * - layout
-	 * - custom widgets
-	 * - printing and program
-	 * - events
-	 * - drag & drop
-	 * - accessibility
-	 * - OLE
-	 * - browser
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ 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,
+		Test_org_eclipse_swt_events_ArmEvent.class, Test_org_eclipse_swt_events_ShellEvent.class,
+		Test_org_eclipse_swt_events_TypedEvent.class, Test_org_eclipse_swt_events_PaintEvent.class,
+		Test_org_eclipse_swt_events_VerifyEvent.class, Test_org_eclipse_swt_events_KeyEvent.class,
+		Test_org_eclipse_swt_events_TraverseEvent.class, Test_org_eclipse_swt_events_DisposeEvent.class,
+		Test_org_eclipse_swt_events_SelectionEvent.class, Test_org_eclipse_swt_events_HelpEvent.class,
+		Test_org_eclipse_swt_events_FocusEvent.class, Test_org_eclipse_swt_events_MouseEvent.class,
+		Test_org_eclipse_swt_events_MenuEvent.class, Test_org_eclipse_swt_events_TreeEvent.class,
+		Test_org_eclipse_swt_printing_PrintDialog.class,
+		Test_org_eclipse_swt_printing_PrinterData.class, Test_org_eclipse_swt_printing_Printer.class,
+		Test_org_eclipse_swt_program_Program.class, Test_org_eclipse_swt_accessibility_Accessible.class,
+		Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class,
+		Test_org_eclipse_swt_accessibility_AccessibleEvent.class,
+		Test_org_eclipse_swt_accessibility_AccessibleTextEvent.class })
+public class AllNonBrowserTests {
+
+	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 -
+	 * layout - custom widgets - printing and program - events - drag & drop -
+	 * accessibility - OLE - browser
 	 */
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_SWT.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_SWTException.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_SWTError.class));
 
-	/* NOTE: If the Display test suite is run, it must be run
-	 * before any other tests that need a display (i.e. graphics
-	 * or widget tests, etc). Otherwise, an InvalidThreadAccess
-	 * exception will be thrown for each Display test.
+	/*
+	 * NOTE: If the Display test suite is run, it must be run before any other
+	 * tests that need a display (i.e. graphics or widget tests, etc).
+	 * Otherwise, an InvalidThreadAccess exception will be thrown for each
+	 * Display test.
 	 */
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_widgets_Display.class));
 
-	addTest(new JUnit4TestAdapter(AllGraphicsTests.class));
-	addTest(AllWidgetTests.suite());
-	
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_layout_GridData.class));
-
-	addTestSuite(Test_org_eclipse_swt_events_ControlEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_ModifyEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_ArmEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_ShellEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_TypedEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_PaintEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_VerifyEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_KeyEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_TraverseEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_DisposeEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_SelectionEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_HelpEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_FocusEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_MouseEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_MenuEvent.class);
-	addTestSuite(Test_org_eclipse_swt_events_TreeEvent.class);
-	
-	addTestSuite(Test_org_eclipse_swt_printing_PrintDialog.class);
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_printing_PrinterData.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_printing_Printer.class));
-
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_program_Program.class));
-
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_accessibility_Accessible.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_accessibility_AccessibleEvent.class));
-	addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_accessibility_AccessibleTextEvent.class));
-
-	// Don't run AllBrowserTests here; see AllTests.
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
index 4b26606164..f1228499c8 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
@@ -1,8 +1,8 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000 2015 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ * which accompanies this distribution and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
@@ -11,75 +11,39 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-
-import junit.framework.JUnit4TestAdapter;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Suite for testing all of the widget test cases.
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({ 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,
+		Test_org_eclipse_swt_widgets_TreeItem.class, Test_org_eclipse_swt_widgets_Caret.class,
+		Test_org_eclipse_swt_widgets_Event.class, Test_org_eclipse_swt_widgets_Menu.class,
+		Test_org_eclipse_swt_widgets_Shell.class, Test_org_eclipse_swt_widgets_Label.class,
+		Test_org_eclipse_swt_widgets_Button.class, Test_org_eclipse_swt_widgets_ExpandBar.class,
+		Test_org_eclipse_swt_widgets_List.class, Test_org_eclipse_swt_widgets_Text.class,
+		Test_org_eclipse_swt_widgets_ScrollBar.class, Test_org_eclipse_swt_widgets_Sash.class,
+		Test_org_eclipse_swt_widgets_Tree.class, Test_org_eclipse_swt_widgets_TabFolder.class,
+		Test_org_eclipse_swt_widgets_Combo.class, Test_org_eclipse_swt_widgets_Group.class,
+		Test_org_eclipse_swt_widgets_ToolBar.class, Test_org_eclipse_swt_widgets_Table.class,
+		Test_org_eclipse_swt_widgets_Canvas.class, Test_org_eclipse_swt_widgets_Scale.class,
+		Test_org_eclipse_swt_widgets_Slider.class, Test_org_eclipse_swt_widgets_ProgressBar.class,
+		Test_org_eclipse_swt_widgets_Composite.class, Test_org_eclipse_swt_widgets_Link.class,
+		Test_org_eclipse_swt_widgets_DateTime.class, Test_org_eclipse_swt_widgets_ColorDialog.class,
+		Test_org_eclipse_swt_widgets_FileDialog.class, Test_org_eclipse_swt_widgets_DirectoryDialog.class,
+		Test_org_eclipse_swt_widgets_FontDialog.class, Test_org_eclipse_swt_widgets_MessageBox.class,
+		Test_org_eclipse_swt_widgets_Monitor.class, Test_org_eclipse_swt_custom_TableTree.class,
+		Test_org_eclipse_swt_custom_StyleRange.class, Test_org_eclipse_swt_custom_CCombo.class,
+		Test_org_eclipse_swt_custom_TableTreeItem.class, Test_org_eclipse_swt_custom_CLabel.class,
+		Test_org_eclipse_swt_custom_CTabItem.class, Test_org_eclipse_swt_custom_StyledText.class,
+		Test_org_eclipse_swt_custom_CTabFolder.class })
 public class AllWidgetTests {
-public static void main(String[] args) {
-	TestRunner.run (suite());
-}
-public static Test suite() {
-	TestSuite suite = new TestSuite(AllWidgetTests.class.getName());
-
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ExpandItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_MenuItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ToolItem.class);
-	//suite.addTest(Test_org_eclipse_swt_widgets_CoolItem.suite());
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_TabItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_TableItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_TableColumn.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_TreeItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Caret.class);
-	suite.addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_widgets_Event.class));
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Menu.class);
-	//suite.addTest(Test_org_eclipse_swt_widgets_Tracker.suite());
-	
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Shell.class);
-	//suite.addTest(Test_org_eclipse_swt_widgets_Decorations.suite());
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Label.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Button.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ExpandBar.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_List.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Text.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ScrollBar.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Sash.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Tree.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_TabFolder.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Combo.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Group.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ToolBar.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Table.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Canvas.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Scale.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Slider.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ProgressBar.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Composite.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_Link.class);
-	suite.addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_widgets_DateTime.class));
-	//suite.addTest(Test_org_eclipse_swt_widgets_CoolBar.suite());
-
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_ColorDialog.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_FileDialog.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_DirectoryDialog.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_FontDialog.class);
-	suite.addTestSuite(Test_org_eclipse_swt_widgets_MessageBox.class);
-	suite.addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_widgets_Monitor.class));
-
-	suite.addTestSuite(Test_org_eclipse_swt_custom_TableTree.class);
-	suite.addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_custom_StyleRange.class));
-	suite.addTestSuite(Test_org_eclipse_swt_custom_CCombo.class);
-	suite.addTestSuite(Test_org_eclipse_swt_custom_TableTreeItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_custom_CLabel.class);
-	suite.addTestSuite(Test_org_eclipse_swt_custom_CTabItem.class);
-	suite.addTestSuite(Test_org_eclipse_swt_custom_StyledText.class);
-	suite.addTestSuite(Test_org_eclipse_swt_custom_CTabFolder.class);
-
-	return suite;
-}
+	public static void main(String[] args) {
+		JUnitCore.main(AllWidgetTests.class.getName());
+	}
 }