Bug 425544 - Phase out SwtTestCase.

Easiest cases where no SwtTestCase functionality is used at all.

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

42 files changed, 295 insertions, 1600 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
index 0d5027278a..5f2beff1ca 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllBrowserTests.java
@@ -25,16 +25,16 @@ public static void main(String[] args) {
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	suite.addTest(Test_org_eclipse_swt_browser_Browser.suite());	
-	suite.addTest(Test_org_eclipse_swt_browser_CloseWindowListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_LocationAdapter.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_LocationListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_OpenWindowListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_ProgressAdapter.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_ProgressListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_StatusTextListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_TitleListener.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_VisibilityWindowAdapter.suite());
-	suite.addTest(Test_org_eclipse_swt_browser_VisibilityWindowListener.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_browser_CloseWindowListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_LocationAdapter.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_LocationListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_OpenWindowListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_ProgressAdapter.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_ProgressListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_StatusTextListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_TitleListener.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowAdapter.class);
+	suite.addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowListener.class);
 	suite.addTest(org.eclipse.swt.tests.junit.browser.Test_BrowserSuite.suite());
 
 	return suite;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java
index 8ab21501d2..0fb40359ac 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java
@@ -24,24 +24,24 @@ public static void main(String[] args) {
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 
-	suite.addTest(Test_org_eclipse_swt_graphics_Color.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_Cursor.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Color.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Cursor.class);
 	suite.addTest(Test_org_eclipse_swt_graphics_DeviceData.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_Font.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_FontData.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_FontMetrics.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_GC.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Font.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_FontData.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_FontMetrics.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_GC.class);
 	suite.addTest(Test_org_eclipse_swt_graphics_Image.suite());
 	suite.addTest(Test_org_eclipse_swt_graphics_ImageData.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_PaletteData.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_Point.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_Rectangle.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_Region.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_RGB.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_TextLayout.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_PaletteData.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Point.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Rectangle.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_Region.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_RGB.class);
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_TextLayout.class);
 	
 	suite.addTest(Test_org_eclipse_swt_graphics_ImageLoader.suite());
-	suite.addTest(Test_org_eclipse_swt_graphics_ImageLoaderEvent.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_graphics_ImageLoaderEvent.class);
 
 	return suite;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
index 184d4366dd..a080833202 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
@@ -48,9 +48,9 @@ public AllTests() {
 	 * - OLE
 	 * - browser
 	 */
-	addTest(Test_org_eclipse_swt_SWT.suite());
-	addTest(Test_org_eclipse_swt_SWTException.suite());
-	addTest(Test_org_eclipse_swt_SWTError.suite());
+	addTestSuite(Test_org_eclipse_swt_SWT.class);
+	addTestSuite(Test_org_eclipse_swt_SWTException.class);
+	addTestSuite(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
@@ -60,22 +60,22 @@ public AllTests() {
 	addTest(Test_org_eclipse_swt_widgets_Display.suite());
 
 	addTest(Test_org_eclipse_swt_graphics_Image.suite());
-	addTest(Test_org_eclipse_swt_graphics_Cursor.suite());
+	addTestSuite(Test_org_eclipse_swt_graphics_Cursor.class);
 	addTest(Test_org_eclipse_swt_graphics_DeviceData.suite());
-	addTest(Test_org_eclipse_swt_graphics_ImageLoaderEvent.suite());
-	addTest(Test_org_eclipse_swt_graphics_RGB.suite());
-	addTest(Test_org_eclipse_swt_graphics_Font.suite());
-	addTest(Test_org_eclipse_swt_graphics_Rectangle.suite());
-	addTest(Test_org_eclipse_swt_graphics_FontData.suite());
-	addTest(Test_org_eclipse_swt_graphics_GC.suite());
+	addTestSuite(Test_org_eclipse_swt_graphics_ImageLoaderEvent.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_RGB.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_Font.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_Rectangle.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_FontData.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_GC.class);
 	addTest(Test_org_eclipse_swt_graphics_ImageData.suite());
-	addTest(Test_org_eclipse_swt_graphics_Region.suite());
-	addTest(Test_org_eclipse_swt_graphics_FontMetrics.suite());
-	addTest(Test_org_eclipse_swt_graphics_Color.suite());
-	addTest(Test_org_eclipse_swt_graphics_Point.suite());
-	addTest(Test_org_eclipse_swt_graphics_PaletteData.suite());
+	addTestSuite(Test_org_eclipse_swt_graphics_Region.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_FontMetrics.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_Color.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_Point.class);
+	addTestSuite(Test_org_eclipse_swt_graphics_PaletteData.class);
 	addTest(Test_org_eclipse_swt_graphics_ImageLoader.suite());
-	addTest(Test_org_eclipse_swt_graphics_TextLayout.suite());
+	addTestSuite(Test_org_eclipse_swt_graphics_TextLayout.class);
 
 	addTest(Test_org_eclipse_swt_widgets_ExpandItem.suite());
 	addTest(Test_org_eclipse_swt_widgets_MenuItem.suite());
@@ -86,7 +86,7 @@ public AllTests() {
 	addTest(Test_org_eclipse_swt_widgets_TableColumn.suite());
 	addTest(Test_org_eclipse_swt_widgets_TreeItem.suite());
 	addTest(Test_org_eclipse_swt_widgets_Caret.suite());
-	addTest(Test_org_eclipse_swt_widgets_Event.suite());
+	addTestSuite(Test_org_eclipse_swt_widgets_Event.class);
 	addTest(Test_org_eclipse_swt_widgets_Menu.suite());
 	//addTest(Test_org_eclipse_swt_widgets_Tracker.suite());
 	
@@ -119,11 +119,11 @@ public AllTests() {
 	addTest(Test_org_eclipse_swt_widgets_DirectoryDialog.suite());
 	addTest(Test_org_eclipse_swt_widgets_FontDialog.suite());
 	addTest(Test_org_eclipse_swt_widgets_MessageBox.suite());
-	addTest(Test_org_eclipse_swt_widgets_Monitor.suite());
-	addTest(Test_org_eclipse_swt_layout_GridData.suite());
+	addTestSuite(Test_org_eclipse_swt_widgets_Monitor.class);
+	addTestSuite(Test_org_eclipse_swt_layout_GridData.class);
 
 	addTest(Test_org_eclipse_swt_custom_TableTree.suite());
-	addTest(Test_org_eclipse_swt_custom_StyleRange.suite());
+	addTestSuite(Test_org_eclipse_swt_custom_StyleRange.class);
 	addTest(Test_org_eclipse_swt_custom_CCombo.suite());
 	addTest(Test_org_eclipse_swt_custom_TableTreeItem.suite());
 	addTest(Test_org_eclipse_swt_custom_CLabel.suite());
@@ -152,7 +152,7 @@ public AllTests() {
 	addTest(Test_org_eclipse_swt_printing_PrinterData.suite());
 	addTest(Test_org_eclipse_swt_printing_Printer.suite());
 
-	addTest(Test_org_eclipse_swt_program_Program.suite());
+	addTestSuite(Test_org_eclipse_swt_program_Program.class);
 
 //	addTest(Test_org_eclipse_swt_dnd_FileTransfer.suite());
 //	addTest(Test_org_eclipse_swt_dnd_TextTransfer.suite());
@@ -162,21 +162,21 @@ public AllTests() {
 //	addTest(Test_org_eclipse_swt_dnd_DropTargetEvent.suite());
 //	addTest(Test_org_eclipse_swt_dnd_DropTarget.suite());
 
-	addTest(Test_org_eclipse_swt_accessibility_Accessible.suite());
-	addTest(Test_org_eclipse_swt_accessibility_AccessibleControlEvent.suite());
-	addTest(Test_org_eclipse_swt_accessibility_AccessibleEvent.suite());
+	addTestSuite(Test_org_eclipse_swt_accessibility_Accessible.class);
+	addTestSuite(Test_org_eclipse_swt_accessibility_AccessibleControlEvent.class);
+	addTestSuite(Test_org_eclipse_swt_accessibility_AccessibleEvent.class);
 
 	addTest(Test_org_eclipse_swt_browser_Browser.suite());
-	addTest(Test_org_eclipse_swt_browser_CloseWindowListener.suite());
-	addTest(Test_org_eclipse_swt_browser_LocationAdapter.suite());
-	addTest(Test_org_eclipse_swt_browser_LocationListener.suite());
-	addTest(Test_org_eclipse_swt_browser_OpenWindowListener.suite());
-	addTest(Test_org_eclipse_swt_browser_ProgressAdapter.suite());
-	addTest(Test_org_eclipse_swt_browser_ProgressListener.suite());
-	addTest(Test_org_eclipse_swt_browser_StatusTextListener.suite());
-	addTest(Test_org_eclipse_swt_browser_TitleListener.suite());
-	addTest(Test_org_eclipse_swt_browser_VisibilityWindowAdapter.suite());
-	addTest(Test_org_eclipse_swt_browser_VisibilityWindowListener.suite());
+	addTestSuite(Test_org_eclipse_swt_browser_CloseWindowListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_LocationAdapter.class);
+	addTestSuite(Test_org_eclipse_swt_browser_LocationListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_OpenWindowListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_ProgressAdapter.class);
+	addTestSuite(Test_org_eclipse_swt_browser_ProgressListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_StatusTextListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_TitleListener.class);
+	addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowAdapter.class);
+	addTestSuite(Test_org_eclipse_swt_browser_VisibilityWindowListener.class);
 	addTest(org.eclipse.swt.tests.junit.browser.Test_BrowserSuite.suite());
 
 }
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 3f758732c0..4123b80603 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
@@ -33,7 +33,7 @@ public static Test suite() {
 	suite.addTest(Test_org_eclipse_swt_widgets_TableColumn.suite());
 	suite.addTest(Test_org_eclipse_swt_widgets_TreeItem.suite());
 	suite.addTest(Test_org_eclipse_swt_widgets_Caret.suite());
-	suite.addTest(Test_org_eclipse_swt_widgets_Event.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_widgets_Event.class);
 	suite.addTest(Test_org_eclipse_swt_widgets_Menu.suite());
 	//suite.addTest(Test_org_eclipse_swt_widgets_Tracker.suite());
 	
@@ -66,10 +66,10 @@ public static Test suite() {
 	suite.addTest(Test_org_eclipse_swt_widgets_DirectoryDialog.suite());
 	suite.addTest(Test_org_eclipse_swt_widgets_FontDialog.suite());
 	suite.addTest(Test_org_eclipse_swt_widgets_MessageBox.suite());
-	suite.addTest(Test_org_eclipse_swt_widgets_Monitor.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_widgets_Monitor.class);
 
 	suite.addTest(Test_org_eclipse_swt_custom_TableTree.suite());
-	suite.addTest(Test_org_eclipse_swt_custom_StyleRange.suite());
+	suite.addTestSuite(Test_org_eclipse_swt_custom_StyleRange.class);
 	suite.addTest(Test_org_eclipse_swt_custom_CCombo.suite());
 	suite.addTest(Test_org_eclipse_swt_custom_TableTreeItem.suite());
 	suite.addTest(Test_org_eclipse_swt_custom_CLabel.suite());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java
index 81de8a4d25..5f600e914c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java
@@ -10,25 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
+import org.eclipse.swt.SWTException;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.SWT
  *
  * @see org.eclipse.swt.SWT
  */
-public class Test_org_eclipse_swt_SWT extends SwtTestCase {
-
-public Test_org_eclipse_swt_SWT(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_SWT extends TestCase {
 
 public void test_Constructor() {
 	// Do nothing. Class SWT is not intended to be subclassed.
@@ -123,33 +116,4 @@ public void test_getVersion() {
 	int ver = SWT.getVersion();
 	assertTrue ("unreasonable value returned", ver > 0 && ver < 1000000);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_SWT(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_errorI");
-	methodNames.addElement("test_errorILjava_lang_Throwable");
-	methodNames.addElement("test_getMessageLjava_lang_String");
-	methodNames.addElement("test_getPlatform");
-	methodNames.addElement("test_getVersion");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_errorI")) test_errorI();
-	else if (getName().equals("test_errorILjava_lang_Throwable")) test_errorILjava_lang_Throwable();
-	else if (getName().equals("test_getMessageLjava_lang_String")) test_getMessageLjava_lang_String();
-	else if (getName().equals("test_getPlatform")) test_getPlatform();
-	else if (getName().equals("test_getVersion")) test_getVersion();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTError.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTError.java
index c3086fd414..0ca045a700 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTError.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTError.java
@@ -10,27 +10,20 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTError;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.SWTError
  *
  * @see org.eclipse.swt.SWTError
  */
-public class Test_org_eclipse_swt_SWTError extends SwtTestCase {
-
-public Test_org_eclipse_swt_SWTError(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_SWTError extends TestCase {
 
 public void test_Constructor() {
 	assertTrue (
@@ -93,33 +86,4 @@ public void test_printStackTrace() {
 	assertTrue(out.size() > 0);
 	assertTrue(new String(out.toByteArray()).indexOf("test_printStackTrace") != -1);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_SWTError(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorI");
-	methodNames.addElement("test_ConstructorILjava_lang_String");
-	methodNames.addElement("test_ConstructorLjava_lang_String");
-	methodNames.addElement("test_getMessage");
-	methodNames.addElement("test_printStackTrace");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorI")) test_ConstructorI();
-	else if (getName().equals("test_ConstructorILjava_lang_String")) test_ConstructorILjava_lang_String();
-	else if (getName().equals("test_ConstructorLjava_lang_String")) test_ConstructorLjava_lang_String();
-	else if (getName().equals("test_getMessage")) test_getMessage();
-	else if (getName().equals("test_printStackTrace")) test_printStackTrace();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTException.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTException.java
index 33f7d70d1b..8a371ab7a1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTException.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTException.java
@@ -11,27 +11,20 @@
 package org.eclipse.swt.tests.junit;
 
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.SWTException;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.SWTException
  *
  * @see org.eclipse.swt.SWTException
  */
-public class Test_org_eclipse_swt_SWTException extends SwtTestCase {
-
-public Test_org_eclipse_swt_SWTException(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_SWTException extends TestCase {
 
 public void test_Constructor() {
 	assertTrue (
@@ -94,33 +87,4 @@ public void test_printStackTrace() {
 	assertTrue(out.size() > 0);
 	assertTrue(new String(out.toByteArray()).indexOf("test_printStackTrace") != -1);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_SWTException(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorI");
-	methodNames.addElement("test_ConstructorILjava_lang_String");
-	methodNames.addElement("test_ConstructorLjava_lang_String");
-	methodNames.addElement("test_getMessage");
-	methodNames.addElement("test_printStackTrace");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorI")) test_ConstructorI();
-	else if (getName().equals("test_ConstructorILjava_lang_String")) test_ConstructorILjava_lang_String();
-	else if (getName().equals("test_ConstructorLjava_lang_String")) test_ConstructorLjava_lang_String();
-	else if (getName().equals("test_getMessage")) test_getMessage();
-	else if (getName().equals("test_printStackTrace")) test_printStackTrace();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
index e5d980de24..3816bba958 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
@@ -10,29 +10,23 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import java.util.Enumeration;
-import java.util.Vector;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
-
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.accessibility.Accessible;
+import org.eclipse.swt.accessibility.AccessibleControlEvent;
+import org.eclipse.swt.accessibility.AccessibleControlListener;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.accessibility.AccessibleListener;
+import org.eclipse.swt.accessibility.AccessibleTextEvent;
+import org.eclipse.swt.accessibility.AccessibleTextListener;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.Accessible
  *
  * @see org.eclipse.swt.accessibility.Accessible
  */
-public class Test_org_eclipse_swt_accessibility_Accessible extends SwtTestCase {	
-
-public Test_org_eclipse_swt_accessibility_Accessible(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_accessibility_Accessible extends TestCase {	
 
 @Override
 protected void setUp() {
@@ -106,33 +100,6 @@ public void test_getControl() {
 	assertEquals(shell, accessible.getControl());
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	Vector<String> methodNames = methodNames();
-	Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_accessibility_Accessible(e.nextElement()));
-	}
-	return suite;
-}
-
-public static Vector<String> methodNames() {
-	Vector<String> methodNames = new Vector<String>();
-	methodNames.addElement("test_addAccessibleControlListenerLorg_eclipse_swt_accessibility_AccessibleControlListener");
-	methodNames.addElement("test_addAccessibleListenerLorg_eclipse_swt_accessibility_AccessibleListener");
-	methodNames.addElement("test_addAccessibleTextListenerLorg_eclipse_swt_accessibility_AccessibleTextListener");
-	methodNames.addElement("test_getControl");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_addAccessibleControlListenerLorg_eclipse_swt_accessibility_AccessibleControlListener")) test_addAccessibleControlListenerLorg_eclipse_swt_accessibility_AccessibleControlListener();
-	else if (getName().equals("test_addAccessibleListenerLorg_eclipse_swt_accessibility_AccessibleListener")) test_addAccessibleListenerLorg_eclipse_swt_accessibility_AccessibleListener();
-	else if (getName().equals("test_addAccessibleTextListenerLorg_eclipse_swt_accessibility_AccessibleTextListener")) test_addAccessibleTextListenerLorg_eclipse_swt_accessibility_AccessibleTextListener();
-	else if (getName().equals("test_getControl")) test_getControl();
-}
-
 /* custom */
 private Shell shell;
 private Accessible accessible;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
index a0dddfe972..040d24dab7 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
@@ -10,26 +10,17 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.accessibility.AccessibleControlEvent;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleControlEvent
  *
  * @see org.eclipse.swt.accessibility.AccessibleControlEvent
  */
-public class Test_org_eclipse_swt_accessibility_AccessibleControlEvent extends SwtTestCase {
-
-public Test_org_eclipse_swt_accessibility_AccessibleControlEvent(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_accessibility_AccessibleControlEvent extends TestCase {
 
 @Override
 protected void setUp() {
@@ -58,28 +49,6 @@ public void test_toString() {
 }
 
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_accessibility_AccessibleControlEvent(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLjava_lang_Object");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
-	else if (getName().equals("test_toString")) test_toString();
-}
 
 /* custom */
 public Shell shell;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
index 693b84c5c3..242587c041 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
@@ -10,26 +10,17 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleEvent
  *
  * @see org.eclipse.swt.accessibility.AccessibleEvent
  */
-public class Test_org_eclipse_swt_accessibility_AccessibleEvent extends SwtTestCase {
-
-public Test_org_eclipse_swt_accessibility_AccessibleEvent(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_accessibility_AccessibleEvent extends TestCase {
 
 @Override
 protected void setUp() {
@@ -57,30 +48,6 @@ public void test_toString() {
 	assertTrue(event.toString().length() > 0);
 }
 
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_accessibility_AccessibleEvent(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLjava_lang_Object");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
-	else if (getName().equals("test_toString")) test_toString();
-}
-
 /* custom */
 public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
index 294c22001c..c292d3edea 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
@@ -10,26 +10,17 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.accessibility.*;
+import org.eclipse.swt.accessibility.AccessibleTextEvent;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleTextEvent
  *
  * @see org.eclipse.swt.accessibility.AccessibleTextEvent
  */
-public class Test_org_eclipse_swt_accessibility_AccessibleTextEvent extends SwtTestCase {
-
-public Test_org_eclipse_swt_accessibility_AccessibleTextEvent(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_accessibility_AccessibleTextEvent extends TestCase {
 
 @Override
 protected void setUp() {
@@ -56,31 +47,6 @@ public void test_toString() {
 	assertNotNull(event.toString());
 	assertTrue(event.toString().length() > 0);
 }
-
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_accessibility_AccessibleTextEvent(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLjava_lang_Object");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
-	else if (getName().equals("test_toString")) test_toString();
-}
-
 /* custom */
 public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
index eb8897abba..4034bfa225 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_CloseWindowListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.CloseWindowListener;
+import org.eclipse.swt.browser.WindowEvent;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.CloseWindowListener
  *
  * @see org.eclipse.swt.browser.CloseWindowListener
  */
-public class Test_org_eclipse_swt_browser_CloseWindowListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_CloseWindowListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_CloseWindowListener extends TestCase {
 
 public void test_closeLorg_eclipse_swt_browser_WindowEvent() {
 	Display display = Display.getCurrent();
@@ -42,26 +36,4 @@ public void test_closeLorg_eclipse_swt_browser_WindowEvent() {
 	});
 	shell.close();
 }
-
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_CloseWindowListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_closeLorg_eclipse_swt_browser_WindowEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_closeLorg_eclipse_swt_browser_WindowEvent")) test_closeLorg_eclipse_swt_browser_WindowEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
index c428910aef..80c8d8b749 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationAdapter.java
@@ -10,27 +10,20 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.LocationAdapter;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.LocationAdapter
  *
  * @see org.eclipse.swt.browser.LocationAdapter
  */
-public class Test_org_eclipse_swt_browser_LocationAdapter extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_LocationAdapter(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_LocationAdapter extends TestCase {
 
 public void test_Constructor() {
 	new LocationAdapter() {};
@@ -46,26 +39,4 @@ public void test_changedLorg_eclipse_swt_browser_LocationEvent() {
 	shell.close();
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_LocationAdapter(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_LocationEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_changedLorg_eclipse_swt_browser_LocationEvent")) test_changedLorg_eclipse_swt_browser_LocationEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
index d0bc934afe..5e29822fde 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_LocationListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.LocationEvent;
+import org.eclipse.swt.browser.LocationListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.LocationListener
  *
  * @see org.eclipse.swt.browser.LocationListener
  */
-public class Test_org_eclipse_swt_browser_LocationListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_LocationListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_LocationListener extends TestCase {
 
 public void test_changedLorg_eclipse_swt_browser_LocationEvent() {
 	Display display = Display.getCurrent();
@@ -44,25 +38,4 @@ public void test_changedLorg_eclipse_swt_browser_LocationEvent() {
 	});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_LocationListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_LocationEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_changedLorg_eclipse_swt_browser_LocationEvent")) test_changedLorg_eclipse_swt_browser_LocationEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
index 4b67040138..8516a6164a 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_OpenWindowListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.OpenWindowListener;
+import org.eclipse.swt.browser.WindowEvent;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.OpenWindowListener
  *
  * @see org.eclipse.swt.browser.OpenWindowListener
  */
-public class Test_org_eclipse_swt_browser_OpenWindowListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_OpenWindowListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_OpenWindowListener extends TestCase {
 
 public void test_openWindowLorg_eclipse_swt_browser_WindowEvent() {
 	Display display = Display.getCurrent();
@@ -42,26 +36,4 @@ public void test_openWindowLorg_eclipse_swt_browser_WindowEvent() {
 	});
 	shell.close();
 }
-
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_OpenWindowListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_openWindowLorg_eclipse_swt_browser_WindowEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_openWindowLorg_eclipse_swt_browser_WindowEvent")) test_openWindowLorg_eclipse_swt_browser_WindowEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
index 22df1447e8..1fb217f715 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressAdapter.java
@@ -10,27 +10,20 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.ProgressAdapter;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.ProgressAdapter
  *
  * @see org.eclipse.swt.browser.ProgressAdapter
  */
-public class Test_org_eclipse_swt_browser_ProgressAdapter extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_ProgressAdapter(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_ProgressAdapter extends TestCase {
 
 public void test_Constructor() {
 	new ProgressAdapter() {};
@@ -43,27 +36,4 @@ public void test_changedLorg_eclipse_swt_browser_ProgressEvent() {
 	browser.addProgressListener(new ProgressAdapter() {});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_ProgressAdapter(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_ProgressEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_changedLorg_eclipse_swt_browser_ProgressEvent")) test_changedLorg_eclipse_swt_browser_ProgressEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
index 2f7fde1822..94add98574 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_ProgressListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.browser.ProgressListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.ProgressListener
  *
  * @see org.eclipse.swt.browser.ProgressListener
  */
-public class Test_org_eclipse_swt_browser_ProgressListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_ProgressListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_ProgressListener extends TestCase {
 
 public void test_changedLorg_eclipse_swt_browser_ProgressEvent() {
 	Display display = Display.getCurrent();
@@ -44,25 +38,4 @@ public void test_changedLorg_eclipse_swt_browser_ProgressEvent() {
 	});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_ProgressListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_ProgressEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_changedLorg_eclipse_swt_browser_ProgressEvent")) test_changedLorg_eclipse_swt_browser_ProgressEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
index f82ccfbc57..4e5774657c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_StatusTextListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.StatusTextEvent;
+import org.eclipse.swt.browser.StatusTextListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.StatusTextListener
  *
  * @see org.eclipse.swt.browser.StatusTextListener
  */
-public class Test_org_eclipse_swt_browser_StatusTextListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_StatusTextListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_StatusTextListener extends TestCase {
 
 public void test_changedLorg_eclipse_swt_browser_StatusTextEvent() {
 	Display display = Display.getCurrent();
@@ -42,26 +36,4 @@ public void test_changedLorg_eclipse_swt_browser_StatusTextEvent() {
 	});
 	shell.close();
 }
-
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_StatusTextListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_StatusTextEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_changedLorg_eclipse_swt_browser_StatusTextEvent")) test_changedLorg_eclipse_swt_browser_StatusTextEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
index feeffa4ad6..6c1f6e16e1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_TitleListener.java
@@ -11,27 +11,21 @@
 package org.eclipse.swt.tests.junit;
 
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.TitleEvent;
+import org.eclipse.swt.browser.TitleListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.TitleListener
  *
  * @see org.eclipse.swt.browser.TitleListener
  */
-public class Test_org_eclipse_swt_browser_TitleListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_TitleListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_TitleListener extends TestCase {
 
 public void test_changedLorg_eclipse_swt_browser_TitleEvent() {
 	Display display = Display.getCurrent();
@@ -43,25 +37,4 @@ public void test_changedLorg_eclipse_swt_browser_TitleEvent() {
 	});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_TitleListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_changedLorg_eclipse_swt_browser_TitleEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_changedLorg_eclipse_swt_browser_TitleEvent")) test_changedLorg_eclipse_swt_browser_TitleEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
index 6d168f8649..3a5070dc94 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowAdapter.java
@@ -10,27 +10,20 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.VisibilityWindowAdapter;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.VisibilityWindowAdapter
  *
  * @see org.eclipse.swt.browser.VisibilityWindowAdapter
  */
-public class Test_org_eclipse_swt_browser_VisibilityWindowAdapter extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_VisibilityWindowAdapter(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_VisibilityWindowAdapter extends TestCase {
 
 public void test_Constructor() {
 	new VisibilityWindowAdapter() {};
@@ -43,27 +36,4 @@ public void test_hideLorg_eclipse_swt_browser_WindowEvent() {
 	browser.addVisibilityWindowListener(new VisibilityWindowAdapter(){});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_VisibilityWindowAdapter(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_hideLorg_eclipse_swt_browser_WindowEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_hideLorg_eclipse_swt_browser_WindowEvent")) test_hideLorg_eclipse_swt_browser_WindowEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
index fba83facd0..ed238741cf 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_browser_VisibilityWindowListener.java
@@ -10,27 +10,21 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.browser.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.VisibilityWindowListener;
+import org.eclipse.swt.browser.WindowEvent;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.browser.VisibilityWindowListener
  *
  * @see org.eclipse.swt.browser.VisibilityWindowListener
  */
-public class Test_org_eclipse_swt_browser_VisibilityWindowListener extends SwtTestCase {
-
-public Test_org_eclipse_swt_browser_VisibilityWindowListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_browser_VisibilityWindowListener extends TestCase {
 
 public void test_hideLorg_eclipse_swt_browser_WindowEvent() {
 	Display display = Display.getCurrent();
@@ -44,25 +38,4 @@ public void test_hideLorg_eclipse_swt_browser_WindowEvent() {
 	});
 	shell.close();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_browser_VisibilityWindowListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_hideLorg_eclipse_swt_browser_WindowEvent");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_hideLorg_eclipse_swt_browser_WindowEvent")) test_hideLorg_eclipse_swt_browser_WindowEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyListener.java
index 203a14d5fb..e2ed25c4a1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyListener.java
@@ -11,30 +11,24 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ExtendedModifyEvent;
+import org.eclipse.swt.custom.ExtendedModifyListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.custom.ExtendedModifyListener
  *
  * @see org.eclipse.swt.custom.ExtendedModifyListener
  */
-public class Test_org_eclipse_swt_custom_ExtendedModifyListener extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_ExtendedModifyListener extends TestCase {
 	Shell shell;
 	StyledText styledText;
 	int verify = -1;
 
-public Test_org_eclipse_swt_custom_ExtendedModifyListener(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	shell = new Shell();
@@ -303,23 +297,4 @@ public void test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent() {
 	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
 	styledText.removeExtendedModifyListener(listener);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_ExtendedModifyListener(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent")) test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundListener.java
index 3163409d9f..f5eff5fd6e 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundListener.java
@@ -11,28 +11,23 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.LineBackgroundEvent;
+import org.eclipse.swt.custom.LineBackgroundListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.custom.LineBackgroundListener
  *
  * @see org.eclipse.swt.custom.LineBackgroundListener
  */
-public class Test_org_eclipse_swt_custom_LineBackgroundListener extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_LineBackgroundListener extends TestCase {
 	Shell shell;
 	StyledText styledText;
 
-public Test_org_eclipse_swt_custom_LineBackgroundListener(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	shell = new Shell();
@@ -54,23 +49,4 @@ public void test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent()
 	styledText.copy();
 	styledText.removeLineBackgroundListener(listener);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_LineBackgroundListener(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent")) test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleListener.java
index a59d9a5734..2bb5207a18 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleListener.java
@@ -11,28 +11,23 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.LineStyleEvent;
+import org.eclipse.swt.custom.LineStyleListener;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.custom.LineStyleListener
  *
  * @see org.eclipse.swt.custom.LineStyleListener
  */
-public class Test_org_eclipse_swt_custom_LineStyleListener extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_LineStyleListener extends TestCase {
 	Shell shell;
 	StyledText styledText;
 
-public Test_org_eclipse_swt_custom_LineStyleListener(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	shell = new Shell();
@@ -53,23 +48,4 @@ public void test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent() {
 	styledText.getLocationAtOffset(5);
 	styledText.removeLineStyleListener(listener);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_LineStyleListener(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent")) test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyleRange.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyleRange.java
index c194bdc691..209802ae28 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyleRange.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyleRange.java
@@ -11,11 +11,12 @@
 package org.eclipse.swt.tests.junit;
 
 
-import java.util.*;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Set;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+import junit.framework.TestCase;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyleRange;
@@ -28,18 +29,11 @@ import org.eclipse.swt.widgets.Display;
  *
  * @see org.eclipse.swt.custom.StyleRange
  */
-public class Test_org_eclipse_swt_custom_StyleRange extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_StyleRange extends TestCase {
 	final static RGB RED = new RGB(255,0,0);
 	final static RGB BLUE = new RGB(0,0,255);
 	final static RGB GREEN = new RGB(0,255,0);
 	Hashtable<RGB, Color> colors = new Hashtable<RGB, Color>();
-public Test_org_eclipse_swt_custom_StyleRange(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 private Color getColor(RGB rgb) {
 	return colors.get(rgb);
 }
@@ -156,39 +150,4 @@ public void test_toString() {
 	StyleRange styleRange = new StyleRange(6, 10, null, getColor(BLUE), SWT.NORMAL);
 	styleRange.toString();
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_StyleRange(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_Color");
-	methodNames.addElement("test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_ColorI");
-	methodNames.addElement("test_clone");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_isUnstyled");
-	methodNames.addElement("test_similarToLorg_eclipse_swt_custom_StyleRange");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_Color")) test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_Color();
-	else if (getName().equals("test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_ColorI")) test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_ColorI();
-	else if (getName().equals("test_clone")) test_clone();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_isUnstyled")) test_isUnstyled();
-	else if (getName().equals("test_similarToLorg_eclipse_swt_custom_StyleRange")) test_similarToLorg_eclipse_swt_custom_StyleRange();
-	else if (getName().equals("test_toString")) test_toString();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java
index 756119ed15..7ee79d169d 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java
@@ -11,29 +11,26 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.*;
-import org.eclipse.swt.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.StyledTextContent;
+import org.eclipse.swt.custom.TextChangeListener;
+import org.eclipse.swt.custom.TextChangedEvent;
+import org.eclipse.swt.custom.TextChangingEvent;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.custom.TextChangeListener
  *
  * @see org.eclipse.swt.custom.TextChangeListener
  */
-public class Test_org_eclipse_swt_custom_TextChangeListener extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_TextChangeListener extends TestCase {
 	Shell shell;
 	StyledText styledText;
 	int verify = -1;
 
-public Test_org_eclipse_swt_custom_TextChangeListener(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	shell = new Shell();
@@ -540,28 +537,4 @@ public void test_textSetLorg_eclipse_swt_custom_TextChangedEvent() {
 	catch (IllegalArgumentException ex) {assertTrue(":4:", true);}	
 	content.removeTextChangeListener(listener);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_TextChangeListener(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_textChangedLorg_eclipse_swt_custom_TextChangedEvent");
-	methodNames.addElement("test_textChangingLorg_eclipse_swt_custom_TextChangingEvent");
-	methodNames.addElement("test_textSetLorg_eclipse_swt_custom_TextChangedEvent");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_textChangedLorg_eclipse_swt_custom_TextChangedEvent")) test_textChangedLorg_eclipse_swt_custom_TextChangedEvent();
-	else if (getName().equals("test_textChangingLorg_eclipse_swt_custom_TextChangingEvent")) test_textChangingLorg_eclipse_swt_custom_TextChangingEvent();
-	else if (getName().equals("test_textSetLorg_eclipse_swt_custom_TextChangedEvent")) test_textSetLorg_eclipse_swt_custom_TextChangedEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java
index 4801980f4c..9f27df6a0c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java
@@ -11,30 +11,25 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.custom.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.custom.VerifyKeyListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.custom.VerifyKeyListener
  *
  * @see org.eclipse.swt.custom.VerifyKeyListener
  */
-public class Test_org_eclipse_swt_custom_VerifyKeyListener extends SwtTestCase {
+public class Test_org_eclipse_swt_custom_VerifyKeyListener extends TestCase {
 	Shell shell;
 	StyledText styledText;
 	int verify = -1;
 
-public Test_org_eclipse_swt_custom_VerifyKeyListener(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	shell = new Shell();
@@ -63,23 +58,4 @@ public void test_verifyKeyLorg_eclipse_swt_events_VerifyEvent() {
 	assertTrue(":2:", styledText.getText().equals(""));
 	styledText.removeVerifyKeyListener(listener);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_custom_VerifyKeyListener(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_verifyKeyLorg_eclipse_swt_events_VerifyEvent");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_verifyKeyLorg_eclipse_swt_events_VerifyEvent")) test_verifyKeyLorg_eclipse_swt_events_VerifyEvent();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
index 6685af2888..f88ac86871 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
@@ -10,26 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.graphics.RGB;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.Color
  *
  * @see org.eclipse.swt.graphics.Color
  */
-public class Test_org_eclipse_swt_graphics_Color extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_Color(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_Color extends TestCase {
 
 @Override
 protected void setUp() {
@@ -237,49 +229,6 @@ public void test_toString() {
 	}
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
-	// do not test - Windows platform only
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_Color(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceIII");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getBlue");
-	methodNames.addElement("test_getGreen");
-	methodNames.addElement("test_getRGB");
-	methodNames.addElement("test_getRed");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_isDisposed");
-	methodNames.addElement("test_toString");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceIII")) test_ConstructorLorg_eclipse_swt_graphics_DeviceIII();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getBlue")) test_getBlue();
-	else if (getName().equals("test_getGreen")) test_getGreen();
-	else if (getName().equals("test_getRGB")) test_getRGB();
-	else if (getName().equals("test_getRed")) test_getRed();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_isDisposed")) test_isDisposed();
-	else if (getName().equals("test_toString")) test_toString();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
-}
-
 /* custom */
 Display display;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
index 94a551103c..a74641ca68 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
@@ -11,13 +11,15 @@
 package org.eclipse.swt.tests.junit;
 
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 
-import junit.framework.*;
-import junit.textui.TestRunner;
+import junit.framework.TestCase;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.Cursor;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.widgets.Display;
 
 /**
@@ -25,15 +27,7 @@ import org.eclipse.swt.widgets.Display;
  *
  * @see org.eclipse.swt.graphics.Cursor
  */
-public class Test_org_eclipse_swt_graphics_Cursor extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_Cursor(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_Cursor extends TestCase {
 
 @Override
 protected void setUp() {
@@ -196,33 +190,6 @@ public void test_toString() {
 	}
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_Cursor(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceI");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageDataII");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_isDisposed");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceI")) test_ConstructorLorg_eclipse_swt_graphics_DeviceI();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageDataII")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageDataII();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_isDisposed")) test_isDisposed();
-	else if (getName().equals("test_toString")) test_toString();
-}
-
 /* custom */
 Display display;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java
index 823a13f5c4..d69202be46 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java
@@ -11,30 +11,22 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.Font
  *
  * @see org.eclipse.swt.graphics.Font
  */
-public class Test_org_eclipse_swt_graphics_Font extends SwtTestCase {
+public class Test_org_eclipse_swt_graphics_Font extends TestCase {
 
 Display display;
 
-public Test_org_eclipse_swt_graphics_Font(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
-
 @Override
 protected void setUp() {
 	display = Display.getDefault();
@@ -346,44 +338,4 @@ public void test_toString() {
 	assertNotNull(font.toString());
 }
 
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
-	// do not test - Windows only
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_Font(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_Device$Lorg_eclipse_swt_graphics_FontData");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_FontData");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII");
-	methodNames.addElement("test_dispose");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getFontData");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_isDisposed");
-	methodNames.addElement("test_toString");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_Device$Lorg_eclipse_swt_graphics_FontData")) test_ConstructorLorg_eclipse_swt_graphics_Device$Lorg_eclipse_swt_graphics_FontData();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_FontData")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_FontData();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII();
-	else if (getName().equals("test_dispose")) test_dispose();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getFontData")) test_getFontData();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_isDisposed")) test_isDisposed();
-	else if (getName().equals("test_toString")) test_toString();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
index 1d7df235e6..8c84afd4c1 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
@@ -10,28 +10,19 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import java.util.*;
+import java.util.Locale;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.FontData;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.FontData
  *
  * @see org.eclipse.swt.graphics.FontData
  */
-public class Test_org_eclipse_swt_graphics_FontData extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_FontData(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_FontData extends TestCase {
 
 public void test_Constructor() {
 	// Test new FontData()
@@ -198,47 +189,4 @@ public void test_toString() {
 	assertNotNull(data.toString());
 	assertTrue(data.toString().length() > 0);
 }
-
-public void test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI() {
-	// do not test - Windows only
-}
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_FontData(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorLjava_lang_String");
-	methodNames.addElement("test_ConstructorLjava_lang_StringII");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_setHeightI");
-	methodNames.addElement("test_setLocaleLjava_lang_String");
-	methodNames.addElement("test_setNameLjava_lang_String");
-	methodNames.addElement("test_setStyleI");
-	methodNames.addElement("test_toString");
-	methodNames.addElement("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorLjava_lang_String")) test_ConstructorLjava_lang_String();
-	else if (getName().equals("test_ConstructorLjava_lang_StringII")) test_ConstructorLjava_lang_StringII();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_setHeightI")) test_setHeightI();
-	else if (getName().equals("test_setLocaleLjava_lang_String")) test_setLocaleLjava_lang_String();
-	else if (getName().equals("test_setNameLjava_lang_String")) test_setNameLjava_lang_String();
-	else if (getName().equals("test_setStyleI")) test_setStyleI();
-	else if (getName().equals("test_toString")) test_toString();
-	else if (getName().equals("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI")) test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java
index 7e6c707ca2..854ac29663 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java
@@ -11,26 +11,19 @@
 package org.eclipse.swt.tests.junit;
 
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.FontMetrics;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.FontMetrics
  *
  * @see org.eclipse.swt.graphics.FontMetrics
  */
-public class Test_org_eclipse_swt_graphics_FontMetrics extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_FontMetrics(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_FontMetrics extends TestCase {
 
 @Override
 protected void setUp() {
@@ -84,37 +77,6 @@ public void test_hashCode() {
 	}
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_FontMetrics(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getAscent");
-	methodNames.addElement("test_getAverageCharWidth");
-	methodNames.addElement("test_getDescent");
-	methodNames.addElement("test_getHeight");
-	methodNames.addElement("test_getLeading");
-	methodNames.addElement("test_hashCode");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getAscent")) test_getAscent();
-	else if (getName().equals("test_getAverageCharWidth")) test_getAverageCharWidth();
-	else if (getName().equals("test_getDescent")) test_getDescent();
-	else if (getName().equals("test_getHeight")) test_getHeight();
-	else if (getName().equals("test_getLeading")) test_getLeading();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-}
-
 /* custom */
 	Display display;
 	Shell shell;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
index 9308c8bd8e..2747338a71 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
@@ -11,25 +11,17 @@
 package org.eclipse.swt.tests.junit;
 
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.ImageLoader;
+import org.eclipse.swt.graphics.ImageLoaderEvent;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.ImageLoaderEvent
  *
  * @see org.eclipse.swt.graphics.ImageLoaderEvent
  */
-public class Test_org_eclipse_swt_graphics_ImageLoaderEvent extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_ImageLoaderEvent(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_ImageLoaderEvent extends TestCase {
 
 public void test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ() {
 	try {
@@ -47,24 +39,4 @@ public void test_toString() {
 	assertTrue(event.toString().length() > 0);
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_ImageLoaderEvent(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ")) test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ();
-	else if (getName().equals("test_toString")) test_toString();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java
index 73503ad3d5..cec365ccf7 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java
@@ -12,26 +12,17 @@ package org.eclipse.swt.tests.junit;
 
 
 import static org.junit.Assert.assertArrayEquals;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.graphics.*;
-
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.graphics.PaletteData;
+import org.eclipse.swt.graphics.RGB;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.PaletteData
  *
  * @see org.eclipse.swt.graphics.PaletteData
  */
-public class Test_org_eclipse_swt_graphics_PaletteData extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_PaletteData(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_PaletteData extends TestCase {
 
 public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() {
 	try {
@@ -131,30 +122,4 @@ public void test_getRGBs() {
 	assertNull(":b:", data.getRGBs());
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_PaletteData(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor$Lorg_eclipse_swt_graphics_RGB");
-	methodNames.addElement("test_ConstructorIII");
-	methodNames.addElement("test_getPixelLorg_eclipse_swt_graphics_RGB");
-	methodNames.addElement("test_getRGBI");
-	methodNames.addElement("test_getRGBs");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor$Lorg_eclipse_swt_graphics_RGB")) test_Constructor$Lorg_eclipse_swt_graphics_RGB();
-	else if (getName().equals("test_ConstructorIII")) test_ConstructorIII();
-	else if (getName().equals("test_getPixelLorg_eclipse_swt_graphics_RGB")) test_getPixelLorg_eclipse_swt_graphics_RGB();
-	else if (getName().equals("test_getRGBI")) test_getRGBI();
-	else if (getName().equals("test_getRGBs")) test_getRGBs();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java
index 62efa52245..f7067d6951 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java
@@ -11,25 +11,16 @@
 package org.eclipse.swt.tests.junit;
 
 
-import org.eclipse.swt.graphics.*;
+import junit.framework.TestCase;
 
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.graphics.Point;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.Point
  *
  * @see org.eclipse.swt.graphics.Point
  */
-public class Test_org_eclipse_swt_graphics_Point extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_Point(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_Point extends TestCase {
 
 public void test_ConstructorII() {
 	// Test new Point (int x, int y)
@@ -71,29 +62,4 @@ public void test_toString() {
 	assertTrue(p.toString().length() > 0);
 	assertEquals("Point {3, 4}", p.toString());
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_Point(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorII");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorII")) test_ConstructorII();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_toString")) test_toString();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_RGB.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_RGB.java
index 76dd8b44bf..9ffa2b28af 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_RGB.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_RGB.java
@@ -10,25 +10,16 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.RGB;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.RGB
  *
  * @see org.eclipse.swt.graphics.RGB
  */
-public class Test_org_eclipse_swt_graphics_RGB extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_RGB(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_RGB extends TestCase {
 
 public void test_ConstructorIII() {
 	// Test RGB(int red, int green, int blue)
@@ -397,32 +388,4 @@ public void test_toString() {
 		fail("RGB.toString returns a null or empty String");
 	}
 }
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_RGB(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorIII");
-	methodNames.addElement("test_ConstructorFFF");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getHSB");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorIII")) test_ConstructorIII();
-	else if (getName().equals("test_ConstructorFFF")) test_ConstructorFFF();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getHSB")) test_getHSB();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_toString")) test_toString();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Region.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Region.java
index ef67e9aee0..3a64e74ca6 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Region.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Region.java
@@ -10,27 +10,20 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.graphics.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Region;
+import org.eclipse.swt.widgets.Display;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.graphics.Region
  *
  * @see org.eclipse.swt.graphics.Region
  */
-public class Test_org_eclipse_swt_graphics_Region extends SwtTestCase {
-
-public Test_org_eclipse_swt_graphics_Region(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_graphics_Region extends TestCase {
 
 @Override
 protected void setUp() {
@@ -919,65 +912,6 @@ public void test_add_intArray() {
 	reg6.dispose();
 }
 
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_Region(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_Device");
-	methodNames.addElement("test_add$I");
-	methodNames.addElement("test_addLorg_eclipse_swt_graphics_Rectangle");
-	methodNames.addElement("test_addLorg_eclipse_swt_graphics_Region");
-	methodNames.addElement("test_containsII");
-	methodNames.addElement("test_containsLorg_eclipse_swt_graphics_Point");
-	methodNames.addElement("test_dispose");
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getBounds");
-	methodNames.addElement("test_hashCode");
-	methodNames.addElement("test_intersectLorg_eclipse_swt_graphics_Rectangle");
-	methodNames.addElement("test_intersectLorg_eclipse_swt_graphics_Region");
-	methodNames.addElement("test_intersectsIIII");
-	methodNames.addElement("test_intersectsLorg_eclipse_swt_graphics_Rectangle");
-	methodNames.addElement("test_isEmpty");
-	methodNames.addElement("test_subtract$I");
-	methodNames.addElement("test_subtractLorg_eclipse_swt_graphics_Rectangle");
-	methodNames.addElement("test_subtractLorg_eclipse_swt_graphics_Region");
-	methodNames.addElement("test_toString");
-	methodNames.addElement("test_add_intArray");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_Device")) test_ConstructorLorg_eclipse_swt_graphics_Device();
-	else if (getName().equals("test_add$I")) test_add$I();
-	else if (getName().equals("test_addLorg_eclipse_swt_graphics_Rectangle")) test_addLorg_eclipse_swt_graphics_Rectangle();
-	else if (getName().equals("test_addLorg_eclipse_swt_graphics_Region")) test_addLorg_eclipse_swt_graphics_Region();
-	else if (getName().equals("test_containsII")) test_containsII();
-	else if (getName().equals("test_containsLorg_eclipse_swt_graphics_Point")) test_containsLorg_eclipse_swt_graphics_Point();
-	else if (getName().equals("test_dispose")) test_dispose();
-	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getBounds")) test_getBounds();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-	else if (getName().equals("test_intersectLorg_eclipse_swt_graphics_Rectangle")) test_intersectLorg_eclipse_swt_graphics_Rectangle();
-	else if (getName().equals("test_intersectLorg_eclipse_swt_graphics_Region")) test_intersectLorg_eclipse_swt_graphics_Region();
-	else if (getName().equals("test_intersectsIIII")) test_intersectsIIII();
-	else if (getName().equals("test_intersectsLorg_eclipse_swt_graphics_Rectangle")) test_intersectsLorg_eclipse_swt_graphics_Rectangle();
-	else if (getName().equals("test_isEmpty")) test_isEmpty();
-	else if (getName().equals("test_subtract$I")) test_subtract$I();
-	else if (getName().equals("test_subtractLorg_eclipse_swt_graphics_Rectangle")) test_subtractLorg_eclipse_swt_graphics_Rectangle();
-	else if (getName().equals("test_subtractLorg_eclipse_swt_graphics_Region")) test_subtractLorg_eclipse_swt_graphics_Region();
-	else if (getName().equals("test_toString")) test_toString();
-	else if (getName().equals("test_add_intArray")) test_add_intArray();
-}
-
 /* custom */
 	Display display;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
index 8f3b882b88..334b3a6eb8 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_TextLayout.java
@@ -1,26 +1,19 @@
 package org.eclipse.swt.tests.junit;
 
 import static org.junit.Assert.assertArrayEquals;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.TextLayout;
+import org.eclipse.swt.graphics.TextStyle;
+import org.eclipse.swt.widgets.Display;
 
-import junit.framework.*;
-import junit.textui.*;
 
-import java.util.*;
-
-
-public class Test_org_eclipse_swt_graphics_TextLayout extends SwtTestCase {
+public class Test_org_eclipse_swt_graphics_TextLayout extends TestCase {
 	Display display;
 	
-public Test_org_eclipse_swt_graphics_TextLayout(String name) {
-	super(name);
-}
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
 @Override
 protected void setUp() {
 	display = Display.getDefault();
@@ -796,54 +789,4 @@ public void test_getTabs() {
 	assertEquals(null, layout.getTabs());
 	layout.dispose();
 }
-/*Test suite end*/
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	Vector<String> methodNames = methodNames();
-	Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_graphics_TextLayout(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_getLevel");
-	methodNames.addElement("test_getLineOffsets");
-	methodNames.addElement("test_getLineIndex");
-	methodNames.addElement("test_getLineBounds");
-	methodNames.addElement("test_getAlignment");
-	methodNames.addElement("test_getOrientation");
-	methodNames.addElement("test_getText");
-	methodNames.addElement("test_getLineSpacing");
-	methodNames.addElement("test_getLocation");
-	methodNames.addElement("test_getNextOffset");
-	methodNames.addElement("test_getNextOffset2");
-	methodNames.addElement("test_getOffset");
-	methodNames.addElement("test_getTabs");
-	methodNames.addElement("test_getSegments");
-	methodNames.addElement("test_getSegmentsChars");
-	methodNames.addElement("test_setStyle");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	String name = getName();
-	if (name.equals("test_getLevel")) test_getLevel();
-	else if (name.equals("test_getLineOffsets")) test_getLineOffsets();	
-	else if (name.equals("test_getLineIndex")) test_getLineIndex();
-	else if (name.equals("test_getLineBounds")) test_getLineBounds();
-	else if (name.equals("test_getAlignment")) test_getAlignment();
-	else if (name.equals("test_getOrientation")) test_getOrientation();
-	else if (name.equals("test_getText")) test_getText();
-	else if (name.equals("test_getLineSpacing")) test_getLineSpacing();
-	else if (name.equals("test_getLocation")) test_getLocation();
-	else if (name.equals("test_getNextOffset")) test_getNextOffset();
-	else if (name.equals("test_getNextOffset2")) test_getNextOffset2();
-	else if (name.equals("test_getOffset")) test_getOffset();	
-	else if (name.equals("test_getTabs")) test_getTabs();	
-	else if (name.equals("test_getSegments")) test_getSegments();
-	else if (name.equals("test_getSegmentsChars")) test_getSegmentsChars();	
-	else if (name.equals("test_setStyle")) test_setStyle();	
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
index f7b2434c35..72ad9a4fdb 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
@@ -10,27 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.widgets.Shell;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.layout.FormAttachment
  *
  * @see org.eclipse.swt.layout.FormAttachment
  */
-public class Test_org_eclipse_swt_layout_FormAttachment extends SwtTestCase {
-
-public Test_org_eclipse_swt_layout_FormAttachment(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_layout_FormAttachment extends TestCase {
 
 @Override
 protected void setUp() {
@@ -78,40 +69,6 @@ public void test_toString() {
 	assertTrue(attachment.toString().length() > 0);
 }
 
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_layout_FormAttachment(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_ConstructorI");
-	methodNames.addElement("test_ConstructorII");
-	methodNames.addElement("test_ConstructorIII");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Control");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ControlI");
-	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ControlII");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorI")) test_ConstructorI();
-	else if (getName().equals("test_ConstructorII")) test_ConstructorII();
-	else if (getName().equals("test_ConstructorIII")) test_ConstructorIII();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Control")) test_ConstructorLorg_eclipse_swt_widgets_Control();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlI")) test_ConstructorLorg_eclipse_swt_widgets_ControlI();
-	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlII")) test_ConstructorLorg_eclipse_swt_widgets_ControlII();
-	else if (getName().equals("test_toString")) test_toString();
-}
-
 /* custom */
 public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
index 38bb8d416f..5cfc30ec4d 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
@@ -11,26 +11,17 @@
 package org.eclipse.swt.tests.junit;
 
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.layout.GridData
  *
  * @see org.eclipse.swt.layout.GridData
  */
-public class Test_org_eclipse_swt_layout_GridData extends SwtTestCase {
-
-public Test_org_eclipse_swt_layout_GridData(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_layout_GridData extends TestCase {
 
 public void test_Constructor() {
 	GridData data = new GridData();
@@ -61,27 +52,4 @@ public void test_ConstructorII() {
 	assertTrue(data.widthHint == 100);
 	assertTrue(data.heightHint == 100);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_layout_GridData(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_ConstructorI");
-	methodNames.addElement("test_ConstructorII");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_ConstructorI")) test_ConstructorI();
-	else if (getName().equals("test_ConstructorII")) test_ConstructorII();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
index 1c0360d2d7..b4edb92b37 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
@@ -11,25 +11,16 @@
 package org.eclipse.swt.tests.junit;
 
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Event;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.widgets.Event
  *
  * @see org.eclipse.swt.widgets.Event
  */
-public class Test_org_eclipse_swt_widgets_Event extends SwtTestCase {
-
-public Test_org_eclipse_swt_widgets_Event(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_widgets_Event extends TestCase {
 
 public void test_Constructor() {
 	Event event = new Event();
@@ -41,25 +32,4 @@ public void test_toString() {
 	assertNotNull(event.toString());
 	assertTrue(event.toString().length() > 0);
 }
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_widgets_Event(e.nextElement()));
-	}
-	return suite;
-}
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_Constructor");
-	methodNames.addElement("test_toString");
-	return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_Constructor")) test_Constructor();
-	else if (getName().equals("test_toString")) test_toString();
-}
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
index d2e81297ee..6b7f258ae3 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Monitor.java
@@ -10,26 +10,18 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Monitor;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.widgets.Monitor
  *
  * @see org.eclipse.swt.widgets.Monitor
  */
-public class Test_org_eclipse_swt_widgets_Monitor extends SwtTestCase {
-	
-public Test_org_eclipse_swt_widgets_Monitor(String name) {
-	super(name);
-}
-
-public static void main(String[] args) {
-	TestRunner.run(suite());
-}
+public class Test_org_eclipse_swt_widgets_Monitor extends TestCase {
 
 @Override
 protected void setUp() {
@@ -81,34 +73,6 @@ public void test_hashCode() {
 	}
 }
 
-
-public static Test suite() {
-	TestSuite suite = new TestSuite();
-	java.util.Vector<String> methodNames = methodNames();
-	java.util.Enumeration<String> e = methodNames.elements();
-	while (e.hasMoreElements()) {
-		suite.addTest(new Test_org_eclipse_swt_widgets_Monitor(e.nextElement()));
-	}
-	return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
-	java.util.Vector<String> methodNames = new java.util.Vector<String>();
-	methodNames.addElement("test_equalsLjava_lang_Object");
-	methodNames.addElement("test_getBounds");
-	methodNames.addElement("test_getClientArea");
-	methodNames.addElement("test_hashCode");
-	return methodNames;
-}
-
-@Override
-protected void runTest() throws Throwable {
-	if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
-	else if (getName().equals("test_getBounds")) test_getBounds();
-	else if (getName().equals("test_getClientArea")) test_getClientArea();
-	else if (getName().equals("test_hashCode")) test_hashCode();
-}
-
 /* custom */
 Display display = null;
 Monitor[] monitors = null;