Initial

author: Carolyn MacLeod 2001-11-06 19:23:07 +0000
committer: Carolyn MacLeod 2001-11-06 19:23:07 +0000
commit: 635faf7df8b255a47fb036ddd76d34febc52406a (patch)
tree: 22cd097cf293603d0f1225713d47c59a076d2063 /tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit
parent: f27a1273fe7c6ffb504004e2c6f8ef2e756f0ef3 (diff)
download: eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.tar.gz
eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.tar.xz
eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.zip
186 files changed, 33993 insertions, 0 deletions
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
new file mode 100644
index 0000000000..6fba883454
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllGraphicsTests.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Suite for testing all of the graphics test cases.
+ */
+public class AllGraphicsTests {
+public static void main(String[] args) {
+	TestRunner.run (suite());
+}
+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.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.addTest(Test_org_eclipse_swt_graphics_GCData.suite());
+	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_ImageLoader.suite());
+	suite.addTest(Test_org_eclipse_swt_graphics_ImageLoaderEvent.suite());
+
+	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
new file mode 100644
index 0000000000..cdb8710364
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
@@ -0,0 +1,178 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Suite for running all SWT test cases.
+ */
+public class AllTests extends TestSuite {
+	public static int unimplementedMethods;
+
+public static void main(String[] args) {
+	unimplementedMethods = 0;
+	TestRunner.run(suite());
+	if (unimplementedMethods > 0) {
+		System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods);
+	}
+}
+public static Test suite() {
+	return new AllTests();
+}
+
+public AllTests() {
+	super();
+	/* The logical order to run the tests in is:
+	 * - SWT, SWTError, SWTException
+	 * - Display
+	 * - graphics classes
+	 * - items and Caret, etc
+	 * - widgets
+	 * - dialogs
+	 * - layout
+	 * - custom widgets
+	 * - printing and program
+	 * - events
+	 * - drag & drop
+	 */
+	addTest(Test_org_eclipse_swt_SWT.suite());
+	addTest(Test_org_eclipse_swt_SWTException.suite());
+	addTest(Test_org_eclipse_swt_SWTError.suite());
+
+	addTest(Test_org_eclipse_swt_widgets_Display.suite());
+
+	addTest(Test_org_eclipse_swt_graphics_Image.suite());
+	addTest(Test_org_eclipse_swt_graphics_Cursor.suite());
+	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());
+	addTest(Test_org_eclipse_swt_graphics_ImageData.suite());
+	addTest(Test_org_eclipse_swt_graphics_Region.suite());
+	addTest(Test_org_eclipse_swt_graphics_GCData.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());
+	addTest(Test_org_eclipse_swt_graphics_ImageLoader.suite());
+
+	addTest(Test_org_eclipse_swt_widgets_MenuItem.suite());
+	addTest(Test_org_eclipse_swt_widgets_ToolItem.suite());
+	//addTest(Test_org_eclipse_swt_widgets_CoolItem.suite());
+	addTest(Test_org_eclipse_swt_widgets_TabItem.suite());
+	addTest(Test_org_eclipse_swt_widgets_TableItem.suite());
+	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());
+	addTest(Test_org_eclipse_swt_widgets_TypedListener.suite());
+	addTest(Test_org_eclipse_swt_widgets_Menu.suite());
+	//addTest(Test_org_eclipse_swt_widgets_Tracker.suite());
+	addTest(Test_org_eclipse_swt_widgets_Synchronizer.suite());
+	
+	addTest(Test_org_eclipse_swt_widgets_Shell.suite());
+	//addTest(Test_org_eclipse_swt_widgets_Decorations.suite());
+	addTest(Test_org_eclipse_swt_widgets_Label.suite());
+	addTest(Test_org_eclipse_swt_widgets_Button.suite());
+	addTest(Test_org_eclipse_swt_widgets_List.suite());
+	addTest(Test_org_eclipse_swt_widgets_Text.suite());
+	addTest(Test_org_eclipse_swt_widgets_ScrollBar.suite());
+	addTest(Test_org_eclipse_swt_widgets_Sash.suite());
+	addTest(Test_org_eclipse_swt_widgets_Tree.suite());
+	addTest(Test_org_eclipse_swt_widgets_TabFolder.suite());
+	addTest(Test_org_eclipse_swt_widgets_Combo.suite());
+	addTest(Test_org_eclipse_swt_widgets_Group.suite());
+	addTest(Test_org_eclipse_swt_widgets_ToolBar.suite());
+	addTest(Test_org_eclipse_swt_widgets_Table.suite());
+	addTest(Test_org_eclipse_swt_widgets_Canvas.suite());
+	addTest(Test_org_eclipse_swt_widgets_Scale.suite());
+	addTest(Test_org_eclipse_swt_widgets_Slider.suite());
+	addTest(Test_org_eclipse_swt_widgets_ProgressBar.suite());
+	addTest(Test_org_eclipse_swt_widgets_Composite.suite());
+	//addTest(Test_org_eclipse_swt_widgets_CoolBar.suite());
+
+	addTest(Test_org_eclipse_swt_widgets_ColorDialog.suite());
+	addTest(Test_org_eclipse_swt_widgets_FileDialog.suite());
+	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_layout_GridData.suite());
+	addTest(Test_org_eclipse_swt_layout_RowData.suite());
+	addTest(Test_org_eclipse_swt_layout_GridLayout.suite());
+	addTest(Test_org_eclipse_swt_layout_FillLayout.suite());
+	addTest(Test_org_eclipse_swt_layout_RowLayout.suite());
+
+	addTest(Test_org_eclipse_swt_custom_TableTree.suite());
+	addTest(Test_org_eclipse_swt_custom_BidiSegmentEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_LineBackgroundEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_LineStyleEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_SashForm.suite());
+	addTest(Test_org_eclipse_swt_custom_TableEditor.suite());
+	addTest(Test_org_eclipse_swt_custom_AnimatedProgress.suite());
+	addTest(Test_org_eclipse_swt_custom_StyleRange.suite());
+	addTest(Test_org_eclipse_swt_custom_TextChangedEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_StackLayout.suite());
+	addTest(Test_org_eclipse_swt_custom_CTabFolderEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_ExtendedModifyEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_CCombo.suite());
+	addTest(Test_org_eclipse_swt_custom_TableTreeItem.suite());
+	addTest(Test_org_eclipse_swt_custom_ViewForm.suite());
+	addTest(Test_org_eclipse_swt_custom_CTabFolderAdapter.suite());
+	addTest(Test_org_eclipse_swt_custom_CLabel.suite());
+	addTest(Test_org_eclipse_swt_custom_TableTreeEditor.suite());
+	addTest(Test_org_eclipse_swt_custom_TextChangingEvent.suite());
+	addTest(Test_org_eclipse_swt_custom_ScrolledComposite.suite());
+	addTest(Test_org_eclipse_swt_custom_TreeEditor.suite());
+	addTest(Test_org_eclipse_swt_custom_PopupList.suite());
+	addTest(Test_org_eclipse_swt_custom_CTabItem.suite());
+	addTest(Test_org_eclipse_swt_custom_BusyIndicator.suite());
+	//addTest(Test_org_eclipse_swt_custom_StyledText.suite());
+	addTest(Test_org_eclipse_swt_custom_ControlEditor.suite());
+	addTest(Test_org_eclipse_swt_custom_ST.suite());
+	addTest(Test_org_eclipse_swt_custom_CTabFolder.suite());
+
+	addTest(Test_org_eclipse_swt_events_ControlEvent.suite());
+	addTest(Test_org_eclipse_swt_events_ModifyEvent.suite());
+	addTest(Test_org_eclipse_swt_events_ArmEvent.suite());
+	addTest(Test_org_eclipse_swt_events_ShellEvent.suite());
+	addTest(Test_org_eclipse_swt_events_TypedEvent.suite());
+	addTest(Test_org_eclipse_swt_events_PaintEvent.suite());
+	addTest(Test_org_eclipse_swt_events_VerifyEvent.suite());
+	addTest(Test_org_eclipse_swt_events_KeyEvent.suite());
+	addTest(Test_org_eclipse_swt_events_TraverseEvent.suite());
+	addTest(Test_org_eclipse_swt_events_MouseTrackAdapter.suite());
+	addTest(Test_org_eclipse_swt_events_DisposeEvent.suite());
+	addTest(Test_org_eclipse_swt_events_SelectionEvent.suite());
+	addTest(Test_org_eclipse_swt_events_HelpEvent.suite());
+	addTest(Test_org_eclipse_swt_events_FocusEvent.suite());
+	addTest(Test_org_eclipse_swt_events_MouseEvent.suite());
+	addTest(Test_org_eclipse_swt_events_MenuEvent.suite());
+	addTest(Test_org_eclipse_swt_events_TreeEvent.suite());
+	
+	addTest(Test_org_eclipse_swt_printing_PrintDialog.suite());
+	addTest(Test_org_eclipse_swt_printing_PrinterData.suite());
+	addTest(Test_org_eclipse_swt_printing_Printer.suite());
+
+	addTest(Test_org_eclipse_swt_program_Program.suite());
+
+//	addTest(Test_org_eclipse_swt_dnd_FileTransfer.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DragSourceAdapter.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DropTargetAdapter.suite());
+//	addTest(Test_org_eclipse_swt_dnd_TextTransfer.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DragSourceEvent.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DragSource.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DND.suite());
+//	addTest(Test_org_eclipse_swt_dnd_TransferData.suite());
+//	addTest(Test_org_eclipse_swt_dnd_RTFTransfer.suite());
+//	addTest(Test_org_eclipse_swt_dnd_Clipboard.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DropTargetEvent.suite());
+//	addTest(Test_org_eclipse_swt_dnd_DropTarget.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
new file mode 100644
index 0000000000..7c5b773d39
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
@@ -0,0 +1,63 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Suite for testing all of the widget test cases.
+ */
+public class AllWidgetTests {
+public static void main(String[] args) {
+	TestRunner.run (suite());
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+
+	suite.addTest(Test_org_eclipse_swt_widgets_MenuItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_ToolItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_CoolItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TabItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TableItem.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.addTest(Test_org_eclipse_swt_widgets_TypedListener.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Menu.suite());
+	//suite.addTest(Test_org_eclipse_swt_widgets_Tracker.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Synchronizer.suite());
+	
+	suite.addTest(Test_org_eclipse_swt_widgets_Shell.suite());
+	//suite.addTest(Test_org_eclipse_swt_widgets_Decorations.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Label.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Button.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_List.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Text.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_ScrollBar.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Sash.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Tree.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TabFolder.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Combo.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Group.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_ToolBar.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Table.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Canvas.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Scale.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Slider.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_ProgressBar.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Composite.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_CoolBar.suite());
+
+	suite.addTest(Test_org_eclipse_swt_widgets_ColorDialog.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_FileDialog.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());
+
+	return suite;
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/EmulatedWidgetsTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/EmulatedWidgetsTests.java
new file mode 100644
index 0000000000..f8d53a6e7c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/EmulatedWidgetsTests.java
@@ -0,0 +1,33 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Suite for testing widgets that have been emulated on Motif.
+ */
+public class EmulatedWidgetsTests {
+
+public static void main(String[] args) {
+	TestRunner.run (suite());
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+
+	suite.addTest(Test_org_eclipse_swt_widgets_ColorDialog.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_FontDialog.suite());	
+	suite.addTest(Test_org_eclipse_swt_widgets_TabFolder.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TabItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_Table.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TableItem.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TableColumn.suite());	
+	suite.addTest(Test_org_eclipse_swt_widgets_Tree.suite());
+	suite.addTest(Test_org_eclipse_swt_widgets_TreeItem.suite());
+		
+	return suite;
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java
new file mode 100644
index 0000000000..a5862fbb3b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/StyledTextContentSpec.java
@@ -0,0 +1,1021 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+/**
+ * Use this test class to validate an implementation of the StyledTextContent
+ * interface.  To perform the validation, copy this class to the package where 
+ * your StyledTextContent implementation lives.  Then specify the fully qualified
+ * name of your StyledTextContent class as an argument to the main method of this 
+ * class. 
+ * 
+ * NOTE:  This test class assumes that your StyledTextContent implementation 
+ * handles the following delimiters:
+ * 
+ * 		/r
+ * 		/n
+ * 		/r/n
+ */
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.layout.*;
+import java.io.*;
+import java.lang.reflect.*;
+public class StyledTextContentSpec implements TextChangeListener {
+	static String contentClassName;
+	static int failCount = 0;
+	static int errorCount = 0;
+	Class contentClass = null;
+	StyledTextContent contentInstance = null;
+	int verify = 0;
+	Method currentMethod = null;
+	boolean failed = false;
+	StyledText widget = null;
+	Shell shell = null;
+	
+public StyledTextContentSpec() {
+}
+public void assert(String message, boolean condition) {
+	System.out.print("\t" + currentMethod.getName() + " " + message);
+	if (!condition) 
+		fail(message);
+	else 
+		System.out.println(" passed");
+}
+public void fail(String message) {
+	failed = true;
+	System.out.println(" FAILED");
+	failCount++;
+}
+public StyledTextContent getContentInstance() {
+	contentInstance.setText("");
+	widget.setContent(contentInstance);
+	return contentInstance;
+}
+public static String getTestText() {
+	return 
+		"This is the first line.\r\n" +
+		"This is the second line.\r\n" +
+		"This is the third line.\r\n" +
+		"This is the fourth line.\r\n" +
+		"This is the fifth line.\r\n" +
+		"\r\n" +
+		"This is the first line again.\r\n" +
+		"This is the second line again.\r\n" +
+		"This is the third line again.\r\n" +
+		"This is the fourth line again.\r\n" +
+		"This is the fifth line again.\r\n" +
+		"\r\n" +
+		"This is the first line once again.\r\n" +
+		"This is the second line once again.\r\n" +
+		"This is the third line once again.\r\n" +
+		"This is the fourth line once again.\r\n" +
+		"This is the fifth line once again.";
+}
+public static void main(String[] args) {
+	StyledTextContentSpec spec = new StyledTextContentSpec();
+	if (args.length > 0) {
+		contentClassName = args[0];
+	} else {
+		MessageBox box = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_ERROR);
+		box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
+		box.open();
+		return;
+	}
+	spec.run();
+	System.out.println();
+	System.out.println(failCount + " TEST FAILURES.");
+	System.out.println(errorCount + " UNEXPECTED ERRORS.");
+}
+public void run() {
+	if (contentClassName.equals("")) {
+		MessageBox box = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_ERROR);
+		box.setMessage("Content class must be specified as an execution argument."); //$NON-NLS-1$
+		box.open();
+		return;
+	}
+	if (contentClass == null) {
+		try {
+			contentClass = Class.forName(contentClassName);
+		} catch (ClassNotFoundException e) {
+			MessageBox box = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_ERROR);
+			box.setMessage("Content class:\n" + contentClassName + "\nnot found"); //$NON-NLS-1$
+			box.open();
+			return;
+		}
+	}
+	try {
+		contentInstance = (StyledTextContent)contentClass.newInstance();
+	} catch (IllegalAccessException e) {
+		MessageBox box = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_ERROR);
+		box.setMessage("Unable to access content class:\n" + contentClassName); //$NON-NLS-1$
+		box.open();
+		return;
+	} catch (InstantiationException e) {
+		MessageBox box = new MessageBox(Display.getDefault().getActiveShell(), SWT.ICON_ERROR);
+		box.setMessage("Unable to instantiate content class:\n" + contentClassName); //$NON-NLS-1$
+		box.open();
+		return;
+	}
+	Class clazz;
+	clazz = this.getClass();
+	Method[] methods = clazz.getDeclaredMethods();
+	for (int i=0; i<methods.length; i++) {
+		setUp();
+		currentMethod = methods[i];
+		failed = false;
+		try {
+			if (currentMethod.getName().startsWith("test_")) {
+				System.out.println();
+				System.out.println(currentMethod.getName() + "...");
+				currentMethod.invoke(this, new Object[0]);
+				if (!failed) {
+					System.out.println("PASSED.");
+				} else {
+					System.out.println("FAILED");
+				}
+			} 
+		} catch (InvocationTargetException ex) {
+			System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.getTargetException().toString());
+			System.out.println("FAILED");
+			errorCount++;
+		} catch (Exception ex) {
+			System.out.println("\t" + currentMethod.getName() + " ERROR ==> " + ex.toString());
+			System.out.println("FAILED");
+			errorCount++;
+		}
+		if (verify != 0) {
+			verify = 0;
+			contentInstance.removeTextChangeListener(this);
+		}
+		tearDown();
+	}
+}
+public void textSet(TextChangedEvent event) {
+}
+public void textChanged(TextChangedEvent event) {
+}
+public void textChanging(TextChangingEvent event) {
+	switch (verify) {
+		case 1 : {
+			assert(":1a:", event.replaceLineCount == 0);
+			assert(":1b:", event.newLineCount == 1);
+			break;
+		}
+		case 2 : {
+			assert(":2a:", event.replaceLineCount == 2);
+			assert(":2b:", event.newLineCount == 0);
+			break;
+		}
+		case 3 : {
+			assert(":3a:", event.replaceLineCount == 0);
+			assert(":3b:", event.newLineCount == 2);
+			break;
+		}
+		case 4: {
+			assert(":4:", false);
+			break;
+		}
+		case 5 : {
+			assert(":5a:", event.replaceLineCount == 0);
+			assert(":5b:", event.newLineCount == 1);
+			break;
+		}
+		case 6 : {
+			assert(":6a:", event.replaceLineCount == 1);
+			assert(":6b:", event.newLineCount == 0);
+			break;
+		}
+		case 8 : {
+			assert(":8a:", event.replaceLineCount == 1);
+			assert(":8b:", event.newLineCount == 0);
+			break;
+		}
+		case 9 : {
+			assert(":9a:", event.replaceLineCount == 1);
+			assert(":9b:", event.newLineCount == 0);
+			break;
+		}
+		case 10:{
+			assert(":10:", false);
+			break;
+		}
+		case 11: {
+			assert(":11:", false);
+			break;
+		}
+		case 12: {
+			assert(":12a:", event.replaceLineCount == 0);
+			assert(":12b:", event.newLineCount == 1);
+			break;
+		}
+		case 13: {
+			assert(":13a:", event.replaceLineCount == 0);
+			assert(":13b:", event.newLineCount == 1);
+			break;
+		}
+		case 14: {
+			assert(":14:", false);
+			break;
+		}
+		case 15: {
+			assert(":15a:", event.replaceLineCount == 1);
+			assert(":15b:", event.newLineCount == 2);
+			break;
+		}
+		case 16:{
+			assert(":16:", false);
+			break;
+		}
+		case 17: {
+			assert(":17:", false);
+			break;
+		}
+		case 18: {
+			assert(":18a:", event.replaceLineCount == 0);
+			assert(":18b:", event.newLineCount == 2);
+			break;
+		}
+		case 19: {
+			assert(":19a:", event.replaceLineCount == 0);
+			assert(":19b:", event.newLineCount == 3);
+			break;
+		}
+		case 20: {
+			assert(":20:", false);
+			break;
+		}
+	}
+}
+public void test_Insert() {
+	StyledTextContent content = getContentInstance();
+	String newText;
+	
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(0, 0, "test\n ");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":1a:", newText.equals("test\n This\nis a test\r"));
+	assert(":1b:", content.getLineCount() == 4);
+	assert(":1c:", content.getLine(0).equals("test"));
+	assert(":1d:", content.getLine(1).equals(" This"));
+	assert(":1e:", content.getLine(2).equals("is a test"));
+	assert(":1f:", content.getLine(3).equals(""));
+
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 0, "*** ");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2a:", newText.equals("This\n*** is a test\r"));
+	assert(":2b:", content.getLineCount() == 3);
+	assert(":2c:", content.getLine(0).equals("This"));
+	assert(":2d:", content.getLine(1).equals("*** is a test"));
+	assert(":2e:", content.getLine(2).equals(""));
+
+	content.setText("Line 1\r\nLine 2");
+	content.replaceTextRange(0, 0, "\r");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3a:", newText.equals("\rLine 1\r\nLine 2"));
+	assert(":3b:", content.getLineCount() == 3);
+	assert(":3c:", content.getLine(0).equals(""));
+	assert(":3d:", content.getLine(1).equals("Line 1"));
+	assert(":3e:", content.getLine(2).equals("Line 2"));
+	content.replaceTextRange(9, 0, "\r");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3f:", newText.equals("\rLine 1\r\n\rLine 2"));
+	assert(":3g:", content.getLineCount() == 4);
+	assert(":3h:", content.getLine(0).equals(""));
+	assert(":3i:", content.getLine(1).equals("Line 1"));
+	assert(":3j:", content.getLine(2).equals(""));
+	assert(":3k:", content.getLine(3).equals("Line 2"));
+
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(0, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4a:", newText.equals("\nThis\nis a test\r"));
+	assert(":4b:", content.getLineCount() == 4);
+	assert(":4c:", content.getLine(0).equals(""));
+	assert(":4d:", content.getLine(1).equals("This"));
+	assert(":4e:", content.getLine(2).equals("is a test"));
+	assert(":4f:", content.getLine(3).equals(""));
+	
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(7, 0, "\r\nnewLine");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":5a:", newText.equals("This\nis\r\nnewLine a test\r"));
+	assert(":5b:", content.getLineCount() == 4);
+	assert(":5c:", content.getLine(0).equals("This"));
+	assert(":5d:", content.getLine(1).equals("is"));
+	assert(":5e:", content.getLine(2).equals("newLine a test"));
+	assert(":5f:", content.getLine(3).equals(""));
+
+	content.setText("");
+	content.replaceTextRange(0, 0, "This\nis\r\nnewLine a test\r");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6a:", newText.equals("This\nis\r\nnewLine a test\r"));
+	assert(":6b:", content.getLineCount() == 4);
+	assert(":6c:", content.getLine(0).equals("This"));
+	assert(":6d:", content.getLine(1).equals("is"));
+	assert(":6e:", content.getLine(2).equals("newLine a test"));
+	assert(":6f:", content.getLine(3).equals(""));
+
+	// insert at end
+	content.setText("This");
+	content.replaceTextRange(4, 0, "\n ");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":7a:", newText.equals("This\n "));
+	assert(":7b:", content.getLineCount() == 2);
+	assert(":7c:", content.getLine(0).equals("This"));
+	assert(":7d:", content.getLine(1).equals(" "));
+	content.setText("This\n");
+	content.replaceTextRange(5, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":7e:", newText.equals("This\n\n"));
+	assert(":7f:", content.getLineCount() == 3);
+	assert(":7g:", content.getLine(0).equals("This"));
+	assert(":7h:", content.getLine(1).equals(""));
+	assert(":7i:", content.getLine(2).equals(""));
+
+	// insert at beginning
+	content.setText("This");
+	content.replaceTextRange(0, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":8a:", newText.equals("\nThis"));
+	assert(":8b:", content.getLineCount() == 2);
+	assert(":8c:", content.getLine(0).equals(""));
+	assert(":8d:", content.getLine(1).equals("This"));
+
+	// insert text
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 0, "*** ");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":9a:", newText.equals("This\n*** is a test\r"));
+	assert(":9b:", content.getLineCount() == 3);
+	assert(":9c:", content.getLine(0).equals("This"));
+	assert(":9d:", content.getLine(1).equals("*** is a test"));
+	assert(":9e:", content.getLine(2).equals(""));
+	
+	content.setText("This\n");
+	content.replaceTextRange(5, 0, "line");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":10a:", newText.equals("This\nline"));
+	assert(":10b:", content.getLineCount() == 2);
+	assert(":10c:", content.getLine(0).equals("This"));
+	assert(":10d:", content.getLine(1).equals("line"));
+	assert(":10e:", content.getLineAtOffset(8) == 1);
+	assert(":10f:", content.getLineAtOffset(9) == 1);
+
+	// insert at beginning 
+	content.setText("This\n");
+	content.replaceTextRange(0, 0, "line\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":11a:", newText.equals("line\nThis\n"));
+	assert(":11b:", content.getLineCount() == 3);
+	assert(":11c:", content.getLine(0).equals("line"));
+	assert(":11d:", content.getLine(1).equals("This"));
+	assert(":11e:", content.getLineAtOffset(5) == 1);
+
+	content.setText("Line 1\r\nLine 2\r\nLine 3");
+	content.replaceTextRange(0, 0, "\r");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":12a:", newText.equals("\rLine 1\r\nLine 2\r\nLine 3"));
+	assert(":12b:", content.getLineCount() == 4);
+	assert(":12c:", content.getLine(0).equals(""));
+	assert(":12d:", content.getLine(1).equals("Line 1"));
+	assert(":12e:", content.getLine(2).equals("Line 2"));
+	assert(":12f:", content.getLine(3).equals("Line 3"));
+
+	content.setText("Line 1\nLine 2\nLine 3");
+	content.replaceTextRange(7, 0, "Line1a\nLine1b\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":13a:", newText.equals("Line 1\nLine1a\nLine1b\nLine 2\nLine 3"));
+	assert(":13b:", content.getLineCount() == 5);
+	assert(":13c:", content.getLine(0).equals("Line 1"));
+	assert(":13d:", content.getLine(1).equals("Line1a"));
+	assert(":13e:", content.getLine(2).equals("Line1b"));
+	assert(":13f:", content.getLine(3).equals("Line 2"));
+	assert(":13g:", content.getLine(4).equals("Line 3"));
+
+	content.setText("Line 1\nLine 2\nLine 3");
+	content.replaceTextRange(11, 0, "l1a");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":14a:", newText.equals("Line 1\nLinel1a 2\nLine 3"));
+	assert(":14b:", content.getLineCount() == 3);
+	assert(":14c:", content.getLine(0).equals("Line 1"));
+	assert(":14d:", content.getLine(1).equals("Linel1a 2"));
+	assert(":14e:", content.getLine(2).equals("Line 3"));
+
+	content.setText("Line 1\nLine 2 is a very long line that spans many words\nLine 3");
+	content.replaceTextRange(19, 0, "very, very, ");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":15a:", newText.equals("Line 1\nLine 2 is a very, very, very long line that spans many words\nLine 3"));
+	assert(":15b:", content.getLineCount() == 3);
+	assert(":15c:", content.getLine(0).equals("Line 1"));
+	assert(":15d:", content.getLine(1).equals("Line 2 is a very, very, very long line that spans many words"));
+	assert(":15e:", content.getLine(2).equals("Line 3"));
+}
+
+public void test_Empty() {
+	StyledTextContent content = getContentInstance();
+	assert(":1a:", content.getLineCount() == 1);
+	assert(":1b:", content.getLine(0).equals(""));
+
+	content.setText("test");
+	content.replaceTextRange(0,4,"");
+	assert(":2a:", content.getLineCount() == 1);
+	assert(":2b:", content.getLine(0).equals(""));
+}
+public void test_Line_Conversion() {
+	StyledTextContent content = getContentInstance();
+	
+	content.setText("This\nis a test\rrepeat\nend\r");
+	assert(":1a:", content.getLineCount() == 5);	
+	assert(":1b:", content.getLine(0).equals("This"));
+	assert(":1c:", content.getOffsetAtLine(0) == 0);	
+	assert(":1d:", content.getLine(1).equals("is a test"));
+	assert(":1e:", content.getLineAtOffset(4) == 0);
+	assert(":1f:", content.getOffsetAtLine(1) == 5);	
+	assert(":1g:", content.getLine(2).equals("repeat"));
+	assert(":1h:", content.getOffsetAtLine(2) == 15);	
+	assert(":1i:", content.getLine(3).equals("end"));
+	assert(":1j:", content.getOffsetAtLine(3) == 22);
+	assert(":1k:", content.getLine(4).equals(""));
+	assert(":1l:", content.getOffsetAtLine(4) == 26);
+	
+	content.setText("This\r\nis a test");
+	assert(":2a:", content.getLineCount() == 2);
+	assert(":2b:", content.getLine(1).equals("is a test"));
+	assert(":2c:", content.getLineAtOffset(4) == 0);
+	assert(":2d:", content.getLineAtOffset(5) == 0);
+
+	content.setText("This\r\nis a test\r");
+	assert(":3a:", content.getLineCount() == 3);
+	assert(":3b:", content.getLine(1).equals("is a test"));
+	assert(":3c:", content.getLineAtOffset(15) == 1);
+	
+	content.setText("\r\n");
+	assert(":4a:", content.getLineCount() == 2);
+	assert(":4b:", content.getLine(0).equals(""));
+	assert(":4c:", content.getLine(1).equals(""));
+	assert(":4d:", content.getLineAtOffset(0) == 0);
+	assert(":4e:", content.getLineAtOffset(1) == 0);
+	assert(":4f:", content.getLineAtOffset(2) == 1);
+
+	content.setText("\r\n\n\r\r\n");
+	assert(":5a:", content.getLineCount() == 5);
+	assert(":5b:", content.getLine(0).equals(""));
+	assert(":5c:", content.getOffsetAtLine(0) == 0);	
+	assert(":5d:", content.getLine(1).equals(""));
+	assert(":5e:", content.getOffsetAtLine(1) == 2);	
+	assert(":5f:", content.getLine(2).equals(""));
+	assert(":5g:", content.getOffsetAtLine(2) == 3);	
+	assert(":5h:", content.getLine(3).equals(""));
+	assert(":5i:", content.getOffsetAtLine(3) == 4);
+	assert(":5j:", content.getLine(4).equals(""));
+	assert(":5k:", content.getOffsetAtLine(4) == 6);
+	
+	content.setText("test\r\rtest2\r\r");
+	assert(":6a:", content.getLineCount() == 5);
+	assert(":6b:", content.getLine(0).equals("test"));
+	assert(":6c:", content.getOffsetAtLine(0) == 0);
+	assert(":6d:", content.getLine(1).equals(""));
+	assert(":6e:", content.getOffsetAtLine(1) == 5);	
+	assert(":6f:", content.getLine(2).equals("test2"));
+	assert(":6g:", content.getOffsetAtLine(2) == 6);	
+	assert(":6h:", content.getLine(3).equals(""));
+	assert(":6i:", content.getOffsetAtLine(3) == 12);
+	assert(":6j:", content.getLine(4).equals(""));
+	assert(":6k:", content.getOffsetAtLine(4) == 13);
+}
+public void test_Offset_To_Line() {
+	StyledTextContent content = getContentInstance();
+	
+	content.setText("This\nis a test\rrepeat\nend\r");
+	assert(":1a:", content.getLineAtOffset(0) == 0);
+	assert(":1b:", content.getLineAtOffset(3) == 0);
+	assert(":1c:", content.getLineAtOffset(4) == 0);
+	assert(":1d:", content.getLineAtOffset(25) == 3);
+	assert(":1e:", content.getLineAtOffset(26) == 4);
+	
+	content.setText("This\r\nis a test");
+	assert(":2a:", content.getLineAtOffset(5) == 0);
+	assert(":2b:", content.getLineAtOffset(6) == 1);
+	assert(":2c:", content.getLineAtOffset(10) == 1);
+	
+	content.setText("\r\n");
+	assert(":3a:", content.getLineAtOffset(0) == 0);
+	assert(":3b:", content.getLineAtOffset(1) == 0);
+	assert(":3c:", content.getLineAtOffset(2) == 1);
+
+	content.setText("\r\n\n\r\r\n");
+	assert(":4a:", content.getLineAtOffset(0) == 0);
+	assert(":4b:", content.getLineAtOffset(1) == 0);
+	assert(":4c:", content.getLineAtOffset(2) == 1);
+	assert(":4d:", content.getLineAtOffset(3) == 2);
+	assert(":4e:", content.getLineAtOffset(4) == 3);
+	assert(":4f:", content.getLineAtOffset(5) == 3);
+	assert(":4g:", content.getLineAtOffset(6) == 4);
+
+	content.setText("\r\n\r\n");
+	assert(":5a:", content.getLineAtOffset(0) == 0);
+	assert(":5b:", content.getLineAtOffset(1) == 0);
+	assert(":5c:", content.getLineAtOffset(2) == 1);
+	assert(":5d:", content.getLineAtOffset(3) == 1);
+	assert(":5e:", content.getLineAtOffset(4) == 2);
+
+	content.setText("\r\r\r\n\r\n");
+	assert(":6a:", content.getLineAtOffset(0) == 0);
+	assert(":6b:", content.getLineAtOffset(1) == 1);
+	assert(":6c:", content.getLineAtOffset(2) == 2);
+	assert(":6d:", content.getLineAtOffset(4) == 3);
+	
+	content.setText("");
+	assert(":7a:", content.getLineAtOffset(0) == 0);
+	
+	content = getContentInstance();
+	assert(":8a:", content.getLineAtOffset(0) == 0);	
+}
+
+public void test_Line_To_Offset() {
+	StyledTextContent content = getContentInstance();
+	
+	content.setText("This\nis a test\rrepeat\nend\r");
+	assert(":1a:", content.getOffsetAtLine(0) == 0);
+	assert(":1b:", content.getOffsetAtLine(1) == 5);
+	assert(":1c:", content.getOffsetAtLine(2) == 15);
+	assert(":1d:", content.getOffsetAtLine(3) == 22);
+	assert(":1e:", content.getOffsetAtLine(4) == 26);
+	
+	content.setText("This\r\nis a test");
+	assert(":2a:", content.getOffsetAtLine(0) == 0);
+	assert(":2b:", content.getOffsetAtLine(1) == 6);
+	
+	content.setText("\r\n");
+	assert(":3a:", content.getOffsetAtLine(0) == 0);
+	assert(":3b:", content.getOffsetAtLine(1) == 2);
+
+	content.setText("\r\n\n\r\r\n");
+	assert(":4a:", content.getOffsetAtLine(0) == 0);
+	assert(":4b:", content.getOffsetAtLine(1) == 2);
+	assert(":4c:", content.getOffsetAtLine(2) == 3);
+	assert(":4d:", content.getOffsetAtLine(3) == 4);
+	assert(":4e:", content.getOffsetAtLine(4) == 6);
+
+	content.setText("\r\ntest\r\n");
+	assert(":5a:", content.getOffsetAtLine(0) == 0);
+	assert(":5b:", content.getOffsetAtLine(1) == 2);
+	assert(":5c:", content.getOffsetAtLine(2) == 8);
+}
+
+public void test_Delete() {
+	StyledTextContent content = getContentInstance();
+	String newText;
+	
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(6, 2, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":1a:", newText.equals("This\nia test\r"));
+	assert(":1b:", content.getLine(0).equals("This"));
+	assert(":1c:", content.getLine(1).equals("ia test"));
+	
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 9, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2a:", newText.equals("This\n\r"));
+	assert(":2b:",content.getLineCount() == 3);
+	assert(":2c:", content.getLine(0).equals("This"));
+	assert(":2d:", content.getLine(1).equals(""));
+	assert(":2e:", content.getLine(2).equals(""));
+	
+	content.setText("This\nis a test\nline 3\nline 4");
+	content.replaceTextRange(21, 7, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3a:", newText.equals("This\nis a test\nline 3"));
+	assert(":3b:", content.getLineCount() == 3);
+	assert(":3c:", content.getLine(0).equals("This"));
+	assert(":3d:", content.getLine(1).equals("is a test"));
+	assert(":3e:", content.getLine(2).equals("line 3"));
+	
+	content.setText("This\nis a test\nline 3\nline 4");
+	content.replaceTextRange(0, 5, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4a:", newText.equals("is a test\nline 3\nline 4"));
+	assert(":4b:", content.getLineCount() == 3);
+	assert(":4c:", content.getLine(0).equals("is a test"));
+	assert(":4d:", content.getLine(1).equals("line 3"));
+	assert(":4e:", content.getLine(2).equals("line 4"));
+	content.replaceTextRange(16, 7, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4f:", newText.equals("is a test\nline 3"));
+	assert(":4g:", content.getLine(0).equals("is a test"));
+	assert(":4h:", content.getLine(1).equals("line 3"));
+	content.replaceTextRange(9, 7, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4i:", newText.equals("is a test"));
+	assert(":4j:", content.getLine(0).equals("is a test"));
+	content.replaceTextRange(1, 8, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4k:", newText.equals("i"));
+	assert(":4l:", content.getLine(0).equals("i"));
+	content.replaceTextRange(0, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4m:", newText.equals(""));
+	assert(":4n:", content.getLine(0).equals(""));
+
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 9, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":5a:", newText.equals("This\n\r"));
+	assert(":5b:",content.getLineCount() == 3);
+	assert(":5c:", content.getLine(0).equals("This"));
+	assert(":5d:", content.getLine(1).equals(""));
+	assert(":5e:", content.getLine(2).equals(""));
+
+	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	content.replaceTextRange(4, 8, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6a:", newText.equals("L1\r\nL4\r\n"));
+	assert(":6b:",content.getLineCount() == 3);
+	assert(":6c:", content.getLine(0).equals("L1"));
+	assert(":6d:", content.getLine(1).equals("L4"));
+	assert(":6e:", content.getLine(2).equals(""));
+
+	content.setText("\nL1\r\nL2");
+	content.replaceTextRange(0, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":7a:", newText.equals("L1\r\nL2"));
+	assert(":7b:",content.getLineCount() == 2);
+	assert(":7c:", content.getLine(0).equals("L1"));
+	assert(":7d:", content.getLine(1).equals("L2"));
+
+	content.setText("\nL1\r\nL2\r\n");
+	content.replaceTextRange(7, 2, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":8a:", newText.equals("\nL1\r\nL2"));
+	assert(":8b:",content.getLineCount() == 3);
+	assert(":8c:", content.getLine(0).equals(""));
+	assert(":8d:", content.getLine(1).equals("L1"));
+	assert(":8e:", content.getLine(2).equals("L2"));
+
+	content.setText("\nLine 1\nLine 2\n");
+	content.replaceTextRange(0, 7, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":9a:", newText.equals("\nLine 2\n"));
+	assert(":9b:", content.getLineCount() == 3);
+	assert(":9c:", content.getLine(0).equals(""));
+	assert(":9d:", content.getLine(1).equals("Line 2"));
+	assert(":9e:", content.getLine(2).equals(""));
+
+	content.setText("Line 1\nLine 2\n");
+	content.replaceTextRange(6, 8, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":10a:", newText.equals("Line 1"));
+	assert(":10b:", content.getLineCount() == 1);
+	assert(":10c:", content.getLine(0).equals("Line 1"));
+
+	content.setText("Line one is short\r\nLine 2 is a longer line\r\nLine 3\n");
+	content.replaceTextRange(12, 17, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":11a:", newText.equals("Line one is a longer line\r\nLine 3\n"));
+	assert(":11b:", content.getLineCount() == 3);
+	assert(":11c:", content.getLine(0).equals("Line one is a longer line"));
+	assert(":11d:", content.getLine(1).equals("Line 3"));
+	assert(":11e:", content.getLine(2).equals(""));
+
+}
+public void test_Replace() {
+	StyledTextContent content = getContentInstance();
+	String newText;
+	
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 4, "a");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":1a:", newText.equals("This\na test\r"));
+	assert(":1b:",content.getLineCount() == 3);
+	assert(":1c:", content.getLine(0).equals("This"));
+	assert(":1d:", content.getLine(1).equals("a test"));
+	assert(":1e:", content.getLine(2).equals(""));
+
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 2, "was");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2a:", newText.equals("This\nwas a test\r"));
+	assert(":2b:",content.getLineCount() == 3);
+	assert(":2c:", content.getLine(0).equals("This"));
+	assert(":2d:", content.getLine(1).equals("was a test"));
+	assert(":2e:", content.getLine(2).equals(""));
+
+	content.setText("This is a test\r");
+	content.replaceTextRange(5, 2, "was");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3a:", newText.equals("This was a test\r"));
+	assert(":3b:",content.getLineCount() == 2);
+	assert(":3c:", content.getLine(0).equals("This was a test"));
+	assert(":3d:", content.getLineAtOffset(15) == 0);
+	
+	content.setText("Line 1\nLine 2\nLine 3");
+	content.replaceTextRange(0, 7, "La\nLb\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4a:", newText.equals("La\nLb\nLine 2\nLine 3"));
+	assert(":4b:", content.getLine(0).equals("La"));
+	assert(":4c:", content.getLine(1).equals("Lb"));
+	assert(":4d:", content.getLine(2).equals("Line 2"));
+	assert(":4e:", content.getLine(3).equals("Line 3"));
+
+	content.setText(getTestText());
+	newText = content.getTextRange(0, content.getCharCount());
+	int start = content.getOffsetAtLine(6);
+	int end = content.getOffsetAtLine(11);
+	content.replaceTextRange(start, end - start, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":5a:", content.getLineCount() == 12);
+	assert(":5a:", content.getLine(5).equals(""));
+	assert(":5a:", content.getLine(6).equals(""));
+	start = content.getOffsetAtLine(7);
+	content.replaceTextRange(start, content.getCharCount() - start, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":5a:", content.getLineCount() == 8);
+	assert(":5a:", content.getLine(5).equals(""));
+	assert(":5a:", content.getLine(6).equals(""));
+	assert(":5a:", content.getLine(7).equals(""));
+
+}
+public void test_Special_Cases() {
+	String newText;
+	StyledTextContent content = getContentInstance();
+	assert(":0a:", content.getLineCount() == 1);
+	assert(":0b:", content.getOffsetAtLine(0) == 0);
+	
+	content.setText("This is the input/output text component.");
+	content.replaceTextRange(0, 0, "\n");
+	assert(":1a:", content.getLine(0).equals(""));
+	content.replaceTextRange(1, 0, "\n");
+	assert(":1b:",content.getLine(0).equals(""));
+	content.replaceTextRange(2, 0, "\n");
+	assert(":1c:",content.getLine(0).equals(""));
+	content.replaceTextRange(3, 0, "\n");
+	assert(":1d:",content.getLine(0).equals(""));
+	content.replaceTextRange(4, 0, "\n");
+	assert(":1e:",content.getLine(0).equals(""));
+	content.replaceTextRange(5, 0, "\n");
+	assert(":1f:",content.getLine(0).equals(""));
+	content.replaceTextRange(6, 0, "\n");
+	assert(":1g:",content.getLine(0).equals(""));
+	content.replaceTextRange(7, 0, "\n");
+	assert(":1h:",content.getLine(0).equals(""));
+
+	content.setText("This is the input/output text component.");
+	content.replaceTextRange(0, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2a:", newText.equals("\nThis is the input/output text component."));
+	assert(":2b:", content.getLine(0).equals(""));
+	assert(":2c:", content.getLine(1).equals("This is the input/output text component."));
+	content.replaceTextRange(1, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2d:", newText.equals("\n\nThis is the input/output text component."));
+	assert(":2e:", content.getLine(0).equals(""));
+	assert(":2f:", content.getLine(1).equals(""));
+	assert(":2g:", content.getLine(2).equals("This is the input/output text component."));
+
+	content.replaceTextRange(2, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3a:", newText.equals("\n\n\nThis is the input/output text component."));
+	assert(":3b:", content.getLine(0).equals(""));
+	assert(":3c:", content.getLine(1).equals(""));
+	assert(":3d:", content.getLine(2).equals(""));
+	assert(":3e:", content.getLine(3).equals("This is the input/output text component."));
+	content.replaceTextRange(3, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3f:", newText.equals("\n\n\n\nThis is the input/output text component."));
+	assert(":3g:", content.getLine(0).equals(""));
+	assert(":3h:", content.getLine(1).equals(""));
+	assert(":3i:", content.getLine(2).equals(""));
+	assert(":3j:", content.getLine(3).equals(""));
+	assert(":3k:", content.getLine(4).equals("This is the input/output text component."));
+
+	content.replaceTextRange(3, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4a:", newText.equals("\n\n\nThis is the input/output text component."));
+	assert(":4b:", content.getLine(0).equals(""));
+	assert(":4c:", content.getLine(1).equals(""));
+	assert(":4d:", content.getLine(2).equals(""));
+	assert(":4e:", content.getLine(3).equals("This is the input/output text component."));
+	content.replaceTextRange(2, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":4f:", newText.equals("\n\nThis is the input/output text component."));
+	assert(":4g:", content.getLine(0).equals(""));
+	assert(":4h:", content.getLine(1).equals(""));
+	assert(":4i:", content.getLine(2).equals("This is the input/output text component."));
+
+	content.replaceTextRange(2, 0, "a");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":5a:", newText.equals("\n\naThis is the input/output text component."));
+	assert(":5b:", content.getLine(0).equals(""));
+	assert(":5c:", content.getLine(1).equals(""));
+	assert(":5d:", content.getLine(2).equals("aThis is the input/output text component."));
+
+	content.setText("abc\r\ndef");
+	content.replaceTextRange(1, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6a:", newText.equals("ac\r\ndef"));
+	assert(":6b:", content.getLineCount() == 2);
+	assert(":6c:", content.getLine(0).equals("ac"));
+	assert(":6d:", content.getLine(1).equals("def"));
+	content.replaceTextRange(1, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6e:", newText.equals("a\r\ndef"));
+	assert(":6f:", content.getLineCount() == 2);
+	assert(":6g:", content.getLine(0).equals("a"));
+	assert(":6h:", content.getLine(1).equals("def"));
+	content.replaceTextRange(1, 2, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6i:", newText.equals("adef"));
+	assert(":6j:", content.getLineCount() == 1);
+	assert(":6k:", content.getLine(0).equals("adef"));
+	content.replaceTextRange(1, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6l:", newText.equals("aef"));
+	assert(":6m:", content.getLineCount() == 1);
+	assert(":6n:", content.getLine(0).equals("aef"));
+	content.replaceTextRange(1, 1, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":6o:", newText.equals("af"));
+	assert(":6p:", content.getLineCount() == 1);
+	assert(":6q:", content.getLine(0).equals("af"));
+
+	content.setText("abc");
+	content.replaceTextRange(0, 1, "1");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":7a:", content.getLineCount() == 1);
+	assert(":7b:", newText.equals("1bc"));
+	assert(":7c:", content.getLine(0).equals("1bc"));
+	content.replaceTextRange(0, 0, "\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":7d:", newText.equals("\n1bc"));
+	assert(":7e:", content.getLineCount() == 2);
+	assert(":7f:", content.getLine(0).equals(""));
+	assert(":7g:", content.getLine(1).equals("1bc"));
+	
+	content = getContentInstance();
+	content.replaceTextRange(0,0,"a");
+	
+	content.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
+	content.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":8a:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
+	assert(":8b:", content.getLineCount() == 6);
+	assert(":8c:", content.getLine(0).equals("package test;"));
+	assert(":8d:", content.getLine(1).equals("\t/*Line 1"));
+	assert(":8e:", content.getLine(2).equals("\t * Line 2"));
+	assert(":8f:", content.getLine(3).equals("\t */"));
+	assert(":8g:", content.getLine(4).equals("public class SimpleClass {"));
+	assert(":8h:", content.getLine(5).equals("}"));
+}
+public void test_Text_Changed_Event() {
+	StyledTextContent content = getContentInstance();
+	content.addTextChangeListener(this);
+	verify = 1;
+	content.setText("testing");
+	content.replaceTextRange(0, 0, "\n");
+
+	verify = 2;
+	content.setText("\n\n");
+	content.replaceTextRange(0, 2, "a");
+
+	verify = 3;
+	content.setText("a");
+	content.replaceTextRange(0, 1, "\n\n");
+
+	verify = 4;
+	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {content.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {assert(":4:", true);}
+
+	verify = 5;
+	content.setText("Line 1\r\nLine 2");
+	content.replaceTextRange(0, 0, "\r");
+
+	verify = 6;
+	content.setText("This\nis a test\nline 3\nline 4");
+	content.replaceTextRange(21, 7, "");
+
+	verify = 7;
+	content.setText("This\nis a test\r");
+	content.replaceTextRange(5, 9, "");
+
+	verify = 8;
+	content.setText("\nL1\r\nL2\r\n");
+	content.replaceTextRange(7, 2, "");
+
+	verify = 9;
+	content.setText("L1\r\n");
+	content.replaceTextRange(2, 2, "test");
+
+	verify = 10;
+	content.setText("L1\r\n");
+	try {content.replaceTextRange(3, 1, "");} 
+	catch (IllegalArgumentException ex) {assert(":10:", true);}
+
+	verify = 11;
+	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {content.replaceTextRange(1, 2, "");}
+	catch (IllegalArgumentException ex) {assert(":11:", true);}
+
+	verify = 12;
+	content.setText("L1\r");
+	content.replaceTextRange(3, 0, "\n");
+
+	verify = 13;
+	content.setText("L1\n");
+	content.replaceTextRange(2, 0, "\r");
+
+	verify = 14;
+	content.setText("L1\r\n");
+	try {content.replaceTextRange(3, 0, "test");}
+	catch (IllegalArgumentException ex) {assert(":14:", true);}
+
+	verify = 15;
+	content.setText("L1\r\n");
+	content.replaceTextRange(2, 2, "test\n\n");
+
+	verify = 16;
+	content.setText("L1\r\n");
+	try {content.replaceTextRange(3, 1, "test\r\n");}
+	catch (IllegalArgumentException ex) {assert(":16:", true);}
+
+	verify = 17;
+	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {content.replaceTextRange(1, 2, "test\n\n");}
+	catch (IllegalArgumentException ex) {assert(":17:", true);}
+
+	verify = 18;
+ 	content.setText("L1\r");
+	content.replaceTextRange(3, 0, "\ntest\r\n");
+
+	verify = 19;
+	content.setText("L1\n");
+	content.replaceTextRange(2, 0, "test\r\r\r");
+	verify = 20;
+	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {content.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {assert(":20:", true);}
+
+
+	verify = 0;
+	content.removeTextChangeListener(this);
+}
+public void test_Delimiter_Special_Cases() {
+	StyledTextContent content = getContentInstance();
+	String newText;
+	
+	content.setText("\nL1\r\nL2\r\n");
+	content.replaceTextRange(7, 2, "");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":1:", newText.equals("\nL1\r\nL2"));
+	
+	content.setText("L1\r\n");
+	content.replaceTextRange(2, 2, "test\n\n");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":2:", newText.equals("L1test\n\n"));
+
+//	content.setText("L1\r\n");
+//	content.replaceTextRange(3, 1, "test\r\n");
+//	newText = content.getTextRange(0, content.getCharCount());
+//	assert(":3:", newText.equals("L1\rtest\r\n"));
+
+//	content.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+//	content.replaceTextRange(1, 2, "test\n\n");
+//	newText = content.getTextRange(0, content.getCharCount());
+//	assert(":4:", newText.equals("Ltest\n\n\nL2\r\nL3\r\nL4\r\n"));
+
+	content.setText("L1\n");
+	content.replaceTextRange(2, 0, "test\r\r\r");
+	newText = content.getTextRange(0, content.getCharCount());
+	assert(":3:", newText.equals("L1test\r\r\r\n"));
+}
+protected void setUp()  {
+	// create shell
+	shell = new Shell ();
+	GridLayout layout = new GridLayout();
+	layout.numColumns = 1;
+	shell.setSize(500, 300);
+	shell.setLayout(layout);
+	// create widget
+	widget = new StyledText (shell, SWT.BORDER | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+	GridData spec = new GridData();
+	spec.horizontalAlignment = spec.FILL;
+	spec.grabExcessHorizontalSpace = true;
+	spec.verticalAlignment = spec.FILL;
+	spec.grabExcessVerticalSpace = true;
+	widget.setLayoutData(spec);
+	shell.open ();
+}
+protected void tearDown()  {
+	if (shell != null && !shell.isDisposed ()) 
+		shell.dispose ();
+	shell = null;
+
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java
new file mode 100644
index 0000000000..ddc5532aa1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtJunit.java
@@ -0,0 +1,26 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+/**
+ * Platform-specific constants used in SWT test cases.
+ */
+public class SwtJunit {
+
+	public static final String testFontName;
+	public final static boolean isLinux = System.getProperty("os.name").equals("Linux");
+	public final static boolean isAIX = System.getProperty("os.name").equals("AIX");
+	public final static boolean isMotif = isLinux || isAIX;
+	public final static boolean isWindows = !isMotif;
+
+	static {
+		if (isMotif) {
+			testFontName = "misc-fixed";
+		}
+		else {
+			testFontName = "Helvetica";
+		}
+	}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java
new file mode 100644
index 0000000000..9e9b1d1533
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/SwtTestCase.java
@@ -0,0 +1,103 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import java.lang.reflect.*;
+import junit.framework.*;
+
+public class SwtTestCase extends TestCase {
+	/**
+	 * The following flags are used to mark test cases that
+	 * are not handled correctly by SWT at this time, or test
+	 * cases that maybe themselves dubious (eg. when the correct
+	 * behaviour may not be clear). Most of these flagged test
+	 * cases involve handling error conditions.
+	 *
+	 * Setting these flags to true will run those tests. As api
+	 * is implemented this gives us a convenient way to include
+	 * it in the junit tests.
+	 */
+
+	// call should result in an 'Argument cannot be null' SWT error
+	public static boolean fCheckSwtNullExceptions = false;
+
+	// an out of range value is not handled gracefully according to our SWT policy
+	public static boolean fCheckOutOfRangeBehaviour = false;
+
+	// run test cases that may themselves be dubious
+	// these should be eventually checked to see if 
+	// there is a valid failure or the test is bogus
+	public static boolean fCheckBogusTestCases = false;
+
+	// check multi select tree api
+	public static boolean fCheckMultiSelectTree = false;
+
+	// check visibility api (eg in menu)
+	public static boolean fCheckVisibility = false;
+
+	// run test cases that check SWT policy not covered by the flags above
+	public static boolean fCheckSWTPolicy = false;
+
+	// make dialog open calls, operator must then close them
+	public static boolean fTestDialogOpen = false;
+
+public SwtTestCase(String name) {
+	super(name);
+}
+
+static public void assertEquals(String message, Object expected[], Object actual[]) {
+	if (expected == null && actual == null)
+		return;
+	boolean equal = false;
+	if (expected != null && actual != null && expected.length == actual.length) {
+		if (expected.length == 0)
+			return;
+		equal = true;
+		for (int i = 0; i < expected.length; i++) {
+			if (!expected[i].equals(actual[i])) {
+				equal = false;
+			}
+		}
+	}
+	if (!equal) {
+		failNotEquals(message, expected, actual);
+	}
+}
+static public void assertEquals(Object expected[], Object actual[]) {
+    assertEquals(null, expected, actual);
+}
+static public void assertEquals(String message, int expected[], int actual[]) {
+	if (expected == null && actual == null)
+		return;
+	boolean equal = false;
+	if (expected != null && actual != null && expected.length == actual.length) {
+		if (expected.length == 0)
+			return;
+		equal = true;
+		for (int i = 0; i < expected.length; i++) {
+			if (expected[i] != actual[i]) {
+				equal = false;
+			}
+		}
+	}
+	if (!equal) {
+		failNotEquals(message, expected, actual);
+	}
+}
+static public void assertEquals(int expected[], int actual[]) {
+    assertEquals(null, expected, actual);
+}
+// copied exactly from junit.framework.TestCase so that it can be called from here even though private
+static private void failNotEquals(String message, Object expected, Object actual) {
+	String formatted= "";
+	if (message != null)
+		formatted= message+" ";
+	fail(formatted+"expected:<"+expected+"> but was:<"+actual+">");
+}
+
+protected void warnUnimpl(String message) {
+	//System.out.println(this.getClass() + ": " + message);
+	AllTests.unimplementedMethods++;
+}
+}
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
new file mode 100644
index 0000000000..4cde60cef4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWT.java
@@ -0,0 +1,154 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	// Do nothing. Class SWT is not intended to be subclassed.
+}
+
+public void test_getMessageLjava_lang_String() {
+	boolean passed = false;
+	try {
+		passed = false;
+		SWT.getMessage(null);
+	} catch (IllegalArgumentException ex) {
+		passed = true;
+	}
+	assertTrue ("did not correctly throw exception with null argument", passed);
+	try {
+		SWT.getMessage("SWT_Yes");
+	} catch (Throwable t) {
+		fail ("exception " + t + " generated for SWT_Yes");
+	}
+	assertTrue (
+		"invalid key did not return as itself",
+		"_NOT_FOUND_IN_PROPERTIES_".equals(SWT.getMessage("_NOT_FOUND_IN_PROPERTIES_")));
+		
+}
+
+public void test_getPlatform() {
+	// Can't test the list of platforms, since this may change,
+	// so just test to see it returns something.
+	assertTrue ("returned null platform name", SWT.getPlatform() != null);
+}
+
+public void test_getVersion() {
+	// Test that the version number which is returned is reasonable.
+	int ver = SWT.getVersion();
+	assertTrue ("unreasonable value returned", ver > 0 && ver < 1000000);
+}
+
+public void test_errorI() {
+	// Test that we throw the expected kinds of errors for the given error types.
+	boolean passed = false;
+	try {
+		SWT.error(SWT.ERROR_NULL_ARGUMENT);
+	} catch (IllegalArgumentException ex) {
+		passed = true;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for ERROR_NULL_ARGUMENT", passed);
+	passed = false;
+	try {
+		SWT.error(SWT.ERROR_FAILED_EXEC);
+	} catch (SWTException ex) {
+		passed = true;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for ERROR_FAILED_EXEC", passed);
+	passed = false;
+	try {
+		SWT.error(SWT.ERROR_NO_HANDLES);
+	} catch (SWTError ex) {
+		passed = true;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for ERROR_NO_HANDLES", passed);
+	passed = false;
+	try {
+		SWT.error(-1);
+	} catch (SWTError ex) {
+		passed = true;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for error(-1)", passed);
+}
+
+public void test_errorILjava_lang_Throwable() {
+	// Test that the causing throwable is filled in.
+	Throwable cause = new RuntimeException("Just for testing");
+	boolean passed = false;
+	try {
+		SWT.error(SWT.ERROR_UNSUPPORTED_FORMAT, cause);
+	} catch (SWTException ex) {
+		passed = ex.throwable == cause;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for ERROR_UNSUPPORTED_FORMAT", passed);
+	passed = false;
+	try {
+		SWT.error(SWT.ERROR_NOT_IMPLEMENTED, cause);
+	} catch (SWTError ex) {
+		passed = ex.throwable == cause;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for ERROR_NOT_IMPLEMENTED", passed);
+	passed = false;
+	try {
+		SWT.error(-1, cause);
+	} catch (SWTError ex) {
+		passed = ex.throwable == cause;
+	} catch (Throwable t) { }
+	assertTrue ("did not correctly throw exception for error(-1)", passed);
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_SWT((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_getMessageLjava_lang_String");
+	methodNames.addElement("test_getPlatform");
+	methodNames.addElement("test_getVersion");
+	methodNames.addElement("test_errorI");
+	methodNames.addElement("test_errorILjava_lang_Throwable");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	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();
+	else if (getName().equals("test_errorI")) test_errorI();
+	else if (getName().equals("test_errorILjava_lang_Throwable")) test_errorILjava_lang_Throwable();
+}
+}
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
new file mode 100644
index 0000000000..0859c66ff3
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTError.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTError().code == SWT.ERROR_UNSPECIFIED);
+}
+
+public void test_ConstructorLjava_lang_String() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTError("An uninteresting message").code == SWT.ERROR_UNSPECIFIED);
+}
+
+public void test_ConstructorI() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTError(SWT.ERROR_CANNOT_BE_ZERO).code == SWT.ERROR_CANNOT_BE_ZERO);
+}
+
+public void test_ConstructorILjava_lang_String() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTError(SWT.ERROR_CANNOT_BE_ZERO, "An uninteresting message").code 
+			== SWT.ERROR_CANNOT_BE_ZERO);
+}
+
+public void test_getMessage() {
+	assertTrue (
+		"did not include creation string in result",
+		new SWTError(SWT.ERROR_CANNOT_BE_ZERO, "An interesting message").getMessage() 
+			.indexOf("An interesting message") >= 0);
+}
+
+public void test_printStackTraceLjava_io_PrintStream() {
+	// Should not test. Result varies by VM.
+}
+
+public void test_printStackTraceLjava_io_PrintWriter() {
+	// Should not test. Result varies by VM.
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_SWTError((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorLjava_lang_String");
+	methodNames.addElement("test_ConstructorI");
+	methodNames.addElement("test_ConstructorILjava_lang_String");
+	methodNames.addElement("test_getMessage");
+	methodNames.addElement("test_printStackTraceLjava_io_PrintStream");
+	methodNames.addElement("test_printStackTraceLjava_io_PrintWriter");
+	return methodNames;
+}
+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_ConstructorI")) test_ConstructorI();
+	else if (getName().equals("test_ConstructorILjava_lang_String")) test_ConstructorILjava_lang_String();
+	else if (getName().equals("test_getMessage")) test_getMessage();
+	else if (getName().equals("test_printStackTraceLjava_io_PrintStream")) test_printStackTraceLjava_io_PrintStream();
+	else if (getName().equals("test_printStackTraceLjava_io_PrintWriter")) test_printStackTraceLjava_io_PrintWriter();
+}
+}
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
new file mode 100644
index 0000000000..7c00990023
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_SWTException.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTException().code == SWT.ERROR_UNSPECIFIED);
+}
+
+public void test_ConstructorLjava_lang_String() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTException("An uninteresting message").code == SWT.ERROR_UNSPECIFIED);
+}
+
+public void test_ConstructorI() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTException(SWT.ERROR_CANNOT_BE_ZERO).code == SWT.ERROR_CANNOT_BE_ZERO);
+}
+
+public void test_ConstructorILjava_lang_String() {
+	assertTrue (
+		"did not fill in code properly",
+		new SWTException(SWT.ERROR_CANNOT_BE_ZERO, "An uninteresting message").code 
+			== SWT.ERROR_CANNOT_BE_ZERO);
+}
+
+public void test_getMessage() {
+	assertTrue (
+		"did not include creation string in result",
+		new SWTException(SWT.ERROR_CANNOT_BE_ZERO, "An interesting message").getMessage() 
+			.indexOf("An interesting message") >= 0);
+}
+
+public void test_printStackTraceLjava_io_PrintStream() {
+	// Should not test. Result varies by VM.
+}
+
+public void test_printStackTraceLjava_io_PrintWriter() {
+	// Should not test. Result varies by VM.
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_SWTException((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorLjava_lang_String");
+	methodNames.addElement("test_ConstructorI");
+	methodNames.addElement("test_ConstructorILjava_lang_String");
+	methodNames.addElement("test_getMessage");
+	methodNames.addElement("test_printStackTraceLjava_io_PrintStream");
+	methodNames.addElement("test_printStackTraceLjava_io_PrintWriter");
+	return methodNames;
+}
+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_ConstructorI")) test_ConstructorI();
+	else if (getName().equals("test_ConstructorILjava_lang_String")) test_ConstructorILjava_lang_String();
+	else if (getName().equals("test_getMessage")) test_getMessage();
+	else if (getName().equals("test_printStackTraceLjava_io_PrintStream")) test_printStackTraceLjava_io_PrintStream();
+	else if (getName().equals("test_printStackTraceLjava_io_PrintWriter")) test_printStackTraceLjava_io_PrintWriter();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_AnimatedProgress.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_AnimatedProgress.java
new file mode 100644
index 0000000000..329c1d9b17
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_AnimatedProgress.java
@@ -0,0 +1,82 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.AnimatedProgress
+ *
+ * @see org.eclipse.swt.custom.AnimatedProgress
+ */
+public class Test_org_eclipse_swt_custom_AnimatedProgress extends Test_org_eclipse_swt_widgets_Canvas {
+
+public Test_org_eclipse_swt_custom_AnimatedProgress(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_clear() {
+	warnUnimpl("Test test_clear not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_start() {
+	warnUnimpl("Test test_start not written");
+}
+
+public void test_stop() {
+	warnUnimpl("Test test_stop not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_AnimatedProgress((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_clear");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_start");
+	methodNames.addElement("test_stop");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Canvas.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_clear")) test_clear();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_start")) test_start();
+	else if (getName().equals("test_stop")) test_stop();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentEvent.java
new file mode 100644
index 0000000000..8181e4cb6e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentEvent.java
@@ -0,0 +1,52 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.BidiSegmentEvent
+ *
+ * @see org.eclipse.swt.custom.BidiSegmentEvent
+ */
+public class Test_org_eclipse_swt_custom_BidiSegmentEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_BidiSegmentEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_BidiSegmentEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentListener.java
new file mode 100644
index 0000000000..f43acb00e4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BidiSegmentListener.java
@@ -0,0 +1,187 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import junit.textui.TestRunner;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BidiSegmentEvent;
+import org.eclipse.swt.custom.BidiSegmentListener;
+import org.eclipse.swt.custom.StyleRange;
+import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.widgets.Shell;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.BidiSegmentListener
+ *
+ * @see org.eclipse.swt.custom.BidiSegmentListener
+ */
+public class Test_org_eclipse_swt_custom_BidiSegmentListener extends SwtTestCase {
+	Shell shell;
+	StyledText text;
+	boolean listenerCalled;	
+	String line = "Line1";
+			
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+public Test_org_eclipse_swt_custom_BidiSegmentListener(String name) {
+	super(name);
+}
+
+private boolean isBidi() {
+	String codePage = System.getProperty("file.encoding").toUpperCase();
+	boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+	
+	// Running on Windows and with Hebrew or Arabic codepage?
+	return isWindows && ("CP1255".equals(codePage) || "CP1256".equals(codePage));
+}
+protected void setUp() {
+	shell = new Shell();
+	text = new StyledText(shell, SWT.NULL);
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_BidiSegmentListener((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void tearDown() {
+	shell.dispose();
+}
+private void testListener(final String message, final int[] segments, boolean exceptionExpected) {
+	boolean exceptionThrown = false;
+	BidiSegmentListener listener = new BidiSegmentListener() {
+		public void lineGetSegments(BidiSegmentEvent event) {
+			assertEquals(message + " incorrect BidiSegmentEvent", 0, event.lineOffset);
+			assertEquals(message + " incorrect BidiSegmentEvent", line, event.lineText);
+			
+			event.segments = segments;
+			listenerCalled = true;	
+		}
+	};
+
+	listenerCalled = false;		
+	try {
+		text.addBidiSegmentListener(listener);
+		text.getLocationAtOffset(0);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	finally {
+		text.removeBidiSegmentListener(listener);
+	}
+	if (exceptionExpected) {
+		assertTrue(message + " expected exception not thrown", exceptionThrown);
+	}
+	else {
+		assertTrue(message + " unexpected exception thrown", exceptionThrown == false);
+	}
+	if (isBidi()) {
+		assertTrue(message + " listener not called", listenerCalled);	
+	}
+	else {
+		assertTrue(message + " listener called when it shouldn't be", listenerCalled == false);
+	}
+}
+private void testStyleRangeSegmenting(final int[] segments, int[] boldRanges) {
+	boolean exceptionThrown = false;
+	BidiSegmentListener listener = new BidiSegmentListener() {
+		public void lineGetSegments(BidiSegmentEvent event) {
+			assertEquals(" incorrect BidiSegmentEvent", 0, event.lineOffset);
+			assertEquals(" incorrect BidiSegmentEvent", line, event.lineText);
+			
+			event.segments = segments;
+			listenerCalled = true;	
+		}
+	};
+
+	listenerCalled = false;		
+	try {
+		text.addBidiSegmentListener(listener);
+		text.setStyleRange(null);
+		for (int i=0; i<boldRanges.length; i+=2) {
+			StyleRange styleRange = new StyleRange(boldRanges[i], boldRanges[i+1], null, null, SWT.BOLD);
+			text.setStyleRange(styleRange);
+		};
+		text.getLocationAtOffset(0);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	finally {
+		text.removeBidiSegmentListener(listener);
+	}
+	assertTrue(" unexpected exception thrown", exceptionThrown == false);
+	if (isBidi()) {
+		assertTrue(" listener not called", listenerCalled);	
+	}
+	else {
+		assertTrue(" listener called when it shouldn't be", listenerCalled == false);
+	}
+}
+
+public void test_lineGetSegmentsLorg_eclipse_swt_custom_BidiSegmentEvent() {
+	int lineLength = line.length();
+
+	text.setText(line);	
+	// should not cause an exception
+	testListener(":a:", null, false);
+	testListener(":b:", new int[] {0, lineLength / 2, lineLength}, false);
+	testListener(":c:", new int[] {0, lineLength / 2}, false);
+			
+	// should all cause an exception on a bidi platform
+	if (isBidi()) {
+		testListener(":d:", new int[] {lineLength / 2}, true);
+		testListener(":e:", new int[] {0, 1, 1, lineLength / 2}, true);
+		testListener(":f:", new int[] {0, 1, 2, lineLength + 1}, true);
+		testListener(":g:", new int[] {0, 1, lineLength + 1, lineLength + 1}, true);
+		testListener(":h:", new int[] {0, 2, 1}, true);
+		testListener(":i:", new int[] {0, -1, 2}, true);
+		testListener(":j:", new int[] {0, -1, 2}, true);
+	}
+
+	// test bold segmenting
+	line = "this is a line with 50 chars - **** **** **** ****";
+	text.setText(line);
+	// should segment as int[] {0,5,5,2,12,3,20,5}
+	testStyleRangeSegmenting(new int[] {0,5,10,15,20,25}, new int[] {0,5,5,2,12,3,20,5});
+	// should segment as int[] {0,5,5,1,7,3,10,3,15,5,20,5}
+	testStyleRangeSegmenting(new int[] {0,5,10,15,20,25}, new int[] {0,6,7,6,15,10});
+	// should segment as int[] {0,5,5,5,10,5}
+	testStyleRangeSegmenting(new int[] {0,5,10,15}, new int[] {0,15});
+	// should segment as int[] {0,5}
+	testStyleRangeSegmenting(new int[] {0,5}, new int[] {0,5});
+	// should segment as int[] {2,3}
+	testStyleRangeSegmenting(new int[] {0,5}, new int[] {2,3});
+	// should segment as int[] {0,2}
+	testStyleRangeSegmenting(new int[] {0,5}, new int[] {0,2});
+	// should segment as int[] {10,5}
+	testStyleRangeSegmenting(new int[] {0,5,10,15}, new int[] {10,5});
+	// should segment as int[] {12,3}
+	testStyleRangeSegmenting(new int[] {0,5,10,15}, new int[] {12,3});
+	// should segment as int[] {3,2,5,5,10,3,21,4,25,3}
+	testStyleRangeSegmenting(new int[] {0,5,10,15,20,25,30}, new int[] {3,10,21,7});
+	// should segment as int[] {10,2}
+	line = "test1test2/r/n";
+	text.setText(line);
+	testStyleRangeSegmenting(new int[] {0,5}, new int[] {10,2});
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_lineGetSegmentsLorg_eclipse_swt_custom_BidiSegmentEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_lineGetSegmentsLorg_eclipse_swt_custom_BidiSegmentEvent")) test_lineGetSegmentsLorg_eclipse_swt_custom_BidiSegmentEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BusyIndicator.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BusyIndicator.java
new file mode 100644
index 0000000000..39a8b5d883
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_BusyIndicator.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.BusyIndicator
+ *
+ * @see org.eclipse.swt.custom.BusyIndicator
+ */
+public class Test_org_eclipse_swt_custom_BusyIndicator extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_BusyIndicator(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_showWhileLorg_eclipse_swt_widgets_DisplayLjava_lang_Runnable() {
+	warnUnimpl("Test test_showWhileLorg_eclipse_swt_widgets_DisplayLjava_lang_Runnable not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_BusyIndicator((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_showWhileLorg_eclipse_swt_widgets_DisplayLjava_lang_Runnable");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_showWhileLorg_eclipse_swt_widgets_DisplayLjava_lang_Runnable")) test_showWhileLorg_eclipse_swt_widgets_DisplayLjava_lang_Runnable();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java
new file mode 100644
index 0000000000..7bb672a5d5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CCombo.java
@@ -0,0 +1,292 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CCombo
+ *
+ * @see org.eclipse.swt.custom.CCombo
+ */
+public class Test_org_eclipse_swt_custom_CCombo extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_CCombo(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_addLjava_lang_String() {
+	warnUnimpl("Test test_addLjava_lang_String not written");
+}
+
+public void test_addLjava_lang_StringI() {
+	warnUnimpl("Test test_addLjava_lang_StringI not written");
+}
+
+public void test_addModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_addModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_clearSelection() {
+	warnUnimpl("Test test_clearSelection not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_deselectI() {
+	warnUnimpl("Test test_deselectI not written");
+}
+
+public void test_deselectAll() {
+	warnUnimpl("Test test_deselectAll not written");
+}
+
+public void test_getChildren() {
+	warnUnimpl("Test test_getChildren not written");
+}
+
+public void test_getItemI() {
+	warnUnimpl("Test test_getItemI not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItemHeight() {
+	warnUnimpl("Test test_getItemHeight not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionIndex() {
+	warnUnimpl("Test test_getSelectionIndex not written");
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_getTextHeight() {
+	warnUnimpl("Test test_getTextHeight not written");
+}
+
+public void test_getTextLimit() {
+	warnUnimpl("Test test_getTextLimit not written");
+}
+
+public void test_indexOfLjava_lang_String() {
+	warnUnimpl("Test test_indexOfLjava_lang_String not written");
+}
+
+public void test_indexOfLjava_lang_StringI() {
+	warnUnimpl("Test test_indexOfLjava_lang_StringI not written");
+}
+
+public void test_isFocusControl() {
+	warnUnimpl("Test test_isFocusControl not written");
+}
+
+public void test_redrawIIIIZ() {
+	warnUnimpl("Test test_redrawIIIIZ not written");
+}
+
+public void test_removeI() {
+	warnUnimpl("Test test_removeI not written");
+}
+
+public void test_removeII() {
+	warnUnimpl("Test test_removeII not written");
+}
+
+public void test_removeLjava_lang_String() {
+	warnUnimpl("Test test_removeLjava_lang_String not written");
+}
+
+public void test_removeAll() {
+	warnUnimpl("Test test_removeAll not written");
+}
+
+public void test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_selectI() {
+	warnUnimpl("Test test_selectI not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setFocus() {
+	warnUnimpl("Test test_setFocus not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setForegroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setItemILjava_lang_String() {
+	warnUnimpl("Test test_setItemILjava_lang_String not written");
+}
+
+public void test_setItems$Ljava_lang_String() {
+	warnUnimpl("Test test_setItems$Ljava_lang_String not written");
+}
+
+public void test_setSelectionLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_setSelectionLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public void test_setTextLimitI() {
+	warnUnimpl("Test test_setTextLimitI not written");
+}
+
+public void test_setVisibleZ() {
+	warnUnimpl("Test test_setVisibleZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CCombo((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addLjava_lang_String");
+	methodNames.addElement("test_addLjava_lang_StringI");
+	methodNames.addElement("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_clearSelection");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_deselectI");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getChildren");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getTextHeight");
+	methodNames.addElement("test_getTextLimit");
+	methodNames.addElement("test_indexOfLjava_lang_String");
+	methodNames.addElement("test_indexOfLjava_lang_StringI");
+	methodNames.addElement("test_isFocusControl");
+	methodNames.addElement("test_redrawIIIIZ");
+	methodNames.addElement("test_removeI");
+	methodNames.addElement("test_removeII");
+	methodNames.addElement("test_removeLjava_lang_String");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_selectI");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setItemILjava_lang_String");
+	methodNames.addElement("test_setItems$Ljava_lang_String");
+	methodNames.addElement("test_setSelectionLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setTextLimitI");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addLjava_lang_String")) test_addLjava_lang_String();
+	else if (getName().equals("test_addLjava_lang_StringI")) test_addLjava_lang_StringI();
+	else if (getName().equals("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_addModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_clearSelection")) test_clearSelection();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_deselectI")) test_deselectI();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getChildren")) test_getChildren();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getTextHeight")) test_getTextHeight();
+	else if (getName().equals("test_getTextLimit")) test_getTextLimit();
+	else if (getName().equals("test_indexOfLjava_lang_String")) test_indexOfLjava_lang_String();
+	else if (getName().equals("test_indexOfLjava_lang_StringI")) test_indexOfLjava_lang_StringI();
+	else if (getName().equals("test_isFocusControl")) test_isFocusControl();
+	else if (getName().equals("test_redrawIIIIZ")) test_redrawIIIIZ();
+	else if (getName().equals("test_removeI")) test_removeI();
+	else if (getName().equals("test_removeII")) test_removeII();
+	else if (getName().equals("test_removeLjava_lang_String")) test_removeLjava_lang_String();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_selectI")) test_selectI();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setForegroundLorg_eclipse_swt_graphics_Color")) test_setForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setItemILjava_lang_String")) test_setItemILjava_lang_String();
+	else if (getName().equals("test_setItems$Ljava_lang_String")) test_setItems$Ljava_lang_String();
+	else if (getName().equals("test_setSelectionLorg_eclipse_swt_graphics_Point")) test_setSelectionLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setTextLimitI")) test_setTextLimitI();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CLabel.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CLabel.java
new file mode 100644
index 0000000000..4a7b0aff04
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CLabel.java
@@ -0,0 +1,136 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CLabel
+ *
+ * @see org.eclipse.swt.custom.CLabel
+ */
+public class Test_org_eclipse_swt_custom_CLabel extends Test_org_eclipse_swt_widgets_Canvas {
+
+public Test_org_eclipse_swt_custom_CLabel(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getAlignment() {
+	warnUnimpl("Test test_getAlignment not written");
+}
+
+public void test_getImage() {
+	warnUnimpl("Test test_getImage not written");
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	warnUnimpl("Test test_setToolTipTextLjava_lang_String not written");
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_getToolTipText() {
+	warnUnimpl("Test test_getToolTipText not written");
+}
+
+public void test_setAlignmentI() {
+	warnUnimpl("Test test_setAlignmentI not written");
+}
+
+public void test_setBackground$Lorg_eclipse_swt_graphics_Color$I() {
+	warnUnimpl("Test test_setBackground$Lorg_eclipse_swt_graphics_Color$I not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public void test_shortenTextLorg_eclipse_swt_graphics_GCLjava_lang_StringI() {
+	warnUnimpl("Test test_shortenTextLorg_eclipse_swt_graphics_GCLjava_lang_StringI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CLabel((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getAlignment");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_setAlignmentI");
+	methodNames.addElement("test_setBackground$Lorg_eclipse_swt_graphics_Color$I");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_shortenTextLorg_eclipse_swt_graphics_GCLjava_lang_StringI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Canvas.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getAlignment")) test_getAlignment();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_setAlignmentI")) test_setAlignmentI();
+	else if (getName().equals("test_setBackground$Lorg_eclipse_swt_graphics_Color$I")) test_setBackground$Lorg_eclipse_swt_graphics_Color$I();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Image")) test_setBackgroundLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_shortenTextLorg_eclipse_swt_graphics_GCLjava_lang_StringI")) test_shortenTextLorg_eclipse_swt_graphics_GCLjava_lang_StringI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolder.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolder.java
new file mode 100644
index 0000000000..9c20b42337
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolder.java
@@ -0,0 +1,220 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CTabFolder
+ *
+ * @see org.eclipse.swt.custom.CTabFolder
+ */
+public class Test_org_eclipse_swt_custom_CTabFolder extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_CTabFolder(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_addCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener() {
+	warnUnimpl("Test test_addCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_onFocusLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_onFocusLorg_eclipse_swt_widgets_Event not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getTabHeight() {
+	warnUnimpl("Test test_getTabHeight not written");
+}
+
+public void test_getItemI() {
+	warnUnimpl("Test test_getItemI not written");
+}
+
+public void test_getItemLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_getItemLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionIndex() {
+	warnUnimpl("Test test_getSelectionIndex not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_custom_CTabItem() {
+	warnUnimpl("Test test_indexOfLorg_eclipse_swt_custom_CTabItem not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_removeCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener() {
+	warnUnimpl("Test test_removeCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setSelectionBackground$Lorg_eclipse_swt_graphics_Color$I() {
+	warnUnimpl("Test test_setSelectionBackground$Lorg_eclipse_swt_graphics_Color$I not written");
+}
+
+public void test_setSelectionBackgroundLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setSelectionBackgroundLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setBorderVisibleZ() {
+	warnUnimpl("Test test_setBorderVisibleZ not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setSelectionForegroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setSelectionForegroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setInsertMarkLorg_eclipse_swt_custom_CTabItemZ() {
+	warnUnimpl("Test test_setInsertMarkLorg_eclipse_swt_custom_CTabItemZ not written");
+}
+
+public void test_setInsertMarkIZ() {
+	warnUnimpl("Test test_setInsertMarkIZ not written");
+}
+
+public void test_setSelectionI() {
+	warnUnimpl("Test test_setSelectionI not written");
+}
+
+public void test_setSelectionLorg_eclipse_swt_custom_CTabItem() {
+	warnUnimpl("Test test_setSelectionLorg_eclipse_swt_custom_CTabItem not written");
+}
+
+public void test_setTabHeightI() {
+	warnUnimpl("Test test_setTabHeightI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CTabFolder((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_addCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_onFocusLorg_eclipse_swt_widgets_Event");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getTabHeight");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_custom_CTabItem");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_removeCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setSelectionBackground$Lorg_eclipse_swt_graphics_Color$I");
+	methodNames.addElement("test_setSelectionBackgroundLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setBorderVisibleZ");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setSelectionForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setInsertMarkLorg_eclipse_swt_custom_CTabItemZ");
+	methodNames.addElement("test_setInsertMarkIZ");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionLorg_eclipse_swt_custom_CTabItem");
+	methodNames.addElement("test_setTabHeightI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_addCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener")) test_addCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_onFocusLorg_eclipse_swt_widgets_Event")) test_onFocusLorg_eclipse_swt_widgets_Event();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getTabHeight")) test_getTabHeight();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemLorg_eclipse_swt_graphics_Point")) test_getItemLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_custom_CTabItem")) test_indexOfLorg_eclipse_swt_custom_CTabItem();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_removeCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener")) test_removeCTabFolderListenerLorg_eclipse_swt_custom_CTabFolderListener();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setSelectionBackground$Lorg_eclipse_swt_graphics_Color$I")) test_setSelectionBackground$Lorg_eclipse_swt_graphics_Color$I();
+	else if (getName().equals("test_setSelectionBackgroundLorg_eclipse_swt_graphics_Image")) test_setSelectionBackgroundLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setBorderVisibleZ")) test_setBorderVisibleZ();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setSelectionForegroundLorg_eclipse_swt_graphics_Color")) test_setSelectionForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setInsertMarkLorg_eclipse_swt_custom_CTabItemZ")) test_setInsertMarkLorg_eclipse_swt_custom_CTabItemZ();
+	else if (getName().equals("test_setInsertMarkIZ")) test_setInsertMarkIZ();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionLorg_eclipse_swt_custom_CTabItem")) test_setSelectionLorg_eclipse_swt_custom_CTabItem();
+	else if (getName().equals("test_setTabHeightI")) test_setTabHeightI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderAdapter.java
new file mode 100644
index 0000000000..6d66c88714
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderAdapter.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CTabFolderAdapter
+ *
+ * @see org.eclipse.swt.custom.CTabFolderAdapter
+ */
+public class Test_org_eclipse_swt_custom_CTabFolderAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_CTabFolderAdapter(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent() {
+	warnUnimpl("Test test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CTabFolderAdapter((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent")) test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderEvent.java
new file mode 100644
index 0000000000..bebee02f7d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderEvent.java
@@ -0,0 +1,52 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CTabFolderEvent
+ *
+ * @see org.eclipse.swt.custom.CTabFolderEvent
+ */
+public class Test_org_eclipse_swt_custom_CTabFolderEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_CTabFolderEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CTabFolderEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderListener.java
new file mode 100644
index 0000000000..adab373b9f
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabFolderListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CTabFolderListener
+ *
+ * @see org.eclipse.swt.custom.CTabFolderListener
+ */
+public class Test_org_eclipse_swt_custom_CTabFolderListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_CTabFolderListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent() {
+	warnUnimpl("Test test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent")) test_itemClosedLorg_eclipse_swt_custom_CTabFolderEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabItem.java
new file mode 100644
index 0000000000..3200942e87
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_CTabItem.java
@@ -0,0 +1,143 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.CTabItem
+ *
+ * @see org.eclipse.swt.custom.CTabItem
+ */
+public class Test_org_eclipse_swt_custom_CTabItem extends Test_org_eclipse_swt_widgets_Item {
+
+	CTabFolder cTabFolder;
+	CTabItem cTabItem;
+
+public Test_org_eclipse_swt_custom_CTabItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	cTabFolder = new CTabFolder(shell, SWT.NONE);
+	cTabItem = new CTabItem(cTabFolder, SWT.NONE);
+	setWidget(cTabItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_CTabFolderI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_CTabFolderI not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_CTabFolderII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_CTabFolderII not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getControl() {
+	warnUnimpl("Test test_getControl not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getDisabledImage() {
+	warnUnimpl("Test test_getDisabledImage not written");
+}
+
+public void test_getParent() {
+	warnUnimpl("Test test_getParent not written");
+}
+
+public void test_getToolTipText() {
+	warnUnimpl("Test test_getToolTipText not written");
+}
+
+public void test_setControlLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setControlLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setDisabledImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setDisabledImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	warnUnimpl("Test test_setToolTipTextLjava_lang_String not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_CTabItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_CTabFolderI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_CTabFolderII");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getDisabledImage");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_setControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setDisabledImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_CTabFolderI")) test_ConstructorLorg_eclipse_swt_custom_CTabFolderI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_CTabFolderII")) test_ConstructorLorg_eclipse_swt_custom_CTabFolderII();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getDisabledImage")) test_getDisabledImage();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_setControlLorg_eclipse_swt_widgets_Control")) test_setControlLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setDisabledImageLorg_eclipse_swt_graphics_Image")) test_setDisabledImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ControlEditor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ControlEditor.java
new file mode 100644
index 0000000000..4b1d933442
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ControlEditor.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.ControlEditor
+ *
+ * @see org.eclipse.swt.custom.ControlEditor
+ */
+public class Test_org_eclipse_swt_custom_ControlEditor extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_ControlEditor(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Composite() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Composite not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getEditor() {
+	warnUnimpl("Test test_getEditor not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_Control not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ControlEditor((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Composite");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getEditor");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_Control");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Composite")) test_ConstructorLorg_eclipse_swt_widgets_Composite();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getEditor")) test_getEditor();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_Control")) test_setEditorLorg_eclipse_swt_widgets_Control();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyEvent.java
new file mode 100644
index 0000000000..d8ea7d14d5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.ExtendedModifyEvent
+ *
+ * @see org.eclipse.swt.custom.ExtendedModifyEvent
+ */
+public class Test_org_eclipse_swt_custom_ExtendedModifyEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_ExtendedModifyEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent() {
+	// this method tested by other test classes
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ExtendedModifyEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent")) test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..59cd7d0cd8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ExtendedModifyListener.java
@@ -0,0 +1,286 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+	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());
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+	shell.open();
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ExtendedModifyListener((String)e.nextElement()));
+	}
+	return suite;
+}
+public void test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent() {
+	ExtendedModifyListener listener = new ExtendedModifyListener() {
+		public void modifyText(ExtendedModifyEvent event) {
+			switch(verify) {
+				case 1 : {
+					assertTrue(":1a:", event.start == 0);
+					assertTrue(":1b:", event.length == 1);
+					assertTrue(":1c:", event.replacedText.equals(""));
+					break;
+				}
+				case 2 : {
+					assertTrue(":2a:", event.start == 0);
+					assertTrue(":2b:", event.length == 1);
+					assertTrue(":2c:", event.replacedText.equals("\n\n"));
+					break;
+				}
+				case 3 : {
+					assertTrue(":3a:", event.start == 0);
+					assertTrue(":3b:", event.length == 2);
+					assertTrue(":3c:", event.replacedText.equals("a"));
+					break;
+				}
+				case 4: {
+					assertTrue(":4:", false);
+					break;
+				}
+				case 5 : {
+					assertTrue(":5a:", event.start == 0);
+					assertTrue(":5b:", event.length == 1);
+					assertTrue(":5c:", event.replacedText.equals(""));
+					break;
+				}
+				case 6 : {
+					assertTrue(":6a:", event.start == 21);
+					assertTrue(":6b:", event.length == 0);
+					assertTrue(":6c:", event.replacedText.equals("\nline 4"));
+					break;
+				}
+				case 7 : {
+					assertTrue(":7a:", event.start == 5);
+					assertTrue(":7b:", event.length == 0);
+					assertTrue(":7c:", event.replacedText.equals("is a test"));
+					break;
+				}
+				case 8 : {
+					assertTrue(":8a:", event.start == 7);
+					assertTrue(":8b:", event.length == 0);
+					assertTrue(":8c:", event.replacedText.equals("\r\n"));
+					break;
+				}
+				case 9 : {
+					assertTrue(":9a:", event.start == 2);
+					assertTrue(":9b:", event.length == 4);
+					assertTrue(":9c:", event.replacedText.equals("\r\n"));
+					break;
+				}
+				case 10:{
+					assertTrue(":10:", false);
+					break;
+				}
+				case 11: {
+					assertTrue(":11:", false);
+					break;
+				}
+				case 12: {
+					assertTrue(":12a:", event.start == 3);
+					assertTrue(":12b:", event.length == 1);
+					assertTrue(":12c:", event.replacedText.equals(""));
+					break;
+				}
+				case 13: {
+					assertTrue(":13a:", event.start == 2);
+					assertTrue(":13b:", event.length == 1);
+					assertTrue(":13c:", event.replacedText.equals(""));
+					break;
+				}
+				case 14: {
+					assertTrue(":14:", false);
+					break;
+				}
+				case 15: {
+					assertTrue(":15a:", event.start == 2);
+					assertTrue(":15b:", event.length == 6);
+					assertTrue(":15c:", event.replacedText.equals("\r\n"));
+					break;
+				}
+				case 16:{
+					assertTrue(":16:", false);
+					break;
+				}
+				case 17: {
+					assertTrue(":17:", false);
+					break;
+				}
+				case 18: {
+					assertTrue(":18a:", event.start == 3);
+					assertTrue(":18b:", event.length == 7);
+					assertTrue(":18c:", event.replacedText.equals(""));
+					break;
+				}
+				case 19: {
+					assertTrue(":19a:", event.start == 2);
+					assertTrue(":19b:", event.length == 7);
+					assertTrue(":19c:", event.replacedText.equals(""));
+					break;
+				}
+				case 20: {
+					assertTrue(":20:", false);
+					break;
+				}
+			}
+		}
+	};
+	styledText.addExtendedModifyListener(listener);
+	
+	boolean exceptionHandled = false;
+	verify = 1;
+	styledText.setText("testing");
+	styledText.replaceTextRange(0, 0, "\n");
+
+	verify = 2;
+	styledText.setText("\n\n");
+	styledText.replaceTextRange(0, 2, "a");
+
+	verify = 3;
+	styledText.setText("a");
+	styledText.replaceTextRange(0, 1, "\n\n");
+
+	verify = 4;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":4: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 5;
+	styledText.setText("Line 1\r\nLine 2");
+	styledText.replaceTextRange(0, 0, "\r");
+
+	verify = 6;
+	styledText.setText("This\nis a test\nline 3\nline 4");
+	styledText.replaceTextRange(21, 7, "");
+
+	verify = 7;
+	styledText.setText("This\nis a test\r");
+	styledText.replaceTextRange(5, 9, "");
+
+	verify = 8;
+	styledText.setText("\nL1\r\nL2\r\n");
+	styledText.replaceTextRange(7, 2, "");
+
+	verify = 9;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test");
+
+	verify = 10;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "");} 
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":10: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 11;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":11: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 12;
+	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\n");
+
+	verify = 13;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "\r");
+
+	verify = 14;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 0, "test");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":14: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 15;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test\n\n");
+
+	verify = 16;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\r\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":16: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 17;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "test\n\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":17: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 18;
+ 	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\ntest\r\n");
+
+	verify = 19;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "test\r\r\r");
+
+	verify = 20;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":20: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+	styledText.removeExtendedModifyListener(listener);
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_modifyTextLorg_eclipse_swt_custom_ExtendedModifyEvent");
+	return methodNames;
+}
+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_LineBackgroundEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundEvent.java
new file mode 100644
index 0000000000..b469a568aa
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.LineBackgroundEvent
+ *
+ * @see org.eclipse.swt.custom.LineBackgroundEvent
+ */
+public class Test_org_eclipse_swt_custom_LineBackgroundEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_LineBackgroundEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent() {
+	// this method tested by other test classes
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_LineBackgroundEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent")) test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..bc2bff2e10
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineBackgroundListener.java
@@ -0,0 +1,69 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+	Shell shell;
+	StyledText styledText;
+
+public Test_org_eclipse_swt_custom_LineBackgroundListener(String name) {
+	super(name);
+}
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+	shell.open();
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_LineBackgroundListener((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void tearDown() {
+}
+
+public void test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent() {
+	LineBackgroundListener listener = new LineBackgroundListener() {
+		public void lineGetBackground(LineBackgroundEvent event) {
+			assertTrue(":1:", event.lineOffset==0);
+			assertTrue(":2:",event.lineText.equals("0123456789"));
+		}
+	};
+	styledText.addLineBackgroundListener(listener);
+	styledText.setText("0123456789");
+	// force get line bg callback
+	styledText.selectAll();
+	styledText.copy();
+	styledText.removeLineBackgroundListener(listener);
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_lineGetBackgroundLorg_eclipse_swt_custom_LineBackgroundEvent");
+	return methodNames;
+}
+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_LineStyleEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleEvent.java
new file mode 100644
index 0000000000..61f68d439e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.LineStyleEvent
+ *
+ * @see org.eclipse.swt.custom.LineStyleEvent
+ */
+public class Test_org_eclipse_swt_custom_LineStyleEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_LineStyleEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent() {
+	// this method tested by other test classes
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_LineStyleEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent")) test_ConstructorLorg_eclipse_swt_custom_StyledTextEvent();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..79bb718658
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_LineStyleListener.java
@@ -0,0 +1,68 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+	Shell shell;
+	StyledText styledText;
+
+public Test_org_eclipse_swt_custom_LineStyleListener(String name) {
+	super(name);
+}
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+	shell.open();
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_LineStyleListener((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void tearDown() {
+}
+
+public void test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent() {
+	LineStyleListener listener = new LineStyleListener() {
+		public void lineGetStyle(LineStyleEvent event) {
+			assertTrue(":1:", event.lineOffset==0);
+			assertTrue(":2:",event.lineText.equals("0123456789"));
+		}
+	};
+	styledText.addLineStyleListener(listener);
+	styledText.setText("0123456789");
+	// force get line styles callback
+	styledText.getLocationAtOffset(5);
+	styledText.removeLineStyleListener(listener);
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_lineGetStyleLorg_eclipse_swt_custom_LineStyleEvent");
+	return methodNames;
+}
+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_PopupList.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_PopupList.java
new file mode 100644
index 0000000000..8886ae131c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_PopupList.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.PopupList
+ *
+ * @see org.eclipse.swt.custom.PopupList
+ */
+public class Test_org_eclipse_swt_custom_PopupList extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_PopupList(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Shell not written");
+}
+
+public void test_getFont() {
+	warnUnimpl("Test test_getFont not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getMinimumWidth() {
+	warnUnimpl("Test test_getMinimumWidth not written");
+}
+
+public void test_openLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_openLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_selectLjava_lang_String() {
+	warnUnimpl("Test test_selectLjava_lang_String not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setItems$Ljava_lang_String() {
+	warnUnimpl("Test test_setItems$Ljava_lang_String not written");
+}
+
+public void test_setMinimumWidthI() {
+	warnUnimpl("Test test_setMinimumWidthI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_PopupList((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_getFont");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getMinimumWidth");
+	methodNames.addElement("test_openLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_selectLjava_lang_String");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setItems$Ljava_lang_String");
+	methodNames.addElement("test_setMinimumWidthI");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_getFont")) test_getFont();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getMinimumWidth")) test_getMinimumWidth();
+	else if (getName().equals("test_openLorg_eclipse_swt_graphics_Rectangle")) test_openLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_selectLjava_lang_String")) test_selectLjava_lang_String();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setItems$Ljava_lang_String")) test_setItems$Ljava_lang_String();
+	else if (getName().equals("test_setMinimumWidthI")) test_setMinimumWidthI();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ST.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ST.java
new file mode 100644
index 0000000000..506813cf0e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ST.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.ST
+ *
+ * @see org.eclipse.swt.custom.ST
+ */
+public class Test_org_eclipse_swt_custom_ST extends SwtTestCase {
+
+public Test_org_eclipse_swt_custom_ST(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	// doesn't make sense to test this, ST is constants class
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ST((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_SashForm.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_SashForm.java
new file mode 100644
index 0000000000..7a212624d7
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_SashForm.java
@@ -0,0 +1,112 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.SashForm
+ *
+ * @see org.eclipse.swt.custom.SashForm
+ */
+public class Test_org_eclipse_swt_custom_SashForm extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_SashForm(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getOrientation() {
+	warnUnimpl("Test test_getOrientation not written");
+}
+
+public void test_getMaximizedControl() {
+	warnUnimpl("Test test_getMaximizedControl not written");
+}
+
+public void test_getWeights() {
+	warnUnimpl("Test test_getWeights not written");
+}
+
+public void test_layoutZ() {
+	warnUnimpl("Test test_layoutZ not written");
+}
+
+public void test_setOrientationI() {
+	warnUnimpl("Test test_setOrientationI not written");
+}
+
+public void test_setLayoutLorg_eclipse_swt_widgets_Layout() {
+	warnUnimpl("Test test_setLayoutLorg_eclipse_swt_widgets_Layout not written");
+}
+
+public void test_setMaximizedControlLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setMaximizedControlLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setWeights$I() {
+	warnUnimpl("Test test_setWeights$I not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_SashForm((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getOrientation");
+	methodNames.addElement("test_getMaximizedControl");
+	methodNames.addElement("test_getWeights");
+	methodNames.addElement("test_layoutZ");
+	methodNames.addElement("test_setOrientationI");
+	methodNames.addElement("test_setLayoutLorg_eclipse_swt_widgets_Layout");
+	methodNames.addElement("test_setMaximizedControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setWeights$I");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getOrientation")) test_getOrientation();
+	else if (getName().equals("test_getMaximizedControl")) test_getMaximizedControl();
+	else if (getName().equals("test_getWeights")) test_getWeights();
+	else if (getName().equals("test_layoutZ")) test_layoutZ();
+	else if (getName().equals("test_setOrientationI")) test_setOrientationI();
+	else if (getName().equals("test_setLayoutLorg_eclipse_swt_widgets_Layout")) test_setLayoutLorg_eclipse_swt_widgets_Layout();
+	else if (getName().equals("test_setMaximizedControlLorg_eclipse_swt_widgets_Control")) test_setMaximizedControlLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setWeights$I")) test_setWeights$I();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ScrolledComposite.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ScrolledComposite.java
new file mode 100644
index 0000000000..cebf531ff6
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ScrolledComposite.java
@@ -0,0 +1,130 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.ScrolledComposite
+ *
+ * @see org.eclipse.swt.custom.ScrolledComposite
+ */
+public class Test_org_eclipse_swt_custom_ScrolledComposite extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_ScrolledComposite(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_getAlwaysShowScrollBars() {
+	warnUnimpl("Test test_getAlwaysShowScrollBars not written");
+}
+
+public void test_getContent() {
+	warnUnimpl("Test test_getContent not written");
+}
+
+public void test_layoutZ() {
+	warnUnimpl("Test test_layoutZ not written");
+}
+
+public void test_setAlwaysShowScrollBarsZ() {
+	warnUnimpl("Test test_setAlwaysShowScrollBarsZ not written");
+}
+
+public void test_setContentLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setContentLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setExpandHorizontalZ() {
+	warnUnimpl("Test test_setExpandHorizontalZ not written");
+}
+
+public void test_setExpandVerticalZ() {
+	warnUnimpl("Test test_setExpandVerticalZ not written");
+}
+
+public void test_setLayoutLorg_eclipse_swt_widgets_Layout() {
+	warnUnimpl("Test test_setLayoutLorg_eclipse_swt_widgets_Layout not written");
+}
+
+public void test_setMinHeightI() {
+	warnUnimpl("Test test_setMinHeightI not written");
+}
+
+public void test_setMinSizeLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_setMinSizeLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_setMinSizeII() {
+	warnUnimpl("Test test_setMinSizeII not written");
+}
+
+public void test_setMinWidthI() {
+	warnUnimpl("Test test_setMinWidthI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ScrolledComposite((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_getAlwaysShowScrollBars");
+	methodNames.addElement("test_getContent");
+	methodNames.addElement("test_layoutZ");
+	methodNames.addElement("test_setAlwaysShowScrollBarsZ");
+	methodNames.addElement("test_setContentLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setExpandHorizontalZ");
+	methodNames.addElement("test_setExpandVerticalZ");
+	methodNames.addElement("test_setLayoutLorg_eclipse_swt_widgets_Layout");
+	methodNames.addElement("test_setMinHeightI");
+	methodNames.addElement("test_setMinSizeLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setMinSizeII");
+	methodNames.addElement("test_setMinWidthI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_getAlwaysShowScrollBars")) test_getAlwaysShowScrollBars();
+	else if (getName().equals("test_getContent")) test_getContent();
+	else if (getName().equals("test_layoutZ")) test_layoutZ();
+	else if (getName().equals("test_setAlwaysShowScrollBarsZ")) test_setAlwaysShowScrollBarsZ();
+	else if (getName().equals("test_setContentLorg_eclipse_swt_widgets_Control")) test_setContentLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setExpandHorizontalZ")) test_setExpandHorizontalZ();
+	else if (getName().equals("test_setExpandVerticalZ")) test_setExpandVerticalZ();
+	else if (getName().equals("test_setLayoutLorg_eclipse_swt_widgets_Layout")) test_setLayoutLorg_eclipse_swt_widgets_Layout();
+	else if (getName().equals("test_setMinHeightI")) test_setMinHeightI();
+	else if (getName().equals("test_setMinSizeLorg_eclipse_swt_graphics_Point")) test_setMinSizeLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setMinSizeII")) test_setMinSizeII();
+	else if (getName().equals("test_setMinWidthI")) test_setMinWidthI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StackLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StackLayout.java
new file mode 100644
index 0000000000..2e3b719fb1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StackLayout.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.StackLayout
+ *
+ * @see org.eclipse.swt.custom.StackLayout
+ */
+public class Test_org_eclipse_swt_custom_StackLayout extends Test_org_eclipse_swt_widgets_Layout {
+
+public Test_org_eclipse_swt_custom_StackLayout(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ() {
+	warnUnimpl("Test test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ not written");
+}
+
+public void test_layoutLorg_eclipse_swt_widgets_CompositeZ() {
+	warnUnimpl("Test test_layoutLorg_eclipse_swt_widgets_CompositeZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_StackLayout((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ");
+	methodNames.addElement("test_layoutLorg_eclipse_swt_widgets_CompositeZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Layout.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ")) test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ();
+	else if (getName().equals("test_layoutLorg_eclipse_swt_widgets_CompositeZ")) test_layoutLorg_eclipse_swt_widgets_CompositeZ();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..ab6647fb1b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyleRange.java
@@ -0,0 +1,173 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+import java.util.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.StyleRange
+ *
+ * @see org.eclipse.swt.custom.StyleRange
+ */
+public class Test_org_eclipse_swt_custom_StyleRange extends SwtTestCase {
+	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 colors = new Hashtable();
+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 (Color)colors.get(rgb);
+}
+protected void initializeColors() {
+	Display display = Display.getDefault();
+	colors.put(RED, new Color (display, RED));
+	colors.put(GREEN, new Color (display, GREEN));
+	colors.put(BLUE, new Color (display, BLUE));
+}
+
+protected void setUp() {
+	initializeColors();
+}
+
+protected void tearDown() {
+	Enumeration enum = colors.keys();
+	while (enum.hasMoreElements()) {
+		Color color = (Color)colors.get((RGB)enum.nextElement());
+		color.dispose();
+	}
+}
+
+public void test_Constructor() {
+	StyleRange styleRange = new StyleRange();
+	assertTrue(":a:", styleRange.start == 0);
+	assertTrue(":a:", styleRange.length == 0);
+	assertTrue(":a:", styleRange.foreground == null);
+	assertTrue(":a:", styleRange.background == null);
+	assertTrue(":a:", styleRange.fontStyle == SWT.NORMAL);
+}
+
+public void test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_Color() {
+	StyleRange styleRange = new StyleRange(5, 10, getColor(RED), getColor(BLUE));
+	assertTrue(":b:", styleRange.start == 5);
+	assertTrue(":b:", styleRange.length == 10);
+	assertTrue(":b:", styleRange.foreground == getColor(RED));
+	assertTrue(":b:", styleRange.background == getColor(BLUE));
+	assertTrue(":b:", styleRange.fontStyle == SWT.NORMAL);
+}
+
+public void test_ConstructorIILorg_eclipse_swt_graphics_ColorLorg_eclipse_swt_graphics_ColorI() {
+	StyleRange styleRange = new StyleRange(5, 10, getColor(RED), getColor(BLUE), SWT.BOLD);
+	assertTrue(":c:", styleRange.start == 5);
+	assertTrue(":c:", styleRange.length == 10);
+	assertTrue(":c:", styleRange.foreground == getColor(RED));
+	assertTrue(":c:", styleRange.background == getColor(BLUE));
+	assertTrue(":c:", styleRange.fontStyle == SWT.BOLD);
+}
+
+public void test_equalsLjava_lang_Object() {
+	StyleRange styleRangeA = new StyleRange(5, 10, getColor(RED), getColor(BLUE), SWT.BOLD);
+	StyleRange styleRangeB = new StyleRange(5, 10, getColor(RED), getColor(BLUE), SWT.BOLD);
+	StyleRange styleRangeC = new StyleRange(5, 10, getColor(BLUE), getColor(BLUE), SWT.BOLD);
+	StyleRange styleRangeD = new StyleRange(6, 10, getColor(RED), getColor(BLUE), SWT.BOLD);
+	StyleRange styleRangeE = new StyleRange(5, 11, getColor(RED), getColor(BLUE), SWT.BOLD);
+	StyleRange styleRangeF = new StyleRange(5, 11, getColor(RED), getColor(RED), SWT.BOLD);
+	StyleRange styleRangeG = new StyleRange(5, 11, getColor(RED), getColor(BLUE), SWT.NORMAL);
+	assertTrue(":d:", styleRangeA.equals(styleRangeB));
+	assertTrue(":d:",!styleRangeA.equals(styleRangeC));
+	assertTrue(":d:",!styleRangeA.equals(styleRangeD));
+	assertTrue(":d:",!styleRangeA.equals(styleRangeE));
+	assertTrue(":d:",!styleRangeA.equals(styleRangeF));
+	assertTrue(":d:",!styleRangeA.equals(styleRangeG));
+}
+
+public void test_hashCode() {
+	// does not make sense to test
+}
+
+public void test_isUnstyled() {
+	StyleRange styleRangeA = new StyleRange(5, 10, null, null, SWT.NORMAL);
+	StyleRange styleRangeB = new StyleRange(5, 10, getColor(RED), null, SWT.NORMAL);
+	StyleRange styleRangeC = new StyleRange(5, 10, null, null, SWT.BOLD);
+	StyleRange styleRangeD = new StyleRange(6, 10, null, getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeE = new StyleRange(5, 10, null, null);
+	assertTrue(":e:", styleRangeA.isUnstyled());
+	assertTrue(":e:",!styleRangeB.isUnstyled());
+	assertTrue(":e:",!styleRangeC.isUnstyled());
+	assertTrue(":e:",!styleRangeD.isUnstyled());
+	assertTrue(":e:", styleRangeE.isUnstyled());
+}
+
+public void test_similarToLorg_eclipse_swt_custom_StyleRange() {
+	StyleRange styleRangeA = new StyleRange(6, 10, getColor(RED), getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeB = new StyleRange(5, 5, getColor(RED), getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeC = new StyleRange(6, 10, getColor(RED), getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeD = new StyleRange(6, 10, getColor(BLUE), getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeE = new StyleRange(6, 10, getColor(RED), getColor(RED), SWT.NORMAL);
+	StyleRange styleRangeF = new StyleRange(6, 10, getColor(RED), getColor(BLUE), SWT.BOLD);
+	assertTrue(":f:", styleRangeA.similarTo(styleRangeB));
+	assertTrue(":f:", styleRangeA.similarTo(styleRangeC));
+	assertTrue(":f:", !styleRangeA.similarTo(styleRangeD));
+	assertTrue(":f:", !styleRangeA.similarTo(styleRangeE));
+	assertTrue(":f:", !styleRangeA.similarTo(styleRangeF));
+}
+
+public void test_clone() {
+	StyleRange styleRangeA = new StyleRange(6, 10, null, getColor(BLUE), SWT.NORMAL);
+	StyleRange styleRangeB = (StyleRange)styleRangeA.clone();
+	assertTrue(":g:", styleRangeA.equals(styleRangeB));
+}
+
+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 methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_StyleRange((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_isUnstyled");
+	methodNames.addElement("test_similarToLorg_eclipse_swt_custom_StyleRange");
+	methodNames.addElement("test_clone");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+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_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_clone")) test_clone();
+	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_StyledText.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
new file mode 100644
index 0000000000..57f04b76b9
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledText.java
@@ -0,0 +1,3188 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import java.util.*;
+
+import junit.framework.*;
+import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.dnd.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.StyledText
+ *
+ * @see org.eclipse.swt.custom.StyledText
+ */
+public class Test_org_eclipse_swt_custom_StyledText extends Test_org_eclipse_swt_widgets_Canvas {
+
+StyledText text;
+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);
+final static RGB YELLOW = new RGB(255,255,0);
+final static RGB CYAN = new RGB(0,255,255);
+final static RGB PURPLE = new RGB(255,0,255);
+Hashtable colors = new Hashtable();
+private boolean listenerCalled;	
+private boolean listener2Called;
+
+public Test_org_eclipse_swt_custom_StyledText(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	initializeColors();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+}
+
+protected void tearDown() {
+	Enumeration enum = colors.keys();
+	while (enum.hasMoreElements()) {
+		Color color = (Color)colors.get((RGB)enum.nextElement());
+		color.dispose();
+	}
+	super.tearDown();
+	
+}
+
+// this method must not be public so that the auto-gen tool keeps it
+private StyleRange[] defaultStyles() {
+	return new StyleRange[] {
+		getStyle(0,48,RED,YELLOW), 
+		getStyle(58,10,BLUE,CYAN), 
+		getStyle(68,10,GREEN,PURPLE)};
+}
+// this method must not be public so that the auto-gen tool keeps it
+protected void getLineBackgrounds() {
+	for (int i=0; i<text.getLineCount(); i++) {
+		text.getLineBackground(i);
+	}
+}
+// this method must not be public so that the auto-gen tool keeps it
+private String textString() {
+	return "This is the text component in testing\nNew Line1\nNew Line2\nNew Line3\nNew Line4.";
+}
+private boolean isBidi() {
+	String codePage = System.getProperty("file.encoding").toUpperCase();
+	boolean isWindows = System.getProperty("os.name").startsWith("Windows");
+	
+	// Running on Windows and with Hebrew or Arabic codepage?
+	return isWindows && ("CP1255".equals(codePage) || "CP1256".equals(codePage));
+}
+// this method must not be public so that the auto-gen tool keeps it
+private StyleRange getStyle(int start, int length, RGB fg, RGB bg) {
+	StyleRange style = new StyleRange();
+	style.start = start;
+	style.length = length;
+	if (fg != null) style.foreground = getColor(fg);
+	else style.foreground = null;
+	if (bg != null) style.background = getColor(bg);
+	else style.background = null;
+	return style;
+}
+// this method must not be public so that the auto-gen tool keeps it
+private Color getColor(RGB rgb) {
+	return (Color)colors.get(rgb);
+}
+// this method must not be public so that the auto-gen tool keeps it
+protected void initializeColors() {
+	Display display = Display.getDefault();
+	colors.put(RED, new Color (display, RED));
+	colors.put(BLUE, new Color (display, BLUE));
+	colors.put(GREEN, new Color (display, GREEN));
+	colors.put(YELLOW, new Color (display, YELLOW));
+	colors.put(CYAN, new Color (display, CYAN));
+	colors.put(PURPLE, new Color (display, PURPLE));
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	StyledText text = new StyledText(shell, SWT.READ_ONLY);
+	
+	assertTrue(":a:", text.getEditable() == false);
+	text.dispose();
+
+	text = new StyledText(shell, SWT.H_SCROLL | SWT.V_SCROLL | SWT.SINGLE);
+	assertTrue(":b:", text.getVerticalBar() == null);
+	assertTrue(":c:", text.getHorizontalBar() == null);
+	text.dispose();
+}
+
+public void test_addExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener() {
+	final String line = "Line1";
+	boolean exceptionThrown = false;
+	ExtendedModifyListener listener = new ExtendedModifyListener() {
+		public void modifyText(ExtendedModifyEvent event) {
+			listenerCalled = true;
+			assertEquals("ExtendedModify event data invalid", 0, event.start);
+			assertEquals("ExtendedModify event data invalid", line.length(), event.length);
+			assertEquals("ExtendedModify event data invalid", "", event.replacedText);
+		}
+	};
+	
+	try {
+		text.addExtendedModifyListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+		
+	// test whether all content modifying API methods send an ExtendedModify event
+	text.addExtendedModifyListener(listener);
+
+	listenerCalled = false;
+	text.append(line);	
+	assertTrue("append does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.insert(line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.removeExtendedModifyListener(listener);
+	listener = new ExtendedModifyListener() {
+		public void modifyText(ExtendedModifyEvent event) {
+			listenerCalled = true;
+			assertEquals("ExtendedModify event data invalid", 0, event.start);
+			assertEquals("ExtendedModify event data invalid", line.length(), event.length);
+			assertEquals("ExtendedModify event data invalid", line.substring(0, 1), event.replacedText);
+		}
+	};
+	text.addExtendedModifyListener(listener);
+	text.replaceTextRange(0, 1, line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.removeExtendedModifyListener(listener);
+	listener = new ExtendedModifyListener() {
+		public void modifyText(ExtendedModifyEvent event) {
+			listenerCalled = true;
+			assertEquals("ExtendedModify event data invalid", 0, event.start);
+			assertEquals("ExtendedModify event data invalid", line.length(), event.length);
+			assertEquals("ExtendedModify event data invalid", line + line.substring(1, line.length()) + line, event.replacedText);
+		}
+	};
+	text.addExtendedModifyListener(listener);
+	text.setText(line);	
+	assertTrue("setText does not send event", listenerCalled);
+
+	listenerCalled = false;	
+	text.removeExtendedModifyListener(listener);
+	// cause StyledText to call the listener. 
+	text.setText(line);	
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_setKeyBindingII(){
+	text.setKeyBinding(SWT.DEL, SWT.NULL);
+	assertTrue(":a:", text.getKeyBinding(SWT.DEL) == SWT.NULL);
+	text.setKeyBinding(SWT.DEL, ST.LINE_UP);
+	assertTrue(":b:", text.getKeyBinding(SWT.DEL) == ST.LINE_UP);
+	text.setKeyBinding(SWT.DEL | SWT.SHIFT, ST.SELECT_PAGE_UP);
+	assertTrue(":c:", text.getKeyBinding(SWT.DEL | SWT.SHIFT) == ST.SELECT_PAGE_UP);
+	text.setKeyBinding(SWT.DEL | SWT.SHIFT, ST.PAGE_UP);
+	assertTrue(":d:", text.getKeyBinding(SWT.DEL | SWT.SHIFT) == ST.PAGE_UP);
+	text.setKeyBinding(-1, ST.PAGE_UP);
+	text.setKeyBinding(-1, -1);
+}
+
+public void test_addBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	BidiSegmentListener listener = new BidiSegmentListener() {
+		public void lineGetSegments(BidiSegmentEvent event) {
+			listenerCalled = true;
+		}
+	};
+	
+	try {
+		text.addBidiSegmentListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+		
+	listenerCalled = false;
+	text.setText(line);	
+	text.addBidiSegmentListener(listener);
+	// cause StyledText to call the BidiSegmentListener. 
+	text.getLocationAtOffset(0);
+	if (isBidi()) {
+		assertTrue("Listener not called", listenerCalled);
+	}
+	else {
+		assertTrue("Listener called when it shouldn't be", listenerCalled == false);
+	}
+	listenerCalled = false;	
+	text.removeBidiSegmentListener(listener);
+	// cause StyledText to call the BidiSegmentListener. 
+	text.getLocationAtOffset(0);
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_addLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	LineBackgroundListener listener = new LineBackgroundListener() {
+		public void lineGetBackground(LineBackgroundEvent event) {
+			listenerCalled = true;
+		}
+	};
+	
+	try {
+		text.addLineBackgroundListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+		
+	listenerCalled = false;
+	text.setText(line);	
+	text.addLineBackgroundListener(listener);
+	// cause StyledText to call the listener. 
+	text.setSelection(0, text.getCharCount());
+	text.copy();
+	assertTrue("Listener not called", listenerCalled);
+
+	listenerCalled = false;	
+	text.removeLineBackgroundListener(listener);
+	// cause StyledText to call the listener. 
+	text.setText(line);	
+	text.setSelection(0, text.getCharCount());
+	text.copy();
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_addLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	LineStyleListener listener = new LineStyleListener() {
+		public void lineGetStyle(LineStyleEvent event) {
+			listenerCalled = true;
+		}
+	};
+	
+	try {
+		text.addLineStyleListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+		
+	listenerCalled = false;
+	text.setText(line);	
+	text.addLineStyleListener(listener);
+	// cause StyledText to call the listener. 
+	text.setSelection(0, text.getCharCount());
+	text.copy();
+	assertTrue("Listener not called", listenerCalled);
+
+	listenerCalled = false;	
+	text.removeLineStyleListener(listener);
+	// cause StyledText to call the listener. 
+	text.setText(line);	
+	text.setSelection(0, text.getCharCount());
+	text.copy();
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_addModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	ModifyListener listener = new ModifyListener() {
+		public void modifyText(ModifyEvent event) {
+			listenerCalled = true;
+		}
+	};
+	
+	try {
+		text.addModifyListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+	
+	// test whether all content modifying API methods send a Modify event	
+	text.addModifyListener(listener);
+
+	listenerCalled = false;
+	text.append(line);	
+	assertTrue("append does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.insert(line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.replaceTextRange(0, 1, line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+
+	listenerCalled = false;
+	text.setText(line);	
+	assertTrue("setText does not send event", listenerCalled);
+
+	listenerCalled = false;	
+	text.removeModifyListener(listener);
+	// cause StyledText to call the listener. 
+	text.setText(line);	
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	SelectionListener listener = new SelectionListener() {
+		public void widgetSelected(SelectionEvent event) {
+			listenerCalled = true;
+		}
+		public void widgetDefaultSelected(SelectionEvent event) {
+			listener2Called = true;
+		}
+	};
+	
+	try {
+		text.addSelectionListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+		
+	text.setText(line);	
+	listenerCalled = false;
+	listener2Called = false;	
+	text.addSelectionListener(listener);
+	// cause StyledText to call the listener. 
+	text.invokeAction(ST.SELECT_LINE_END);
+	assertTrue("Listener not called", listenerCalled);
+	assertTrue("Listener called unexpectedly", listener2Called == false);
+
+	listenerCalled = false;	
+	listener2Called = false;	
+	text.removeSelectionListener(listener);
+	// cause StyledText to call the listener. 
+	text.invokeAction(ST.SELECT_LINE_END);
+	assertTrue("Listener not removed", listenerCalled == false);
+	assertTrue("Listener called unexpectedly", listener2Called == false);
+}
+
+public void test_addVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener() {
+	String line = "Line1";
+	boolean exceptionThrown = false;
+	VerifyKeyListener listener = new VerifyKeyListener() {
+		public void verifyKey(VerifyEvent event) {
+		}
+	};
+	
+	try {
+		text.addVerifyKeyListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+
+	// only test whether listener can be added and removed.
+	// can't test listener because VerifyKey is user driven.
+	text.addVerifyKeyListener(listener);
+	text.removeVerifyKeyListener(listener);
+}
+
+public void test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener() {
+	final String line = "Line1";
+	final String newLine = "NewLine1";
+	final int textLength;
+	boolean exceptionThrown = false;
+	VerifyListener listener = new VerifyListener() {
+		public void verifyText(VerifyEvent event) {
+			listenerCalled = true;
+			assertEquals("Verify event data invalid", 0, event.start);
+			assertEquals("Verify event data invalid", 0, event.end);
+			assertEquals("Verify event data invalid", line, event.text);
+			event.start = 2;
+			event.end = 5;
+			event.text = newLine;
+		}
+	};
+	
+	try {
+		text.addVerifyListener(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("Expected exception not thrown", exceptionThrown);
+
+	// test whether all content modifying API sends a Verify event
+	text.addVerifyListener(listener);
+
+	listenerCalled = false;
+	text.append(line);	
+	assertTrue("append does not send event", listenerCalled);
+	assertEquals("Listener failed", newLine, text.getText());
+
+	listenerCalled = false;
+	text.insert(line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+	assertEquals("Listener failed", newLine + newLine, text.getText());
+
+	listenerCalled = false;
+	text.removeVerifyListener(listener);
+	listener = new VerifyListener() {
+		public void verifyText(VerifyEvent event) {
+			listenerCalled = true;
+			assertEquals("Verify event data invalid", 0, event.start);
+			assertEquals("Verify event data invalid", 1, event.end);
+			assertEquals("Verify event data invalid", line, event.text);
+			event.start = 2;
+			event.end = 5;
+			event.text = newLine;
+		}
+	};
+	text.addVerifyListener(listener);
+	textLength = text.getCharCount() - 1 + newLine.length();
+	text.replaceTextRange(0, 1, line);	
+	assertTrue("replaceTextRange does not send event", listenerCalled);
+	assertEquals("Listener failed", newLine + newLine.substring(1, newLine.length()) + newLine, text.getText());
+
+	listenerCalled = false;
+	text.removeVerifyListener(listener);
+	listener = new VerifyListener() {
+		public void verifyText(VerifyEvent event) {
+			listenerCalled = true;
+			assertEquals("Verify event data invalid", 0, event.start);
+			assertEquals("Verify event data invalid", textLength, event.end);
+			assertEquals("Verify event data invalid", line, event.text);
+			event.start = 2;
+			event.end = 5;
+			event.text = newLine;
+		}
+	};
+	text.addVerifyListener(listener);
+	text.setText(line);	
+	assertTrue("setText does not send event", listenerCalled);
+	assertEquals("Listener failed", newLine, text.getText());
+
+	text.removeVerifyListener(listener);
+
+	listenerCalled = false;	
+	listener = new VerifyListener() {
+		public void verifyText(VerifyEvent event) {
+			listenerCalled = true;
+			assertEquals("Verify event data invalid", 2, event.start);
+			assertEquals("Verify event data invalid", newLine.length(), event.end);
+			assertEquals("Verify event data invalid", line, event.text);
+			event.doit = false;
+		}
+	};
+	text.addVerifyListener(listener);
+	// cause StyledText to call the listener. 
+	text.replaceTextRange(2, text.getCharCount() - 2, line);	
+	assertTrue("Listener not called", listenerCalled);
+	assertEquals("Listener failed", newLine, text.getText());
+
+	listenerCalled = false;	
+	text.removeVerifyListener(listener);
+	// cause StyledText to call the listener. 
+	text.setText(line);	
+	assertTrue("Listener not removed", listenerCalled == false);
+}
+
+public void test_appendLjava_lang_String() {
+	boolean exceptionThrown;	
+	String line = "Line1";
+	
+	text.append(line);
+	assertEquals("append to empty text", line, text.getText());
+	
+	exceptionThrown = false;
+	try {
+		text.append(null);
+	}
+	catch (IllegalArgumentException exception) {
+		exceptionThrown = true;
+	}
+	assertTrue("append null string", exceptionThrown);
+
+	text.append("");
+	assertEquals("append empty string", line, text.getText());
+	
+	text.append(line);
+	assertEquals("append non-empty string", line + line, text.getText());
+	
+	text.setText("");
+	String text2 = "line\r";
+	text.append(text2);
+	assertEquals("append string ending with line delimiter", text2, text.getText());
+	
+	String text3 = "line\r\nline3";
+	text.append(text3);
+	assertEquals("append multi line string", text2 + text3, text.getText());	
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_copy() {
+	Clipboard clipboard = new Clipboard(text.getDisplay());
+	TextTransfer transfer = TextTransfer.getInstance();
+	String clipboardText;
+	String convertedText;
+
+	clipboard.setContents(new String[]{""}, new Transfer[]{transfer});
+	
+	text.setSelectionRange(0, 0);
+	text.copy();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":a:", clipboardText != null && clipboardText.length() == 0);
+	
+	text.setText("0123456789");
+	text.setSelectionRange(0, 0);
+	text.copy();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":c:", clipboardText != null && clipboardText.length() == 0);
+	
+
+	text.setSelectionRange(0, 1);
+	text.copy();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":d:", clipboardText != null && clipboardText.equals("0"));
+	
+	text.setSelectionRange(1, 2);	
+	text.copy();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":e:", clipboardText != null && clipboardText.equals("12"));
+	
+	// test line delimiter conversion
+	text.setText("\rLine1\nLine2\r\nLine3\n\rLine4\n");
+	text.setSelectionRange(0, text.getCharCount());
+	text.copy();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	if (SwtJunit.isLinux) {
+		convertedText = "\nLine1\nLine2\nLine3\n\nLine4\n";
+	}
+	else {
+		convertedText = "\r\nLine1\r\nLine2\r\nLine3\r\n\r\nLine4\r\n";
+	}
+	assertTrue(":f:", clipboardText != null && clipboardText.equals(convertedText));
+	
+	// test line delimiter conversion
+	text.setText("Line1\r\nLine2");
+	text.setSelectionRange(0, text.getCharCount());
+	text.copy();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	if (SwtJunit.isLinux) {
+		convertedText = "Line1\nLine2";
+	}
+	else {
+		convertedText = "Line1\r\nLine2";
+	}
+	assertTrue(":g:", clipboardText != null && clipboardText.equals(convertedText));
+
+	clipboard.dispose();
+}
+
+public void test_cut() {
+	Clipboard clipboard = new Clipboard(text.getDisplay());
+	TextTransfer transfer = TextTransfer.getInstance();
+	String clipboardText;
+	String convertedText;
+
+	clipboard.setContents(new String[]{""}, new Transfer[]{transfer});
+		
+	text.setSelectionRange(0, 0);
+	text.cut();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":a:", clipboardText != null && clipboardText.length() == 0);
+	
+	text.setText("0123456789");
+	text.setSelectionRange(0, 0);
+	text.cut();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":c:", clipboardText != null && clipboardText.length() == 0);
+
+	text.setSelectionRange(0, 1);
+	text.cut();	
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":d:", clipboardText != null && clipboardText.equals("0"));
+	
+	text.setSelectionRange(1, 2);	
+	text.cut();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	assertTrue(":e:", clipboardText != null && clipboardText.equals("23"));
+	
+	// test line delimiter conversion
+	text.setText("\rLine1\nLine2\r\nLine3\n\rLine4\n");
+	text.setSelectionRange(0, text.getCharCount());
+	text.cut();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	if (SwtJunit.isLinux) {
+		convertedText = "\nLine1\nLine2\nLine3\n\nLine4\n";
+	}
+	else {
+		convertedText = "\r\nLine1\r\nLine2\r\nLine3\r\n\r\nLine4\r\n";
+	}
+	assertTrue(":f:", clipboardText != null && clipboardText.equals(convertedText));
+	
+	// test line delimiter conversion
+	text.setText("Line1\r\nLine2");
+	text.setSelectionRange(0, text.getCharCount());
+	text.cut();		
+	clipboardText = (String) clipboard.getContents(transfer);
+	if (SwtJunit.isLinux) {
+		convertedText = "Line1\nLine2";
+	}
+	else {
+		convertedText = "Line1\r\nLine2";
+	}
+	assertTrue(":g:", clipboardText != null && clipboardText.equals(convertedText));
+
+	clipboard.dispose();
+}
+
+public void test_getBidiColoring() {
+	/// deprecated, will be removed.
+	warnUnimpl("Test test_getBidiColoring not written");
+}
+
+public void test_getCaretOffset() {
+	assertTrue(":a:", text.getCaretOffset() == 0);
+	text.setText("Line0\r\n");
+	assertTrue(":b:", text.getCaretOffset() == 0);
+	text.setTopIndex(1);
+	assertTrue(":c:", text.getCaretOffset() == 0);
+
+	text.replaceTextRange(text.getCharCount(), 0, "Line1");
+	assertTrue(":d:", text.getCaretOffset() == 0);
+	String newText = "Line-1\r\n";
+	text.replaceTextRange(0, 0, newText);
+	assertTrue(":e:", text.getCaretOffset() == 0);
+
+	text.setCaretOffset(1);
+	assertTrue(":f:", text.getCaretOffset() == 1);
+	text.replaceTextRange(2, 0, newText);
+	assertTrue(":g:", text.getCaretOffset() == 1);
+	text.replaceTextRange(0, 0, newText);
+	assertTrue(":h:", text.getCaretOffset() == newText.length() + 1);
+}
+
+public void test_getContent() {
+	StyledTextContent content = text.getContent();
+	
+	assertTrue(content != null);
+	content = new StyledTextContent() {
+		public void addTextChangeListener(TextChangeListener listener) {
+		}
+		public int getCharCount() {
+			return 0;
+		}
+		public String getLine(int lineIndex) {
+			return "";
+		}
+		public int getLineAtOffset(int offset) {
+			return 0;
+		}
+		public int getLineCount() {
+			return 0;
+		}
+		public String getLineDelimiter() {
+			return "";
+		}
+		public int getOffsetAtLine(int lineIndex) {
+			return 0;
+		}		
+		public String getTextRange(int start, int length) {
+			return "";
+		}
+		public void removeTextChangeListener(TextChangeListener listener) {
+		}
+		public void replaceTextRange(int start, int replaceLength, String text) {
+		}
+		public void setText(String text) {
+		}
+	};
+	text.setContent(content);
+	assertEquals(content, text.getContent());
+}
+
+public void test_getDoubleClickEnabled() {
+	assertTrue(":a:", text.getDoubleClickEnabled() == true);
+	text.setDoubleClickEnabled(true);
+	assertTrue(":b:", text.getDoubleClickEnabled() == true);
+	text.setDoubleClickEnabled(false);
+	assertTrue(":c:", text.getDoubleClickEnabled() == false);
+	text.setDoubleClickEnabled(false);
+	assertTrue(":d:", text.getDoubleClickEnabled() == false);
+	text.setDoubleClickEnabled(true);
+	assertTrue(":e:", text.getDoubleClickEnabled() == true);
+}
+
+public void test_getEditable() {
+	assertTrue(":a:", text.getEditable() == true);
+	text.setEditable(true);
+	assertTrue(":b:", text.getEditable() == true);
+	text.setEditable(false);
+	assertTrue(":c:", text.getEditable() == false);
+	text.setEditable(false);
+	assertTrue(":d:", text.getEditable() == false);
+	text.setEditable(true);
+	assertTrue(":e:", text.getEditable() == true);
+}
+
+public void test_getHorizontalIndex() {
+	assertTrue(":a:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(-1);
+	assertTrue(":b:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":c:", text.getHorizontalIndex() == 0);
+	
+	text.setText("Line0");
+	assertTrue(":d:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(-1);	
+	assertTrue(":e:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":f:", text.getHorizontalIndex() == 1);
+	text.setHorizontalIndex(500);
+	assertTrue(":g:", text.getHorizontalIndex() > 0);
+	text.setHorizontalIndex(-1);
+	assertTrue(":h:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":i:", text.getHorizontalIndex() == 1);
+	// make sure the widget can be scrolled
+	shell.open();
+	text.setSize(10, 50);
+	text.setText("Line0");
+	text.setHorizontalIndex(1);	
+	assertTrue(":j:", text.getHorizontalIndex() == 1);		
+}
+
+public void test_getHorizontalPixel() {	
+	assertTrue(":a:", text.getHorizontalPixel() == 0);
+	text.setHorizontalIndex(-1);
+	assertTrue(":b:", text.getHorizontalPixel() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":c:", text.getHorizontalPixel() == 0);
+	
+	text.setText("Line0");
+	assertTrue(":d:", text.getHorizontalPixel() == 0);
+	text.setHorizontalIndex(-1);	
+	assertTrue(":e:", text.getHorizontalPixel() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":f:", text.getHorizontalPixel() > 0);
+	text.setHorizontalIndex(-1);
+	assertTrue(":g:", text.getHorizontalPixel() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":h:", text.getHorizontalPixel() > 0);
+	// make sure the widget can be scrolled
+	shell.open();
+	text.setSize(10, 50);
+	text.setText("Line0");
+	text.setHorizontalIndex(1);	
+	assertTrue(":i:", text.getHorizontalPixel() > 0);
+}
+
+public void test_getKeyBindingI() {
+	assertTrue(":a:", text.getKeyBinding(SWT.DEL) == ST.DELETE_NEXT);
+	text.setKeyBinding(SWT.DEL, ST.LINE_UP);
+	assertTrue(":b:", text.getKeyBinding(SWT.DEL) == ST.LINE_UP);
+	text.setKeyBinding(SWT.DEL | SWT.SHIFT, ST.SELECT_PAGE_UP);
+	assertTrue(":c:", text.getKeyBinding(SWT.DEL | SWT.SHIFT) == ST.SELECT_PAGE_UP);
+	text.setKeyBinding(SWT.DEL | SWT.SHIFT, ST.PAGE_UP);
+	assertTrue(":d:", text.getKeyBinding(SWT.DEL | SWT.SHIFT) == ST.PAGE_UP);
+	assertTrue(":e:", text.getKeyBinding(-1) == SWT.NULL);
+	assertTrue(":f:", text.getKeyBinding(SWT.F2) == SWT.NULL);
+}
+
+public void test_getCharCount() {
+	assertTrue(":a:", text.getCharCount() == 0);
+	text.setText("Line0");
+	assertTrue(":b:", text.getCharCount() == 5);
+	text.setText("");
+	assertTrue(":c:", text.getCharCount() == 0);
+	text.setText("Line0\n");
+	assertTrue(":d:", text.getCharCount() == 6);
+}
+
+public void test_getLineBackgroundI() {
+	StyleRange[] styles;
+	
+	String textString = "L1\nL2\nL3\nL4";
+	text.setText(textString);
+	assertTrue(":1:", text.getLineBackground(0) == null);
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	assertTrue(":1:", text.getLineBackground(1) == getColor(YELLOW));
+	assertTrue(":1:", text.getLineBackground(2) == getColor(BLUE));
+}
+
+public void test_getLineCount() {
+	String delimiterString = "\r\n";
+	assertTrue(":a:", text.getLineCount()==1);
+	text.append("dddasd" + delimiterString);
+	assertTrue(":b:", text.getLineCount()==2);
+	text.append("ddasdasdasdasd" + delimiterString);
+	assertTrue(":c:", text.getLineCount()==3);
+
+
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertTrue(":a:", text.getLineCount()==1);
+	text.insert(delimiterString);
+	assertTrue(":b:", text.getLineCount()==2);
+}
+
+public void test_getLineAtOffsetI() {
+	boolean exceptionThrown = false;
+	
+	assertTrue(":a:", text.getLineAtOffset(0) == 0);
+	try {
+		text.getLineAtOffset(-1);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":b:", exceptionThrown == true);
+	exceptionThrown = false;
+	
+	try {
+		text.getLineAtOffset(100);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":c:", exceptionThrown == true);
+	exceptionThrown = false;
+	
+	text.setText("Line0\r\n");	
+	assertTrue(":d:", text.getLineAtOffset(4) == 0);
+	assertTrue(":e:", text.getLineAtOffset(5) == 0);
+	assertTrue(":f:", text.getLineAtOffset(6) == 0);
+	assertTrue(":g:", text.getLineAtOffset(7) == 1);
+	try {
+		text.getLineAtOffset(8);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":h:", exceptionThrown == true);
+	exceptionThrown = false;
+}
+
+public void test_getLineDelimiter() {
+	final String lineDelimiter = "\n";
+	StyledTextContent content = text.getContent();
+	
+	assertEquals(content.getLineDelimiter(), text.getLineDelimiter());
+
+	content = new StyledTextContent() {
+		public void addTextChangeListener(TextChangeListener listener) {
+		}
+		public int getCharCount() {
+			return 0;
+		}
+		public String getLine(int lineIndex) {
+			return "";
+		}
+		public int getLineAtOffset(int offset) {
+			return 0;
+		}
+		public int getLineCount() {
+			return 0;
+		}
+		public String getLineDelimiter() {
+			return lineDelimiter;
+		}
+		public int getOffsetAtLine(int lineIndex) {
+			return 0;
+		}		
+		public String getTextRange(int start, int length) {
+			return "";
+		}
+		public void removeTextChangeListener(TextChangeListener listener) {
+		}
+		public void replaceTextRange(int start, int replaceLength, String text) {
+		}
+		public void setText(String text) {
+		}
+	};
+	text.setContent(content);
+	assertEquals(lineDelimiter, text.getLineDelimiter());
+}
+
+public void test_getLineHeight() {
+	assertTrue(":a:", text.getLineHeight() > 0);
+}
+
+public void test_getLocationAtOffsetI(){
+	// copy from StyledText, has to match value used by StyledText
+	final int XINSET;
+	if (isBidi()) XINSET = 3;
+	else XINSET = 0;
+	
+	assertTrue(":a:", text.getLocationAtOffset(0).equals(new Point(0, 0)));
+	try {
+		text.getLocationAtOffset(-1);
+		fail("No exception thrown for offset == -1");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		text.getLocationAtOffset(100);
+		fail("No exception thrown for illegal offset argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	text.setText("Line0\r\nLine1");	
+	assertTrue(":d:", text.getLocationAtOffset(4).x > 0 && text.getLocationAtOffset(4).y == 0);
+	assertTrue(":e:", text.getLocationAtOffset(6).x > 0 && text.getLocationAtOffset(6).y == 0);
+	// x location will == StyledText x inset on bidi platforms
+	assertTrue(":f:", text.getLocationAtOffset(7).x == XINSET && text.getLocationAtOffset(7).y > 0);
+	try {
+		text.getLocationAtOffset(13);
+		fail("No exception thrown for illegal offset argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	text.setTopIndex(1);
+	assertTrue(":h:", text.getLocationAtOffset(4).x > 0 && text.getLocationAtOffset(4).y < 0);
+	// x location will == StyledText x inset on bidi platforms	
+	assertTrue(":i:", text.getLocationAtOffset(7).x == XINSET && text.getLocationAtOffset(7).y == 0);
+	
+	text.setHorizontalIndex(1);
+	assertTrue(":j:", text.getLocationAtOffset(0).x < 0 && text.getLocationAtOffset(0).y < 0);
+	assertTrue(":k:", text.getLocationAtOffset(7).x < 0 && text.getLocationAtOffset(7).y == 0);
+}
+
+public void test_getOffsetAtLocationLorg_eclipse_swt_graphics_Point() {
+	boolean exceptionThrown = false;
+	Point location;
+	
+	assertTrue(":a:", text.getOffsetAtLocation(new Point(0, 0)) == 0);
+	try {
+		text.getOffsetAtLocation(new Point(-1, 0));
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":b:", exceptionThrown == true);
+	exceptionThrown = false;
+	
+	try {
+		text.getOffsetAtLocation(new Point(0, -1));
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":c:", exceptionThrown == true);
+	exceptionThrown = false;
+	
+	text.setText("Line0\r\nLine1");	
+	location = text.getLocationAtOffset(5);
+	assertTrue(":d:", text.getOffsetAtLocation(new Point(10, 0)) > 0);
+	assertTrue(":e:", text.getOffsetAtLocation(new Point(location.x - 1, 0)) == 4);
+	location = text.getLocationAtOffset(7);	
+	assertTrue(":f:", text.getOffsetAtLocation(location) == 7);
+	try {
+		text.getOffsetAtLocation(new Point(100, 0));
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":g:", exceptionThrown == true);
+	exceptionThrown = false;
+
+	try {
+		text.getOffsetAtLocation(new Point(0, 50));
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":h:", exceptionThrown == true);
+	exceptionThrown = false;
+
+	text.setTopIndex(1);
+	assertTrue(":i:", text.getOffsetAtLocation(new Point(0, -5)) == 0);
+	assertTrue(":j:", text.getOffsetAtLocation(new Point(0, 0)) == 7);
+	
+	text.setHorizontalIndex(1);
+	assertTrue(":k:", text.getOffsetAtLocation(new Point(-5, -5)) == 0);
+	assertTrue(":l:", text.getOffsetAtLocation(new Point(-5, 0)) == 7);
+
+	// 1GL4ZVE
+	assertTrue(":m:", text.getOffsetAtLocation(text.getLocationAtOffset(2)) == 2);
+	text.setHorizontalIndex(0);
+	assertTrue(":n:", text.getOffsetAtLocation(text.getLocationAtOffset(2)) == 2);
+}
+
+public void test_getSelection(){
+	text.setText("01234567890");
+	text.setSelection(new Point(2, 2));
+	assertTrue(":b:", text.getSelection().equals(new Point(2, 2)));
+	text.setSelection(new Point(2, 3));
+	assertTrue(":c:", text.getSelection().equals(new Point(2, 3)));
+	text.setSelection(new Point(3, 11));
+	assertTrue(":d:", text.getSelection().equals(new Point(3, 11)));
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertTrue(":a:", text.getSelection().equals(new Point(4, 4)));
+	text.setSelection(11);
+	assertTrue(":b:", text.getSelection().equals(new Point(11, 11)));
+}
+
+public void test_getSelectionRange() {
+	String testText = "Line1\r\nLine2";
+// test with incorrect values as soon as we have a story for handling out of range values
+//	int selectionRanges [][] = {{0, 1}, {0, 0}, {-1, 0}, {-1, -1}, {100, 1}, {100, -1}, {2, 5}, {5, 2}};
+	int selectionRanges [][] = {{0, 1}, {0, 0}, {2, 5}};
+	int textLength;
+	
+	assertTrue(":a:", text.getSelectionRange().x == 0 && text.getSelectionRange().y == 0);
+	text.setText(testText);
+	assertTrue(":b:", text.getSelectionRange().x == 0 && text.getSelectionRange().y == 0);
+
+
+	textLength = text.getCharCount();
+	for (int i = 0; i < selectionRanges.length; i++) {
+		int start = selectionRanges[i][0];
+		int end = selectionRanges[i][1];
+		text.setSelectionRange(start, end - start);
+		assertTrue(":c:" + i, text.getSelectionRange().x == start && text.getSelectionRange().y == end - start);
+	}
+}
+
+public void test_getSelectionCount(){
+	text.setText("01234567890");
+	assertTrue(":a:", text.getSelectionCount()==0);
+	text.setSelection(2, 4);
+	assertTrue(":b:", text.getSelectionCount()==2);
+	text.setSelection(2, 11);
+	assertTrue(":c:", text.getSelectionCount()==9);
+	text.setText("0123\n4567890");
+	assertTrue(":d:", text.getSelectionCount()==0);
+	text.setSelection(2, 4);
+	assertTrue(":e:", text.getSelectionCount()==2);
+	text.setSelection(2, 12);
+	assertTrue(":f:", text.getSelectionCount()==10);
+}
+
+public void test_getSelectionText() {
+	String testText = "Line1\r\nLine2";
+// test with incorrect values as soon as we have a story for handling out of range values
+//	int selectionRanges [][] = {{0, 1}, {0, 0}, {-1, 0}, {-1, -1}, {100, 1}, {100, -1}, {2, 5}, {5, 2}};
+	int selectionRanges [][] = {{0, 1}, {0, 0}, {2, 5}};
+	int textLength;
+	
+	assertTrue(":a:", text.getSelectionText().length() == 0);
+	text.setText(testText);
+	assertTrue(":b:", text.getSelectionText().length() == 0);
+
+
+	textLength = text.getCharCount();
+	for (int i = 0; i < selectionRanges.length; i++) {
+		int start = selectionRanges[i][0];
+		int end = selectionRanges[i][1];
+		text.setSelectionRange(start, end - start);
+		assertTrue(":c:" + i, text.getSelectionText().equals(testText.substring(start, end)));
+	}
+}
+
+public void test_getStyleRangeAtOffsetI() {
+	String line = "Line1\r\nLine2";
+	int styleStart = 0;
+	int styleLength = 5;
+	int i;
+	boolean exceptionThrown = false;
+	StyleRange style = new StyleRange(styleStart, styleLength, getColor(BLUE), getColor(RED), SWT.BOLD);
+
+	try {
+		text.getStyleRangeAtOffset(0);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("offset out of range no text", exceptionThrown);
+
+	text.setText(line);
+	exceptionThrown = false;
+	try {
+		text.getStyleRangeAtOffset(-1);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("offset out of range negative", exceptionThrown);
+
+	exceptionThrown = false;
+	try {
+		text.getStyleRangeAtOffset(line.length());
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue("offset out of range positive", exceptionThrown);
+		
+	text.setStyleRange(style);
+	style.length = 1;
+	for (i = styleStart; i < styleStart + styleLength; i++) {
+		style.start = i;
+		assertEquals(style, text.getStyleRangeAtOffset(i));
+	}
+	assertEquals(null, text.getStyleRangeAtOffset(i));
+			
+	// test offset at line delimiter
+	style = new StyleRange(5, 2, null, getColor(BLUE), SWT.NORMAL);
+	text.setStyleRange(style);
+	style.length = 1;
+	assertEquals(style, text.getStyleRangeAtOffset(5));
+	style.start = 6;
+	assertEquals(style, text.getStyleRangeAtOffset(6));	
+	assertEquals(null, text.getStyleRangeAtOffset(10));
+}
+
+public void test_getStyleRanges() {
+	text.setText("package test;\n/* Line 1\n * Line 2\n */\npublic class SimpleClass {\n}");
+	text.setStyleRange(getStyle(0,7,BLUE,null));
+	text.setStyleRange(getStyle(14,23,RED,null));
+	text.setStyleRange(getStyle(38,6,BLUE,null));
+	text.setStyleRange(getStyle(45,5,BLUE,null));
+ 	text.replaceTextRange(14, 23, "\t/*Line 1\n\t * Line 2\n\t */");
+ 	String newText = text.getTextRange(0, text.getCharCount());
+	assertTrue(":1:", newText.equals("package test;\n\t/*Line 1\n\t * Line 2\n\t */\npublic class SimpleClass {\n}"));
+	StyleRange[] styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 3);
+	assertTrue(":1:", styles[0].equals(getStyle(0,7,BLUE,null)));
+	assertTrue(":1:", styles[1].equals(getStyle(40,6,BLUE,null)));
+	assertTrue(":1:", styles[2].equals(getStyle(47,5,BLUE,null)));
+}
+
+public void test_getTabs() {
+	text.setTabs(1);
+	assertTrue(":a:", text.getTabs() == 1);
+	text.setTabs(8);
+	assertTrue(":b:", text.getTabs() == 8);
+	text.setText("Line\t1\r\n");
+	assertTrue(":c:", text.getTabs() == 8);
+	text.setTabs(7);
+	assertTrue(":d:", text.getTabs() == 7);
+}
+
+public void test_getText() {
+	String testText = "Line1\r\nLine2";
+	
+	assertTrue(":a:", text.getText().length() == 0);
+	text.setText(testText);
+	assertTrue(":b:", text.getText().equals(testText));
+	text.setText("");
+	assertTrue(":c:", text.getText().length() == 0);
+	
+	text.setText(testText);
+	assertTrue(":a:", text.getText().equals(testText));
+	text.setText(testText + "\r\n");
+	assertTrue(":b:", text.getText().equals(testText + "\r\n"));
+	text.setText("");
+	assertTrue(":c:", text.getText().length() == 0);
+}
+
+public void test_getTextII() {
+	boolean exceptionThrown;
+	String testText = "Line1\r\nLine2";
+	int invalidRanges[][] = {{-1, 0}, {0, -1}, {-1, -1}, {100, 1}, {100, -1}, {2, testText.length()}, {5, 2}};
+	int ranges[][] = {{0, 1}, {0, 0}, {2, 5}, {7, 11}};
+	
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int end = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.getText(start, end);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	text.setText(testText);
+	for (int i = 0; i < ranges.length; i++) {
+		int start = ranges[i][0];
+		int end = ranges[i][1];
+		assertEquals(":b:" + i, testText.substring(start, end + 1), text.getText(start, end));
+	}
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int end = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.getText(start, end);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	text.setText("testing");
+	assertTrue(":d:", text.getText(0,0).equals("t"));
+	assertTrue(":d:", text.getText(0,1).equals("te"));
+	assertTrue(":d:", text.getText(1,5).equals("estin"));
+}
+
+public void test_getTextRangeII() {
+	boolean exceptionThrown;
+	String testText = "Line1\r\nLine2";
+	int invalidRanges[][] = {{-1, 0}, {0, -1}, {-1, -1}, {100, 1}, {100, -1}, {1, testText.length()}, {5, -1}};
+	int ranges[][] = {{0, 1}, {0, 0}, {5, 1}, {7, 5}, {12, 0}};
+	
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int length = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.getTextRange(start, length);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	text.setText(testText);
+	for (int i = 0; i < ranges.length; i++) {
+		int start = ranges[i][0];
+		int length = ranges[i][1];
+		assertEquals(":b:" + i, testText.substring(start, start + length), text.getTextRange(start, length));
+	}
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int length = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.getTextRange(start, length);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	text.setText("testing");
+	assertTrue(":d:", text.getTextRange(0,0).equals(""));
+	assertTrue(":d:", text.getTextRange(0,1).equals("t"));	
+	assertTrue(":d:", text.getTextRange(0,2).equals("te"));
+	assertTrue(":d:", text.getTextRange(1,5).equals("estin"));
+}
+
+public void test_getTextLimit() {
+	assertTrue(":a:", text.getTextLimit() < 0);
+	text.setTextLimit(10);
+	assertTrue(":b:", text.getTextLimit() == 10);
+}
+
+public void test_getTopIndex() {
+	text.setText("Line0\r\n");
+
+	assertTrue(":a:", text.getTopIndex() == 0);
+	text.setTopIndex(-2);
+	assertTrue(":b:", text.getTopIndex() == 0);
+	text.setTopIndex(-1);
+	assertTrue(":c:", text.getTopIndex() == 0);
+	text.setTopIndex(1);
+	assertTrue(":d:", text.getTopIndex() == 1);
+	text.setTopIndex(2);
+	assertTrue(":e:", text.getTopIndex() == 2);
+	text.setTopIndex(0);
+	assertTrue(":f:", text.getTopIndex() == 0);
+	text.setTopIndex(3);
+	assertTrue(":g:", text.getTopIndex() == 2);
+	text.replaceTextRange(text.getCharCount(), 0, "Line1");
+	assertTrue(":h:", text.getTopIndex() == 2);
+	text.setText("");
+	assertTrue(":i:", text.getTopIndex() == 0);
+}
+
+public void test_getTopPixel() {
+	text.setText("Line0\r\n");
+
+	assertTrue(":a:", text.getTopPixel() == 0);
+	text.setTopIndex(-2);
+	assertTrue(":b:", text.getTopPixel() == 0);
+	text.setTopIndex(-1);
+	assertTrue(":c:", text.getTopPixel() == 0);
+	text.setTopIndex(1);
+	assertTrue(":d:", text.getTopPixel() == text.getLineHeight());
+	text.setTopIndex(2);
+	assertTrue(":e:", text.getTopPixel() == text.getLineHeight() * 2);
+	text.setTopIndex(0);
+	assertTrue(":f:", text.getTopPixel() == 0);
+	text.setTopIndex(3);
+	assertTrue(":g:", text.getTopPixel() == text.getLineHeight() * 2);
+	text.replaceTextRange(text.getCharCount(), 0, "Line1");
+	assertTrue(":h:", text.getTopPixel() == text.getLineHeight() * 2);
+	text.setText("");
+	assertTrue(":i:", text.getTopPixel() == 0);
+}
+
+public void test_insertLjava_lang_String(){
+	String delimiterString = "\n";
+	try {
+		text.insert(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	assertTrue(":a:", text.getText().equals(""));
+	text.insert("");
+	assertTrue(":b:", text.getText().equals(""));
+	text.insert("fred");
+	assertTrue(":c:", text.getText().equals("fred"));
+	text.setSelection(2);
+	text.insert("helmut");
+	assertTrue(":d:", text.getText().equals("frhelmuted"));
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertTrue(":e:", text.getLineCount()==1);
+	text.insert(delimiterString);
+	assertTrue(":f:", text.getLineCount()==2);
+}
+
+public void test_invokeActionI() {
+	warnUnimpl("Test test_invokeActionI not written");
+}
+
+public void test_paste(){
+	Clipboard clipboard = new Clipboard(text.getDisplay());
+	TextTransfer transfer = TextTransfer.getInstance();
+	String convertedText;
+
+	clipboard.setContents(new String[]{""}, new Transfer[]{transfer});
+	
+	text.copy();	
+	text.paste();	
+	assertTrue(":a:", text.getCharCount() == 0);
+	
+	text.setSelectionRange(0, 0);
+	text.copy();	
+	text.paste();	
+	assertTrue(":b:", text.getCharCount() == 0);
+
+	text.setText("0123456789");
+	text.setSelectionRange(0, 1);
+	text.copy();	
+	text.setCaretOffset(0);
+	text.paste();	
+	assertTrue(":c:", text.getText().equals("00123456789"));
+	text.setSelectionRange(1, 2);	
+	text.copy();	
+	text.setText("");
+	text.paste();
+	assertTrue(":d:", text.getText().equals("01"));
+	text.setText("");
+
+	// test line delimiter conversion
+	clipboard.setContents(new String[]{"\rLine1\nLine2\r\nLine3\n\rLine4\n"}, new Transfer[]{transfer});
+	text.paste();
+	if (SwtJunit.isLinux) {
+		convertedText = "\nLine1\nLine2\nLine3\n\nLine4\n";
+	}
+	else {
+		convertedText = "\r\nLine1\r\nLine2\r\nLine3\r\n\r\nLine4\r\n";
+	}
+	assertTrue(":f:", text.getText() != null && text.getText().equals(convertedText));
+	text.setText("");
+
+	// test line delimiter conversion
+	clipboard.setContents(new String[]{"Line1\r\nLine2"}, new Transfer[]{transfer});
+	text.paste();
+	if (SwtJunit.isLinux) {
+		convertedText = "Line1\nLine2";
+	}
+	else {
+		convertedText = "Line1\r\nLine2";
+	}
+	assertTrue(":g:", text.getText() != null && text.getText().equals(convertedText));
+	text.setText("");
+
+	// test line delimiter conversion
+	clipboard.setContents(new String[]{"Line1\rLine2"}, new Transfer[]{transfer});
+	text.paste();
+	if (SwtJunit.isLinux) {
+		convertedText = "Line1\nLine2";
+	}
+	else {
+		convertedText = "Line1\r\nLine2";
+	}
+	assertTrue(":h:", text.getText() != null && text.getText().equals(convertedText));
+	text.setText("");
+
+
+	// test line delimiter conversion
+	clipboard.setContents(new String[]{"Line1\nLine2"}, new Transfer[]{transfer});
+	text.paste();
+	if (SwtJunit.isLinux) {
+		convertedText = "Line1\nLine2";
+	}
+	else {
+		convertedText = "Line1\r\nLine2";
+	}
+	assertTrue(":i:", text.getText() != null && text.getText().equals(convertedText));
+	text.setText("");
+
+
+	clipboard.dispose();
+}
+
+public void test_print() {
+	warnUnimpl("Test test_print not written");
+}
+
+public void test_printLorg_eclipse_swt_printing_Printer() {
+	warnUnimpl("Test test_printLorg_eclipse_swt_printing_Printer not written");
+}
+
+public void test_redraw() {
+	warnUnimpl("Test test_redraw not written");
+}
+
+public void test_redrawIIIIZ() {
+	warnUnimpl("Test test_redrawIIIIZ not written");
+}
+
+public void test_redrawRangeIIZ() {
+	warnUnimpl("Test test_redrawRangeIIZ not written");
+}
+
+public void test_removeBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener() {
+	// tested in test_addBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener
+}
+
+public void test_removeExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener() {
+	// tested in test_addExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener
+}
+
+public void test_removeLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener() {
+	// tested in test_addLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener
+}
+
+public void test_removeLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener() {
+	// tested in test_addLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener
+}
+
+public void test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	// tested in test_addModifyListenerLorg_eclipse_swt_events_ModifyListener
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	// tested in test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener
+}
+
+public void test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener() {
+	// tested in test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener
+}
+
+public void test_removeVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener() {
+	// tested in test_addVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener
+}
+
+public void test_replaceTextRangeIILjava_lang_String(){
+	String defaultText = "line0\n\rline1\n\rline2\n\r";
+	int defaultTextLength = defaultText.length();
+	int selectionStart = 7;
+	int selectionLength = 7;
+	int replaceStart = selectionStart + selectionLength + 1;
+	int replaceLength = 5;
+	boolean exceptionThrown = false;
+	String newText = "newline0\n\rnewline1";
+	int newTextLength = newText.length();
+			
+	// insert text
+	// within range
+	// after selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(replaceStart, 0, newText);
+	assertTrue(":a:", text.getCharCount() == defaultTextLength + newTextLength);
+	assertTrue(":b:", text.getSelectionRange().x == selectionStart && text.getSelectionRange().y == selectionLength);
+		
+	// before selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(0, 0, newText);
+	assertTrue(":c:", text.getCharCount() == defaultTextLength + newTextLength);
+	assertTrue(":d:", text.getSelectionRange().x == selectionStart + newTextLength && text.getSelectionRange().y == selectionLength);
+
+
+	// intersecting selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(selectionStart + 1, 0, newText);
+	assertTrue(":e:", text.getCharCount() == defaultTextLength + newTextLength);
+	assertTrue(":f:", text.getSelectionRange().x == selectionStart + 1 + newTextLength && text.getSelectionRange().y == 0);
+				
+	// out of range
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	try {
+		text.replaceTextRange(-1, 0, newText);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":g:", exceptionThrown == true);
+	exceptionThrown = false;
+	try {
+		text.replaceTextRange(text.getCharCount() + 1, 0, newText);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":h:", exceptionThrown == true);
+	assertTrue(":i:", text.getSelectionRange().x == selectionStart && text.getSelectionRange().y == selectionLength);
+	exceptionThrown = false;
+		
+	// append text
+	// append in empty widget
+	text.setText("");
+	text.replaceTextRange(text.getCharCount(), 0, newText);
+	assertTrue(":j:", text.getCharCount() == newTextLength);
+	assertTrue(":k:", text.getSelectionRange().x == 0 && text.getSelectionRange().y == 0);
+			
+	// append in non-empty widget (selection should always be preserved)
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(text.getCharCount(), 0, newText);
+	assertTrue(":l:", text.getCharCount() == defaultTextLength + newTextLength);
+	assertTrue(":m:", text.getSelectionRange().x == selectionStart && text.getSelectionRange().y == selectionLength);
+
+	// place caret at end of text
+	text.setText(defaultText);
+	text.setSelectionRange(text.getCharCount(), 0);	
+	text.replaceTextRange(text.getCharCount(), 0, newText);
+	assertTrue(":n:", text.getCharCount() == defaultTextLength + newTextLength);
+	assertTrue(":o:", text.getSelectionRange().x == text.getCharCount() - newTextLength && text.getSelectionRange().y == 0);
+
+	// replace text
+	// within range
+	// after selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(replaceStart, replaceLength, newText);
+	assertTrue(":p:", text.getCharCount() == defaultTextLength + newTextLength - replaceLength);
+	assertTrue(":q:", text.getSelectionRange().x == selectionStart && text.getSelectionRange().y == selectionLength);
+		
+	// before selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(0, replaceLength, newText);
+	assertTrue(":r:", text.getCharCount() == defaultTextLength + newTextLength - replaceLength);
+	assertTrue(":s:", text.getSelectionRange().x == selectionStart + newTextLength - replaceLength && text.getSelectionRange().y == selectionLength);
+	
+	// intersecting selection
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	text.replaceTextRange(selectionStart + 1, replaceLength, newText);
+	assertTrue(":t:", text.getCharCount() == defaultTextLength + newTextLength - replaceLength);
+	assertTrue(":u:", text.getSelectionRange().x == selectionStart + 1 + newTextLength && text.getSelectionRange().y == 0);
+			
+	// out of range
+	text.setText(defaultText);
+	// select 2nd line including line break
+	text.setSelectionRange(selectionStart, selectionLength);	
+	try {
+		text.replaceTextRange(-1, replaceLength, newText);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":v:", exceptionThrown == true);
+	exceptionThrown = false;
+	try {
+		text.replaceTextRange(text.getCharCount() + 1, replaceLength, newText);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":w:", exceptionThrown == true);
+	assertTrue(":x:", text.getSelectionRange().x == selectionStart && text.getSelectionRange().y == selectionLength);
+	exceptionThrown = false;
+}
+
+public void test_selectAll() {
+	warnUnimpl("Test test_selectAll not written");
+}
+
+public void test_setCaretLorg_eclipse_swt_widgets_Caret() {
+	warnUnimpl("Test test_setCaretLorg_eclipse_swt_widgets_Caret not written");
+}
+
+public void test_setBidiColoringZ() {
+	warnUnimpl("Test test_setBidiColoringZ not written");
+}
+
+public void test_setCaretOffsetI(){
+	text.setCaretOffset(-2);
+	assertTrue(":a:", text.getCaretOffset() == 0);
+	text.setCaretOffset(1);
+	assertTrue(":b:", text.getCaretOffset() == 0);
+	text.setCaretOffset(0);
+	assertTrue(":c:", text.getCaretOffset() == 0);
+
+	text.setText("Line0\r\n");
+	text.setCaretOffset(-2);
+	assertTrue(":d:", text.getCaretOffset() == 0);
+	text.setCaretOffset(1);
+	assertTrue(":e:", text.getCaretOffset() == 1);
+	text.setCaretOffset(0);
+	assertTrue(":f:", text.getCaretOffset() == 0);
+
+	text.setCaretOffset(text.getCharCount());
+	assertTrue(":g:", text.getCaretOffset() == text.getCharCount());
+	text.setCaretOffset(text.getCharCount() + 1);
+	assertTrue(":h:", text.getCaretOffset() == text.getCharCount());
+	text.setCaretOffset(5);
+	assertTrue(":i:", text.getCaretOffset() == 5);
+
+	text.setText("");
+	text.setCaretOffset(-2);
+	assertTrue(":j:", text.getCaretOffset() == 0);
+	text.setCaretOffset(1);
+	assertTrue(":k:", text.getCaretOffset() == 0);
+	text.setCaretOffset(0);
+	assertTrue(":l:", text.getCaretOffset() == 0);
+}
+
+public void test_setContentLorg_eclipse_swt_custom_StyledTextContent() {
+	boolean exceptionThrown;
+	StyledTextContent content = new StyledTextContent() {
+		public void addTextChangeListener(TextChangeListener listener) {
+		}
+		public int getCharCount() {
+			return 0;
+		}
+		public String getLine(int lineIndex) {
+			return "";
+		}
+		public int getLineAtOffset(int offset) {
+			return 0;
+		}
+		public int getLineCount() {
+			return 0;
+		}
+		public String getLineDelimiter() {
+			return "";
+		}
+		public int getOffsetAtLine(int lineIndex) {
+			return 0;
+		}		
+		public String getTextRange(int start, int length) {
+			return "";
+		}
+		public void removeTextChangeListener(TextChangeListener listener) {
+		}
+		public void replaceTextRange(int start, int replaceLength, String text) {
+		}
+		public void setText(String text) {
+		}
+	};
+	text.setContent(content);
+	assertEquals(content, text.getContent());
+	
+	exceptionThrown = false;
+	try {
+		text.setContent(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(exceptionThrown);
+}
+
+public void test_setDoubleClickEnabledZ(){
+	text.setDoubleClickEnabled(true);
+	assertTrue(":a:", text.getDoubleClickEnabled() == true);
+	text.setDoubleClickEnabled(false);
+	assertTrue(":b:", text.getDoubleClickEnabled() == false);
+	text.setDoubleClickEnabled(false);
+	assertTrue(":c:", text.getDoubleClickEnabled() == false);
+	text.setDoubleClickEnabled(true);
+	assertTrue(":d:", text.getDoubleClickEnabled() == true);
+}
+
+public void test_setEditableZ(){
+	text.setEditable(true);
+	assertTrue(":a:", text.getEditable() == true);
+	text.setEditable(false);
+	assertTrue(":b:", text.getEditable() == false);
+	text.setEditable(false);
+	assertTrue(":c:", text.getEditable() == false);
+	text.setEditable(true);
+	assertTrue(":d:", text.getEditable() == true);
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font(){
+	FontData fontData = text.getFont().getFontData()[0];
+	int lineHeight;
+	Font font;
+	
+	font = new Font(text.getDisplay(), fontData.getName(), 8, fontData.getStyle());
+	text.setFont(font);
+	font.dispose();
+	lineHeight = text.getLineHeight();
+	font = new Font(text.getDisplay(), fontData.getName(), 12, fontData.getStyle());
+	text.setFont(font);
+	assertTrue(":a:", text.getLineHeight() > lineHeight && font.equals(text.getFont()));
+	font.dispose();
+}
+
+public void test_setHorizontalIndexI(){
+	text.setHorizontalIndex(-1);
+	assertTrue(":a:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":b:", text.getHorizontalIndex() == 0);
+	
+	text.setText("Line0");
+	text.setHorizontalIndex(-1);
+	assertTrue(":c:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":d:", text.getHorizontalIndex() == 1);
+	text.setHorizontalIndex(500);
+	assertTrue(":e:", text.getHorizontalIndex() > 0);
+	text.setHorizontalIndex(-1);	
+	assertTrue(":f:", text.getHorizontalIndex() == 0);
+	text.setHorizontalIndex(1);	
+	assertTrue(":g:", text.getHorizontalIndex() == 1);	
+
+	text.setText("");
+	text.setHorizontalIndex(2);
+	assertTrue(":h:", text.getHorizontalIndex() == 0);
+
+	// make sure the widget can be scrolled
+	shell.open();
+	text.setSize(10, 50);	
+	text.setText("Line0");
+	text.setHorizontalIndex(1);	
+	assertTrue(":i:", text.getHorizontalIndex() == 1);
+}
+
+public void test_setLineBackgroundIILorg_eclipse_swt_graphics_Color(){
+	StyleRange[] styles;
+	String textString = "";
+
+	textString = "L1\nL2\nL3\nL4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(1,5,"");
+	assertTrue(":0a:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":0a:", text.getLineBackground(1) == getColor(GREEN));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(0,4,"");
+	assertTrue(":0b:", text.getLineBackground(0) == getColor(YELLOW));
+	assertTrue(":0b:", text.getLineBackground(1) == getColor(BLUE));
+	assertTrue(":0b:", text.getLineBackground(2) == getColor(GREEN));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(1,1,"");
+	assertTrue(":0c:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":0c:", text.getLineBackground(1) == getColor(YELLOW));
+	assertTrue(":0c:", text.getLineBackground(2) == getColor(BLUE));
+	assertTrue(":0c:", text.getLineBackground(3) == getColor(GREEN));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(0,6,"");
+	assertTrue(":0d:", text.getLineBackground(0) == getColor(BLUE));
+	assertTrue(":0d:", text.getLineBackground(1) == getColor(GREEN));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(1,3,"");
+	assertTrue(":0e:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":0e:", text.getLineBackground(1) == getColor(BLUE));
+	assertTrue(":0e:", text.getLineBackground(2) == getColor(GREEN));
+
+	textString = "L1\nL2";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(1,4,"");
+	assertTrue(":0a1:", text.getLineBackground(0) == getColor(RED));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(0,4,"");
+	assertTrue(":0b1:", text.getLineBackground(0) == getColor(YELLOW));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(1,1,"");
+	assertTrue(":0c1:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":0c1:", text.getLineBackground(1) == getColor(YELLOW));
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(0,5,"");
+	assertTrue(":0d1:", text.getLineBackground(0) == null);
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(1,3,"");
+	assertTrue(":0e1:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":0e1:", text.getLineBackground(1) == getColor(YELLOW));
+	textString = "L1\nL2";
+	text.setText(textString);
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(1,4,"");
+	assertTrue(":0f1:", text.getLineBackground(0) == null);
+	text.setText(textString+"\n");
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.replaceTextRange(0,6,"");
+	assertTrue(":0g1:", text.getLineBackground(0) == null);
+				
+	text.setText(textString);
+	text.setLineBackground(0,0,getColor(RED));
+	assertTrue(":1:", text.getLineBackground(0) == null);
+	text.setLineBackground(0,1,getColor(RED));
+	assertTrue(":1:", text.getLineBackground(0) == getColor(RED));
+	
+	textString = "New Line1\nNew Line2\nNew Line3\nNew Line4";
+	text.setText(textString);
+	text.setLineBackground(0,2,getColor(RED));
+	text.setLineBackground(2,2,getColor(YELLOW));
+	text.replaceTextRange(0,0,"\n");
+	assertTrue(":2:", text.getLineBackground(0) == null);
+	assertTrue(":2:", text.getLineBackground(1) == getColor(RED));
+	assertTrue(":2:", text.getLineBackground(2) == getColor(RED));
+	assertTrue(":2:", text.getLineBackground(3) == getColor(YELLOW));
+	assertTrue(":2:", text.getLineBackground(4) == getColor(YELLOW));
+	
+	textString = "New Line1\nNew Line2\nNew Line3\nNew Line4";
+	text.setText(textString);
+	text.setLineBackground(0,2,getColor(RED));
+	text.setLineBackground(2,2,getColor(YELLOW));
+	text.replaceTextRange(0,20,"");
+	assertTrue(":3:", text.getLineBackground(0) == getColor(YELLOW));
+	assertTrue(":3:", text.getLineBackground(1) == getColor(YELLOW));
+
+	textString = "Line1\nLine2\nLine3\nLine4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(2,1,getColor(YELLOW));
+	text.replaceTextRange(0,18,"");
+	assertTrue(":4:", text.getLineBackground(0) == null);
+
+	textString = "Line1\nLine2\nLine3\nLine4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(2,1,getColor(YELLOW));
+	text.replaceTextRange(0,18,"L1\nL2\nL3\n");
+	assertTrue(":5:", text.getLineBackground(0) == null);
+	assertTrue(":5:", text.getLineBackground(1) == null);
+	assertTrue(":5:", text.getLineBackground(2) == null);
+	assertTrue(":5:", text.getLineBackground(3) == null);
+
+	textString = "Line1\nLine2\nLine3\nLine4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(3,9,"L1\nL2\n");
+	assertTrue(":6a:", text.getLineBackground(0) == getColor(RED));
+	assertTrue(":6a:", text.getLineBackground(1) == null);
+	textString = "Line1\nLine2\nLine3\nLine4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(11,11,"L3\nL4");
+	assertTrue(":6b:", text.getLineBackground(2) == null);
+	assertTrue(":6b:", text.getLineBackground(3) == getColor(GREEN));
+		
+	textString = "Line1\nLine2\nLine3\nLine4";
+	text.setText(textString);
+	text.setLineBackground(0,1,getColor(RED));
+	text.setLineBackground(1,1,getColor(YELLOW));
+	text.setLineBackground(2,1,getColor(BLUE));
+	text.setLineBackground(3,1,getColor(GREEN));
+	text.replaceTextRange(0,18,"L1\n");
+	assertTrue(":7:", text.getLineBackground(0) == null);
+	assertTrue(":7:", text.getLineBackground(1) == getColor(GREEN));
+}
+
+public void test_setSelectionI() {
+	warnUnimpl("Test test_setSelectionI not written");
+}
+
+public void test_setSelectionLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_setSelectionLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_setSelectionII(){
+	int invalidRanges [][] = {{-1, 0}, {-1, -1}, {100, 1}, {100, -1}, {11, 12}, {10, 12}};
+	boolean exceptionThrown;
+
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int end = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.setSelection(start, end);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	text.setText("01234567890");
+	assertTrue(":a:", text.getSelectionText().equals(""));
+	text.setSelection(3, 7);
+	assertTrue(":b:", text.getSelectionText().equals("3456"));
+
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int end = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.setSelection(start, end);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":c:", exceptionThrown);
+	}	
+}
+
+public void test_setSelectionRangeII(){
+	String testText = "Line1\r\nLine2";
+	int invalidRanges [][] = {{-1, 0}, {-1, -1}, {100, 1}, {100, -1}, {12, 1}, {11, 2}};
+	int selectionRanges [][] = {{0, 1}, {0, 0}, {2, 3}, {12, 0}};
+	int textLength;
+	boolean exceptionThrown;
+	
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int length = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.setSelectionRange(start, length);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}	
+	
+	text.setSelectionRange(0, 0);
+	assertTrue(":b:", text.getSelectionRange().x == 0 && text.getSelectionRange().y == 0);
+	text.setText(testText);
+	textLength = text.getCharCount();
+	for (int i = 0; i < selectionRanges.length; i++) {
+		int start = selectionRanges[i][0];
+		int length = selectionRanges[i][1];
+		text.setSelectionRange(start, length);
+		assertTrue(":c:" + i, text.getSelectionRange().x == start && text.getSelectionRange().y == length);
+	}
+
+	for (int i = 0; i < invalidRanges.length; i++) {
+		int start = invalidRanges[i][0];
+		int length = invalidRanges[i][1];
+	
+		exceptionThrown = false;
+		try {
+			text.setSelectionRange(start, length);
+		}
+		catch (IllegalArgumentException e) {
+			exceptionThrown = true;
+		}
+		assertTrue(":a:", exceptionThrown);
+	}
+}
+
+public void test_setStyleRangeLorg_eclipse_swt_custom_StyleRange(){
+	StyleRange[] styles;
+	String textString = textString();
+
+	/* 
+		defaultStyles
+		
+			(0,48,RED,YELLOW), 
+			(58,10,BLUE,CYAN), 
+			(68,10,GREEN,PURPLE)
+	*/
+
+
+	text.setText(textString);
+	
+	// No overlap with existing styles
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(48,5,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 4);
+	assertTrue(":1:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(48,5,YELLOW,RED)));
+	assertTrue(":1:", styles[2].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":1:", styles[3].equals(getStyle(68,10,GREEN,PURPLE)));
+
+	// Overlap middle of one style - partial
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(10,10,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 5);
+	assertTrue(":2:", styles[0].equals(getStyle(0,10,RED,YELLOW)));
+	assertTrue(":2:", styles[1].equals(getStyle(10,10,YELLOW,RED)));
+	assertTrue(":2:", styles[2].equals(getStyle(20,28,RED,YELLOW)));
+	assertTrue(":2:", styles[3].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":2:", styles[4].equals(getStyle(68,10,GREEN,PURPLE)));
+	text.setStyleRange(null);
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 0);
+	
+	// Overlap middle of one style - full
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(58,10,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 3);
+	assertTrue(":3:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":3:", styles[1].equals(getStyle(58,10,YELLOW,RED)));
+	assertTrue(":3:", styles[2].equals(getStyle(68,10,GREEN,PURPLE)));
+	
+	// Overlap end of one style
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(38,15,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 4);
+	assertTrue(":4:", styles[0].equals(getStyle(0,38,RED,YELLOW)));
+	assertTrue(":4:", styles[1].equals(getStyle(38,15,YELLOW,RED)));
+	assertTrue(":4:", styles[2].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":4:", styles[3].equals(getStyle(68,10,GREEN,PURPLE)));
+	
+	// Overlap beginning of one style
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(50,10,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":5:", styles.length == 4);
+	assertTrue(":5:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":5:", styles[1].equals(getStyle(50,10,YELLOW,RED)));
+	assertTrue(":5:", styles[2].equals(getStyle(60,8,BLUE,CYAN)));
+	assertTrue(":5:", styles[3].equals(getStyle(68,10,GREEN,PURPLE)));
+
+	// Overlap complete style
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(48,20,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":6:", styles.length == 3);
+	assertTrue(":6:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":6:", styles[1].equals(getStyle(48,20,YELLOW,RED)));
+	assertTrue(":6:", styles[2].equals(getStyle(68,10,GREEN,PURPLE)));
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+			
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,48,RED,YELLOW));
+	text.setStyleRange(getStyle(48,20,BLUE,CYAN));
+	text.setStyleRange(getStyle(68,10,GREEN,PURPLE));
+	// should be merged with style before it
+	text.setStyleRange(getStyle(48,10,RED,YELLOW));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 3);
+	assertTrue(":1:", styles[0].equals(getStyle(0,58,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":1:", styles[2].equals(getStyle(68,10,GREEN,PURPLE)));
+
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(15,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(25,10,GREEN,PURPLE));
+	// should be merged with style after it
+	text.setStyleRange(getStyle(11,4,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 3);
+	assertTrue(":2:", styles[0].equals(getStyle(0,10,RED,YELLOW)));
+	assertTrue(":2:", styles[1].equals(getStyle(11,14,BLUE,CYAN)));
+	assertTrue(":2:", styles[2].equals(getStyle(25,10,GREEN,PURPLE)));
+	
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(15,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(25,10,GREEN,PURPLE));
+	// should be merged with style after it
+	text.setStyleRange(getStyle(5,15,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 3);
+	assertTrue(":3:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":3:", styles[1].equals(getStyle(5,20,BLUE,CYAN)));
+	assertTrue(":3:", styles[2].equals(getStyle(25,10,GREEN,PURPLE)));
+
+	text.setText("01234567890123456789");
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(10,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(5,3,RED,YELLOW));
+	text.setStyleRange(getStyle(12,5,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 2);
+	assertTrue(":4:", styles[0].equals(getStyle(0,10,RED,YELLOW)));
+	assertTrue(":4:", styles[1].equals(getStyle(10,10,BLUE,CYAN)));
+	
+	text.setText("0123456789012345");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(5,5,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,5,GREEN,PURPLE));
+	// no merging since styles are completely overlapping existing
+	// styles
+	text.setStyleRange(getStyle(5,5,RED,YELLOW));
+	text.setStyleRange(getStyle(10,5,RED,YELLOW));
+	styles = text.getStyleRanges();
+	assertTrue(":5:", styles.length == 3);
+	assertTrue(":5:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":5:", styles[1].equals(getStyle(5,5,RED,YELLOW)));
+	assertTrue(":5:", styles[2].equals(getStyle(10,5,RED,YELLOW)));
+	
+	text.setText("012345678901234");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(10,5,BLUE,CYAN));
+	// should be merged
+	text.setStyleRange(getStyle(5,7,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":6:", styles.length == 2);
+	assertTrue(":6:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":6:", styles[1].equals(getStyle(5,10,BLUE,CYAN)));
+
+	text.setText("123 456 789");
+	text.setStyleRange(getStyle(4,3,BLUE,null));
+	text.setStyleRange(getStyle(8,3,RED,null));
+	text.setStyleRange(getStyle(5,2,BLUE,null));
+	styles = text.getStyleRanges();
+	assertTrue(":7:", styles.length == 2);
+	assertTrue(":7:", styles[0].equals(getStyle(4,3,BLUE,null)));
+	assertTrue(":7:", styles[1].equals(getStyle(8,3,RED,null)));
+	
+	text.setText("123 456 789");
+	text.setStyleRange(getStyle(4,3,BLUE,null));
+	text.setStyleRange(getStyle(8,3,RED,null));
+	text.setStyleRange(getStyle(7,4,BLUE,null));
+	styles = text.getStyleRanges();
+	assertTrue(":8:", styles.length == 2);
+	assertTrue(":8:", styles[0].equals(getStyle(4,3,BLUE,null)));
+	assertTrue(":8:", styles[1].equals(getStyle(7,4,BLUE,null)));
+	
+	text.setText("123 456 789 ABC DEF");
+	text.setStyleRange(getStyle(0,4,BLUE,null));
+	text.setStyleRange(getStyle(4,4,RED,null));
+	text.setStyleRange(getStyle(8,4,BLUE,null));
+	text.setStyleRange(getStyle(12,4,RED,null));
+	text.setStyleRange(getStyle(16,3,BLUE,null));
+	text.setStyleRange(getStyle(5,14,RED,null));
+	styles = text.getStyleRanges();
+	assertTrue(":9:", styles.length == 2);
+	assertTrue(":9:", styles[0].equals(getStyle(0,4,BLUE,null)));
+	assertTrue(":9:", styles[1].equals(getStyle(4,15,RED,null)));
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,48,RED,YELLOW));
+	text.setStyleRange(getStyle(48,20,BLUE,CYAN));
+	text.setStyleRange(getStyle(68,10,GREEN,PURPLE));
+	text.setStyleRange(getStyle(38,20,null,null));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 3);
+	assertTrue(":1:", styles[0].equals(getStyle(0,38,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":1:", styles[2].equals(getStyle(68,10,GREEN,PURPLE)));
+
+	text.setText(textString);
+	int length = textString.length();
+	text.setStyleRange(getStyle(0,48,RED,YELLOW));
+	text.setStyleRange(getStyle(48,20,BLUE,CYAN));
+	text.setStyleRange(getStyle(68,10,GREEN,PURPLE));
+	text.setStyleRange(getStyle(0,length,null,null));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 0);
+	
+	text.setText("01234567890123456789");
+	text.setStyleRange(getStyle(0,3,RED,YELLOW));
+	text.setStyleRange(getStyle(5,3,BLUE,CYAN));
+	text.setStyleRange(getStyle(9,8,GREEN,PURPLE));
+	text.setStyleRange(getStyle(0,10,GREEN,PURPLE));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 2);
+	assertTrue(":3:", styles[0].equals(getStyle(0,10,GREEN,PURPLE)));
+	assertTrue(":3:", styles[1].equals(getStyle(10,7,GREEN,PURPLE)));
+	
+	text.setText("0123456789012345");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(5,5,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,5,GREEN,PURPLE));
+	text.setStyleRange(getStyle(7,9,RED,YELLOW));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 3);
+	assertTrue(":4:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":4:", styles[1].equals(getStyle(5,2,BLUE,CYAN)));
+	assertTrue(":4:", styles[2].equals(getStyle(7,9,RED,YELLOW)));
+	
+	text.setText("012345678901234");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(10,5,BLUE,CYAN));
+	text.setStyleRange(getStyle(3,10,GREEN,PURPLE));
+	styles = text.getStyleRanges();
+	assertTrue(":5:", styles.length == 3);
+	assertTrue(":5:", styles[0].equals(getStyle(0,3,RED,YELLOW)));
+	assertTrue(":5:", styles[1].equals(getStyle(3,10,GREEN,PURPLE)));
+	assertTrue(":5:", styles[2].equals(getStyle(13,2,BLUE,CYAN)));
+	
+	text.setText("redgreenblueyellowcyanpurple");
+	text.setStyleRange(getStyle(0,3,RED,null));
+	text.setStyleRange(getStyle(3,5,GREEN,null));
+	text.setStyleRange(getStyle(8,4,BLUE,null));
+	text.setStyleRange(getStyle(12,6,YELLOW,null));
+	text.setStyleRange(getStyle(18,4,CYAN,null));
+	text.setStyleRange(getStyle(22,6,PURPLE,null));
+	text.setStyleRange(getStyle(8,14,null,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":6:", styles.length == 4);
+	assertTrue(":6:", styles[0].equals(getStyle(0,3,RED,null)));
+	assertTrue(":6:", styles[1].equals(getStyle(3,5,GREEN,null)));
+	assertTrue(":6:", styles[2].equals(getStyle(8,14,null,RED)));
+	assertTrue(":6:", styles[3].equals(getStyle(22,6,PURPLE,null)));
+
+
+	text.setText("redgreenblueyellowcyanpurple");
+	text.setStyleRange(getStyle(0,3,RED,null));
+	text.setStyleRange(getStyle(3,5,GREEN,null));
+	text.setStyleRange(getStyle(8,4,BLUE,null));
+	text.setStyleRange(getStyle(12,6,YELLOW,null));
+	text.setStyleRange(getStyle(18,4,CYAN,null));
+	text.setStyleRange(getStyle(22,6,PURPLE,null));
+	text.setStyleRange(getStyle(0,28,null,null));
+	styles = text.getStyleRanges();
+	assertTrue(":7:", styles.length == 0);
+
+
+/*
+	text.setText("This\r\na\tAnother line.");
+	text.setStyleRange(getStyle(3,3,BLUE,null));
+	text.setStyleRange(getStyle(7,8,BLUE,null));
+	text.setStyleRange(getStyle(6,1,BLUE,null));
+	StyledTextEvent event = new StyledTextEvent();
+	event.detail = 6;
+	event.text = "a\tAnother line.";
+	text.notifyListener(ST.LineGetStyle, event);
+	assertTrue(":8:", event.styles[0].equals(getStyle(3,4,BLUE,null)));
+*/
+
+
+	text.setText("123 456 789");
+	text.setStyleRange(getStyle(4,3,BLUE,null));
+	text.setStyleRange(getStyle(8,3,RED,null));
+	text.setStyleRange(getStyle(5,5,BLUE,null));
+	styles = text.getStyleRanges();
+	assertTrue(":9:", styles.length == 2);
+	assertTrue(":9:", styles[0].equals(getStyle(4,6,BLUE,null)));
+	assertTrue(":9:", styles[1].equals(getStyle(10,1,RED,null)));
+
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	textString = textString();
+			
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,48,RED,YELLOW));
+	text.setStyleRange(getStyle(48,20,BLUE,CYAN));
+	text.setStyleRange(getStyle(68,10,GREEN,PURPLE));
+	// should be merged with style before it
+	text.setStyleRange(getStyle(48,10,RED,YELLOW));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 3);
+	assertTrue(":1:", styles[0].equals(getStyle(0,58,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(58,10,BLUE,CYAN)));
+	assertTrue(":1:", styles[2].equals(getStyle(68,10,GREEN,PURPLE)));
+
+
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(15,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(25,10,GREEN,PURPLE));
+	// should be merged with style after it
+	text.setStyleRange(getStyle(11,4,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 3);
+	assertTrue(":2:", styles[0].equals(getStyle(0,10,RED,YELLOW)));
+	assertTrue(":2:", styles[1].equals(getStyle(11,14,BLUE,CYAN)));
+	assertTrue(":2:", styles[2].equals(getStyle(25,10,GREEN,PURPLE)));
+	
+	text.setText(textString);
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(15,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(25,10,GREEN,PURPLE));
+	// should be merged with style after it
+	text.setStyleRange(getStyle(5,15,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 3);
+	assertTrue(":3:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":3:", styles[1].equals(getStyle(5,20,BLUE,CYAN)));
+	assertTrue(":3:", styles[2].equals(getStyle(25,10,GREEN,PURPLE)));
+
+
+
+	text.setText("01234567890123456789");
+	text.setStyleRange(getStyle(0,10,RED,YELLOW));
+	text.setStyleRange(getStyle(10,10,BLUE,CYAN));
+	text.setStyleRange(getStyle(5,3,RED,YELLOW));
+	text.setStyleRange(getStyle(12,5,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 2);
+	assertTrue(":4:", styles[0].equals(getStyle(0,10,RED,YELLOW)));
+	assertTrue(":4:", styles[1].equals(getStyle(10,10,BLUE,CYAN)));
+	
+	text.setText("0123456789012345");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(5,5,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,5,GREEN,PURPLE));
+	// no merging since styles are completely overlapping existing
+	// styles
+	text.setStyleRange(getStyle(5,5,RED,YELLOW));
+	text.setStyleRange(getStyle(10,5,RED,YELLOW));
+	styles = text.getStyleRanges();
+	assertTrue(":5:", styles.length == 3);
+	assertTrue(":5:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":5:", styles[1].equals(getStyle(5,5,RED,YELLOW)));
+	assertTrue(":5:", styles[2].equals(getStyle(10,5,RED,YELLOW)));
+	
+	text.setText("012345678901234");
+	text.setStyleRange(getStyle(0,5,RED,YELLOW));
+	text.setStyleRange(getStyle(10,5,BLUE,CYAN));
+	// should be merged
+	text.setStyleRange(getStyle(5,7,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":6:", styles.length == 2);
+	assertTrue(":6:", styles[0].equals(getStyle(0,5,RED,YELLOW)));
+	assertTrue(":6:", styles[1].equals(getStyle(5,10,BLUE,CYAN)));
+
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	textString = textString();
+
+
+	/* 
+		defaultStyles
+		
+			(0,48,RED,YELLOW), 
+			(58,10,BLUE,CYAN), 
+			(68,10,GREEN,PURPLE)
+	*/
+
+
+	text.setText(textString);
+	
+	// End/Beginning overlap
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(38,25,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 4);
+	assertTrue(":1:", styles[0].equals(getStyle(0,38,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(38,25,YELLOW,RED)));
+	assertTrue(":1:", styles[2].equals(getStyle(63,5,BLUE,CYAN)));
+	assertTrue(":1:", styles[3].equals(getStyle(68,10,GREEN,PURPLE)));
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(63,10,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 4);
+	assertTrue(":1:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":1:", styles[1].equals(getStyle(58,5,BLUE,CYAN)));
+	assertTrue(":1:", styles[2].equals(getStyle(63,10,YELLOW,RED)));
+	assertTrue(":1:", styles[3].equals(getStyle(73,5,GREEN,PURPLE)));
+
+
+	// Complete overlap
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(0,78,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 1);
+	assertTrue(":2:", styles[0].equals(getStyle(0,78,YELLOW,RED)));
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(0,68,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 2);
+	assertTrue(":2:", styles[0].equals(getStyle(0,68,YELLOW,RED)));
+	assertTrue(":2:", styles[1].equals(getStyle(68,10,GREEN,PURPLE)));
+	text.setStyleRanges(defaultStyles());
+	text.setStyleRange(getStyle(58,20,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 2);
+	assertTrue(":2:", styles[0].equals(getStyle(0,48,RED,YELLOW)));
+	assertTrue(":2:", styles[1].equals(getStyle(58,20,YELLOW,RED)));
+
+
+	// 1-N complete, beginning
+	text.setText("012345678901234567890123456789");
+	text.setStyleRanges( 
+		new StyleRange[] {getStyle(0,5,RED,RED), getStyle(5,5,YELLOW,YELLOW),
+			getStyle(10,5,CYAN,CYAN), getStyle(15,5,BLUE,BLUE),
+			getStyle(20,5,GREEN,GREEN), getStyle(25,5,PURPLE,PURPLE)}
+	);
+	text.setStyleRange(getStyle(5,23,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 3);
+	assertTrue(":3:", styles[0].equals(getStyle(0,5,RED,RED)));
+	assertTrue(":3:", styles[1].equals(getStyle(5,23,YELLOW,RED)));
+	assertTrue(":3:", styles[2].equals(getStyle(28,2,PURPLE,PURPLE)));
+	
+	// end, 1-N complete, beginning
+	text.setStyleRanges( 
+		new StyleRange[] {getStyle(0,5,RED,RED), getStyle(5,5,YELLOW,YELLOW),
+			getStyle(10,5,CYAN,CYAN), getStyle(15,5,BLUE,BLUE),
+			getStyle(20,5,GREEN,GREEN), getStyle(25,5,PURPLE,PURPLE)}
+	);
+	text.setStyleRange(getStyle(13,12,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 5);
+	assertTrue(":3:", styles[0].equals(getStyle(0,5,RED,RED)));
+	assertTrue(":3:", styles[1].equals(getStyle(5,5,YELLOW,YELLOW)));
+	assertTrue(":3:", styles[2].equals(getStyle(10,3,CYAN,CYAN)));
+	assertTrue(":3:", styles[3].equals(getStyle(13,12,YELLOW,RED)));
+	assertTrue(":3:", styles[4].equals(getStyle(25,5,PURPLE,PURPLE)));
+
+
+	text.setText("x/");	
+	text.setStyleRange(getStyle(0,2,YELLOW,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 1);
+	assertTrue(":4:", styles[0].equals(getStyle(0,2,YELLOW,null)));
+	text.replaceTextRange(2,0,"/");
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 1);
+	assertTrue(":4:", styles[0].equals(getStyle(0,2,YELLOW,null)));
+	text.setStyleRange(getStyle(0,1,YELLOW,null));
+	assertTrue(":4:", styles.length == 1);
+	assertTrue(":4:", styles[0].equals(getStyle(0,2,YELLOW,null)));
+	text.setStyleRange(getStyle(1,2,RED,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 2);
+	assertTrue(":4:", styles[0].equals(getStyle(0,1,YELLOW,null)));
+	assertTrue(":4:", styles[1].equals(getStyle(1,2,RED,null)));
+
+
+	text.setText("xxx/");	
+	text.setStyleRange(getStyle(0,2,RED,null));
+	text.setStyleRange(getStyle(2,2,YELLOW,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4a:", styles.length == 2);
+	assertTrue(":4a:", styles[0].equals(getStyle(0,2,RED,null)));
+	assertTrue(":4a:", styles[1].equals(getStyle(2,2,YELLOW,null)));
+	text.replaceTextRange(4,0,"/");
+	styles = text.getStyleRanges();
+	assertTrue(":4a:", styles.length == 2);
+	assertTrue(":4a:", styles[0].equals(getStyle(0,2,RED,null)));
+	assertTrue(":4a:", styles[1].equals(getStyle(2,2,YELLOW,null)));
+	text.setStyleRange(getStyle(2,1,YELLOW,null));
+	assertTrue(":4a:", styles.length == 2);
+	assertTrue(":4a:", styles[0].equals(getStyle(0,2,RED,null)));
+	assertTrue(":4a:", styles[1].equals(getStyle(2,2,YELLOW,null)));
+	text.setStyleRange(getStyle(3,2,RED,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4a:", styles.length == 3);
+	assertTrue(":4a:", styles[0].equals(getStyle(0,2,RED,null)));
+	assertTrue(":4a:", styles[1].equals(getStyle(2,1,YELLOW,null)));
+	assertTrue(":4a:", styles[2].equals(getStyle(3,2,RED,null)));
+
+
+	text.setText("xxx/");	
+	text.setStyleRange(getStyle(0,2,RED,null));
+	text.setStyleRange(getStyle(2,2,YELLOW,null));
+	text.replaceTextRange(4,0,"/");
+	styles = text.getStyleRanges();
+	text.setStyleRange(getStyle(2,1,YELLOW,null));
+	text.setStyleRange(getStyle(2,3,RED,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4b:", styles.length == 2);
+	assertTrue(":4b:", styles[0].equals(getStyle(0,2,RED,null)));
+	assertTrue(":4b:", styles[1].equals(getStyle(2,3,RED,null)));
+
+
+	text.setText("xxx/");	
+	text.setStyleRange(getStyle(0,2,RED,null));
+	text.setStyleRange(getStyle(2,2,YELLOW,null));
+	text.replaceTextRange(4,0,"/");
+	styles = text.getStyleRanges();
+	text.setStyleRange(getStyle(2,1,YELLOW,null));
+	text.setStyleRange(getStyle(1,4,YELLOW,null));
+	styles = text.getStyleRanges();
+	assertTrue(":4c:", styles.length == 2);
+	assertTrue(":4c:", styles[0].equals(getStyle(0,1,RED,null)));
+	assertTrue(":4c:", styles[1].equals(getStyle(1,4,YELLOW,null)));
+
+
+	text.setText("New\r\n");
+	StyleRange style = getStyle(0,5,null,null);
+	style.fontStyle = SWT.BOLD;	
+	text.setStyleRange(style);
+	// styles (0,5,BOLD)
+	text.replaceTextRange(3,0,"a"); // "Newa\r\n"
+	// styles (0,3,BOLD), (4,2,BOLD)
+	style = text.getStyleRangeAtOffset(4);
+	style.start = 3;
+	style.length = 1;
+	text.setStyleRange(style);
+	// styles (0,6,BOLD)
+	text.replaceTextRange(0,0,"a"); // "aNewa\r\n"
+	// styles (1,6,BOLD)
+	style = text.getStyleRangeAtOffset(1);
+	style.start = 0;
+	style.length = 1;
+	text.setStyleRange(style);
+	// styles (0,7,BOLD)
+	text.replaceTextRange(0,1,""); // "Newa\r\n"
+	// styles (0,6,BOLD)
+	for (int i=0; i<6; i++) {
+		style = text.getStyleRangeAtOffset(i);
+		assertTrue(":5:", style.fontStyle == SWT.BOLD);
+	}
+
+
+	text.setText("New L 1\r\nNew L 2\r\n");
+	style = getStyle(0,9,null,null);
+	style.fontStyle = SWT.BOLD;	
+	text.setStyleRange(style);
+	// styles (0,9,BOLD)
+	text.replaceTextRange(7,0,"a");
+	// styles (0,7,BOLD), (8,2,BOLD)
+	style = text.getStyleRangeAtOffset(8);
+	if (style != null) {
+		style.start = 7;
+		style.length = 1;
+		text.setStyleRange(style);
+	}
+	// styles (0,10,BOLD)
+	text.replaceTextRange(4,0,"a");
+	// styles (0,4,BOLD), (5,6,BOLD)
+	style = text.getStyleRangeAtOffset(5);
+	if (style != null) {
+		style.start = 4;
+		style.length = 1;
+		text.setStyleRange(style);
+	}
+	// styles (0,11,BOLD)
+	text.replaceTextRange(2,3,"");
+	// styles (0,8,BOLD)
+	for (int i=0; i<8; i++) {
+		style = text.getStyleRangeAtOffset(i);
+		assertTrue(":5a:", style.fontStyle == SWT.BOLD);
+	}
+
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	
+	//					"01234567890123"
+	textString = 		"1234 1234 1234";
+
+
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(5,2,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":1a:", styles.length == 1);
+	assertTrue(":1a:", styles[0].equals(getStyle(5,4,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(7,2,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":2a:", styles.length == 1);
+	assertTrue(":2a:", styles[0].equals(getStyle(5,4,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(6,2,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":3a:", styles.length == 1);
+	assertTrue(":3a:", styles[0].equals(getStyle(5,4,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(3,4,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":4a:", styles.length == 1);
+	assertTrue(":4a:", styles[0].equals(getStyle(3,6,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(7,4,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":5a:", styles.length == 1);
+	assertTrue(":5a:", styles[0].equals(getStyle(5,6,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":6a:", styles.length == 1);
+	assertTrue(":6a:", styles[0].equals(getStyle(5,4,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(3,10,YELLOW,RED));
+	styles = text.getStyleRanges();
+	assertTrue(":7a:", styles.length == 1);
+	assertTrue(":7a:", styles[0].equals(getStyle(3,10,YELLOW,RED)));
+
+
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(5,2,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":1b:", styles.length == 2);
+	assertTrue(":1b:", styles[0].equals(getStyle(5,2,BLUE,CYAN)));
+	assertTrue(":1b:", styles[1].equals(getStyle(7,2,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(7,2,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":2b:", styles.length == 2);
+	assertTrue(":2b:", styles[0].equals(getStyle(5,2,YELLOW,RED)));
+	assertTrue(":2b:", styles[1].equals(getStyle(7,2,BLUE,CYAN)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(6,2,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":3b:", styles.length == 3);
+	assertTrue(":3b:", styles[0].equals(getStyle(5,1,YELLOW,RED)));
+	assertTrue(":3b:", styles[1].equals(getStyle(6,2,BLUE,CYAN)));
+	assertTrue(":3b:", styles[2].equals(getStyle(8,1,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(3,4,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":4b:", styles.length == 2);
+	assertTrue(":4b:", styles[0].equals(getStyle(3,4,BLUE,CYAN)));
+	assertTrue(":4b:", styles[1].equals(getStyle(7,2,YELLOW,RED)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(7,4,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":5b:", styles.length == 2);
+	assertTrue(":5b:", styles[0].equals(getStyle(5,2,YELLOW,RED)));
+	assertTrue(":5b:", styles[1].equals(getStyle(7,4,BLUE,CYAN)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":6b:", styles.length == 1);
+	assertTrue(":6b:", styles[0].equals(getStyle(5,4,BLUE,CYAN)));
+	text.setText("1234 1234 1234");
+	text.setStyleRange(getStyle(5,4,YELLOW,RED));
+	text.setStyleRange(getStyle(3,10,BLUE,CYAN));
+	styles = text.getStyleRanges();
+	assertTrue(":7b:", styles.length == 1);
+	assertTrue(":7b:", styles[0].equals(getStyle(3,10,BLUE,CYAN)));
+
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	//			 		"012345678901234567890123"
+	String testString=	"1234 1234 1234 1234 1234";
+	
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(12,2,"");
+	styles = text.getStyleRanges();
+	assertTrue(":1:", styles.length == 1);
+	assertTrue(":1:", styles[0].equals(getStyle(10,2,YELLOW,RED)));
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(10,2,"");
+	styles = text.getStyleRanges();
+	assertTrue(":2:", styles.length == 1);
+	assertTrue(":2:", styles[0].equals(getStyle(10,2,YELLOW,RED)));
+
+
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(12,4,"");
+	styles = text.getStyleRanges();
+	assertTrue(":3:", styles.length == 1);
+	assertTrue(":3:", styles[0].equals(getStyle(10,2,YELLOW,RED)));
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(8,4,"");
+	styles = text.getStyleRanges();
+	assertTrue(":4:", styles.length == 1);
+	assertTrue(":4:", styles[0].equals(getStyle(8,2,YELLOW,RED)));
+
+
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(8,6,"");
+	styles = text.getStyleRanges();
+	assertTrue(":5:", styles.length == 0);
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(10,6,"");
+	styles = text.getStyleRanges();
+	assertTrue(":6:", styles.length == 0);
+	text.setText(testString);
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(8,12,"");
+	styles = text.getStyleRanges();
+	assertTrue(":7:", styles.length == 0);
+	
+	//			 			"012345678901234567890123"
+	//	String testString=	"1234 1234 1234 1234 1234";
+	
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(5,7,"");
+	styles = text.getStyleRanges();
+	assertTrue(":8:", styles.length == 1);
+	assertTrue(":8:", styles[0].equals(getStyle(5,2,YELLOW,RED)));
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(7,7,"");
+	styles = text.getStyleRanges();
+	assertTrue(":9:", styles.length == 1);
+	assertTrue(":9:", styles[0].equals(getStyle(5,2,BLUE,CYAN)));
+
+
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(2,10,"");
+	styles = text.getStyleRanges();
+	assertTrue(":10:", styles.length == 1);
+	assertTrue(":10:", styles[0].equals(getStyle(2,2,YELLOW,RED)));
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(7,9,"");
+	styles = text.getStyleRanges();
+	assertTrue(":11:", styles.length == 1);
+	assertTrue(":11:", styles[0].equals(getStyle(5,2,BLUE,CYAN)));
+
+
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(5,9,"");
+	styles = text.getStyleRanges();
+	assertTrue(":12:", styles.length == 0);
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.replaceTextRange(3,13,"");
+	styles = text.getStyleRanges();
+	assertTrue(":11:", styles.length == 0);
+
+
+	//			 			"012345678901234567890123"
+	//	String testString=	"1234 1234 1234 1234 1234";
+	
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.setStyleRange(getStyle(15,4,GREEN,PURPLE));
+	text.replaceTextRange(7,12,"");
+	styles = text.getStyleRanges();
+	assertTrue(":14:", styles.length == 1);
+	assertTrue(":14:", styles[0].equals(getStyle(5,2,BLUE,CYAN)));
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.setStyleRange(getStyle(15,4,GREEN,PURPLE));
+	text.replaceTextRange(5,12,"");
+	styles = text.getStyleRanges();
+	assertTrue(":15:", styles.length == 1);
+	assertTrue(":15:", styles[0].equals(getStyle(5,2,GREEN,PURPLE)));
+
+
+	text.setText(testString);
+	text.setStyleRange(getStyle(5,4,BLUE,CYAN));
+	text.setStyleRange(getStyle(10,4,YELLOW,RED));
+	text.setStyleRange(getStyle(15,4,GREEN,PURPLE));
+	text.replaceTextRange(9,10,"");
+	styles = text.getStyleRanges();
+	assertTrue(":16:", styles.length == 1);
+	assertTrue(":16:", styles[0].equals(getStyle(5,4,BLUE,CYAN)));
+
+
+	// reset the environment
+	text.dispose();
+	text = new StyledText(shell, SWT.NULL);
+	setWidget(text);
+
+	StyleRange style1 = getStyle(0,0,null,null);
+
+
+	StyleRange style2 = getStyle(0,0,RED,YELLOW);
+
+
+	assertTrue(":1:", !style1.equals(style2));
+	assertTrue(":1:", !style1.similarTo(style2));
+
+
+	assertTrue(":1:", !style2.equals(style1));
+
+
+	assertTrue(":1:", !style2.similarTo(style1));
+
+
+
+	style1 = getStyle(0,10,RED,YELLOW);
+	style2 = getStyle(11,5,RED,YELLOW);
+
+
+	assertTrue(":2:", !style1.equals(style2));
+
+
+	assertTrue(":2:", !style2.equals(style1));
+	assertTrue(":2:", style1.similarTo(style2));
+
+
+	assertTrue(":2:", style2.similarTo(style1));
+
+
+}
+
+public void test_setStyleRanges$Lorg_eclipse_swt_custom_StyleRange() {
+	boolean exceptionThrown = false;
+	StyleRange[] ranges = new StyleRange[] {
+		new StyleRange(0, 1, getColor(RED), null), 
+		new StyleRange(2, 1, getColor(RED), null)};
+	
+	text.setText("Line0\r\n");
+	try {
+		text.setStyleRanges(null);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(exceptionThrown);
+
+	text.setStyleRanges(ranges);
+	StyleRange[] currentRanges = text.getStyleRanges();
+	assertEquals(ranges.length, currentRanges.length);
+	for (int i = 0; i < currentRanges.length; i++) {
+		assertEquals(ranges[i], currentRanges[i]);
+	}
+	text.setStyleRanges(new StyleRange[] {});
+	assertEquals(0, text.getStyleRanges().length);
+}
+
+public void test_setTabsI(){
+	text.setTabs(1);
+	assertTrue(":a:", text.getTabs() == 1);
+	
+	text.setTabs(8);
+	assertTrue(":b:", text.getTabs() == 8);
+	text.setText("Line\t1\r\n");
+	text.setTabs(7);
+	assertTrue(":c:", text.getTabs() == 7);
+}
+
+public void test_setTextLjava_lang_String(){
+	assertTrue(":a:", text.getText().equals(""));
+	text.setText("01234567890");
+	assertTrue(":b:", text.getText(3, 5).equals("345"));
+	// these tests should not cause a null pointer exception, checks not implemented yet	
+	if (fCheckOutOfRangeBehaviour) {
+		text.setText("");
+		assertTrue(":c:", text.getText(3, 5).equals(""));
+		text.setText("01234567890");
+		assertTrue(":d:", text.getText(3, 100).equals("34567890"));
+		text.setText("01234567890");
+		assertTrue(":e:", text.getText(5, 3).equals("34"));
+	}
+}
+
+public void test_setTextLimitI(){
+	boolean exceptionThrown = false;
+	
+	text.setTextLimit(10);
+	assertTrue(":a:", text.getTextLimit() == 10);
+
+	text.setTextLimit(-1);
+	assertTrue(":b:", text.getTextLimit() == -1);
+
+	try {
+		text.setTextLimit(0);
+	}
+	catch (IllegalArgumentException e) {
+		exceptionThrown = true;
+	}
+	assertTrue(":c:", exceptionThrown == true);
+	exceptionThrown = false;
+}
+
+public void test_setTopIndexI(){
+	text.setText("Line0\r\n");
+
+	text.setTopIndex(-2);
+	assertTrue(":a:", text.getTopIndex() == 0);
+	text.setTopIndex(-1);
+	assertTrue(":b:", text.getTopIndex() == 0);
+	text.setTopIndex(1);
+	assertTrue(":c:", text.getTopIndex() == 1);
+	text.setTopIndex(2);
+	assertTrue(":d:", text.getTopIndex() == 2);
+	text.setTopIndex(0);
+	assertTrue(":e:", text.getTopIndex() == 0);
+	text.setTopIndex(3);
+	assertTrue(":f:", text.getTopIndex() == 2);
+
+	text.setText("");
+	text.setTopIndex(2);
+	assertTrue(":g:", text.getTopIndex() == 0);
+}
+
+public void test_showSelection() {
+	text.showSelection();
+	text.setSelectionRange(0, 0);
+	text.showSelection();
+	text.setText("Line0\r\n");
+	text.showSelection();
+	text.setSelectionRange(5, 2);
+	text.showSelection();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_StyledText((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener");
+	methodNames.addElement("test_setKeyBindingII");
+	methodNames.addElement("test_addBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener");
+	methodNames.addElement("test_addLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener");
+	methodNames.addElement("test_addLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener");
+	methodNames.addElement("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_addVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener");
+	methodNames.addElement("test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener");
+	methodNames.addElement("test_appendLjava_lang_String");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_copy");
+	methodNames.addElement("test_cut");
+	methodNames.addElement("test_getBidiColoring");
+	methodNames.addElement("test_getCaretOffset");
+	methodNames.addElement("test_getContent");
+	methodNames.addElement("test_getDoubleClickEnabled");
+	methodNames.addElement("test_getEditable");
+	methodNames.addElement("test_getHorizontalIndex");
+	methodNames.addElement("test_getHorizontalPixel");
+	methodNames.addElement("test_getKeyBindingI");
+	methodNames.addElement("test_getCharCount");
+	methodNames.addElement("test_getLineBackgroundI");
+	methodNames.addElement("test_getLineCount");
+	methodNames.addElement("test_getLineAtOffsetI");
+	methodNames.addElement("test_getLineDelimiter");
+	methodNames.addElement("test_getLineHeight");
+	methodNames.addElement("test_getLocationAtOffsetI");
+	methodNames.addElement("test_getOffsetAtLocationLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionRange");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_getSelectionText");
+	methodNames.addElement("test_getStyleRangeAtOffsetI");
+	methodNames.addElement("test_getStyleRanges");
+	methodNames.addElement("test_getTabs");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getTextII");
+	methodNames.addElement("test_getTextRangeII");
+	methodNames.addElement("test_getTextLimit");
+	methodNames.addElement("test_getTopIndex");
+	methodNames.addElement("test_getTopPixel");
+	methodNames.addElement("test_insertLjava_lang_String");
+	methodNames.addElement("test_invokeActionI");
+	methodNames.addElement("test_paste");
+	methodNames.addElement("test_print");
+	methodNames.addElement("test_printLorg_eclipse_swt_printing_Printer");
+	methodNames.addElement("test_redraw");
+	methodNames.addElement("test_redrawIIIIZ");
+	methodNames.addElement("test_redrawRangeIIZ");
+	methodNames.addElement("test_removeBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener");
+	methodNames.addElement("test_removeExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener");
+	methodNames.addElement("test_removeLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener");
+	methodNames.addElement("test_removeLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener");
+	methodNames.addElement("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener");
+	methodNames.addElement("test_removeVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener");
+	methodNames.addElement("test_replaceTextRangeIILjava_lang_String");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setCaretLorg_eclipse_swt_widgets_Caret");
+	methodNames.addElement("test_setBidiColoringZ");
+	methodNames.addElement("test_setCaretOffsetI");
+	methodNames.addElement("test_setContentLorg_eclipse_swt_custom_StyledTextContent");
+	methodNames.addElement("test_setDoubleClickEnabledZ");
+	methodNames.addElement("test_setEditableZ");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setHorizontalIndexI");
+	methodNames.addElement("test_setLineBackgroundIILorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setSelectionII");
+	methodNames.addElement("test_setSelectionRangeII");
+	methodNames.addElement("test_setStyleRangeLorg_eclipse_swt_custom_StyleRange");
+	methodNames.addElement("test_setStyleRanges$Lorg_eclipse_swt_custom_StyleRange");
+	methodNames.addElement("test_setTabsI");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setTextLimitI");
+	methodNames.addElement("test_setTopIndexI");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Canvas.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener")) test_addExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener();
+	else if (getName().equals("test_setKeyBindingII")) test_setKeyBindingII();
+	else if (getName().equals("test_addBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener")) test_addBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener();
+	else if (getName().equals("test_addLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener")) test_addLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener();
+	else if (getName().equals("test_addLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener")) test_addLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener();
+	else if (getName().equals("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_addModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_addVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener")) test_addVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener();
+	else if (getName().equals("test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener")) test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener();
+	else if (getName().equals("test_appendLjava_lang_String")) test_appendLjava_lang_String();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_copy")) test_copy();
+	else if (getName().equals("test_cut")) test_cut();
+	else if (getName().equals("test_getBidiColoring")) test_getBidiColoring();
+	else if (getName().equals("test_getCaretOffset")) test_getCaretOffset();
+	else if (getName().equals("test_getContent")) test_getContent();
+	else if (getName().equals("test_getDoubleClickEnabled")) test_getDoubleClickEnabled();
+	else if (getName().equals("test_getEditable")) test_getEditable();
+	else if (getName().equals("test_getHorizontalIndex")) test_getHorizontalIndex();
+	else if (getName().equals("test_getHorizontalPixel")) test_getHorizontalPixel();
+	else if (getName().equals("test_getKeyBindingI")) test_getKeyBindingI();
+	else if (getName().equals("test_getCharCount")) test_getCharCount();
+	else if (getName().equals("test_getLineBackgroundI")) test_getLineBackgroundI();
+	else if (getName().equals("test_getLineCount")) test_getLineCount();
+	else if (getName().equals("test_getLineAtOffsetI")) test_getLineAtOffsetI();
+	else if (getName().equals("test_getLineDelimiter")) test_getLineDelimiter();
+	else if (getName().equals("test_getLineHeight")) test_getLineHeight();
+	else if (getName().equals("test_getLocationAtOffsetI")) test_getLocationAtOffsetI();
+	else if (getName().equals("test_getOffsetAtLocationLorg_eclipse_swt_graphics_Point")) test_getOffsetAtLocationLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionRange")) test_getSelectionRange();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_getSelectionText")) test_getSelectionText();
+	else if (getName().equals("test_getStyleRangeAtOffsetI")) test_getStyleRangeAtOffsetI();
+	else if (getName().equals("test_getStyleRanges")) test_getStyleRanges();
+	else if (getName().equals("test_getTabs")) test_getTabs();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getTextII")) test_getTextII();
+	else if (getName().equals("test_getTextRangeII")) test_getTextRangeII();
+	else if (getName().equals("test_getTextLimit")) test_getTextLimit();
+	else if (getName().equals("test_getTopIndex")) test_getTopIndex();
+	else if (getName().equals("test_getTopPixel")) test_getTopPixel();
+	else if (getName().equals("test_insertLjava_lang_String")) test_insertLjava_lang_String();
+	else if (getName().equals("test_invokeActionI")) test_invokeActionI();
+	else if (getName().equals("test_paste")) test_paste();
+	else if (getName().equals("test_print")) test_print();
+	else if (getName().equals("test_printLorg_eclipse_swt_printing_Printer")) test_printLorg_eclipse_swt_printing_Printer();
+	else if (getName().equals("test_redraw")) test_redraw();
+	else if (getName().equals("test_redrawIIIIZ")) test_redrawIIIIZ();
+	else if (getName().equals("test_redrawRangeIIZ")) test_redrawRangeIIZ();
+	else if (getName().equals("test_removeBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener")) test_removeBidiSegmentListenerLorg_eclipse_swt_custom_BidiSegmentListener();
+	else if (getName().equals("test_removeExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener")) test_removeExtendedModifyListenerLorg_eclipse_swt_custom_ExtendedModifyListener();
+	else if (getName().equals("test_removeLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener")) test_removeLineBackgroundListenerLorg_eclipse_swt_custom_LineBackgroundListener();
+	else if (getName().equals("test_removeLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener")) test_removeLineStyleListenerLorg_eclipse_swt_custom_LineStyleListener();
+	else if (getName().equals("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener")) test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener();
+	else if (getName().equals("test_removeVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener")) test_removeVerifyKeyListenerLorg_eclipse_swt_custom_VerifyKeyListener();
+	else if (getName().equals("test_replaceTextRangeIILjava_lang_String")) test_replaceTextRangeIILjava_lang_String();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setCaretLorg_eclipse_swt_widgets_Caret")) test_setCaretLorg_eclipse_swt_widgets_Caret();
+	else if (getName().equals("test_setBidiColoringZ")) test_setBidiColoringZ();
+	else if (getName().equals("test_setCaretOffsetI")) test_setCaretOffsetI();
+	else if (getName().equals("test_setContentLorg_eclipse_swt_custom_StyledTextContent")) test_setContentLorg_eclipse_swt_custom_StyledTextContent();
+	else if (getName().equals("test_setDoubleClickEnabledZ")) test_setDoubleClickEnabledZ();
+	else if (getName().equals("test_setEditableZ")) test_setEditableZ();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setHorizontalIndexI")) test_setHorizontalIndexI();
+	else if (getName().equals("test_setLineBackgroundIILorg_eclipse_swt_graphics_Color")) test_setLineBackgroundIILorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionLorg_eclipse_swt_graphics_Point")) test_setSelectionLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setSelectionII")) test_setSelectionII();
+	else if (getName().equals("test_setSelectionRangeII")) test_setSelectionRangeII();
+	else if (getName().equals("test_setStyleRangeLorg_eclipse_swt_custom_StyleRange")) test_setStyleRangeLorg_eclipse_swt_custom_StyleRange();
+	else if (getName().equals("test_setStyleRanges$Lorg_eclipse_swt_custom_StyleRange")) test_setStyleRanges$Lorg_eclipse_swt_custom_StyleRange();
+	else if (getName().equals("test_setTabsI")) test_setTabsI();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setTextLimitI")) test_setTextLimitI();
+	else if (getName().equals("test_setTopIndexI")) test_setTopIndexI();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextContent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextContent.java
new file mode 100644
index 0000000000..e9d9bd8997
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_StyledTextContent.java
@@ -0,0 +1,160 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import junit.framework.*;
+import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.Point;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.StyledTextContent
+ *
+ * @see org.eclipse.swt.custom.StyledTextContent
+ */
+public class Test_org_eclipse_swt_custom_StyledTextContent extends SwtTestCase {
+
+	class ContentImplementation implements StyledTextContent {
+		String textContent = "";
+		
+		public void addTextChangeListener(TextChangeListener listener){
+		}
+		public int getCharCount() {
+			return 0;
+		}
+		public String getLine(int lineIndex) {
+			return "getLine";
+		}
+		public int getLineAtOffset(int offset) {
+			return 0;
+		}
+		public int getLineCount() {
+			return 0;
+		}
+		public String getLineDelimiter() {
+			return "getLineDelimiter";
+		}
+		public int getOffsetAtLine(int lineIndex) {
+			return 0;
+		}
+		public String getTextRange(int start, int length) {
+			return textContent;
+		}
+		public void removeTextChangeListener(TextChangeListener listener) {
+		}
+		public void replaceTextRange(int start, int replaceLength, String text) {
+			textContent = text;
+		}
+		public void setText(String text) {
+			textContent = text;
+		}
+	}
+	StyledTextContent content = new ContentImplementation();
+	Shell shell;
+	StyledText styledText;
+	
+public Test_org_eclipse_swt_custom_StyledTextContent(String name) {
+	super(name);
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+	styledText.setContent(content);
+}
+
+protected void tearDown() {
+}
+
+public void test_addTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener() {
+	// does not make sense to test, not called by StyledText
+}
+
+public void test_getCharCount() {
+	assertTrue(":a:", styledText.getCharCount() == 0);
+}
+
+public void test_getLineI() {
+	// will indirectly cause getLine to be called
+	assertTrue(":b:", styledText.getLocationAtOffset(0).equals(new Point(0,0)));
+}
+
+public void test_getLineAtOffsetI() {
+	assertTrue(":c:", styledText.getLineAtOffset(0) == 0);
+}
+
+public void test_getLineCount() {
+	assertTrue(":d:", styledText.getLineCount() == 1);
+}
+
+public void test_getLineDelimiter() {
+	assertTrue(":e:", styledText.getLineDelimiter().equals("getLineDelimiter"));
+}
+
+public void test_getOffsetAtLineI() {
+	// will indirectly cause getOffsetAtLine to be called
+	assertTrue(":f:", styledText.getLocationAtOffset(0).equals(new Point(0,0)));
+}
+
+public void test_getTextRangeII() {
+	assertTrue(":g:", styledText.getTextRange(0,0).equals(""));
+}
+
+public void test_removeTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener() {
+	// does not make sense to test, not called by StyledText
+}
+
+public void test_replaceTextRangeIILjava_lang_String() {
+	styledText.replaceTextRange(0,0,"test1");
+	assertTrue(":h:", styledText.getText().equals("test1"));
+}
+
+public void test_setTextLjava_lang_String() {
+	styledText.replaceTextRange(0,0,"test2");
+	assertTrue(":i:", styledText.getText().equals("test2"));
+}
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_addTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener");
+	methodNames.addElement("test_getCharCount");
+	methodNames.addElement("test_getLineI");
+	methodNames.addElement("test_getLineAtOffsetI");
+	methodNames.addElement("test_getLineCount");
+	methodNames.addElement("test_getLineDelimiter");
+	methodNames.addElement("test_getOffsetAtLineI");
+	methodNames.addElement("test_getTextRangeII");
+	methodNames.addElement("test_removeTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener");
+	methodNames.addElement("test_replaceTextRangeIILjava_lang_String");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	return methodNames;
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_StyledTextContent((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_addTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener")) test_addTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener();
+	else if (getName().equals("test_getCharCount")) test_getCharCount();
+	else if (getName().equals("test_getLineI")) test_getLineI();
+	else if (getName().equals("test_getLineAtOffsetI")) test_getLineAtOffsetI();
+	else if (getName().equals("test_getLineCount")) test_getLineCount();
+	else if (getName().equals("test_getLineDelimiter")) test_getLineDelimiter();
+	else if (getName().equals("test_getOffsetAtLineI")) test_getOffsetAtLineI();
+	else if (getName().equals("test_getTextRangeII")) test_getTextRangeII();
+	else if (getName().equals("test_removeTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener")) test_removeTextChangeListenerLorg_eclipse_swt_custom_TextChangeListener();
+	else if (getName().equals("test_replaceTextRangeIILjava_lang_String")) test_replaceTextRangeIILjava_lang_String();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableEditor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableEditor.java
new file mode 100644
index 0000000000..1257eea636
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableEditor.java
@@ -0,0 +1,100 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TableEditor
+ *
+ * @see org.eclipse.swt.custom.TableEditor
+ */
+public class Test_org_eclipse_swt_custom_TableEditor extends Test_org_eclipse_swt_custom_ControlEditor {
+
+public Test_org_eclipse_swt_custom_TableEditor(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Table() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Table not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getColumn() {
+	warnUnimpl("Test test_getColumn not written");
+}
+
+public void test_setColumnI() {
+	warnUnimpl("Test test_setColumnI not written");
+}
+
+public void test_getItem() {
+	warnUnimpl("Test test_getItem not written");
+}
+
+public void test_setItemLorg_eclipse_swt_widgets_TableItem() {
+	warnUnimpl("Test test_setItemLorg_eclipse_swt_widgets_TableItem not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TableItemI() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TableItemI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TableEditor((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Table");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getColumn");
+	methodNames.addElement("test_setColumnI");
+	methodNames.addElement("test_getItem");
+	methodNames.addElement("test_setItemLorg_eclipse_swt_widgets_TableItem");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TableItemI");
+	methodNames.addAll(Test_org_eclipse_swt_custom_ControlEditor.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Table")) test_ConstructorLorg_eclipse_swt_widgets_Table();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getColumn")) test_getColumn();
+	else if (getName().equals("test_setColumnI")) test_setColumnI();
+	else if (getName().equals("test_getItem")) test_getItem();
+	else if (getName().equals("test_setItemLorg_eclipse_swt_widgets_TableItem")) test_setItemLorg_eclipse_swt_widgets_TableItem();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_Control")) test_setEditorLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TableItemI")) test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TableItemI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTree.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTree.java
new file mode 100644
index 0000000000..ffe9174b3c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTree.java
@@ -0,0 +1,214 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TableTree
+ *
+ * @see org.eclipse.swt.custom.TableTree
+ */
+public class Test_org_eclipse_swt_custom_TableTree extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_TableTree(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_addTreeListenerLorg_eclipse_swt_events_TreeListener() {
+	warnUnimpl("Test test_addTreeListenerLorg_eclipse_swt_events_TreeListener not written");
+}
+
+public void test_computeSizeII() {
+	warnUnimpl("Test test_computeSizeII not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_deselectAll() {
+	warnUnimpl("Test test_deselectAll not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItemHeight() {
+	warnUnimpl("Test test_getItemHeight not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionCount() {
+	warnUnimpl("Test test_getSelectionCount not written");
+}
+
+public void test_getTable() {
+	warnUnimpl("Test test_getTable not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_custom_TableTreeItem() {
+	warnUnimpl("Test test_indexOfLorg_eclipse_swt_custom_TableTreeItem not written");
+}
+
+public void test_getItemLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_getItemLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_removeAll() {
+	warnUnimpl("Test test_removeAll not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_removeTreeListenerLorg_eclipse_swt_events_TreeListener() {
+	warnUnimpl("Test test_removeTreeListenerLorg_eclipse_swt_events_TreeListener not written");
+}
+
+public void test_selectAll() {
+	warnUnimpl("Test test_selectAll not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setEnabledZ() {
+	warnUnimpl("Test test_setEnabledZ not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setForegroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setMenuLorg_eclipse_swt_widgets_Menu() {
+	warnUnimpl("Test test_setMenuLorg_eclipse_swt_widgets_Menu not written");
+}
+
+public void test_setSelection$Lorg_eclipse_swt_custom_TableTreeItem() {
+	warnUnimpl("Test test_setSelection$Lorg_eclipse_swt_custom_TableTreeItem not written");
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	warnUnimpl("Test test_setToolTipTextLjava_lang_String not written");
+}
+
+public void test_showItemLorg_eclipse_swt_custom_TableTreeItem() {
+	warnUnimpl("Test test_showItemLorg_eclipse_swt_custom_TableTreeItem not written");
+}
+
+public void test_showSelection() {
+	warnUnimpl("Test test_showSelection not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TableTree((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_addTreeListenerLorg_eclipse_swt_events_TreeListener");
+	methodNames.addElement("test_computeSizeII");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_getTable");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_custom_TableTreeItem");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_removeTreeListenerLorg_eclipse_swt_events_TreeListener");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setMenuLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_setSelection$Lorg_eclipse_swt_custom_TableTreeItem");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addElement("test_showItemLorg_eclipse_swt_custom_TableTreeItem");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_addTreeListenerLorg_eclipse_swt_events_TreeListener")) test_addTreeListenerLorg_eclipse_swt_events_TreeListener();
+	else if (getName().equals("test_computeSizeII")) test_computeSizeII();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_getTable")) test_getTable();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_custom_TableTreeItem")) test_indexOfLorg_eclipse_swt_custom_TableTreeItem();
+	else if (getName().equals("test_getItemLorg_eclipse_swt_graphics_Point")) test_getItemLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_removeTreeListenerLorg_eclipse_swt_events_TreeListener")) test_removeTreeListenerLorg_eclipse_swt_events_TreeListener();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setForegroundLorg_eclipse_swt_graphics_Color")) test_setForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setMenuLorg_eclipse_swt_widgets_Menu")) test_setMenuLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_setSelection$Lorg_eclipse_swt_custom_TableTreeItem")) test_setSelection$Lorg_eclipse_swt_custom_TableTreeItem();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else if (getName().equals("test_showItemLorg_eclipse_swt_custom_TableTreeItem")) test_showItemLorg_eclipse_swt_custom_TableTreeItem();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeEditor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeEditor.java
new file mode 100644
index 0000000000..a39daecb92
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeEditor.java
@@ -0,0 +1,100 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TableTreeEditor
+ *
+ * @see org.eclipse.swt.custom.TableTreeEditor
+ */
+public class Test_org_eclipse_swt_custom_TableTreeEditor extends Test_org_eclipse_swt_custom_ControlEditor {
+
+public Test_org_eclipse_swt_custom_TableTreeEditor(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_TableTree() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_TableTree not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getColumn() {
+	warnUnimpl("Test test_getColumn not written");
+}
+
+public void test_setColumnI() {
+	warnUnimpl("Test test_setColumnI not written");
+}
+
+public void test_getItem() {
+	warnUnimpl("Test test_getItem not written");
+}
+
+public void test_setItemLorg_eclipse_swt_custom_TableTreeItem() {
+	warnUnimpl("Test test_setItemLorg_eclipse_swt_custom_TableTreeItem not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_custom_TableTreeItemI() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_custom_TableTreeItemI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TableTreeEditor((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_TableTree");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getColumn");
+	methodNames.addElement("test_setColumnI");
+	methodNames.addElement("test_getItem");
+	methodNames.addElement("test_setItemLorg_eclipse_swt_custom_TableTreeItem");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_custom_TableTreeItemI");
+	methodNames.addAll(Test_org_eclipse_swt_custom_ControlEditor.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_TableTree")) test_ConstructorLorg_eclipse_swt_custom_TableTree();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getColumn")) test_getColumn();
+	else if (getName().equals("test_setColumnI")) test_setColumnI();
+	else if (getName().equals("test_getItem")) test_getItem();
+	else if (getName().equals("test_setItemLorg_eclipse_swt_custom_TableTreeItem")) test_setItemLorg_eclipse_swt_custom_TableTreeItem();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_Control")) test_setEditorLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_custom_TableTreeItemI")) test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_custom_TableTreeItemI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeItem.java
new file mode 100644
index 0000000000..ca0e0d0c40
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TableTreeItem.java
@@ -0,0 +1,202 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TableTreeItem
+ *
+ * @see org.eclipse.swt.custom.TableTreeItem
+ */
+public class Test_org_eclipse_swt_custom_TableTreeItem extends Test_org_eclipse_swt_widgets_Item {
+
+	TableTree tableTree;
+	TableTreeItem tableTreeItem;
+	
+public Test_org_eclipse_swt_custom_TableTreeItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	tableTree = new TableTree(shell, 0);
+	tableTreeItem = new TableTreeItem(tableTree, 0);
+	setWidget(tableTreeItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_TableTreeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_TableTreeI not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_TableTreeII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_TableTreeII not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_TableTreeItemI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_TableTreeItemI not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_TableTreeItemII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_custom_TableTreeItemII not written");
+}
+
+public void test_getBoundsI() {
+	warnUnimpl("Test test_getBoundsI not written");
+}
+
+public void test_getChecked() {
+	warnUnimpl("Test test_getChecked not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getExpanded() {
+	warnUnimpl("Test test_getExpanded not written");
+}
+
+public void test_getImage() {
+	warnUnimpl("Test test_getImage not written");
+}
+
+public void test_getImageI() {
+	warnUnimpl("Test test_getImageI not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getParent() {
+	warnUnimpl("Test test_getParent not written");
+}
+
+public void test_getParentItem() {
+	warnUnimpl("Test test_getParentItem not written");
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_getTextI() {
+	warnUnimpl("Test test_getTextI not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_custom_TableTreeItem() {
+	warnUnimpl("Test test_indexOfLorg_eclipse_swt_custom_TableTreeItem not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_setCheckedZ() {
+	warnUnimpl("Test test_setCheckedZ not written");
+}
+
+public void test_setExpandedZ() {
+	warnUnimpl("Test test_setExpandedZ not written");
+}
+
+public void test_setImageILorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageILorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setTextILjava_lang_String() {
+	warnUnimpl("Test test_setTextILjava_lang_String not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TableTreeItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_TableTreeI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_TableTreeII");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_TableTreeItemI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_TableTreeItemII");
+	methodNames.addElement("test_getBoundsI");
+	methodNames.addElement("test_getChecked");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getExpanded");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getImageI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getParentItem");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getTextI");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_custom_TableTreeItem");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_setCheckedZ");
+	methodNames.addElement("test_setExpandedZ");
+	methodNames.addElement("test_setImageILorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextILjava_lang_String");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_TableTreeI")) test_ConstructorLorg_eclipse_swt_custom_TableTreeI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_TableTreeII")) test_ConstructorLorg_eclipse_swt_custom_TableTreeII();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_TableTreeItemI")) test_ConstructorLorg_eclipse_swt_custom_TableTreeItemI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_TableTreeItemII")) test_ConstructorLorg_eclipse_swt_custom_TableTreeItemII();
+	else if (getName().equals("test_getBoundsI")) test_getBoundsI();
+	else if (getName().equals("test_getChecked")) test_getChecked();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getExpanded")) test_getExpanded();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getImageI")) test_getImageI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getParentItem")) test_getParentItem();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getTextI")) test_getTextI();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_custom_TableTreeItem")) test_indexOfLorg_eclipse_swt_custom_TableTreeItem();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_setCheckedZ")) test_setCheckedZ();
+	else if (getName().equals("test_setExpandedZ")) test_setExpandedZ();
+	else if (getName().equals("test_setImageILorg_eclipse_swt_graphics_Image")) test_setImageILorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextILjava_lang_String")) test_setTextILjava_lang_String();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..38e6f7cf20
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangeListener.java
@@ -0,0 +1,549 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.custom.*;
+import org.eclipse.swt.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+	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());
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TextChangeListener((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void tearDown() {
+}
+public void test_textChangingLorg_eclipse_swt_custom_TextChangingEvent() {
+	StyledTextContent content = styledText.getContent();
+	TextChangeListener listener = new TextChangeListener() {
+		public void textChanging(TextChangingEvent event) {
+			switch(verify) {
+				case 1 : {
+					assertTrue(":1a:", event.replaceLineCount == 0);
+					assertTrue(":1b:", event.newLineCount == 1);
+					break;
+				}
+				case 2 : {
+					assertTrue(":2a:", event.replaceLineCount == 2);
+					assertTrue(":2b:", event.newLineCount == 0);
+					break;
+				}
+				case 3 : {
+					assertTrue(":3a:", event.replaceLineCount == 0);
+					assertTrue(":3b:", event.newLineCount == 2);
+					break;
+				}
+				case 4: {
+					assertTrue(":4:", false);
+					break;
+				}
+				case 5 : {
+					assertTrue(":5a:", event.replaceLineCount == 0);
+					assertTrue(":5b:", event.newLineCount == 1);
+					break;
+				}
+				case 6 : {
+					assertTrue(":6a:", event.replaceLineCount == 1);
+					assertTrue(":6b:", event.newLineCount == 0);
+					break;
+				}
+				case 7 : {
+					assertTrue(":7a:", event.replaceLineCount == 0);
+					assertTrue(":7b:", event.newLineCount == 0);
+					break;
+				}
+				case 8 : {
+					assertTrue(":8a:", event.replaceLineCount == 1);
+					assertTrue(":8b:", event.newLineCount == 0);
+					break;
+				}
+				case 9 : {
+					assertTrue(":9a:", event.replaceLineCount == 1);
+					assertTrue(":9b:", event.newLineCount == 0);
+					break;
+				}
+				case 10:{
+					assertTrue(":10:", false);
+					break;
+				}
+				case 11: {
+					assertTrue(":11:", false);
+					break;
+				}
+				case 12: {
+					assertTrue(":12a:", event.replaceLineCount == 0);
+					assertTrue(":12b:", event.newLineCount == 1);
+					break;
+				}
+				case 13: {
+					assertTrue(":13a:", event.replaceLineCount == 0);
+					assertTrue(":13b:", event.newLineCount == 1);
+					break;
+				}
+				case 14: {
+					assertTrue(":14:", false);
+					break;
+				}
+				case 15: {
+					assertTrue(":15a:", event.replaceLineCount == 1);
+					assertTrue(":15b:", event.newLineCount == 2);
+					break;
+				}
+				case 16:{
+					assertTrue(":16:", false);
+					break;
+				}
+				case 17: {
+					assertTrue(":17:", false);
+					break;
+				}
+				case 18: {
+					assertTrue(":18a:", event.replaceLineCount == 0);
+					assertTrue(":18b:", event.newLineCount == 2);
+					break;
+				}
+				case 19: {
+					assertTrue(":19a:", event.replaceLineCount == 0);
+					assertTrue(":19b:", event.newLineCount == 3);
+					break;
+				}
+				case 20: {
+					assertTrue(":20:", false);
+					break;
+				}
+			}
+		}
+		public void textChanged(TextChangedEvent event) {
+		}
+		public void textSet(TextChangedEvent event) {
+		}
+	};
+	content.addTextChangeListener(listener);
+
+	boolean exceptionHandled = false;	
+	verify = 1;
+	styledText.setText("testing");
+	styledText.replaceTextRange(0, 0, "\n");
+
+	verify = 2;
+	styledText.setText("\n\n");
+	styledText.replaceTextRange(0, 2, "a");
+
+	verify = 3;
+	styledText.setText("a");
+	styledText.replaceTextRange(0, 1, "\n\n");
+
+	verify = 4;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":4: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 5;
+	styledText.setText("Line 1\r\nLine 2");
+	styledText.replaceTextRange(0, 0, "\r");
+
+	verify = 6;
+	styledText.setText("This\nis a test\nline 3\nline 4");
+	styledText.replaceTextRange(21, 7, "");
+
+	verify = 7;
+	styledText.setText("This\nis a test\r");
+	styledText.replaceTextRange(5, 9, "");
+
+	verify = 8;
+	styledText.setText("\nL1\r\nL2\r\n");
+	styledText.replaceTextRange(7, 2, "");
+
+	verify = 9;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test");
+
+	verify = 10;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "");} 
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":10: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 11;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":11: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 12;
+	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\n");
+
+	verify = 13;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "\r");
+
+	verify = 14;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 0, "test");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":14: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 15;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test\n\n");
+
+	verify = 16;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\r\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":16: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 17;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "test\n\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":17: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 18;
+ 	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\ntest\r\n");
+
+	verify = 19;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "test\r\r\r");
+	verify = 20;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":20: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+	content.removeTextChangeListener(listener);
+}
+
+public void test_textSetLorg_eclipse_swt_custom_TextChangedEvent() {
+	StyledTextContent content = styledText.getContent();
+	TextChangeListener listener = new TextChangeListener() {
+		public void textChanging(TextChangingEvent event) {
+		}
+		public void textChanged(TextChangedEvent event) {
+		}
+		public void textSet(TextChangedEvent event) {
+			switch (verify) {
+				case 1 : {
+					assertTrue(":1:", styledText.getText().equals("testing"));
+					break;
+				}
+				case 2 : {
+					assertTrue(":2:", styledText.getText().equals("\n\n"));
+					break;
+				}
+				case 3 : {
+					assertTrue(":3:", styledText.getText().equals("a"));
+					break;
+				}
+				case 4 : {
+					assertTrue(":4:", styledText.getText().equals(""));
+					break;
+				}
+			}
+		}
+	};
+	content.addTextChangeListener(listener);
+	
+	verify = 1;
+	styledText.setText("testing");
+
+	verify = 2;
+	styledText.setText("\n\n");
+
+	verify = 3;
+	styledText.setText("a");
+	
+	verify = 4;
+	try {styledText.setText(null);}
+	catch (NullPointerException ex) {assertTrue(":4:", true);}	
+	content.removeTextChangeListener(listener);
+}
+
+public void test_textChangedLorg_eclipse_swt_custom_TextChangedEvent() {
+	StyledTextContent content = styledText.getContent();
+	TextChangeListener listener = new TextChangeListener() {
+		public void textChanged(TextChangedEvent event) {
+			switch (verify) {
+				case 1 : {
+					assertTrue(":1:", styledText.getText().equals("\ntesting"));
+					break;
+				}
+				case 2 : {
+					assertTrue(":2:", styledText.getText().equals("a"));
+					break;
+				}
+				case 3 : {
+					assertTrue(":3:", styledText.getText().equals("\n\n"));
+					break;
+				}
+				case 4: {
+					assertTrue(":4:", false);
+					break;
+				}
+				case 5 : {
+					assertTrue(":5:", styledText.getText().equals("\rLine 1\r\nLine 2"));
+					break;
+				}
+				case 6 : {
+					assertTrue(":6:", styledText.getText().equals("This\nis a test\nline 3"));
+					break;
+				}
+				case 7 : {
+					assertTrue(":7:", styledText.getText().equals("This\n\r"));
+					break;
+				}
+				case 8 : {
+					assertTrue(":8:", styledText.getText().equals("\nL1\r\nL2"));
+					break;
+				}
+				case 9 : {
+					assertTrue(":9:", styledText.getText().equals("L1test"));
+					break;
+				}
+				case 10:{
+					assertTrue(":10:", false);
+					break;
+				}
+				case 11: {
+					assertTrue(":11:", false);
+					break;
+				}
+				case 12: {
+					assertTrue(":12:", styledText.getText().equals("L1\r\n"));
+					break;
+				}
+				case 13: {
+					assertTrue(":13:", styledText.getText().equals("L1\r\n"));
+					break;
+				}
+				case 14: {
+					assertTrue(":14:", false);
+					break;
+				}
+				case 15: {
+					assertTrue(":15:", styledText.getText().equals("L1test\n\n"));
+					break;
+				}
+				case 16:{
+					assertTrue(":16:", false);
+					break;
+				}
+				case 17: {
+					assertTrue(":17:", false);
+					break;
+				}
+				case 18: {
+					assertTrue(":18:", styledText.getText().equals("L1\r\ntest\r\n"));
+					break;
+				}
+				case 19: {
+					assertTrue(":19:", styledText.getText().equals("L1test\r\r\r\n"));
+					break;
+				}
+				case 20: {
+					assertTrue(":20:", false);
+					break;
+				}
+			}
+		}
+		public void textChanging(TextChangingEvent event) {
+		}
+		public void textSet(TextChangedEvent event) {
+		}
+	};
+	content.addTextChangeListener(listener);
+	
+	boolean exceptionHandled = false;
+	verify = 1;
+	styledText.setText("testing");
+	styledText.replaceTextRange(0, 0, "\n");
+
+
+	verify = 2;
+	styledText.setText("\n\n");
+	styledText.replaceTextRange(0, 2, "a");
+
+
+	verify = 3;
+	styledText.setText("a");
+	styledText.replaceTextRange(0, 1, "\n\n");
+
+
+	verify = 4;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":4: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 5;
+	styledText.setText("Line 1\r\nLine 2");
+	styledText.replaceTextRange(0, 0, "\r");
+
+
+	verify = 6;
+	styledText.setText("This\nis a test\nline 3\nline 4");
+	styledText.replaceTextRange(21, 7, "");
+
+
+	verify = 7;
+	styledText.setText("This\nis a test\r");
+	styledText.replaceTextRange(5, 9, "");
+
+
+	verify = 8;
+	styledText.setText("\nL1\r\nL2\r\n");
+	styledText.replaceTextRange(7, 2, "");
+
+
+	verify = 9;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test");
+
+
+	verify = 10;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "");} 
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":10: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 11;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":11: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 12;
+	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\n");
+
+
+	verify = 13;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "\r");
+
+
+	verify = 14;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 0, "test");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":14: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 15;
+	styledText.setText("L1\r\n");
+	styledText.replaceTextRange(2, 2, "test\n\n");
+
+
+	verify = 16;
+	styledText.setText("L1\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\r\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":16: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 17;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(1, 2, "test\n\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":17: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+
+	verify = 18;
+ 	styledText.setText("L1\r");
+	styledText.replaceTextRange(3, 0, "\ntest\r\n");
+
+
+	verify = 19;
+	styledText.setText("L1\n");
+	styledText.replaceTextRange(2, 0, "test\r\r\r");
+	verify = 20;
+	styledText.setText("L1\r\nL2\r\nL3\r\nL4\r\n");
+	try {styledText.replaceTextRange(3, 1, "test\n");}
+	catch (IllegalArgumentException ex) {
+		exceptionHandled = true;
+	}
+	assertTrue(":20: exception not thrown", exceptionHandled);
+	exceptionHandled = false;
+	content.removeTextChangeListener(listener);
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_textChangingLorg_eclipse_swt_custom_TextChangingEvent");
+	methodNames.addElement("test_textChangedLorg_eclipse_swt_custom_TextChangedEvent");
+	methodNames.addElement("test_textSetLorg_eclipse_swt_custom_TextChangedEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_textChangingLorg_eclipse_swt_custom_TextChangingEvent")) test_textChangingLorg_eclipse_swt_custom_TextChangingEvent();
+	else if (getName().equals("test_textChangedLorg_eclipse_swt_custom_TextChangedEvent")) test_textChangedLorg_eclipse_swt_custom_TextChangedEvent();
+	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_TextChangedEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangedEvent.java
new file mode 100644
index 0000000000..4e48aee295
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangedEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TextChangedEvent
+ *
+ * @see org.eclipse.swt.custom.TextChangedEvent
+ */
+public class Test_org_eclipse_swt_custom_TextChangedEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_TextChangedEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_StyledTextContent() {
+	// this method tested by other test classes
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TextChangedEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_StyledTextContent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_StyledTextContent")) test_ConstructorLorg_eclipse_swt_custom_StyledTextContent();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangingEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangingEvent.java
new file mode 100644
index 0000000000..212a57bee3
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TextChangingEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TextChangingEvent
+ *
+ * @see org.eclipse.swt.custom.TextChangingEvent
+ */
+public class Test_org_eclipse_swt_custom_TextChangingEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_custom_TextChangingEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_custom_StyledTextContent() {
+	// this method tested by other test classes
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TextChangingEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_custom_StyledTextContent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_custom_StyledTextContent")) test_ConstructorLorg_eclipse_swt_custom_StyledTextContent();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TreeEditor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TreeEditor.java
new file mode 100644
index 0000000000..cb9200a15d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_TreeEditor.java
@@ -0,0 +1,88 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.TreeEditor
+ *
+ * @see org.eclipse.swt.custom.TreeEditor
+ */
+public class Test_org_eclipse_swt_custom_TreeEditor extends Test_org_eclipse_swt_custom_ControlEditor {
+
+public Test_org_eclipse_swt_custom_TreeEditor(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Tree() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Tree not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getItem() {
+	warnUnimpl("Test test_getItem not written");
+}
+
+public void test_setItemLorg_eclipse_swt_widgets_TreeItem() {
+	warnUnimpl("Test test_setItemLorg_eclipse_swt_widgets_TreeItem not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TreeItem() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TreeItem not written");
+}
+
+public void test_setEditorLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setEditorLorg_eclipse_swt_widgets_Control not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_TreeEditor((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Tree");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getItem");
+	methodNames.addElement("test_setItemLorg_eclipse_swt_widgets_TreeItem");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TreeItem");
+	methodNames.addElement("test_setEditorLorg_eclipse_swt_widgets_Control");
+	methodNames.addAll(Test_org_eclipse_swt_custom_ControlEditor.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Tree")) test_ConstructorLorg_eclipse_swt_widgets_Tree();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getItem")) test_getItem();
+	else if (getName().equals("test_setItemLorg_eclipse_swt_widgets_TreeItem")) test_setItemLorg_eclipse_swt_widgets_TreeItem();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TreeItem")) test_setEditorLorg_eclipse_swt_widgets_ControlLorg_eclipse_swt_widgets_TreeItem();
+	else if (getName().equals("test_setEditorLorg_eclipse_swt_widgets_Control")) test_setEditorLorg_eclipse_swt_widgets_Control();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..57e2e994d4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_VerifyKeyListener.java
@@ -0,0 +1,78 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+	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());
+}
+protected void setUp() {
+	shell = new Shell();
+	styledText = new StyledText(shell, SWT.NULL);
+	shell.open();
+}
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_VerifyKeyListener((String)e.nextElement()));
+	}
+	return suite;
+}
+protected void tearDown() {
+}
+
+public void test_verifyKeyLorg_eclipse_swt_events_VerifyEvent() {
+	VerifyKeyListener listener = new VerifyKeyListener() {
+		public void verifyKey(VerifyEvent event) {
+			if (verify != 1) {event.doit = false;}
+		}
+	};
+	styledText.addVerifyKeyListener(listener);
+	verify = 1;
+	Event e = new Event();
+	e.character = 'a';
+	styledText.notifyListeners(SWT.KeyDown, e);
+	assertTrue(":1:", styledText.getText().equals("a"));
+
+	verify = 2;
+	styledText.setText("");
+	e = new Event();
+	e.character = 'a';
+	styledText.notifyListeners(SWT.KeyDown, e);
+	assertTrue(":2:", styledText.getText().equals(""));
+	styledText.removeVerifyKeyListener(listener);
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_verifyKeyLorg_eclipse_swt_events_VerifyEvent");
+	return methodNames;
+}
+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_custom_ViewForm.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ViewForm.java
new file mode 100644
index 0000000000..5cdefb8d38
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_custom_ViewForm.java
@@ -0,0 +1,148 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.custom.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.custom.ViewForm
+ *
+ * @see org.eclipse.swt.custom.ViewForm
+ */
+public class Test_org_eclipse_swt_custom_ViewForm extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_custom_ViewForm(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getContent() {
+	warnUnimpl("Test test_getContent not written");
+}
+
+public void test_getTopCenter() {
+	warnUnimpl("Test test_getTopCenter not written");
+}
+
+public void test_getTopLeft() {
+	warnUnimpl("Test test_getTopLeft not written");
+}
+
+public void test_getTopRight() {
+	warnUnimpl("Test test_getTopRight not written");
+}
+
+public void test_layoutZ() {
+	warnUnimpl("Test test_layoutZ not written");
+}
+
+public void test_setContentLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setContentLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setLayoutLorg_eclipse_swt_widgets_Layout() {
+	warnUnimpl("Test test_setLayoutLorg_eclipse_swt_widgets_Layout not written");
+}
+
+public void test_setTopCenterLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setTopCenterLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setTopLeftLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setTopLeftLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setTopRightLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setTopRightLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setBorderVisibleZ() {
+	warnUnimpl("Test test_setBorderVisibleZ not written");
+}
+
+public void test_setTopCenterSeparateZ() {
+	warnUnimpl("Test test_setTopCenterSeparateZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_custom_ViewForm((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getContent");
+	methodNames.addElement("test_getTopCenter");
+	methodNames.addElement("test_getTopLeft");
+	methodNames.addElement("test_getTopRight");
+	methodNames.addElement("test_layoutZ");
+	methodNames.addElement("test_setContentLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setLayoutLorg_eclipse_swt_widgets_Layout");
+	methodNames.addElement("test_setTopCenterLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setTopLeftLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setTopRightLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setBorderVisibleZ");
+	methodNames.addElement("test_setTopCenterSeparateZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getContent")) test_getContent();
+	else if (getName().equals("test_getTopCenter")) test_getTopCenter();
+	else if (getName().equals("test_getTopLeft")) test_getTopLeft();
+	else if (getName().equals("test_getTopRight")) test_getTopRight();
+	else if (getName().equals("test_layoutZ")) test_layoutZ();
+	else if (getName().equals("test_setContentLorg_eclipse_swt_widgets_Control")) test_setContentLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setLayoutLorg_eclipse_swt_widgets_Layout")) test_setLayoutLorg_eclipse_swt_widgets_Layout();
+	else if (getName().equals("test_setTopCenterLorg_eclipse_swt_widgets_Control")) test_setTopCenterLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setTopLeftLorg_eclipse_swt_widgets_Control")) test_setTopLeftLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setTopRightLorg_eclipse_swt_widgets_Control")) test_setTopRightLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setBorderVisibleZ")) test_setBorderVisibleZ();
+	else if (getName().equals("test_setTopCenterSeparateZ")) test_setTopCenterSeparateZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_ByteArrayTransfer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_ByteArrayTransfer.java
new file mode 100644
index 0000000000..70be934696
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_ByteArrayTransfer.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.ByteArrayTransfer
+ *
+ * @see org.eclipse.swt.dnd.ByteArrayTransfer
+ */
+public class Test_org_eclipse_swt_dnd_ByteArrayTransfer extends Test_org_eclipse_swt_dnd_Transfer {
+
+public Test_org_eclipse_swt_dnd_ByteArrayTransfer(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_getSupportedTypes() {
+	warnUnimpl("Test test_getSupportedTypes not written");
+}
+
+public void test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_nativeToJavaLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_nativeToJavaLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_getSupportedTypes");
+	methodNames.addElement("test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addAll(Test_org_eclipse_swt_dnd_Transfer.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_getSupportedTypes")) test_getSupportedTypes();
+	else if (getName().equals("test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData")) test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData")) test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData")) test_nativeToJavaLorg_eclipse_swt_dnd_TransferData();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Clipboard.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Clipboard.java
new file mode 100644
index 0000000000..4574e046a4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Clipboard.java
@@ -0,0 +1,84 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.Clipboard
+ *
+ * @see org.eclipse.swt.dnd.Clipboard
+ */
+public class Test_org_eclipse_swt_dnd_Clipboard extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_Clipboard(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Display() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Display not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getContentsLorg_eclipse_swt_dnd_Transfer() {
+	warnUnimpl("Test test_getContentsLorg_eclipse_swt_dnd_Transfer not written");
+}
+
+public void test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer() {
+	warnUnimpl("Test test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer not written");
+}
+
+public void test_getAvailableTypeNames() {
+	warnUnimpl("Test test_getAvailableTypeNames not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_Clipboard((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Display");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getContentsLorg_eclipse_swt_dnd_Transfer");
+	methodNames.addElement("test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer");
+	methodNames.addElement("test_getAvailableTypeNames");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Display")) test_ConstructorLorg_eclipse_swt_widgets_Display();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getContentsLorg_eclipse_swt_dnd_Transfer")) test_getContentsLorg_eclipse_swt_dnd_Transfer();
+	else if (getName().equals("test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer")) test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer();
+	else if (getName().equals("test_getAvailableTypeNames")) test_getAvailableTypeNames();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DND.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DND.java
new file mode 100644
index 0000000000..5f5eb704ef
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DND.java
@@ -0,0 +1,66 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DND
+ *
+ * @see org.eclipse.swt.dnd.DND
+ */
+public class Test_org_eclipse_swt_dnd_DND extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_DND(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_errorI() {
+	warnUnimpl("Test test_errorI not written");
+}
+
+public void test_errorII() {
+	warnUnimpl("Test test_errorII not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DND((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_errorI");
+	methodNames.addElement("test_errorII");
+	return methodNames;
+}
+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_errorII")) test_errorII();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSource.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSource.java
new file mode 100644
index 0000000000..80b967e5d2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSource.java
@@ -0,0 +1,100 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DragSource
+ *
+ * @see org.eclipse.swt.dnd.DragSource
+ */
+public class Test_org_eclipse_swt_dnd_DragSource extends Test_org_eclipse_swt_widgets_Widget {
+
+public Test_org_eclipse_swt_dnd_DragSource(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ControlI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ControlI not written");
+}
+
+public void test_addDragListenerLorg_eclipse_swt_dnd_DragSourceListener() {
+	warnUnimpl("Test test_addDragListenerLorg_eclipse_swt_dnd_DragSourceListener not written");
+}
+
+public void test_getControl() {
+	warnUnimpl("Test test_getControl not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getTransfer() {
+	warnUnimpl("Test test_getTransfer not written");
+}
+
+public void test_removeDragListenerLorg_eclipse_swt_dnd_DragSourceListener() {
+	warnUnimpl("Test test_removeDragListenerLorg_eclipse_swt_dnd_DragSourceListener not written");
+}
+
+public void test_setTransfer$Lorg_eclipse_swt_dnd_Transfer() {
+	warnUnimpl("Test test_setTransfer$Lorg_eclipse_swt_dnd_Transfer not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DragSource((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ControlI");
+	methodNames.addElement("test_addDragListenerLorg_eclipse_swt_dnd_DragSourceListener");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getTransfer");
+	methodNames.addElement("test_removeDragListenerLorg_eclipse_swt_dnd_DragSourceListener");
+	methodNames.addElement("test_setTransfer$Lorg_eclipse_swt_dnd_Transfer");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlI")) test_ConstructorLorg_eclipse_swt_widgets_ControlI();
+	else if (getName().equals("test_addDragListenerLorg_eclipse_swt_dnd_DragSourceListener")) test_addDragListenerLorg_eclipse_swt_dnd_DragSourceListener();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getTransfer")) test_getTransfer();
+	else if (getName().equals("test_removeDragListenerLorg_eclipse_swt_dnd_DragSourceListener")) test_removeDragListenerLorg_eclipse_swt_dnd_DragSourceListener();
+	else if (getName().equals("test_setTransfer$Lorg_eclipse_swt_dnd_Transfer")) test_setTransfer$Lorg_eclipse_swt_dnd_Transfer();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceAdapter.java
new file mode 100644
index 0000000000..a8d2e13955
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceAdapter.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DragSourceAdapter
+ *
+ * @see org.eclipse.swt.dnd.DragSourceAdapter
+ */
+public class Test_org_eclipse_swt_dnd_DragSourceAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_DragSourceAdapter(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public void test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public void test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DragSourceAdapter((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent");
+	methodNames.addElement("test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent");
+	methodNames.addElement("test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent();
+	else if (getName().equals("test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent();
+	else if (getName().equals("test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceEvent.java
new file mode 100644
index 0000000000..fbaf351773
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DragSourceEvent
+ *
+ * @see org.eclipse.swt.dnd.DragSourceEvent
+ */
+public class Test_org_eclipse_swt_dnd_DragSourceEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_dnd_DragSourceEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_dnd_DNDEvent() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_dnd_DNDEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DragSourceEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_dnd_DNDEvent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_dnd_DNDEvent")) test_ConstructorLorg_eclipse_swt_dnd_DNDEvent();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceListener.java
new file mode 100644
index 0000000000..697cbea387
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DragSourceListener.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DragSourceListener
+ *
+ * @see org.eclipse.swt.dnd.DragSourceListener
+ */
+public class Test_org_eclipse_swt_dnd_DragSourceListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_DragSourceListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public void test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public void test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent() {
+	warnUnimpl("Test test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent");
+	methodNames.addElement("test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent");
+	methodNames.addElement("test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragStartLorg_eclipse_swt_dnd_DragSourceEvent();
+	else if (getName().equals("test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragSetDataLorg_eclipse_swt_dnd_DragSourceEvent();
+	else if (getName().equals("test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent")) test_dragFinishedLorg_eclipse_swt_dnd_DragSourceEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTarget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTarget.java
new file mode 100644
index 0000000000..21edb1aa83
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTarget.java
@@ -0,0 +1,106 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DropTarget
+ *
+ * @see org.eclipse.swt.dnd.DropTarget
+ */
+public class Test_org_eclipse_swt_dnd_DropTarget extends Test_org_eclipse_swt_widgets_Widget {
+
+public Test_org_eclipse_swt_dnd_DropTarget(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ControlI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ControlI not written");
+}
+
+public void test_addDropListenerLorg_eclipse_swt_dnd_DropTargetListener() {
+	warnUnimpl("Test test_addDropListenerLorg_eclipse_swt_dnd_DropTargetListener not written");
+}
+
+public void test_getControl() {
+	warnUnimpl("Test test_getControl not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getTransfer() {
+	warnUnimpl("Test test_getTransfer not written");
+}
+
+public void test_notifyListenersILorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_notifyListenersILorg_eclipse_swt_widgets_Event not written");
+}
+
+public void test_removeDropListenerLorg_eclipse_swt_dnd_DropTargetListener() {
+	warnUnimpl("Test test_removeDropListenerLorg_eclipse_swt_dnd_DropTargetListener not written");
+}
+
+public void test_setTransfer$Lorg_eclipse_swt_dnd_Transfer() {
+	warnUnimpl("Test test_setTransfer$Lorg_eclipse_swt_dnd_Transfer not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DropTarget((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ControlI");
+	methodNames.addElement("test_addDropListenerLorg_eclipse_swt_dnd_DropTargetListener");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getTransfer");
+	methodNames.addElement("test_notifyListenersILorg_eclipse_swt_widgets_Event");
+	methodNames.addElement("test_removeDropListenerLorg_eclipse_swt_dnd_DropTargetListener");
+	methodNames.addElement("test_setTransfer$Lorg_eclipse_swt_dnd_Transfer");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlI")) test_ConstructorLorg_eclipse_swt_widgets_ControlI();
+	else if (getName().equals("test_addDropListenerLorg_eclipse_swt_dnd_DropTargetListener")) test_addDropListenerLorg_eclipse_swt_dnd_DropTargetListener();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getTransfer")) test_getTransfer();
+	else if (getName().equals("test_notifyListenersILorg_eclipse_swt_widgets_Event")) test_notifyListenersILorg_eclipse_swt_widgets_Event();
+	else if (getName().equals("test_removeDropListenerLorg_eclipse_swt_dnd_DropTargetListener")) test_removeDropListenerLorg_eclipse_swt_dnd_DropTargetListener();
+	else if (getName().equals("test_setTransfer$Lorg_eclipse_swt_dnd_Transfer")) test_setTransfer$Lorg_eclipse_swt_dnd_Transfer();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetAdapter.java
new file mode 100644
index 0000000000..8fb278fe4b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetAdapter.java
@@ -0,0 +1,90 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DropTargetAdapter
+ *
+ * @see org.eclipse.swt.dnd.DropTargetAdapter
+ */
+public class Test_org_eclipse_swt_dnd_DropTargetAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_DropTargetAdapter(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dropLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dropLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DropTargetAdapter((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dropLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dropLorg_eclipse_swt_dnd_DropTargetEvent")) test_dropLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent")) test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetEvent.java
new file mode 100644
index 0000000000..02a1a9e027
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DropTargetEvent
+ *
+ * @see org.eclipse.swt.dnd.DropTargetEvent
+ */
+public class Test_org_eclipse_swt_dnd_DropTargetEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_dnd_DropTargetEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_dnd_DNDEvent() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_dnd_DNDEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_DropTargetEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_dnd_DNDEvent");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_dnd_DNDEvent")) test_ConstructorLorg_eclipse_swt_dnd_DNDEvent();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetListener.java
new file mode 100644
index 0000000000..73897bc59b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_DropTargetListener.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.DropTargetListener
+ *
+ * @see org.eclipse.swt.dnd.DropTargetListener
+ */
+public class Test_org_eclipse_swt_dnd_DropTargetListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_DropTargetListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dropLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dropLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public void test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent() {
+	warnUnimpl("Test test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dropLorg_eclipse_swt_dnd_DropTargetEvent");
+	methodNames.addElement("test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragEnterLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragLeaveLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragOperationChangedLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent")) test_dragOverLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dropLorg_eclipse_swt_dnd_DropTargetEvent")) test_dropLorg_eclipse_swt_dnd_DropTargetEvent();
+	else if (getName().equals("test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent")) test_dropAcceptLorg_eclipse_swt_dnd_DropTargetEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_FileTransfer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_FileTransfer.java
new file mode 100644
index 0000000000..58050f0cdd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_FileTransfer.java
@@ -0,0 +1,82 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.FileTransfer
+ *
+ * @see org.eclipse.swt.dnd.FileTransfer
+ */
+public class Test_org_eclipse_swt_dnd_FileTransfer extends Test_org_eclipse_swt_dnd_ByteArrayTransfer {
+
+public Test_org_eclipse_swt_dnd_FileTransfer(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_getInstance() {
+	warnUnimpl("Test test_getInstance not written");
+}
+
+public void test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_nativeToJavaLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_nativeToJavaLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_getTypeIds() {
+	warnUnimpl("Test test_getTypeIds not written");
+}
+
+public void test_getTypeNames() {
+	warnUnimpl("Test test_getTypeNames not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_FileTransfer((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_getInstance");
+	methodNames.addElement("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_getTypeIds");
+	methodNames.addElement("test_getTypeNames");
+	methodNames.addAll(Test_org_eclipse_swt_dnd_ByteArrayTransfer.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_getInstance")) test_getInstance();
+	else if (getName().equals("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData")) test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData")) test_nativeToJavaLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_getTypeIds")) test_getTypeIds();
+	else if (getName().equals("test_getTypeNames")) test_getTypeNames();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_RTFTransfer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_RTFTransfer.java
new file mode 100644
index 0000000000..b4a7a8969c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_RTFTransfer.java
@@ -0,0 +1,82 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.RTFTransfer
+ *
+ * @see org.eclipse.swt.dnd.RTFTransfer
+ */
+public class Test_org_eclipse_swt_dnd_RTFTransfer extends Test_org_eclipse_swt_dnd_ByteArrayTransfer {
+
+public Test_org_eclipse_swt_dnd_RTFTransfer(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_getInstance() {
+	warnUnimpl("Test test_getInstance not written");
+}
+
+public void test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_nativeToJavaLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_nativeToJavaLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_getTypeIds() {
+	warnUnimpl("Test test_getTypeIds not written");
+}
+
+public void test_getTypeNames() {
+	warnUnimpl("Test test_getTypeNames not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_RTFTransfer((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_getInstance");
+	methodNames.addElement("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_getTypeIds");
+	methodNames.addElement("test_getTypeNames");
+	methodNames.addAll(Test_org_eclipse_swt_dnd_ByteArrayTransfer.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_getInstance")) test_getInstance();
+	else if (getName().equals("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData")) test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData")) test_nativeToJavaLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_getTypeIds")) test_getTypeIds();
+	else if (getName().equals("test_getTypeNames")) test_getTypeNames();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TextTransfer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TextTransfer.java
new file mode 100644
index 0000000000..200a576a6a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TextTransfer.java
@@ -0,0 +1,82 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.TextTransfer
+ *
+ * @see org.eclipse.swt.dnd.TextTransfer
+ */
+public class Test_org_eclipse_swt_dnd_TextTransfer extends Test_org_eclipse_swt_dnd_ByteArrayTransfer {
+
+public Test_org_eclipse_swt_dnd_TextTransfer(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_getInstance() {
+	warnUnimpl("Test test_getInstance not written");
+}
+
+public void test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_nativeToJavaLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_nativeToJavaLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_getTypeIds() {
+	warnUnimpl("Test test_getTypeIds not written");
+}
+
+public void test_getTypeNames() {
+	warnUnimpl("Test test_getTypeNames not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_TextTransfer((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_getInstance");
+	methodNames.addElement("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_getTypeIds");
+	methodNames.addElement("test_getTypeNames");
+	methodNames.addAll(Test_org_eclipse_swt_dnd_ByteArrayTransfer.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_getInstance")) test_getInstance();
+	else if (getName().equals("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData")) test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData")) test_nativeToJavaLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_getTypeIds")) test_getTypeIds();
+	else if (getName().equals("test_getTypeNames")) test_getTypeNames();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Transfer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Transfer.java
new file mode 100644
index 0000000000..42847366f8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Transfer.java
@@ -0,0 +1,84 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.Transfer
+ *
+ * @see org.eclipse.swt.dnd.Transfer
+ */
+public class Test_org_eclipse_swt_dnd_Transfer extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_Transfer(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_getSupportedTypes() {
+	warnUnimpl("Test test_getSupportedTypes not written");
+}
+
+public void test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_getTypeIds() {
+	warnUnimpl("Test test_getTypeIds not written");
+}
+
+public void test_getTypeNames() {
+	warnUnimpl("Test test_getTypeNames not written");
+}
+
+public void test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_nativeToJavaLorg_eclipse_swt_dnd_TransferData() {
+	warnUnimpl("Test test_nativeToJavaLorg_eclipse_swt_dnd_TransferData not written");
+}
+
+public void test_registerTypeLjava_lang_String() {
+	warnUnimpl("Test test_registerTypeLjava_lang_String not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_getSupportedTypes");
+	methodNames.addElement("test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_getTypeIds");
+	methodNames.addElement("test_getTypeNames");
+	methodNames.addElement("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData");
+	methodNames.addElement("test_registerTypeLjava_lang_String");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_getSupportedTypes")) test_getSupportedTypes();
+	else if (getName().equals("test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData")) test_isSupportedTypeLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_getTypeIds")) test_getTypeIds();
+	else if (getName().equals("test_getTypeNames")) test_getTypeNames();
+	else if (getName().equals("test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData")) test_javaToNativeLjava_lang_ObjectLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_nativeToJavaLorg_eclipse_swt_dnd_TransferData")) test_nativeToJavaLorg_eclipse_swt_dnd_TransferData();
+	else if (getName().equals("test_registerTypeLjava_lang_String")) test_registerTypeLjava_lang_String();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TransferData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TransferData.java
new file mode 100644
index 0000000000..4d824ce5f8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_TransferData.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.dnd.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.dnd.TransferData
+ *
+ * @see org.eclipse.swt.dnd.TransferData
+ */
+public class Test_org_eclipse_swt_dnd_TransferData extends SwtTestCase {
+
+public Test_org_eclipse_swt_dnd_TransferData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_dnd_TransferData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmEvent.java
new file mode 100644
index 0000000000..c7c02f2e04
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ArmEvent
+ *
+ * @see org.eclipse.swt.events.ArmEvent
+ */
+public class Test_org_eclipse_swt_events_ArmEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_ArmEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_ArmEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmListener.java
new file mode 100644
index 0000000000..55bacaafb5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ArmListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ArmListener
+ *
+ * @see org.eclipse.swt.events.ArmListener
+ */
+public class Test_org_eclipse_swt_events_ArmListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ArmListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_widgetArmedLorg_eclipse_swt_events_ArmEvent() {
+	warnUnimpl("Test test_widgetArmedLorg_eclipse_swt_events_ArmEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_widgetArmedLorg_eclipse_swt_events_ArmEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_widgetArmedLorg_eclipse_swt_events_ArmEvent")) test_widgetArmedLorg_eclipse_swt_events_ArmEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlAdapter.java
new file mode 100644
index 0000000000..3688a6e70a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ControlAdapter
+ *
+ * @see org.eclipse.swt.events.ControlAdapter
+ */
+public class Test_org_eclipse_swt_events_ControlAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ControlAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_controlMovedLorg_eclipse_swt_events_ControlEvent() {
+	warnUnimpl("Test test_controlMovedLorg_eclipse_swt_events_ControlEvent not written");
+}
+
+public void test_controlResizedLorg_eclipse_swt_events_ControlEvent() {
+	warnUnimpl("Test test_controlResizedLorg_eclipse_swt_events_ControlEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_controlMovedLorg_eclipse_swt_events_ControlEvent");
+	methodNames.addElement("test_controlResizedLorg_eclipse_swt_events_ControlEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_controlMovedLorg_eclipse_swt_events_ControlEvent")) test_controlMovedLorg_eclipse_swt_events_ControlEvent();
+	else if (getName().equals("test_controlResizedLorg_eclipse_swt_events_ControlEvent")) test_controlResizedLorg_eclipse_swt_events_ControlEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlEvent.java
new file mode 100644
index 0000000000..aaadbe2684
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ControlEvent
+ *
+ * @see org.eclipse.swt.events.ControlEvent
+ */
+public class Test_org_eclipse_swt_events_ControlEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_ControlEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_ControlEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlListener.java
new file mode 100644
index 0000000000..0052e44e61
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ControlListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ControlListener
+ *
+ * @see org.eclipse.swt.events.ControlListener
+ */
+public class Test_org_eclipse_swt_events_ControlListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ControlListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_controlMovedLorg_eclipse_swt_events_ControlEvent() {
+	warnUnimpl("Test test_controlMovedLorg_eclipse_swt_events_ControlEvent not written");
+}
+
+public void test_controlResizedLorg_eclipse_swt_events_ControlEvent() {
+	warnUnimpl("Test test_controlResizedLorg_eclipse_swt_events_ControlEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_controlMovedLorg_eclipse_swt_events_ControlEvent");
+	methodNames.addElement("test_controlResizedLorg_eclipse_swt_events_ControlEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_controlMovedLorg_eclipse_swt_events_ControlEvent")) test_controlMovedLorg_eclipse_swt_events_ControlEvent();
+	else if (getName().equals("test_controlResizedLorg_eclipse_swt_events_ControlEvent")) test_controlResizedLorg_eclipse_swt_events_ControlEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeEvent.java
new file mode 100644
index 0000000000..6662bcdd9f
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.DisposeEvent
+ *
+ * @see org.eclipse.swt.events.DisposeEvent
+ */
+public class Test_org_eclipse_swt_events_DisposeEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_DisposeEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_DisposeEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeListener.java
new file mode 100644
index 0000000000..18352f60f1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_DisposeListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.DisposeListener
+ *
+ * @see org.eclipse.swt.events.DisposeListener
+ */
+public class Test_org_eclipse_swt_events_DisposeListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_DisposeListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_widgetDisposedLorg_eclipse_swt_events_DisposeEvent() {
+	warnUnimpl("Test test_widgetDisposedLorg_eclipse_swt_events_DisposeEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_widgetDisposedLorg_eclipse_swt_events_DisposeEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_widgetDisposedLorg_eclipse_swt_events_DisposeEvent")) test_widgetDisposedLorg_eclipse_swt_events_DisposeEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusAdapter.java
new file mode 100644
index 0000000000..bae70d6e09
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.FocusAdapter
+ *
+ * @see org.eclipse.swt.events.FocusAdapter
+ */
+public class Test_org_eclipse_swt_events_FocusAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_FocusAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_focusGainedLorg_eclipse_swt_events_FocusEvent() {
+	warnUnimpl("Test test_focusGainedLorg_eclipse_swt_events_FocusEvent not written");
+}
+
+public void test_focusLostLorg_eclipse_swt_events_FocusEvent() {
+	warnUnimpl("Test test_focusLostLorg_eclipse_swt_events_FocusEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_focusGainedLorg_eclipse_swt_events_FocusEvent");
+	methodNames.addElement("test_focusLostLorg_eclipse_swt_events_FocusEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_focusGainedLorg_eclipse_swt_events_FocusEvent")) test_focusGainedLorg_eclipse_swt_events_FocusEvent();
+	else if (getName().equals("test_focusLostLorg_eclipse_swt_events_FocusEvent")) test_focusLostLorg_eclipse_swt_events_FocusEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusEvent.java
new file mode 100644
index 0000000000..bf06714607
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.FocusEvent
+ *
+ * @see org.eclipse.swt.events.FocusEvent
+ */
+public class Test_org_eclipse_swt_events_FocusEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_FocusEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_FocusEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusListener.java
new file mode 100644
index 0000000000..8c7e32b46d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_FocusListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.FocusListener
+ *
+ * @see org.eclipse.swt.events.FocusListener
+ */
+public class Test_org_eclipse_swt_events_FocusListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_FocusListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_focusGainedLorg_eclipse_swt_events_FocusEvent() {
+	warnUnimpl("Test test_focusGainedLorg_eclipse_swt_events_FocusEvent not written");
+}
+
+public void test_focusLostLorg_eclipse_swt_events_FocusEvent() {
+	warnUnimpl("Test test_focusLostLorg_eclipse_swt_events_FocusEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_focusGainedLorg_eclipse_swt_events_FocusEvent");
+	methodNames.addElement("test_focusLostLorg_eclipse_swt_events_FocusEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_focusGainedLorg_eclipse_swt_events_FocusEvent")) test_focusGainedLorg_eclipse_swt_events_FocusEvent();
+	else if (getName().equals("test_focusLostLorg_eclipse_swt_events_FocusEvent")) test_focusLostLorg_eclipse_swt_events_FocusEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpEvent.java
new file mode 100644
index 0000000000..1854e146fa
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.HelpEvent
+ *
+ * @see org.eclipse.swt.events.HelpEvent
+ */
+public class Test_org_eclipse_swt_events_HelpEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_HelpEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_HelpEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpListener.java
new file mode 100644
index 0000000000..5dcc1e5e2a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_HelpListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.HelpListener
+ *
+ * @see org.eclipse.swt.events.HelpListener
+ */
+public class Test_org_eclipse_swt_events_HelpListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_HelpListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_helpRequestedLorg_eclipse_swt_events_HelpEvent() {
+	warnUnimpl("Test test_helpRequestedLorg_eclipse_swt_events_HelpEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_helpRequestedLorg_eclipse_swt_events_HelpEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_helpRequestedLorg_eclipse_swt_events_HelpEvent")) test_helpRequestedLorg_eclipse_swt_events_HelpEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyAdapter.java
new file mode 100644
index 0000000000..8d8c295cf5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.KeyAdapter
+ *
+ * @see org.eclipse.swt.events.KeyAdapter
+ */
+public class Test_org_eclipse_swt_events_KeyAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_KeyAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_keyPressedLorg_eclipse_swt_events_KeyEvent() {
+	warnUnimpl("Test test_keyPressedLorg_eclipse_swt_events_KeyEvent not written");
+}
+
+public void test_keyReleasedLorg_eclipse_swt_events_KeyEvent() {
+	warnUnimpl("Test test_keyReleasedLorg_eclipse_swt_events_KeyEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_keyPressedLorg_eclipse_swt_events_KeyEvent");
+	methodNames.addElement("test_keyReleasedLorg_eclipse_swt_events_KeyEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_keyPressedLorg_eclipse_swt_events_KeyEvent")) test_keyPressedLorg_eclipse_swt_events_KeyEvent();
+	else if (getName().equals("test_keyReleasedLorg_eclipse_swt_events_KeyEvent")) test_keyReleasedLorg_eclipse_swt_events_KeyEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyEvent.java
new file mode 100644
index 0000000000..08a75c93cd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.KeyEvent
+ *
+ * @see org.eclipse.swt.events.KeyEvent
+ */
+public class Test_org_eclipse_swt_events_KeyEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_KeyEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_KeyEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyListener.java
new file mode 100644
index 0000000000..ae6afde2c0
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_KeyListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.KeyListener
+ *
+ * @see org.eclipse.swt.events.KeyListener
+ */
+public class Test_org_eclipse_swt_events_KeyListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_KeyListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_keyPressedLorg_eclipse_swt_events_KeyEvent() {
+	warnUnimpl("Test test_keyPressedLorg_eclipse_swt_events_KeyEvent not written");
+}
+
+public void test_keyReleasedLorg_eclipse_swt_events_KeyEvent() {
+	warnUnimpl("Test test_keyReleasedLorg_eclipse_swt_events_KeyEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_keyPressedLorg_eclipse_swt_events_KeyEvent");
+	methodNames.addElement("test_keyReleasedLorg_eclipse_swt_events_KeyEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_keyPressedLorg_eclipse_swt_events_KeyEvent")) test_keyPressedLorg_eclipse_swt_events_KeyEvent();
+	else if (getName().equals("test_keyReleasedLorg_eclipse_swt_events_KeyEvent")) test_keyReleasedLorg_eclipse_swt_events_KeyEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuAdapter.java
new file mode 100644
index 0000000000..ad62105834
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MenuAdapter
+ *
+ * @see org.eclipse.swt.events.MenuAdapter
+ */
+public class Test_org_eclipse_swt_events_MenuAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MenuAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_menuHiddenLorg_eclipse_swt_events_MenuEvent() {
+	warnUnimpl("Test test_menuHiddenLorg_eclipse_swt_events_MenuEvent not written");
+}
+
+public void test_menuShownLorg_eclipse_swt_events_MenuEvent() {
+	warnUnimpl("Test test_menuShownLorg_eclipse_swt_events_MenuEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_menuHiddenLorg_eclipse_swt_events_MenuEvent");
+	methodNames.addElement("test_menuShownLorg_eclipse_swt_events_MenuEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_menuHiddenLorg_eclipse_swt_events_MenuEvent")) test_menuHiddenLorg_eclipse_swt_events_MenuEvent();
+	else if (getName().equals("test_menuShownLorg_eclipse_swt_events_MenuEvent")) test_menuShownLorg_eclipse_swt_events_MenuEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuEvent.java
new file mode 100644
index 0000000000..3be5465a07
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MenuEvent
+ *
+ * @see org.eclipse.swt.events.MenuEvent
+ */
+public class Test_org_eclipse_swt_events_MenuEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_MenuEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_MenuEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuListener.java
new file mode 100644
index 0000000000..42e6980494
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MenuListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MenuListener
+ *
+ * @see org.eclipse.swt.events.MenuListener
+ */
+public class Test_org_eclipse_swt_events_MenuListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MenuListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_menuHiddenLorg_eclipse_swt_events_MenuEvent() {
+	warnUnimpl("Test test_menuHiddenLorg_eclipse_swt_events_MenuEvent not written");
+}
+
+public void test_menuShownLorg_eclipse_swt_events_MenuEvent() {
+	warnUnimpl("Test test_menuShownLorg_eclipse_swt_events_MenuEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_menuHiddenLorg_eclipse_swt_events_MenuEvent");
+	methodNames.addElement("test_menuShownLorg_eclipse_swt_events_MenuEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_menuHiddenLorg_eclipse_swt_events_MenuEvent")) test_menuHiddenLorg_eclipse_swt_events_MenuEvent();
+	else if (getName().equals("test_menuShownLorg_eclipse_swt_events_MenuEvent")) test_menuShownLorg_eclipse_swt_events_MenuEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyEvent.java
new file mode 100644
index 0000000000..4cb9b84ab6
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ModifyEvent
+ *
+ * @see org.eclipse.swt.events.ModifyEvent
+ */
+public class Test_org_eclipse_swt_events_ModifyEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_ModifyEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_ModifyEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyListener.java
new file mode 100644
index 0000000000..68f4ee1011
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ModifyListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ModifyListener
+ *
+ * @see org.eclipse.swt.events.ModifyListener
+ */
+public class Test_org_eclipse_swt_events_ModifyListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ModifyListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_modifyTextLorg_eclipse_swt_events_ModifyEvent() {
+	warnUnimpl("Test test_modifyTextLorg_eclipse_swt_events_ModifyEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_modifyTextLorg_eclipse_swt_events_ModifyEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_modifyTextLorg_eclipse_swt_events_ModifyEvent")) test_modifyTextLorg_eclipse_swt_events_ModifyEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseAdapter.java
new file mode 100644
index 0000000000..8f76f16a00
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseAdapter.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseAdapter
+ *
+ * @see org.eclipse.swt.events.MouseAdapter
+ */
+public class Test_org_eclipse_swt_events_MouseAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MouseAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseDownLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseDownLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseUpLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseUpLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseDownLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseUpLorg_eclipse_swt_events_MouseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent")) test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseDownLorg_eclipse_swt_events_MouseEvent")) test_mouseDownLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseUpLorg_eclipse_swt_events_MouseEvent")) test_mouseUpLorg_eclipse_swt_events_MouseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseEvent.java
new file mode 100644
index 0000000000..990fea8c41
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseEvent
+ *
+ * @see org.eclipse.swt.events.MouseEvent
+ */
+public class Test_org_eclipse_swt_events_MouseEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_MouseEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_MouseEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseListener.java
new file mode 100644
index 0000000000..ddd3c64d0b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseListener.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseListener
+ *
+ * @see org.eclipse.swt.events.MouseListener
+ */
+public class Test_org_eclipse_swt_events_MouseListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MouseListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseDownLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseDownLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseUpLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseUpLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseDownLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseUpLorg_eclipse_swt_events_MouseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent")) test_mouseDoubleClickLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseDownLorg_eclipse_swt_events_MouseEvent")) test_mouseDownLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseUpLorg_eclipse_swt_events_MouseEvent")) test_mouseUpLorg_eclipse_swt_events_MouseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseMoveListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseMoveListener.java
new file mode 100644
index 0000000000..02ce4d0a91
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseMoveListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseMoveListener
+ *
+ * @see org.eclipse.swt.events.MouseMoveListener
+ */
+public class Test_org_eclipse_swt_events_MouseMoveListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MouseMoveListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_mouseMoveLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseMoveLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_mouseMoveLorg_eclipse_swt_events_MouseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_mouseMoveLorg_eclipse_swt_events_MouseEvent")) test_mouseMoveLorg_eclipse_swt_events_MouseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackAdapter.java
new file mode 100644
index 0000000000..d3022a6ef8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackAdapter.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseTrackAdapter
+ *
+ * @see org.eclipse.swt.events.MouseTrackAdapter
+ */
+public class Test_org_eclipse_swt_events_MouseTrackAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MouseTrackAdapter(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_mouseEnterLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseEnterLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseExitLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseExitLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseHoverLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseHoverLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_MouseTrackAdapter((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_mouseEnterLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseExitLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseHoverLorg_eclipse_swt_events_MouseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_mouseEnterLorg_eclipse_swt_events_MouseEvent")) test_mouseEnterLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseExitLorg_eclipse_swt_events_MouseEvent")) test_mouseExitLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseHoverLorg_eclipse_swt_events_MouseEvent")) test_mouseHoverLorg_eclipse_swt_events_MouseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackListener.java
new file mode 100644
index 0000000000..07abd33200
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_MouseTrackListener.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.MouseTrackListener
+ *
+ * @see org.eclipse.swt.events.MouseTrackListener
+ */
+public class Test_org_eclipse_swt_events_MouseTrackListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_MouseTrackListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_mouseEnterLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseEnterLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseExitLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseExitLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public void test_mouseHoverLorg_eclipse_swt_events_MouseEvent() {
+	warnUnimpl("Test test_mouseHoverLorg_eclipse_swt_events_MouseEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_mouseEnterLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseExitLorg_eclipse_swt_events_MouseEvent");
+	methodNames.addElement("test_mouseHoverLorg_eclipse_swt_events_MouseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_mouseEnterLorg_eclipse_swt_events_MouseEvent")) test_mouseEnterLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseExitLorg_eclipse_swt_events_MouseEvent")) test_mouseExitLorg_eclipse_swt_events_MouseEvent();
+	else if (getName().equals("test_mouseHoverLorg_eclipse_swt_events_MouseEvent")) test_mouseHoverLorg_eclipse_swt_events_MouseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintEvent.java
new file mode 100644
index 0000000000..465bc06519
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.PaintEvent
+ *
+ * @see org.eclipse.swt.events.PaintEvent
+ */
+public class Test_org_eclipse_swt_events_PaintEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_PaintEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_PaintEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintListener.java
new file mode 100644
index 0000000000..bf576db158
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_PaintListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.PaintListener
+ *
+ * @see org.eclipse.swt.events.PaintListener
+ */
+public class Test_org_eclipse_swt_events_PaintListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_PaintListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_paintControlLorg_eclipse_swt_events_PaintEvent() {
+	warnUnimpl("Test test_paintControlLorg_eclipse_swt_events_PaintEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_paintControlLorg_eclipse_swt_events_PaintEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_paintControlLorg_eclipse_swt_events_PaintEvent")) test_paintControlLorg_eclipse_swt_events_PaintEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionAdapter.java
new file mode 100644
index 0000000000..58687acd58
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.SelectionAdapter
+ *
+ * @see org.eclipse.swt.events.SelectionAdapter
+ */
+public class Test_org_eclipse_swt_events_SelectionAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_SelectionAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent() {
+	warnUnimpl("Test test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent not written");
+}
+
+public void test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent() {
+	warnUnimpl("Test test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent");
+	methodNames.addElement("test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent")) test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent();
+	else if (getName().equals("test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent")) test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionEvent.java
new file mode 100644
index 0000000000..66e5a3892d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.SelectionEvent
+ *
+ * @see org.eclipse.swt.events.SelectionEvent
+ */
+public class Test_org_eclipse_swt_events_SelectionEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_SelectionEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_SelectionEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionListener.java
new file mode 100644
index 0000000000..9efed83541
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_SelectionListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.SelectionListener
+ *
+ * @see org.eclipse.swt.events.SelectionListener
+ */
+public class Test_org_eclipse_swt_events_SelectionListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_SelectionListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent() {
+	warnUnimpl("Test test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent not written");
+}
+
+public void test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent() {
+	warnUnimpl("Test test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent");
+	methodNames.addElement("test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent")) test_widgetSelectedLorg_eclipse_swt_events_SelectionEvent();
+	else if (getName().equals("test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent")) test_widgetDefaultSelectedLorg_eclipse_swt_events_SelectionEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellAdapter.java
new file mode 100644
index 0000000000..70449d59d8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellAdapter.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ShellAdapter
+ *
+ * @see org.eclipse.swt.events.ShellAdapter
+ */
+public class Test_org_eclipse_swt_events_ShellAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ShellAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_shellActivatedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellActivatedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellClosedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellClosedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellIconifiedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellIconifiedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_shellActivatedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellClosedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellIconifiedLorg_eclipse_swt_events_ShellEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_shellActivatedLorg_eclipse_swt_events_ShellEvent")) test_shellActivatedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellClosedLorg_eclipse_swt_events_ShellEvent")) test_shellClosedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent")) test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent")) test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellIconifiedLorg_eclipse_swt_events_ShellEvent")) test_shellIconifiedLorg_eclipse_swt_events_ShellEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellEvent.java
new file mode 100644
index 0000000000..21099cc76a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ShellEvent
+ *
+ * @see org.eclipse.swt.events.ShellEvent
+ */
+public class Test_org_eclipse_swt_events_ShellEvent extends Test_org_eclipse_swt_events_TypedEvent {
+
+public Test_org_eclipse_swt_events_ShellEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_ShellEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_TypedEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellListener.java
new file mode 100644
index 0000000000..d2cd82257e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_ShellListener.java
@@ -0,0 +1,66 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.ShellListener
+ *
+ * @see org.eclipse.swt.events.ShellListener
+ */
+public class Test_org_eclipse_swt_events_ShellListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_ShellListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_shellActivatedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellActivatedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellClosedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellClosedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public void test_shellIconifiedLorg_eclipse_swt_events_ShellEvent() {
+	warnUnimpl("Test test_shellIconifiedLorg_eclipse_swt_events_ShellEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_shellActivatedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellClosedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent");
+	methodNames.addElement("test_shellIconifiedLorg_eclipse_swt_events_ShellEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_shellActivatedLorg_eclipse_swt_events_ShellEvent")) test_shellActivatedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellClosedLorg_eclipse_swt_events_ShellEvent")) test_shellClosedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent")) test_shellDeactivatedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent")) test_shellDeiconifiedLorg_eclipse_swt_events_ShellEvent();
+	else if (getName().equals("test_shellIconifiedLorg_eclipse_swt_events_ShellEvent")) test_shellIconifiedLorg_eclipse_swt_events_ShellEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseEvent.java
new file mode 100644
index 0000000000..2afaf2c997
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TraverseEvent
+ *
+ * @see org.eclipse.swt.events.TraverseEvent
+ */
+public class Test_org_eclipse_swt_events_TraverseEvent extends Test_org_eclipse_swt_events_KeyEvent {
+
+public Test_org_eclipse_swt_events_TraverseEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_TraverseEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_KeyEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseListener.java
new file mode 100644
index 0000000000..a2e7a3ffd7
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TraverseListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TraverseListener
+ *
+ * @see org.eclipse.swt.events.TraverseListener
+ */
+public class Test_org_eclipse_swt_events_TraverseListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_TraverseListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_keyTraversedLorg_eclipse_swt_events_TraverseEvent() {
+	warnUnimpl("Test test_keyTraversedLorg_eclipse_swt_events_TraverseEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_keyTraversedLorg_eclipse_swt_events_TraverseEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_keyTraversedLorg_eclipse_swt_events_TraverseEvent")) test_keyTraversedLorg_eclipse_swt_events_TraverseEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeAdapter.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeAdapter.java
new file mode 100644
index 0000000000..28d34329f8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeAdapter.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TreeAdapter
+ *
+ * @see org.eclipse.swt.events.TreeAdapter
+ */
+public class Test_org_eclipse_swt_events_TreeAdapter extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_TreeAdapter(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_treeCollapsedLorg_eclipse_swt_events_TreeEvent() {
+	warnUnimpl("Test test_treeCollapsedLorg_eclipse_swt_events_TreeEvent not written");
+}
+
+public void test_treeExpandedLorg_eclipse_swt_events_TreeEvent() {
+	warnUnimpl("Test test_treeExpandedLorg_eclipse_swt_events_TreeEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_treeCollapsedLorg_eclipse_swt_events_TreeEvent");
+	methodNames.addElement("test_treeExpandedLorg_eclipse_swt_events_TreeEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_treeCollapsedLorg_eclipse_swt_events_TreeEvent")) test_treeCollapsedLorg_eclipse_swt_events_TreeEvent();
+	else if (getName().equals("test_treeExpandedLorg_eclipse_swt_events_TreeEvent")) test_treeExpandedLorg_eclipse_swt_events_TreeEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeEvent.java
new file mode 100644
index 0000000000..6242f4fa52
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TreeEvent
+ *
+ * @see org.eclipse.swt.events.TreeEvent
+ */
+public class Test_org_eclipse_swt_events_TreeEvent extends Test_org_eclipse_swt_events_SelectionEvent {
+
+public Test_org_eclipse_swt_events_TreeEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_TreeEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_SelectionEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeListener.java
new file mode 100644
index 0000000000..cd55ba5a8a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TreeListener.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TreeListener
+ *
+ * @see org.eclipse.swt.events.TreeListener
+ */
+public class Test_org_eclipse_swt_events_TreeListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_TreeListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_treeCollapsedLorg_eclipse_swt_events_TreeEvent() {
+	warnUnimpl("Test test_treeCollapsedLorg_eclipse_swt_events_TreeEvent not written");
+}
+
+public void test_treeExpandedLorg_eclipse_swt_events_TreeEvent() {
+	warnUnimpl("Test test_treeExpandedLorg_eclipse_swt_events_TreeEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_treeCollapsedLorg_eclipse_swt_events_TreeEvent");
+	methodNames.addElement("test_treeExpandedLorg_eclipse_swt_events_TreeEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_treeCollapsedLorg_eclipse_swt_events_TreeEvent")) test_treeCollapsedLorg_eclipse_swt_events_TreeEvent();
+	else if (getName().equals("test_treeExpandedLorg_eclipse_swt_events_TreeEvent")) test_treeExpandedLorg_eclipse_swt_events_TreeEvent();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TypedEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TypedEvent.java
new file mode 100644
index 0000000000..5a54a1e404
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_TypedEvent.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.TypedEvent
+ *
+ * @see org.eclipse.swt.events.TypedEvent
+ */
+public class Test_org_eclipse_swt_events_TypedEvent extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_TypedEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLjava_lang_Object() {
+	warnUnimpl("Test test_ConstructorLjava_lang_Object not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_TypedEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLjava_lang_Object");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyEvent.java
new file mode 100644
index 0000000000..f95c148cd2
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyEvent.java
@@ -0,0 +1,58 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.VerifyEvent
+ *
+ * @see org.eclipse.swt.events.VerifyEvent
+ */
+public class Test_org_eclipse_swt_events_VerifyEvent extends Test_org_eclipse_swt_events_KeyEvent {
+
+public Test_org_eclipse_swt_events_VerifyEvent(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_events_VerifyEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Event");
+	methodNames.addAll(Test_org_eclipse_swt_events_KeyEvent.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Event")) test_ConstructorLorg_eclipse_swt_widgets_Event();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyListener.java
new file mode 100644
index 0000000000..e90ba4872a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_events_VerifyListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.events.VerifyListener
+ *
+ * @see org.eclipse.swt.events.VerifyListener
+ */
+public class Test_org_eclipse_swt_events_VerifyListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_events_VerifyListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_verifyTextLorg_eclipse_swt_events_VerifyEvent() {
+	warnUnimpl("Test test_verifyTextLorg_eclipse_swt_events_VerifyEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_verifyTextLorg_eclipse_swt_events_VerifyEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_verifyTextLorg_eclipse_swt_events_VerifyEvent")) test_verifyTextLorg_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
new file mode 100644
index 0000000000..e1380dc17a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
@@ -0,0 +1,280 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+
+Display display;
+
+public Test_org_eclipse_swt_graphics_Color(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+}
+
+protected void tearDown() {
+	display.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceIII() {
+	// Test new Color(Device device, int red, int green, int blue)
+	// IllegalArgumentException if the red, green or blue argument is not between 0 and 255
+
+	// valid color (black)
+	Color color = new Color(display, 0, 0, 0);
+	color.dispose();
+	
+	// valid color (white)
+	color = new Color(display, 255, 255, 255);
+	color.dispose();
+	
+	// valid color (random grey)
+	color = new Color(display, 20, 20, 20);
+	color.dispose();
+
+	// valid color (random)
+	color = new Color(display, 102, 255, 0);
+	color.dispose();
+	
+	// device == null (valid)
+	color = new Color(null, 0, 0, 0);
+	color.dispose();
+	
+	// illegal argument, rgb < 0
+	try {
+		color = new Color(display, -10, -10, -10);
+		color.dispose();
+		fail("No exception thrown for rgb < 0");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, rgb > 255
+	try {
+		color = new Color(display, 1000, 2000, 3000);
+		color.dispose();
+		fail("No exception thrown for rgb > 255");
+	} catch (IllegalArgumentException e) {
+	}
+	// illegal argument, blue > 255
+	try {
+		color = new Color(display, 10, 10, 256);
+		color.dispose();
+		fail("No exception thrown for blue > 255");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB() {
+	// Test new Color(Device device, RGB rgb)
+	// IllegalArgumentException if the red, green or blue argument is not between 0 and 255; or rgb is null
+	
+	// valid color (black)
+	Color color = new Color(display, new RGB(0, 0, 0));
+	color.dispose();
+	
+	// valid color (white)
+	color = new Color(display, new RGB(255, 255, 255));
+	color.dispose();
+	
+	// valid color (random grey)
+	color = new Color(display, new RGB(10, 10, 10));
+	color.dispose();
+	
+	// valid color (random)
+	color = new Color(display, new RGB(102, 255, 0));
+	color.dispose();
+	
+	// device == null (valid)
+	color = new Color(null, new RGB(0, 0, 0));
+	color.dispose();
+	
+	// illegal argument, rgb < 0
+	try {
+		color = new Color(display, new RGB(-10, -10, -10));
+		color.dispose();
+		fail("No exception thrown for rgb < 0");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	// illegal argument, rgb > 255
+	try {
+		color = new Color(display, new RGB(1000, 2000, 3000));
+		color.dispose();
+		fail("No exception thrown for rgb > 255");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	// illegal argument, blue > 255
+	try {
+		color = new Color(display, new RGB(10, 10, 256));
+		color.dispose();
+		fail("No exception thrown for blue > 255");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, rgb == null
+	try {
+		color = new Color(display, null);
+		color.dispose();
+		fail("No exception thrown for rgb == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_dispose() {
+	// tested in test_isDisposed
+}
+
+public void test_equalsLjava_lang_Object() {
+	Color color = new Color(display, 1, 2, 3);
+	Color sameColor = new Color(display, 1, 2, 3);
+	Color sameColor2 = new Color(display, new RGB(1, 2, 3));
+	Color otherColor = new Color(display, 5, 6, 7);
+	try {
+		// Test Color.equals(Object)
+		assertTrue("!color.equals((Object)null)", !color.equals((Object)null));
+
+		// Test Color.equals(Color)
+		assertTrue("!color.equals((Color)null)", !color.equals((Color)null));
+		assertTrue("color.equals(color)", color.equals(color));
+		assertTrue("color.equals(sameColor)", color.equals(sameColor));
+		assertTrue("color.equals(sameColor2)", color.equals(sameColor2));
+		assertTrue("!color.equals(otherColor)", !color.equals(otherColor));
+	} finally {
+		color.dispose();
+		sameColor.dispose();
+		sameColor2.dispose();
+		otherColor.dispose();
+	}
+}
+
+public void test_getBlue() {
+	// Test Color.getBlue()
+	Color color = new Color(display, 1, 2, 4);
+	try {
+		assertEquals("color.getBlue() == 4", color.getBlue(), 4);
+	} finally {
+		color.dispose();
+	}
+	
+}
+
+public void test_getGreen() {
+	// Test Color.getGreen()
+	Color color = new Color(display, 1, 2, 4);
+	try {
+		assertEquals("color.getGreen() == 2", color.getGreen(), 2);
+	} finally {
+		color.dispose();
+	}
+}
+
+public void test_getRed() {
+	// Test Color.getRed()
+	Color color = new Color(display, 1, 2, 4);
+	try {
+		assertEquals("color.getRed() == 1", color.getRed(), 1);
+	} finally {
+		color.dispose();
+	}
+}
+
+public void test_getRGB() {
+	Color color = new Color(display, 12, 34, 56);
+	assertNotNull(color.getRGB());
+	assertEquals(new RGB(12, 34, 56), color.getRGB());
+}
+
+public void test_hashCode() {
+	Color color = new Color(display, 12, 34, 56);
+	Color otherColor = new Color(display, 12, 34, 56);
+	if (color.equals(otherColor)) {
+		assertEquals("Hash codes of equal objects should be equal", color.hashCode(), otherColor.hashCode());
+	}
+}
+
+public void test_isDisposed() {
+	// Test Color.isDisposed() false
+	Color color = new Color(display, 34, 67, 98);
+	try {
+		assertTrue("Color should not be disposed", !color.isDisposed());
+	} finally {
+		// Test Color.isDisposed() true
+		color.dispose();
+		assertTrue("Color should be disposed", color.isDisposed());
+	}
+}
+
+public void test_toString() {
+	Color color = new Color(display, 12, 34, 56);
+	assertNotNull(color.toString());
+	assertTrue(color.toString().length() > 0);
+	assertEquals("Color {12, 34, 56}", color.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 methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Color((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceIII");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_RGB");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_getBlue");
+	methodNames.addElement("test_getGreen");
+	methodNames.addElement("test_getRed");
+	methodNames.addElement("test_getRGB");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_toString");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
+	return methodNames;
+}
+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_dispose")) test_dispose();
+	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_getRed")) test_getRed();
+	else if (getName().equals("test_getRGB")) test_getRGB();
+	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_Cursor.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
new file mode 100644
index 0000000000..cd3ba3a686
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Cursor.java
@@ -0,0 +1,220 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.Cursor
+ *
+ * @see org.eclipse.swt.graphics.Cursor
+ */
+public class Test_org_eclipse_swt_graphics_Cursor extends SwtTestCase {
+
+Display display;
+
+public Test_org_eclipse_swt_graphics_Cursor(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+}
+
+protected void tearDown() {
+	display.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceI() {
+	// Test new Cursor(Device device, int style)
+	// IllegalArgumentException when an unknown style is specified
+
+	Cursor cursor = new Cursor(display, SWT.CURSOR_ARROW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_WAIT);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_CROSS);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_APPSTARTING);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_HELP);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZEALL);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZENESW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZENS);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZENWSE);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZEWE);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZEN);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZES);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZEE);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZEW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZENE);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZESE);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZESW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_SIZENW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_UPARROW);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_IBEAM);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_NO);
+	cursor.dispose();
+
+	cursor = new Cursor(display, SWT.CURSOR_HAND);
+	cursor.dispose();
+
+	// device == null (valid)
+	cursor = new Cursor(null, SWT.CURSOR_ARROW);
+	cursor.dispose();
+
+	// illegal argument, style > SWT.CURSOR_HAND (21)
+	try {
+		cursor = new Cursor(display, 100);
+		cursor.dispose();
+		fail("No exception thrown for style > SWT.CURSOR_HAND (21)");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, style < 0
+	try {
+		cursor = new Cursor(display, -100);
+		cursor.dispose();
+		fail("No exception thrown for style < 0");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageDataII() {
+	// Test new Cursor(Device device, ImageData source, ImageData mask, int hotspotX, int hotspotY)
+	ImageLoader loader = new ImageLoader();
+	ImageData source = loader.load(SwtTestCase.class.getResourceAsStream("dot.gif"))[0];
+	ImageData mask = source.getTransparencyMask();
+	Cursor cursor = new Cursor(display, source, mask, 0, 0);
+	cursor.dispose();
+}
+public void test_dispose() {
+	// tested in test_isDisposed
+}
+
+public void test_equalsLjava_lang_Object() {
+	/* Note: Two cursors are only considered equal if their handles are equal.
+	 * So since Windows reuses cursor handles, and other platforms do not,
+	 * it does not make sense to test whether cursor.equals(sameCursor).
+	 */
+	Cursor cursor = new Cursor(display, SWT.CURSOR_WAIT);
+	Cursor otherCursor = new Cursor(display, SWT.CURSOR_CROSS);
+	try {
+		// Test Cursor.equals(Object)
+		assertTrue("!cursor.equals((Object)null)", !cursor.equals((Object)null));
+
+		// Test Cursor.equals(Cursor)
+		assertTrue("!cursor.equals((Cursor)null)", !cursor.equals((Cursor)null));
+		assertTrue("cursor.equals(cursor)", cursor.equals(cursor));
+		assertTrue("!cursor.equals(otherCursor)", !cursor.equals(otherCursor));
+	} finally {
+		cursor.dispose();
+		otherCursor.dispose();
+	}
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_isDisposed() {
+	// Test Cursor.isDisposed() false
+	Cursor cursor = new Cursor(display, SWT.CURSOR_WAIT);
+	try {
+		assertTrue("Cursor should not be disposed", !cursor.isDisposed());
+	} finally {
+		// Test Cursor.isDisposed() true
+		cursor.dispose();
+		assertTrue("Cursor should be disposed", cursor.isDisposed());
+	}
+}
+
+public void test_toString() {
+	Cursor cursor = new Cursor(display, SWT.CURSOR_WAIT);
+	assertNotNull(cursor.toString());
+	assertTrue(cursor.toString().length() > 0);
+}
+
+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 methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Cursor((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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_dispose");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_toString");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
+	return methodNames;
+}
+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_dispose")) test_dispose();
+	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_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_Device.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Device.java
new file mode 100644
index 0000000000..d8264a3dfb
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Device.java
@@ -0,0 +1,156 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.Device
+ *
+ * @see org.eclipse.swt.graphics.Device
+ */
+public class Test_org_eclipse_swt_graphics_Device extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_Device(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceData() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceData not written");
+}
+
+public void test_checkDevice() {
+	warnUnimpl("Test test_checkDevice not written");
+}
+
+public void test_createLorg_eclipse_swt_graphics_DeviceData() {
+	warnUnimpl("Test test_createLorg_eclipse_swt_graphics_DeviceData not written");
+}
+
+public void test_destroy() {
+	warnUnimpl("Test test_destroy not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getDeviceData() {
+	warnUnimpl("Test test_getDeviceData not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getDepth() {
+	warnUnimpl("Test test_getDepth not written");
+}
+
+public void test_getDPI() {
+	warnUnimpl("Test test_getDPI not written");
+}
+
+public void test_getFontListLjava_lang_StringZ() {
+	warnUnimpl("Test test_getFontListLjava_lang_StringZ not written");
+}
+
+public void test_getSystemColorI() {
+	warnUnimpl("Test test_getSystemColorI not written");
+}
+
+public void test_getSystemFont() {
+	warnUnimpl("Test test_getSystemFont not written");
+}
+
+public void test_getWarnings() {
+	warnUnimpl("Test test_getWarnings not written");
+}
+
+public void test_init() {
+	warnUnimpl("Test test_init not written");
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_new_GCLorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_isDisposed() {
+	warnUnimpl("Test test_isDisposed not written");
+}
+
+public void test_release() {
+	warnUnimpl("Test test_release not written");
+}
+
+public void test_setWarningsZ() {
+	warnUnimpl("Test test_setWarningsZ not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceData");
+	methodNames.addElement("test_checkDevice");
+	methodNames.addElement("test_createLorg_eclipse_swt_graphics_DeviceData");
+	methodNames.addElement("test_destroy");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getDeviceData");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getDepth");
+	methodNames.addElement("test_getDPI");
+	methodNames.addElement("test_getFontListLjava_lang_StringZ");
+	methodNames.addElement("test_getSystemColorI");
+	methodNames.addElement("test_getSystemFont");
+	methodNames.addElement("test_getWarnings");
+	methodNames.addElement("test_init");
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_release");
+	methodNames.addElement("test_setWarningsZ");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceData")) test_ConstructorLorg_eclipse_swt_graphics_DeviceData();
+	else if (getName().equals("test_checkDevice")) test_checkDevice();
+	else if (getName().equals("test_createLorg_eclipse_swt_graphics_DeviceData")) test_createLorg_eclipse_swt_graphics_DeviceData();
+	else if (getName().equals("test_destroy")) test_destroy();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getDeviceData")) test_getDeviceData();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getDepth")) test_getDepth();
+	else if (getName().equals("test_getDPI")) test_getDPI();
+	else if (getName().equals("test_getFontListLjava_lang_StringZ")) test_getFontListLjava_lang_StringZ();
+	else if (getName().equals("test_getSystemColorI")) test_getSystemColorI();
+	else if (getName().equals("test_getSystemFont")) test_getSystemFont();
+	else if (getName().equals("test_getWarnings")) test_getWarnings();
+	else if (getName().equals("test_init")) test_init();
+	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_release")) test_release();
+	else if (getName().equals("test_setWarningsZ")) test_setWarningsZ();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_DeviceData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_DeviceData.java
new file mode 100644
index 0000000000..9c1ef4fca6
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_DeviceData.java
@@ -0,0 +1,56 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.DeviceData
+ *
+ * @see org.eclipse.swt.graphics.DeviceData
+ */
+public class Test_org_eclipse_swt_graphics_DeviceData extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_DeviceData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	DeviceData data = new DeviceData();
+	data.debug = true;
+	data.tracking = true;
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_DeviceData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Drawable.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Drawable.java
new file mode 100644
index 0000000000..72461e3dd4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Drawable.java
@@ -0,0 +1,48 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.Drawable
+ *
+ * @see org.eclipse.swt.graphics.Drawable
+ */
+public class Test_org_eclipse_swt_graphics_Drawable extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_Drawable(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_new_GCLorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+}
+}
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
new file mode 100644
index 0000000000..72c5470b21
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Font.java
@@ -0,0 +1,302 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+
+Display display;
+
+public Test_org_eclipse_swt_graphics_Font(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+}
+
+protected void tearDown() {
+	display.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_FontData() {
+	// Test new Font(Device device, FontData fd)
+	// IllegalArgumentException if the fd argument is null
+	// SWTError: ERROR_NO_HANDLES, if a font could not be created from the given font data
+
+	// valid font with no name (strange, but apparently valid)
+	Font font = new Font(display, new FontData("", 10, SWT.NORMAL));
+	font.dispose();
+
+	// valid font with unknown name (strange, but apparently valid)
+	font = new Font(display, new FontData("bad-font", 10, SWT.NORMAL));
+	font.dispose();
+
+	// valid font with 0 height (strange, but apparently valid)
+	font = new Font(display, new FontData(SwtJunit.testFontName, 0, SWT.NORMAL));
+	font.dispose();
+
+	// valid normal 1000-point font (pretty big, but apparently valid)
+	font = new Font(display, new FontData(SwtJunit.testFontName, 1000, SWT.NORMAL));
+	font.dispose();
+
+	// valid normal 10-point font
+	font = new Font(display, new FontData(SwtJunit.testFontName, 10, SWT.NORMAL));
+	font.dispose();
+
+	// valid bold 10-point font
+	font = new Font(display, new FontData(SwtJunit.testFontName, 10, SWT.BOLD));
+	font.dispose();
+
+	// valid italic 10-point font
+	font = new Font(display, new FontData(SwtJunit.testFontName, 10, SWT.ITALIC));
+	font.dispose();
+
+	// valid bold italic 10-point font
+	font = new Font(display, new FontData(SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC));
+	font.dispose();
+
+	// illegal argument, fontData == null
+	try {
+		font = new Font(display, null);
+		font.dispose();
+		fail("No exception thrown for fontData == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, name == null
+	try {
+		font = new Font(display, new FontData(null, 10, SWT.NORMAL));
+		font.dispose();
+		fail("No exception thrown for name == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, height < 0
+	try {
+		font = new Font(display, new FontData(SwtJunit.testFontName, -10, SWT.NORMAL));
+		font.dispose();
+		fail("No exception thrown for height < 0");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_StringII() {
+	// Test new Font(Device device, String name, int height, int style)
+	// IllegalArgumentException if the name argument is null or the height is negative
+	// SWTError: ERROR_NO_HANDLES, if a font could not be created from the given arguments
+
+	// valid font with no name (strange, but apparently valid)
+	Font font = new Font(display, "", 10, SWT.NORMAL);
+	font.dispose();
+
+	// valid font with unknown name (strange, but apparently valid)
+	font = new Font(display, "bad-font", 10, SWT.NORMAL);
+	font.dispose();
+
+	// valid font with 0 height (strange, but apparently valid)
+	font = new Font(display, SwtJunit.testFontName, 0, SWT.NORMAL);
+	font.dispose();
+
+	// valid normal 1000-point font (pretty big, but apparently valid)
+	font = new Font(display, SwtJunit.testFontName, 1000, SWT.NORMAL);
+	font.dispose();
+
+	// valid normal 10-point font
+	font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
+	font.dispose();
+
+	// valid bold 10-point font
+	font = new Font(display, SwtJunit.testFontName, 10, SWT.BOLD);
+	font.dispose();
+
+	// valid italic 10-point font
+	font = new Font(display, SwtJunit.testFontName, 10, SWT.ITALIC);
+	font.dispose();
+
+	// valid bold italic 10-point font
+	font = new Font(display, SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC);
+	font.dispose();
+
+	// device == null (valid)
+	font = new Font(null, SwtJunit.testFontName, 10, SWT.NORMAL);
+	font.dispose();
+
+	// illegal argument, name == null
+	try {
+		font = new Font(display, null, 10, SWT.NORMAL);
+		font.dispose();
+		fail("No exception thrown for name == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, height < 0
+	try {
+		font = new Font(display, SwtJunit.testFontName, -10, SWT.NORMAL);
+		font.dispose();
+		fail("No exception thrown for height < 0");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_equalsLjava_lang_Object() {
+	// Fonts are only equal if their handles are the same (?!)
+	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
+	Font otherFont = new Font(display, SwtJunit.testFontName, 20, SWT.NORMAL);
+	try {
+		// Test Font.equals(Object)
+		assertTrue("!font.equals((Object)null)", !font.equals((Object)null));
+
+		// Test Font.equals(Font)
+		assertTrue("!font.equals((Font)null)", !font.equals((Font)null));
+		assertTrue("font.equals(font)", font.equals(font));
+		assertTrue("!font.equals(otherFont)", !font.equals(otherFont));
+	} finally {
+		font.dispose();
+		otherFont.dispose();
+	}
+}
+
+public void test_getFontData() {
+	// Test Font.getFontData()
+	// valid normal 10-point font
+	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
+	try {
+		FontData fontData[] = font.getFontData();
+		assertTrue("No font data", fontData != null && fontData.length > 0);
+		assertEquals("Wrong font name", SwtJunit.testFontName, fontData[0].getName());
+		assertEquals("Wrong font height", 10, fontData[0].getHeight());
+		assertEquals("Wrong font style", SWT.NORMAL, fontData[0].getStyle());
+	} finally {
+		font.dispose();
+	}
+
+	// valid bold 20-point font
+	font = new Font(display, SwtJunit.testFontName, 20, SWT.BOLD);
+	try {
+		FontData fontData[] = font.getFontData();
+		assertTrue("No font data", fontData != null && fontData.length > 0);
+		assertEquals("Wrong font name", SwtJunit.testFontName, fontData[0].getName());
+		assertEquals("Wrong font height", 20, fontData[0].getHeight());
+		assertEquals("Wrong font style", SWT.BOLD, fontData[0].getStyle());
+	} finally {
+		font.dispose();
+	}
+
+	// valid italic 30-point font
+	font = new Font(display, SwtJunit.testFontName, 30, SWT.ITALIC);
+	try {
+		FontData fontData[] = font.getFontData();
+		assertTrue("No font data", fontData != null && fontData.length > 0);
+		assertEquals("Wrong font name", SwtJunit.testFontName, fontData[0].getName());
+		assertEquals("Wrong font height", 30, fontData[0].getHeight());
+		assertEquals("Wrong font style", SWT.ITALIC, fontData[0].getStyle());
+	} finally {
+		font.dispose();
+	}
+
+	// valid bold italic 40-point font
+	font = new Font(display, SwtJunit.testFontName, 40, SWT.BOLD | SWT.ITALIC);
+	try {
+		FontData fontData[] = font.getFontData();
+		font.dispose();
+		assertTrue("No font data", fontData != null && fontData.length > 0);
+		assertEquals("Wrong font name", SwtJunit.testFontName, fontData[0].getName());
+		assertEquals("Wrong font height", 40, fontData[0].getHeight());
+		assertEquals("Wrong font style", SWT.BOLD | SWT.ITALIC, fontData[0].getStyle());
+	} finally {
+		font.dispose();
+	}
+
+	// valid 10-point font with unknown name
+	font = new Font(display, "bad-font", 10, SWT.NORMAL);
+	try {
+		FontData fontData[] = font.getFontData();
+		assertTrue("No font data", fontData != null && fontData.length > 0);
+		assertEquals("Wrong font name", "bad-font", fontData[0].getName());
+		assertEquals("Wrong font height", 10, fontData[0].getHeight());
+		assertEquals("Wrong font style", SWT.NORMAL, fontData[0].getStyle());
+	} finally {
+		font.dispose();
+	}
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_isDisposed() {
+	// Test Font.isDisposed() false
+	Font font = new Font(display, SwtJunit.testFontName, 10, SWT.NORMAL);
+	try {
+		assertTrue("Font should not be disposed", !font.isDisposed());
+	} finally {
+		// Test Font.isDisposed() true
+		font.dispose();
+		assertTrue("Font should be disposed", font.isDisposed());
+	}
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+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 methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Font((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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;
+}
+protected void runTest() throws Throwable {
+	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
new file mode 100644
index 0000000000..a993547564
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
@@ -0,0 +1,245 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	// Test new FontData()
+	FontData fd = new FontData();
+}
+
+public void test_ConstructorLjava_lang_String() {
+	// Test new FontData(String string)
+	FontData fd = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	FontData reconstructedFontData = new FontData(fd.toString());
+	assertEquals(fd, reconstructedFontData);
+}
+
+public void test_ConstructorLjava_lang_StringII() {
+	// Test new FontData(String name, int height, int style)
+	// valid font data with no name (strange, but apparently valid)
+	FontData fd = new FontData("", 10, SWT.NORMAL);
+
+	// valid font data with unknown name (strange, but apparently valid)
+	fd = new FontData("bad-font", 10, SWT.NORMAL);
+
+	// valid font data with 0 height (strange, but apparently valid)
+	fd = new FontData(SwtJunit.testFontName, 0, SWT.NORMAL);
+
+	// valid font data with 1000 height (pretty big, but apparently valid)
+	fd = new FontData(SwtJunit.testFontName, 1000, SWT.NORMAL);
+
+	// valid normal 10-point font data
+	fd = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+
+	// valid bold 10-point font data
+	fd = new FontData(SwtJunit.testFontName, 10, SWT.BOLD);
+
+	// valid italic 10-point font data
+	fd = new FontData(SwtJunit.testFontName, 10, SWT.ITALIC);
+
+	// valid bold italic 10-point font data
+	fd = new FontData(SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC);
+
+	// illegal argument, name == null
+	try {
+		fd = new FontData(null, 10, SWT.NORMAL);
+		fail("No exception thrown for name == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	// illegal argument, height < 0
+	try {
+		fd = new FontData(SwtJunit.testFontName, -10, SWT.NORMAL);
+		fail("No exception thrown for height < 0");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_equalsLjava_lang_Object() {
+	warnUnimpl("Test test_equalsLjava_lang_Object not written");
+}
+
+public void test_getHeight() {
+	// Font.getHeight() tested in test_setHeightI
+}
+
+public void test_getName() {
+	// Font.getName() tested in test_setNameLjava_lang_String
+}
+
+public void test_getStyle() {
+	// Font.getStyle() tested in test_setStyleI
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_setHeightI() {
+	// Test Font.setHeight(int  height)
+	// valid normal font data for various heights
+	FontData fontData = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);	
+	for (int height = 0; height < 1000; height++) {
+		fontData.setHeight(height);
+		assertEquals("Wrong height", fontData.getHeight(), height);
+	}
+
+	// valid bold font data for various heights
+	fontData = new FontData(SwtJunit.testFontName, 10, SWT.BOLD);	
+	for (int height = 0; height < 1000; height++) {
+		fontData.setHeight(height);
+		assertEquals("Wrong height", fontData.getHeight(), height);
+	}
+
+	// valid italic font data for various heights
+	fontData = new FontData(SwtJunit.testFontName, 10, SWT.ITALIC);	
+	for (int height = 0; height < 1000; height++) {
+		fontData.setHeight(height);
+		assertEquals("Wrong height", fontData.getHeight(), height);
+	}
+
+	// valid bold italic font data for various heights
+	fontData = new FontData(SwtJunit.testFontName, 10, SWT.BOLD | SWT.ITALIC);	
+	for (int height = 0; height < 1000; height++) {
+		fontData.setHeight(height);
+		assertEquals("Wrong height", fontData.getHeight(), height);
+	}
+}
+
+public void test_setLocaleLjava_lang_String() {
+	warnUnimpl("Test test_setLocaleLjava_lang_String not written");
+}
+
+public void test_setNameLjava_lang_String() {
+	// Test Font.setName(String name)
+	// valid name
+	FontData fontData = new FontData(SwtJunit.testFontName, 10, SWT.NORMAL);
+	assertEquals("Wrong name", fontData.getName(), SwtJunit.testFontName);
+
+	// valid name (unknown name, but valid)
+	fontData.setName("bad-font");
+	assertEquals("Wrong name", fontData.getName(), "bad-font");
+
+	// valid name (empty string, but valid)
+	fontData.setName("");
+	assertEquals("Wrong name", fontData.getName(), "");
+
+	// valid name
+	fontData.setName(SwtJunit.testFontName);	
+	assertEquals("Wrong name", fontData.getName(), SwtJunit.testFontName);
+
+	// illegal argument, name == null
+	try {
+		fontData.setName(null);
+		fail("No exception thrown for name == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setStyleI() {
+	// Test Font.setStyle(int  style)
+	for (int height = 0; height < 1000; height++) {
+		// valid normal font data
+		FontData fontData = new FontData(SwtJunit.testFontName, height, SWT.NORMAL);	
+		assertEquals("Wrong style", fontData.getStyle(), SWT.NORMAL);
+
+		// valid bold font data
+		fontData.setStyle(SWT.BOLD);
+		assertEquals("Wrong style", fontData.getStyle(), SWT.BOLD);
+
+		// valid italic font data
+		fontData.setStyle(SWT.ITALIC);
+		assertEquals("Wrong style", fontData.getStyle(), SWT.ITALIC);
+		
+		// valid bold italic font data
+		fontData.setStyle(SWT.ITALIC | SWT.BOLD);
+		assertEquals("Wrong style", fontData.getStyle(), SWT.BOLD | SWT.ITALIC);
+
+		// valid normal font data
+		fontData.setStyle(SWT.NORMAL);
+		assertEquals("Wrong style", fontData.getStyle(), SWT.NORMAL);
+	}
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+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 methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_FontData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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_getHeight");
+	methodNames.addElement("test_getName");
+	methodNames.addElement("test_getStyle");
+	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;
+}
+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_getHeight")) test_getHeight();
+	else if (getName().equals("test_getName")) test_getName();
+	else if (getName().equals("test_getStyle")) test_getStyle();
+	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
new file mode 100644
index 0000000000..a2972e63f1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontMetrics.java
@@ -0,0 +1,119 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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 {
+
+	Display display;
+	Shell shell;
+	GC gc;
+
+public Test_org_eclipse_swt_graphics_FontMetrics(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+	shell = new Shell(display);
+	gc = new GC(shell);
+}
+
+protected void tearDown() {
+	gc.dispose();
+	shell.dispose();
+	display.dispose();
+}
+
+public void test_equalsLjava_lang_Object() {
+	FontMetrics fm1 = gc.getFontMetrics();
+	FontMetrics fm2 = gc.getFontMetrics();
+	assertTrue(fm1.equals(fm2));
+}
+
+public void test_getAscent() {
+	FontMetrics fm = gc.getFontMetrics();
+	fm.getAscent();
+}
+
+public void test_getAverageCharWidth() {
+	FontMetrics fm = gc.getFontMetrics();
+	fm.getAverageCharWidth();
+}
+
+public void test_getDescent() {
+	FontMetrics fm = gc.getFontMetrics();
+	fm.getDescent();
+}
+
+public void test_getHeight() {
+	FontMetrics fm = gc.getFontMetrics();
+	fm.getHeight();
+}
+
+public void test_getLeading() {
+	FontMetrics fm = gc.getFontMetrics();
+	fm.getLeading();
+}
+
+public void test_hashCode() {
+	FontMetrics fm1 = gc.getFontMetrics();
+	FontMetrics fm2 = gc.getFontMetrics();
+	if (fm1.equals(fm2)) {
+		assertEquals(fm1.hashCode(), fm2.hashCode());
+	}
+}
+
+public void test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC() {
+	// do not test - Windows only
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_FontMetrics((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC");
+	return methodNames;
+}
+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();
+	else if (getName().equals("test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC")) test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
new file mode 100644
index 0000000000..8364effa14
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
@@ -0,0 +1,378 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.GC
+ *
+ * @see org.eclipse.swt.graphics.GC
+ */
+public class Test_org_eclipse_swt_graphics_GC extends SwtTestCase {
+
+Display display;
+
+public Test_org_eclipse_swt_graphics_GC(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+}
+
+protected void tearDown() {
+	display.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_Drawable() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_Drawable not written");
+}
+
+public void test_copyAreaLorg_eclipse_swt_graphics_ImageII() {
+	warnUnimpl("Test test_copyAreaLorg_eclipse_swt_graphics_ImageII not written");
+}
+
+public void test_copyAreaIIIIII() {
+	warnUnimpl("Test test_copyAreaIIIIII not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_drawArcIIIIII() {
+	warnUnimpl("Test test_drawArcIIIIII not written");
+}
+
+public void test_drawFocusIIII() {
+	warnUnimpl("Test test_drawFocusIIII not written");
+}
+
+public void test_drawImageLorg_eclipse_swt_graphics_ImageII() {
+	warnUnimpl("Test test_drawImageLorg_eclipse_swt_graphics_ImageII not written");
+}
+
+public void test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII() {
+	warnUnimpl("Test test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII not written");
+}
+
+public void test_drawLineIIII() {
+	warnUnimpl("Test test_drawLineIIII not written");
+}
+
+public void test_drawOvalIIII() {
+	warnUnimpl("Test test_drawOvalIIII not written");
+}
+
+public void test_drawPolygon$I() {
+	warnUnimpl("Test test_drawPolygon$I not written");
+}
+
+public void test_drawPolyline$I() {
+	warnUnimpl("Test test_drawPolyline$I not written");
+}
+
+public void test_drawRectangleIIII() {
+	warnUnimpl("Test test_drawRectangleIIII not written");
+}
+
+public void test_drawRectangleLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_drawRectangleLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_drawRoundRectangleIIIIII() {
+	warnUnimpl("Test test_drawRoundRectangleIIIIII not written");
+}
+
+public void test_drawStringLjava_lang_StringII() {
+	warnUnimpl("Test test_drawStringLjava_lang_StringII not written");
+}
+
+public void test_drawStringLjava_lang_StringIIZ() {
+	warnUnimpl("Test test_drawStringLjava_lang_StringIIZ not written");
+}
+
+public void test_drawTextLjava_lang_StringII() {
+	warnUnimpl("Test test_drawTextLjava_lang_StringII not written");
+}
+
+public void test_drawTextLjava_lang_StringIIZ() {
+	warnUnimpl("Test test_drawTextLjava_lang_StringIIZ not written");
+}
+
+public void test_equalsLjava_lang_Object() {
+	warnUnimpl("Test test_equalsLjava_lang_Object not written");
+}
+
+public void test_fillArcIIIIII() {
+	warnUnimpl("Test test_fillArcIIIIII not written");
+}
+
+public void test_fillGradientRectangleIIIIZ() {
+	warnUnimpl("Test test_fillGradientRectangleIIIIZ not written");
+}
+
+public void test_fillOvalIIII() {
+	warnUnimpl("Test test_fillOvalIIII not written");
+}
+
+public void test_fillPolygon$I() {
+	warnUnimpl("Test test_fillPolygon$I not written");
+}
+
+public void test_fillRectangleIIII() {
+	warnUnimpl("Test test_fillRectangleIIII not written");
+}
+
+public void test_fillRectangleLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_fillRectangleLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_fillRoundRectangleIIIIII() {
+	warnUnimpl("Test test_fillRoundRectangleIIIIII not written");
+}
+
+public void test_getAdvanceWidthC() {
+	warnUnimpl("Test test_getAdvanceWidthC not written");
+}
+
+public void test_getBackground() {
+	warnUnimpl("Test test_getBackground not written");
+}
+
+public void test_getCharWidthC() {
+	warnUnimpl("Test test_getCharWidthC not written");
+}
+
+public void test_getClipping() {
+	warnUnimpl("Test test_getClipping not written");
+}
+
+public void test_getClippingLorg_eclipse_swt_graphics_Region() {
+	warnUnimpl("Test test_getClippingLorg_eclipse_swt_graphics_Region not written");
+}
+
+public void test_getFont() {
+	warnUnimpl("Test test_getFont not written");
+}
+
+public void test_getFontMetrics() {
+	warnUnimpl("Test test_getFontMetrics not written");
+}
+
+public void test_getForeground() {
+	warnUnimpl("Test test_getForeground not written");
+}
+
+public void test_getLineStyle() {
+	warnUnimpl("Test test_getLineStyle not written");
+}
+
+public void test_getLineWidth() {
+	warnUnimpl("Test test_getLineWidth not written");
+}
+
+public void test_getXORMode() {
+	warnUnimpl("Test test_getXORMode not written");
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_isClipped() {
+	warnUnimpl("Test test_isClipped not written");
+}
+
+public void test_isDisposed() {
+	warnUnimpl("Test test_isDisposed not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setClippingIIII() {
+	warnUnimpl("Test test_setClippingIIII not written");
+}
+
+public void test_setClippingLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_setClippingLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_setClippingLorg_eclipse_swt_graphics_Region() {
+	warnUnimpl("Test test_setClippingLorg_eclipse_swt_graphics_Region not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setForegroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_setLineStyleI() {
+	warnUnimpl("Test test_setLineStyleI not written");
+}
+
+public void test_setLineWidthI() {
+	warnUnimpl("Test test_setLineWidthI not written");
+}
+
+public void test_setXORModeZ() {
+	warnUnimpl("Test test_setXORModeZ not written");
+}
+
+public void test_stringExtentLjava_lang_String() {
+	warnUnimpl("Test test_stringExtentLjava_lang_String not written");
+}
+
+public void test_textExtentLjava_lang_String() {
+	warnUnimpl("Test test_textExtentLjava_lang_String not written");
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+public void test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData() {
+	// do not test - Windows only
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_GC((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_Drawable");
+	methodNames.addElement("test_copyAreaLorg_eclipse_swt_graphics_ImageII");
+	methodNames.addElement("test_copyAreaIIIIII");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_drawArcIIIIII");
+	methodNames.addElement("test_drawFocusIIII");
+	methodNames.addElement("test_drawImageLorg_eclipse_swt_graphics_ImageII");
+	methodNames.addElement("test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII");
+	methodNames.addElement("test_drawLineIIII");
+	methodNames.addElement("test_drawOvalIIII");
+	methodNames.addElement("test_drawPolygon$I");
+	methodNames.addElement("test_drawPolyline$I");
+	methodNames.addElement("test_drawRectangleIIII");
+	methodNames.addElement("test_drawRectangleLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_drawRoundRectangleIIIIII");
+	methodNames.addElement("test_drawStringLjava_lang_StringII");
+	methodNames.addElement("test_drawStringLjava_lang_StringIIZ");
+	methodNames.addElement("test_drawTextLjava_lang_StringII");
+	methodNames.addElement("test_drawTextLjava_lang_StringIIZ");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_fillArcIIIIII");
+	methodNames.addElement("test_fillGradientRectangleIIIIZ");
+	methodNames.addElement("test_fillOvalIIII");
+	methodNames.addElement("test_fillPolygon$I");
+	methodNames.addElement("test_fillRectangleIIII");
+	methodNames.addElement("test_fillRectangleLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_fillRoundRectangleIIIIII");
+	methodNames.addElement("test_getAdvanceWidthC");
+	methodNames.addElement("test_getBackground");
+	methodNames.addElement("test_getCharWidthC");
+	methodNames.addElement("test_getClipping");
+	methodNames.addElement("test_getClippingLorg_eclipse_swt_graphics_Region");
+	methodNames.addElement("test_getFont");
+	methodNames.addElement("test_getFontMetrics");
+	methodNames.addElement("test_getForeground");
+	methodNames.addElement("test_getLineStyle");
+	methodNames.addElement("test_getLineWidth");
+	methodNames.addElement("test_getXORMode");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_isClipped");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setClippingIIII");
+	methodNames.addElement("test_setClippingLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_setClippingLorg_eclipse_swt_graphics_Region");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setLineStyleI");
+	methodNames.addElement("test_setLineWidthI");
+	methodNames.addElement("test_setXORModeZ");
+	methodNames.addElement("test_stringExtentLjava_lang_String");
+	methodNames.addElement("test_textExtentLjava_lang_String");
+	methodNames.addElement("test_toString");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_Drawable")) test_ConstructorLorg_eclipse_swt_graphics_Drawable();
+	else if (getName().equals("test_copyAreaLorg_eclipse_swt_graphics_ImageII")) test_copyAreaLorg_eclipse_swt_graphics_ImageII();
+	else if (getName().equals("test_copyAreaIIIIII")) test_copyAreaIIIIII();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_drawArcIIIIII")) test_drawArcIIIIII();
+	else if (getName().equals("test_drawFocusIIII")) test_drawFocusIIII();
+	else if (getName().equals("test_drawImageLorg_eclipse_swt_graphics_ImageII")) test_drawImageLorg_eclipse_swt_graphics_ImageII();
+	else if (getName().equals("test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII")) test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII();
+	else if (getName().equals("test_drawLineIIII")) test_drawLineIIII();
+	else if (getName().equals("test_drawOvalIIII")) test_drawOvalIIII();
+	else if (getName().equals("test_drawPolygon$I")) test_drawPolygon$I();
+	else if (getName().equals("test_drawPolyline$I")) test_drawPolyline$I();
+	else if (getName().equals("test_drawRectangleIIII")) test_drawRectangleIIII();
+	else if (getName().equals("test_drawRectangleLorg_eclipse_swt_graphics_Rectangle")) test_drawRectangleLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_drawRoundRectangleIIIIII")) test_drawRoundRectangleIIIIII();
+	else if (getName().equals("test_drawStringLjava_lang_StringII")) test_drawStringLjava_lang_StringII();
+	else if (getName().equals("test_drawStringLjava_lang_StringIIZ")) test_drawStringLjava_lang_StringIIZ();
+	else if (getName().equals("test_drawTextLjava_lang_StringII")) test_drawTextLjava_lang_StringII();
+	else if (getName().equals("test_drawTextLjava_lang_StringIIZ")) test_drawTextLjava_lang_StringIIZ();
+	else if (getName().equals("test_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
+	else if (getName().equals("test_fillArcIIIIII")) test_fillArcIIIIII();
+	else if (getName().equals("test_fillGradientRectangleIIIIZ")) test_fillGradientRectangleIIIIZ();
+	else if (getName().equals("test_fillOvalIIII")) test_fillOvalIIII();
+	else if (getName().equals("test_fillPolygon$I")) test_fillPolygon$I();
+	else if (getName().equals("test_fillRectangleIIII")) test_fillRectangleIIII();
+	else if (getName().equals("test_fillRectangleLorg_eclipse_swt_graphics_Rectangle")) test_fillRectangleLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_fillRoundRectangleIIIIII")) test_fillRoundRectangleIIIIII();
+	else if (getName().equals("test_getAdvanceWidthC")) test_getAdvanceWidthC();
+	else if (getName().equals("test_getBackground")) test_getBackground();
+	else if (getName().equals("test_getCharWidthC")) test_getCharWidthC();
+	else if (getName().equals("test_getClipping")) test_getClipping();
+	else if (getName().equals("test_getClippingLorg_eclipse_swt_graphics_Region")) test_getClippingLorg_eclipse_swt_graphics_Region();
+	else if (getName().equals("test_getFont")) test_getFont();
+	else if (getName().equals("test_getFontMetrics")) test_getFontMetrics();
+	else if (getName().equals("test_getForeground")) test_getForeground();
+	else if (getName().equals("test_getLineStyle")) test_getLineStyle();
+	else if (getName().equals("test_getLineWidth")) test_getLineWidth();
+	else if (getName().equals("test_getXORMode")) test_getXORMode();
+	else if (getName().equals("test_hashCode")) test_hashCode();
+	else if (getName().equals("test_isClipped")) test_isClipped();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setClippingIIII")) test_setClippingIIII();
+	else if (getName().equals("test_setClippingLorg_eclipse_swt_graphics_Rectangle")) test_setClippingLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_setClippingLorg_eclipse_swt_graphics_Region")) test_setClippingLorg_eclipse_swt_graphics_Region();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setForegroundLorg_eclipse_swt_graphics_Color")) test_setForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setLineStyleI")) test_setLineStyleI();
+	else if (getName().equals("test_setLineWidthI")) test_setLineWidthI();
+	else if (getName().equals("test_setXORModeZ")) test_setXORModeZ();
+	else if (getName().equals("test_stringExtentLjava_lang_String")) test_stringExtentLjava_lang_String();
+	else if (getName().equals("test_textExtentLjava_lang_String")) test_textExtentLjava_lang_String();
+	else if (getName().equals("test_toString")) test_toString();
+	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData")) test_win32_newLorg_eclipse_swt_graphics_DrawableLorg_eclipse_swt_graphics_GCData();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GCData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GCData.java
new file mode 100644
index 0000000000..05c45006f3
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GCData.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.GCData
+ *
+ * @see org.eclipse.swt.graphics.GCData
+ */
+public class Test_org_eclipse_swt_graphics_GCData extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_GCData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_GCData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
new file mode 100644
index 0000000000..0413188870
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Image.java
@@ -0,0 +1,175 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.Image
+ *
+ * @see org.eclipse.swt.graphics.Image
+ */
+public class Test_org_eclipse_swt_graphics_Image extends SwtTestCase {
+
+Display display;
+
+public Test_org_eclipse_swt_graphics_Image(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	display = new Display();
+}
+
+protected void tearDown() {
+	display.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceII not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String not written");
+}
+
+public void test_dispose() {
+	warnUnimpl("Test test_dispose not written");
+}
+
+public void test_equalsLjava_lang_Object() {
+	warnUnimpl("Test test_equalsLjava_lang_Object not written");
+}
+
+public void test_getBackground() {
+	warnUnimpl("Test test_getBackground not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getImageData() {
+	ImageLoader loader = new ImageLoader();
+	ImageData data1 = loader.load(SwtTestCase.class.getResourceAsStream("dot.gif"))[0];
+
+	Image image = new Image(display, data1);
+	ImageData data2 = image.getImageData();
+	
+	assertEquals("Image width should be the same", data1.width, data2.width);
+	assertEquals("Image height should be the same", data1.height, data2.height);
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_new_GCLorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_isDisposed() {
+	warnUnimpl("Test test_isDisposed not written");
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	warnUnimpl("Test test_setBackgroundLorg_eclipse_swt_graphics_Color not written");
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+public void test_win32_newLorg_eclipse_swt_graphics_DeviceII() {
+	// do not test - Windows only
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Image((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceII");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_getBackground");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getImageData");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_toString");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceII");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceII")) test_ConstructorLorg_eclipse_swt_graphics_DeviceII();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageData();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_io_InputStream();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String")) test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String();
+	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_getBackground")) test_getBackground();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getImageData")) test_getImageData();
+	else if (getName().equals("test_hashCode")) test_hashCode();
+	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_toString")) test_toString();
+	else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceII")) test_win32_newLorg_eclipse_swt_graphics_DeviceII();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java
new file mode 100644
index 0000000000..bd70b8434c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageData.java
@@ -0,0 +1,168 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.ImageData
+ *
+ * @see org.eclipse.swt.graphics.ImageData
+ */
+public class Test_org_eclipse_swt_graphics_ImageData extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_ImageData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData() {
+	warnUnimpl("Test test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData not written");
+}
+
+public void test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B() {
+	warnUnimpl("Test test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B not written");
+}
+
+public void test_ConstructorLjava_io_InputStream() {
+	warnUnimpl("Test test_ConstructorLjava_io_InputStream not written");
+}
+
+public void test_ConstructorLjava_lang_String() {
+	warnUnimpl("Test test_ConstructorLjava_lang_String not written");
+}
+
+public void test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII() {
+	warnUnimpl("Test test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII not written");
+}
+
+public void test_clone() {
+	warnUnimpl("Test test_clone not written");
+}
+
+public void test_getAlphaII() {
+	warnUnimpl("Test test_getAlphaII not written");
+}
+
+public void test_getAlphasIII$BI() {
+	warnUnimpl("Test test_getAlphasIII$BI not written");
+}
+
+public void test_getPixelII() {
+	warnUnimpl("Test test_getPixelII not written");
+}
+
+public void test_getPixelsIII$BI() {
+	warnUnimpl("Test test_getPixelsIII$BI not written");
+}
+
+public void test_getPixelsIII$II() {
+	warnUnimpl("Test test_getPixelsIII$II not written");
+}
+
+public void test_getRGBs() {
+	warnUnimpl("Test test_getRGBs not written");
+}
+
+public void test_getTransparencyMask() {
+	warnUnimpl("Test test_getTransparencyMask not written");
+}
+
+public void test_getTransparencyType() {
+	warnUnimpl("Test test_getTransparencyType not written");
+}
+
+public void test_scaledToII() {
+	warnUnimpl("Test test_scaledToII not written");
+}
+
+public void test_setAlphaIII() {
+	warnUnimpl("Test test_setAlphaIII not written");
+}
+
+public void test_setAlphasIII$BI() {
+	warnUnimpl("Test test_setAlphasIII$BI not written");
+}
+
+public void test_setPixelIII() {
+	warnUnimpl("Test test_setPixelIII not written");
+}
+
+public void test_setPixelsIII$BI() {
+	warnUnimpl("Test test_setPixelsIII$BI not written");
+}
+
+public void test_setPixelsIII$II() {
+	warnUnimpl("Test test_setPixelsIII$II not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_ImageData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData");
+	methodNames.addElement("test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B");
+	methodNames.addElement("test_ConstructorLjava_io_InputStream");
+	methodNames.addElement("test_ConstructorLjava_lang_String");
+	methodNames.addElement("test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII");
+	methodNames.addElement("test_clone");
+	methodNames.addElement("test_getAlphaII");
+	methodNames.addElement("test_getAlphasIII$BI");
+	methodNames.addElement("test_getPixelII");
+	methodNames.addElement("test_getPixelsIII$BI");
+	methodNames.addElement("test_getPixelsIII$II");
+	methodNames.addElement("test_getRGBs");
+	methodNames.addElement("test_getTransparencyMask");
+	methodNames.addElement("test_getTransparencyType");
+	methodNames.addElement("test_scaledToII");
+	methodNames.addElement("test_setAlphaIII");
+	methodNames.addElement("test_setAlphasIII$BI");
+	methodNames.addElement("test_setPixelIII");
+	methodNames.addElement("test_setPixelsIII$BI");
+	methodNames.addElement("test_setPixelsIII$II");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData")) test_ConstructorIIILorg_eclipse_swt_graphics_PaletteData();
+	else if (getName().equals("test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B")) test_ConstructorIIILorg_eclipse_swt_graphics_PaletteDataI$B();
+	else if (getName().equals("test_ConstructorLjava_io_InputStream")) test_ConstructorLjava_io_InputStream();
+	else if (getName().equals("test_ConstructorLjava_lang_String")) test_ConstructorLjava_lang_String();
+	else if (getName().equals("test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII")) test_internal_newIIILorg_eclipse_swt_graphics_PaletteDataI$BI$B$BIIIIIII();
+	else if (getName().equals("test_clone")) test_clone();
+	else if (getName().equals("test_getAlphaII")) test_getAlphaII();
+	else if (getName().equals("test_getAlphasIII$BI")) test_getAlphasIII$BI();
+	else if (getName().equals("test_getPixelII")) test_getPixelII();
+	else if (getName().equals("test_getPixelsIII$BI")) test_getPixelsIII$BI();
+	else if (getName().equals("test_getPixelsIII$II")) test_getPixelsIII$II();
+	else if (getName().equals("test_getRGBs")) test_getRGBs();
+	else if (getName().equals("test_getTransparencyMask")) test_getTransparencyMask();
+	else if (getName().equals("test_getTransparencyType")) test_getTransparencyType();
+	else if (getName().equals("test_scaledToII")) test_scaledToII();
+	else if (getName().equals("test_setAlphaIII")) test_setAlphaIII();
+	else if (getName().equals("test_setAlphasIII$BI")) test_setAlphasIII$BI();
+	else if (getName().equals("test_setPixelIII")) test_setPixelIII();
+	else if (getName().equals("test_setPixelsIII$BI")) test_setPixelsIII$BI();
+	else if (getName().equals("test_setPixelsIII$II")) test_setPixelsIII$II();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoader.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoader.java
new file mode 100644
index 0000000000..cd195ef701
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoader.java
@@ -0,0 +1,102 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.ImageLoader
+ *
+ * @see org.eclipse.swt.graphics.ImageLoader
+ */
+public class Test_org_eclipse_swt_graphics_ImageLoader extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_ImageLoader(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_loadLjava_io_InputStream() {
+	warnUnimpl("Test test_loadLjava_io_InputStream not written");
+}
+
+public void test_loadLjava_lang_String() {
+	warnUnimpl("Test test_loadLjava_lang_String not written");
+}
+
+public void test_saveLjava_io_OutputStreamI() {
+	warnUnimpl("Test test_saveLjava_io_OutputStreamI not written");
+}
+
+public void test_saveLjava_lang_StringI() {
+	warnUnimpl("Test test_saveLjava_lang_StringI not written");
+}
+
+public void test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener() {
+	warnUnimpl("Test test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener not written");
+}
+
+public void test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener() {
+	warnUnimpl("Test test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener not written");
+}
+
+public void test_hasListeners() {
+	warnUnimpl("Test test_hasListeners not written");
+}
+
+public void test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent() {
+	warnUnimpl("Test test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_ImageLoader((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_loadLjava_io_InputStream");
+	methodNames.addElement("test_loadLjava_lang_String");
+	methodNames.addElement("test_saveLjava_io_OutputStreamI");
+	methodNames.addElement("test_saveLjava_lang_StringI");
+	methodNames.addElement("test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener");
+	methodNames.addElement("test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener");
+	methodNames.addElement("test_hasListeners");
+	methodNames.addElement("test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_loadLjava_io_InputStream")) test_loadLjava_io_InputStream();
+	else if (getName().equals("test_loadLjava_lang_String")) test_loadLjava_lang_String();
+	else if (getName().equals("test_saveLjava_io_OutputStreamI")) test_saveLjava_io_OutputStreamI();
+	else if (getName().equals("test_saveLjava_lang_StringI")) test_saveLjava_lang_StringI();
+	else if (getName().equals("test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener")) test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener();
+	else if (getName().equals("test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener")) test_removeImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener();
+	else if (getName().equals("test_hasListeners")) test_hasListeners();
+	else if (getName().equals("test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent")) test_notifyListenersLorg_eclipse_swt_graphics_ImageLoaderEvent();
+}
+}
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
new file mode 100644
index 0000000000..0390fd46cd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderEvent.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ not written");
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_ImageLoaderEvent((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_ImageLoaderLorg_eclipse_swt_graphics_ImageDataIZ");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+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_ImageLoaderListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderListener.java
new file mode 100644
index 0000000000..2f779db42a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_ImageLoaderListener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.ImageLoaderListener
+ *
+ * @see org.eclipse.swt.graphics.ImageLoaderListener
+ */
+public class Test_org_eclipse_swt_graphics_ImageLoaderListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_ImageLoaderListener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_imageDataLoadedLorg_eclipse_swt_graphics_ImageLoaderEvent() {
+	warnUnimpl("Test test_imageDataLoadedLorg_eclipse_swt_graphics_ImageLoaderEvent not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_imageDataLoadedLorg_eclipse_swt_graphics_ImageLoaderEvent");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_imageDataLoadedLorg_eclipse_swt_graphics_ImageLoaderEvent")) test_imageDataLoadedLorg_eclipse_swt_graphics_ImageLoaderEvent();
+}
+}
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
new file mode 100644
index 0000000000..c55f5464cd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_PaletteData.java
@@ -0,0 +1,78 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor$Lorg_eclipse_swt_graphics_RGB() {
+	warnUnimpl("Test test_Constructor$Lorg_eclipse_swt_graphics_RGB not written");
+}
+
+public void test_ConstructorIII() {
+	warnUnimpl("Test test_ConstructorIII not written");
+}
+
+public void test_getPixelLorg_eclipse_swt_graphics_RGB() {
+	warnUnimpl("Test test_getPixelLorg_eclipse_swt_graphics_RGB not written");
+}
+
+public void test_getRGBI() {
+	warnUnimpl("Test test_getRGBI not written");
+}
+
+public void test_getRGBs() {
+	warnUnimpl("Test test_getRGBs not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_PaletteData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	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;
+}
+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
new file mode 100644
index 0000000000..66a07624ee
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Point.java
@@ -0,0 +1,98 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorII(){
+	// Test new Point (int x, int y)
+	Point p = new Point(3, 4);
+	assertEquals(3, p.x);
+	assertEquals(4, p.y);
+
+	p = new Point(-4, -3);
+	assertEquals(-4, p.x);
+	assertEquals(-3, p.y);
+
+	p = new Point(500000, 700000);
+	assertEquals(500000, p.x);
+	assertEquals(700000, p.y);
+}
+
+public void test_equalsLjava_lang_Object(){
+	Point p1 = new Point(5, 5);
+	Point p2 = new Point(5, 5);
+	assertTrue("Points should be equal", p1.equals(p2));
+
+	p1 = new Point(-5, -5);
+	p2 = new Point(-5, -5);
+	assertTrue("Points should be equal", p1.equals(p2));
+
+	p2 = new Point(3, 4);
+	assertTrue("Points should not be equal", !p1.equals(p2));
+}
+
+public void test_hashCode(){
+	Point p1 = new Point(5, 5);
+	Point p2 = new Point(5, 5);
+	assertTrue("Points should have the same hashCode", p1.hashCode() == p2.hashCode());
+}
+
+public void test_toString(){
+	Point p = new Point(3, 4);
+	assertNotNull(p.toString());
+	assertTrue(p.toString().length() > 0);
+	assertEquals("Point {3, 4}", p.toString());
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Point((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorII");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+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
new file mode 100644
index 0000000000..1eb074cc1c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_RGB.java
@@ -0,0 +1,159 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorIII() {
+	// Test RGB(int red, int green, int blue)
+	RGB rgb = new RGB(20,100,200);
+	
+	rgb = new RGB(0,0,0);
+
+	rgb = new RGB(255,255,255);
+
+	try {
+		rgb = new RGB(-1, 20, 50);
+		fail("No exception thrown for red < 0");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		rgb = new RGB(256, 20, 50);
+		fail("No exception thrown for red > 255");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		rgb = new RGB(20, -1, 50);
+		fail("No exception thrown for green < 0");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		rgb = new RGB(20, 256, 50);
+		fail("No exception thrown for green > 255");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		rgb = new RGB(20, 50, -1);
+		fail("No exception thrown for blue < 0");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		rgb = new RGB(20, 50, 256);
+		fail("No exception thrown for blue > 255");
+	}
+	catch (IllegalArgumentException e) {
+	}
+			
+}
+
+public void test_equalsLjava_lang_Object() {
+	int r = 0, g = 127, b = 254;
+	RGB rgb1 = new RGB(r, g, b);
+	RGB rgb2;
+	
+	rgb2 = rgb1;
+	if (!rgb1.equals(rgb2)) {
+		fail("Two references to the same RGB instance not found equal");
+	}
+	
+	rgb2 = new RGB(r, g, b);
+	if (!rgb1.equals(rgb2)) {
+		fail("References to two different RGB instances with same R G B parameters not found equal");
+	}
+	
+	if (rgb1.equals(new RGB(r+1, g, b)) ||
+	    rgb1.equals(new RGB(r, g+1, b)) ||
+	    rgb1.equals(new RGB(r, g, b+1)) ||
+	    rgb1.equals(new RGB(r+1, g+1, b+1))) {
+		fail("Comparing two RGB instances with different combination of R G B parameters found equal");    	
+	}
+}
+
+public void test_hashCode() {
+	int r = 255, g = 100, b = 0;
+	RGB rgb1 = new RGB(r, g, b);
+	RGB rgb2 = new RGB(r, g, b);
+	
+	int hash1 = rgb1.hashCode();
+	int hash2 = rgb2.hashCode();
+	
+	if (hash1 != hash2) {
+		fail("Two RGB instances with same R G B parameters returned different hash codes");
+	}
+	
+	if (rgb1.hashCode() == new RGB(g, b, r).hashCode() ||
+		rgb1.hashCode() == new RGB(b, r, g).hashCode()) {
+		fail("Two RGB instances with different R G B parameters returned the same hash code");
+	}
+}
+
+public void test_toString() {
+	RGB rgb = new RGB(0, 100, 200);
+
+	String s = rgb.toString();
+	
+	if (s == null || s.length() == 0) {
+		fail("RGB.toString returns a null or empty String");
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_RGB((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorIII");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorIII")) test_ConstructorIII();
+	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_Rectangle.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java
new file mode 100644
index 0000000000..c01f56046f
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Rectangle.java
@@ -0,0 +1,320 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.graphics.Rectangle
+ *
+ * @see org.eclipse.swt.graphics.Rectangle
+ */
+public class Test_org_eclipse_swt_graphics_Rectangle extends SwtTestCase {
+
+public Test_org_eclipse_swt_graphics_Rectangle(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorIIII(){
+	// Test new Rectangle (int x, int y, int width, int height)
+	Rectangle r = new Rectangle(3, 4, 5, 6);
+	assertEquals(3, r.x);
+	assertEquals(4, r.y);
+	assertEquals(5, r.width);
+	assertEquals(6, r.height);
+
+	r = new Rectangle(-4, -3, -2, -1);
+	assertEquals(-4, r.x);
+	assertEquals(-3, r.y);
+	assertEquals(-2, r.width);
+	assertEquals(-1, r.height);
+
+	r = new Rectangle(500000, 700000, 200000, 100000);
+	assertEquals(500000, r.x);
+	assertEquals(700000, r.y);
+	assertEquals(200000, r.width);
+	assertEquals(100000, r.height);
+}
+
+/**
+ * Destructively replaces the x, y, width and height values
+ * in the receiver with ones which represent the union of the
+ * rectangles specified by the receiver and the given rectangle.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ */
+public void test_addLorg_eclipse_swt_graphics_Rectangle(){
+	Rectangle r1 = new Rectangle(1, 2, 3, 4);
+	Rectangle r2 = new Rectangle(3, 3, 2, 2);
+	r1.add(r2);
+	assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 4, 4), r1);
+
+	r1.add(r2);
+	assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 4, 4), r1);
+	
+	r1 = new Rectangle(1, 2, 3, 4);
+	r2 = new Rectangle(3, 3, 0, 0);
+	r1.add(r2);
+	assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 3, 4), r1);
+
+	r1 = new Rectangle(1, 2, 3, 4);
+	r2 = new Rectangle(6, 6, 0, 0);
+	r1.add(r2);
+	assertEquals("Rectangle add incorrect", new Rectangle(1, 2, 5, 4), r1);
+
+	try {
+		r1.add(null);
+		fail("No exception thrown for rectangle == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+/**
+ * Returns <code>true</code> if the point specified by the
+ * arguments is inside the area specified by the receiver.
+ */
+public void test_containsII(){
+	Rectangle r = new Rectangle(1, 2, 3, 4);
+	assertTrue("Rectangle should contain point (1, 2)", r.contains(1, 2));
+
+	assertTrue("Rectangle should contain point (3, 4)", r.contains(3, 4));
+
+	assertTrue("Rectangle should contain point (3, 5)", r.contains(3, 5));
+
+//	assertTrue("Rectangle should contain point (3, 6)", r.contains(3, 6));
+//
+//	assertTrue("Rectangle should contain point (4, 5)", r.contains(4, 5));
+//
+//	assertTrue("Rectangle should contain point (4, 6)", r.contains(4, 6));
+
+	assertTrue("Rectangle should not contain point (9, 10)", !r.contains(9, 10));
+
+	assertTrue("Rectangle should not contain point (-1, -1)", !r.contains(-1, -1));
+}
+
+/**
+ * Returns <code>true</code> if the given point is inside the
+ * area specified by the receiver.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ */
+public void test_containsLorg_eclipse_swt_graphics_Point(){
+	Rectangle r = new Rectangle(1, 2, 3, 4);
+	assertTrue("Rectangle should contain Point(1, 2)", r.contains(new Point(1, 2)));
+
+	assertTrue("Rectangle should contain Point(3, 4)", r.contains(new Point(3, 4)));
+
+	assertTrue("Rectangle should contain point (3, 5)", r.contains(new Point(3, 5)));
+
+//	assertTrue("Rectangle should contain point (3, 6)", r.contains(new Point(3, 6)));
+//
+//	assertTrue("Rectangle should contain point (4, 5)", r.contains(new Point(4, 5)));
+//
+//	assertTrue("Rectangle should contain Point(4, 6)", r.contains(new Point(4, 6)));
+
+	assertTrue("Rectangle should not contain Point(9, 10)", !r.contains(new Point(9, 10)));
+
+	assertTrue("Rectangle should not contain point (-1, -1)", !r.contains(new Point(-1, -1)));
+
+	try {
+		r.contains(null);
+		fail("No exception thrown for rectangle == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_equalsLjava_lang_Object(){
+	Rectangle r1 = new Rectangle(5, 4, 3, 2);
+	Rectangle r2 = new Rectangle(5, 4, 3, 2);
+	assertTrue("Rectangles should be equal", r1.equals(r2));
+
+	r2 = new Rectangle(3, 4, 5, 6);
+	assertTrue("Rectangles should not be equal", !r1.equals(r2));
+
+	r2 = new Rectangle(2, 3, 4, 5);
+	assertTrue("Rectangles should not be equal", !r1.equals(r2));
+
+	r2 = new Rectangle(5, 4, 2, 3);
+	assertTrue("Rectangles should not be equal", !r1.equals(r2));
+
+	r2 = new Rectangle(4, 5, 3, 2);
+	assertTrue("Rectangles should not be equal", !r1.equals(r2));
+}
+
+public void test_hashCode(){
+	Rectangle r1 = new Rectangle(5, 4, 3, 2);
+	Rectangle r2 = new Rectangle(5, 4, 3, 2);
+	assertTrue("Rectangles should have the same hashCode", r1.hashCode() == r2.hashCode());
+}
+
+/**
+ * Returns a new rectangle which represents the intersection
+ * of the receiver and the given rectangle. 
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ */
+public void test_intersectionLorg_eclipse_swt_graphics_Rectangle(){
+	Rectangle r1 = new Rectangle(1, 2, 3, 4);
+	Rectangle r2 = new Rectangle(3, 3, 2, 2);
+	assertEquals("Rectangle intersection incorrect", new Rectangle(3, 3, 1, 2), r1.intersection(r2));
+
+	r2 = new Rectangle(3, 3, 0, 0);
+	assertEquals("Rectangle intersection incorrect", new Rectangle(3, 3, 0, 0), r1.intersection(r2));
+
+	r2 = new Rectangle(3, 3, -1, -1);
+	assertEquals("Rectangle intersection incorrect", new Rectangle(3, 3, -1, -1), r1.intersection(r2));
+
+	try {
+		r1.intersection(null);
+		fail("No exception thrown for rectangle == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+/**
+ * Returns <code>true</code> if the given rectangle intersects
+ * with the receiver and <code>false</code> otherwise.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ */
+public void test_intersectsLorg_eclipse_swt_graphics_Rectangle(){
+	Rectangle r1 = new Rectangle(1, 2, 3, 4);
+	Rectangle r2 = new Rectangle(2, 3, 7, 8);
+	assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(2, 3, 7, 8)", r1.intersects(r2));
+	assertTrue("Rectangle(2, 3, 7, 8) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1));
+
+	r2 = new Rectangle(200, 300, 400, 500);
+	assertTrue("Rectangle(1, 2, 3, 4) should not intersect Rectangle(200, 300, 400, 500)", !r1.intersects(r2));
+	assertTrue("Rectangle(200, 300, 400, 500) should not intersect Rectangle(1, 2, 3, 4)", !r2.intersects(r1));
+	
+	r2 = new Rectangle(3, 3, 0, 0);
+	assertTrue("Rectangle(1, 2, 3, 4) should intersect Rectangle(3, 3, 0, 0)", r1.intersects(r2));
+	assertTrue("Rectangle(3, 3, 0, 0) should intersect Rectangle(1, 2, 3, 4)", r2.intersects(r1));
+
+	r2 = new Rectangle(3, 3, -1, -1);
+	assertTrue("Rectangle(1, 2, 3, 4) should not intersect Rectangle(3, 3, -1, -1)", !r1.intersects(r2));
+	assertTrue("Rectangle(3, 3, -1, -1) should not intersect Rectangle(1, 2, 3, 4)", !r2.intersects(r1));
+
+	try {
+		r1.intersects(null);
+		fail("No exception thrown for rectangle == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+/**
+ * Returns <code>true</code> if the receiver does not cover any
+ * area in the (x, y) coordinate plane, and <code>false</code> if
+ * the receiver does cover some area in the plane.
+ * <p>
+ * A rectangle is considered to <em>cover area</em> in the 
+ * (x, y) coordinate plane if both its width and height are 
+ * non-zero.
+ * </p>
+ */
+public void test_isEmpty(){
+	Rectangle r = new Rectangle(1, 2, 0, 0);
+	assertTrue("Rectangle is empty", r.isEmpty());
+
+	r = new Rectangle(1, 2, -3, -4);
+	assertTrue("Rectangle is empty", r.isEmpty());
+
+	r = new Rectangle(1, 2, 3, 4);
+	assertTrue("Rectangle is not empty", !r.isEmpty());
+}
+
+public void test_toString(){
+	Rectangle r = new Rectangle(3, 4, 5, 6);
+	assertNotNull(r.toString());
+	assertTrue(r.toString().length() > 0);
+	assertEquals("Rectangle {3, 4, 5, 6}", r.toString());
+}
+
+/**
+ * Returns a new rectangle which represents the union of
+ * the receiver and the given rectangle.
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the argument is null</li>
+ * </ul>
+ */
+public void test_unionLorg_eclipse_swt_graphics_Rectangle(){
+	Rectangle r1 = new Rectangle(1, 2, 3, 4);
+	Rectangle r2 = new Rectangle(3, 3, 2, 2);
+	assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 4, 4), r1.union(r2));
+	
+	r2 = new Rectangle(3, 3, 0, 0);
+	assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 3, 4), r1.union(r2));
+
+	r2 = new Rectangle(3, 3, -1, -1);
+	assertEquals("Rectangle union incorrect", new Rectangle(1, 2, 3, 4), r1.union(r2));
+
+	try {
+		r1.union(null);
+		fail("No exception thrown for rectangle == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Rectangle((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorIIII");
+	methodNames.addElement("test_addLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_containsII");
+	methodNames.addElement("test_containsLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_intersectionLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_intersectsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_isEmpty");
+	methodNames.addElement("test_toString");
+	methodNames.addElement("test_unionLorg_eclipse_swt_graphics_Rectangle");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorIIII")) test_ConstructorIIII();
+	else if (getName().equals("test_addLorg_eclipse_swt_graphics_Rectangle")) test_addLorg_eclipse_swt_graphics_Rectangle();
+	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_equalsLjava_lang_Object")) test_equalsLjava_lang_Object();
+	else if (getName().equals("test_hashCode")) test_hashCode();
+	else if (getName().equals("test_intersectionLorg_eclipse_swt_graphics_Rectangle")) test_intersectionLorg_eclipse_swt_graphics_Rectangle();
+	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_toString")) test_toString();
+	else if (getName().equals("test_unionLorg_eclipse_swt_graphics_Rectangle")) test_unionLorg_eclipse_swt_graphics_Rectangle();
+}
+}
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
new file mode 100644
index 0000000000..311987a207
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Region.java
@@ -0,0 +1,525 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor(){
+	// test Region()
+	Region reg = new Region();
+	if (reg.isDisposed()) {
+		fail("Constructor for Region didn't initialize handle field");
+	}
+	reg.dispose();
+}
+
+public void test_addLorg_eclipse_swt_graphics_Rectangle(){
+	Region reg = new Region();
+	// add a rectangle
+	reg.add(new Rectangle(0, 0, 100, 50));
+	// add a second rectangle
+	reg.add(new Rectangle(200, 200, 10,10));	
+
+	try {
+		reg.add((Rectangle)null);
+		fail("no exception thrown for adding a null rectangle");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	reg.dispose();
+	
+	try {
+		reg.add(new Rectangle(20,30,10,5));
+		fail("no exception thrown for adding a rectangle after Region got disposed");
+	}
+	catch (SWTException e) {
+	}
+}
+
+public void test_addLorg_eclipse_swt_graphics_Region(){
+	Region reg1 = new Region();
+	// make a second region and add it to the first one
+	Region reg2 = new Region();
+	reg2.add(new Rectangle(40, 50, 10, 20));
+	reg1.add(reg2);
+
+	try {
+		reg1.add((Region)null);
+		fail("no exception thrown for adding a null region");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		reg2 = new Region();
+		reg2.add(new Rectangle(1,1,100,200));
+		reg2.dispose();
+		reg1.add(reg2);
+		fail("no exception thrown for adding to a Region a Region which got disposed");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	reg1.dispose();
+	
+	try {
+		reg2 = new Region();
+		reg2.add(new Rectangle(1,1,100,200));
+		reg1.add(reg2);
+		fail("no exception thrown for adding a Region to a Region which got disposed");
+	}
+	catch (SWTException e) {
+	}
+}
+
+public void test_containsII(){
+	Rectangle rect1 = new Rectangle(10,10,200,100);
+	Point pointInRect1 = new Point(10,10);
+	Rectangle rect2 = new Rectangle(50,50,1000,1000);
+	Point pointInRect2 = new Point(1049,1009);
+	Point pointNotInRect12 = new Point(49,110);
+	
+	Region reg = new Region();
+	reg.dispose();
+	try {
+		boolean res = reg.contains(pointInRect1.x, pointInRect1.y);
+		fail("no exception thrown on disposed region");
+	}
+	catch (Exception e) {
+	}
+	
+	reg = new Region();
+	if (reg.contains(pointInRect1.x, pointInRect1.y)) {
+		reg.dispose();
+		fail("Empty region should not contain point");
+	}
+	reg.add(rect1);
+	if (!reg.contains(pointInRect1.x, pointInRect1.y)) {
+		reg.dispose();
+		fail("Region should contain point");
+	}
+	reg.add(rect2);
+	if (!reg.contains(pointInRect1.x, pointInRect1.y) ||
+		!reg.contains(pointInRect2.x, pointInRect2.y)) {
+		reg.dispose();
+		fail("Region should contain point");
+	}
+	if (reg.contains(pointNotInRect12.x, pointNotInRect12.y)) {
+		reg.dispose();
+		fail("Region should not contain point");
+	}	
+	reg.dispose();
+}
+
+public void test_containsLorg_eclipse_swt_graphics_Point(){
+	Rectangle rect1 = new Rectangle(10,10,200,100);
+	Point pointInRect1 = new Point(10,10);
+	Rectangle rect2 = new Rectangle(50,50,1000,1000);
+	Point pointInRect2 = new Point(1049,1009);
+	Point pointNotInRect12 = new Point(49,110);
+	
+	Region reg = new Region();
+	reg.dispose();
+	try {
+		boolean res = reg.contains(pointInRect1);
+		fail("no exception thrown on disposed region");
+	}
+	catch (Exception e) {
+	}
+	
+	reg = new Region();
+	if (reg.contains(pointInRect1)) {
+		reg.dispose();
+		fail("Empty region should not contain point");
+	}
+	reg.add(rect1);
+	if (!reg.contains(pointInRect1)) {
+		reg.dispose();
+		fail("Region should contain point");
+	}
+	reg.add(rect2);
+	if (!reg.contains(pointInRect1) ||
+		!reg.contains(pointInRect2)) {
+		reg.dispose();
+		fail("Region should contain point");
+	}
+	if (reg.contains(pointNotInRect12)) {
+		reg.dispose();
+		fail("Region should not contain point");
+	}
+	reg.dispose();
+}
+
+public void test_dispose(){
+	Region reg = new Region();
+	reg.add(new Rectangle(1,1,50,100));
+	if (reg.isDisposed()) {
+		fail("Region should not be in the disposed state");
+	}
+	
+	// dispose twice as this is allowed
+	for (int i = 0; i < 2; i++) {
+		reg.dispose();
+		if (!reg.isDisposed()) {
+			fail("Region should be in the disposed state");
+		}
+	}
+}
+
+public void test_equalsLjava_lang_Object(){
+	Rectangle rect1 = new Rectangle(25, 100, 200, 780);
+	Rectangle rect2 = new Rectangle(30, 105, 205, 785);
+	
+	Region reg1 = new Region();
+	reg1.add(rect1);
+
+	Region reg2 = reg1;
+	
+	if (!reg1.equals(reg2)) {
+		reg1.dispose();
+		reg2.dispose();
+		fail("references to the same instance of Region should be considered equal");
+	}
+	
+	reg2 = new Region();
+	reg2.add(rect1);
+	
+	if (!reg1.equals(reg2)) {
+		reg1.dispose();
+		reg2.dispose();
+		fail("two instances of Region representing the same area should be considered equal");
+	}		
+	
+	reg2.dispose();
+	reg2 = new Region();
+	if (reg1.equals(reg2)) {
+		reg1.dispose();
+		reg2.dispose();
+		fail("Non empy region considered equal to empty one");
+	}
+	
+	reg2.add(rect2);
+	if (reg1.equals(reg2)) {
+		reg1.dispose();
+		reg2.dispose();
+		fail("two different regions considered equal");
+	}
+	
+	reg1.dispose();
+	reg2.dispose();
+}
+
+public void test_getBounds(){
+	Region reg = new Region();
+	reg.dispose();
+	
+	try {
+		Rectangle rect = reg.getBounds();
+		fail("Region disposed should throw Exception");
+	}
+	catch (Exception e) {
+	}
+
+	Rectangle rect1 = new Rectangle(10,10,50,30);
+	Rectangle rect2 = new Rectangle(100,100,10,10);
+	// the rectangle enclosing the two preceding rectangles
+	Rectangle rect12Bounds = new Rectangle(10,10,100,100);
+	
+	reg = new Region();
+	reg.add(rect1);
+	Rectangle rect1Bis = reg.getBounds();
+	if (rect1Bis.x != rect1.x || rect1Bis.y != rect1.y || 
+		rect1Bis.height != rect1.height || rect1Bis.width != rect1.width) {
+		reg.dispose();
+		fail("getBounds doesn't return the borders of the rectangle area which was set up");
+	}
+	
+	reg.add(rect2);
+	Rectangle rect12 = reg.getBounds();
+	if (rect12.x != rect12Bounds.x || rect12.y != rect12Bounds.y || 
+		rect12.height != rect12Bounds.height || rect12.width != rect12Bounds.width) {
+		reg.dispose();
+		fail("getBounds doesn't return the borders of the resulting rectangle area which was set up");
+	}
+	
+	reg.dispose();
+}
+
+public void test_hashCode(){
+	Region reg1 = new Region();
+	Region reg2 = new Region();
+		
+	Rectangle rect1 = new Rectangle(25, 100, 200, 780);
+	Rectangle rect2 = new Rectangle(30, 105, 205, 785);
+	
+	reg1.add(rect1);
+	reg2.add(rect2);
+	
+	if (reg1.hashCode() == reg2.hashCode()) {
+		reg1.dispose();
+		reg2.dispose();
+		fail("two different regions should have different hashCode");
+	}
+	reg2.dispose();	
+
+	reg2 = new Region();
+	reg2.add(rect1);
+
+
+// BUG: this should pass	
+//	if (reg1.hashCode() != reg2.hashCode()) {
+//		reg1.dispose();
+//		reg2.dispose();
+//		fail("two regions representing same area should have same hashCode");
+//	}
+	
+	reg1.dispose();
+	reg2.dispose();
+}
+
+public void test_intersectsIIII(){
+	Rectangle rect1 = new Rectangle(10,20,50,30);
+	Rectangle rectInter1 = new Rectangle(59,49,10,20);
+	Rectangle rectNotInter1 = new Rectangle(0,5,10,15);
+	
+	Rectangle rect2 = new Rectangle(30,40,10,100);
+	Rectangle rectInter2 = new Rectangle(39,139,1,5);
+	Rectangle rectNotInter12 = new Rectangle(40,50,5,15);
+	
+	
+	Region reg = new Region();
+	reg.dispose();
+	try {
+		boolean res = reg.intersects(rectInter1.x, rectInter1.y, rectInter1.width, rectInter1.height);
+		fail("no exception thrown on disposed region");
+	}
+	catch (Exception e) {
+	}
+	
+	reg = new Region();
+	if (reg.intersects(rect1.x, rect1.y, rect1.width, rect1.height)) {
+		reg.dispose();
+		fail("intersects can't return true on empty region");
+	}
+	reg.add(rect1);
+	if (!reg.intersects(rect1.x, rect1.y, rect1.width, rect1.height)) {
+		reg.dispose();
+		fail("intersects didn't return true");
+	}
+	if (!reg.intersects(rectInter1.x, rectInter1.y, rectInter1.width, rectInter1.height)) {
+		reg.dispose();
+		fail("intersects didn't return true ");
+	}
+	if (reg.intersects(rectNotInter1.x, rectNotInter1.y, rectNotInter1.width, rectNotInter1.height)) {
+		reg.dispose();
+		fail("intersects return true on rectangle not intersecting with region");
+	}
+	
+	reg.add(rect2);
+	if (!reg.intersects(rect2.x, rect2.y, rect2.width, rect2.height)) {
+		reg.dispose();
+		fail("intersects didn't return true");
+	}
+	if (!reg.intersects(rectInter2.x, rectInter2.y, rectInter2.width, rectInter2.height)) {
+		reg.dispose();
+		fail("intersects didn't return true ");
+	}
+	if (reg.intersects(rectNotInter12.x, rectNotInter12.y, rectNotInter12.width, rectNotInter12.height)) {
+		reg.dispose();
+		fail("intersects return true on rectangle not intersecting with region");
+	}
+	reg.dispose();
+}
+
+public void test_intersectsLorg_eclipse_swt_graphics_Rectangle(){
+	Rectangle rect1 = new Rectangle(10,20,50,30);
+	Rectangle rectInter1 = new Rectangle(59,49,10,20);
+	Rectangle rectNotInter1 = new Rectangle(0,5,10,15);
+	
+	Rectangle rect2 = new Rectangle(30,40,10,100);
+	Rectangle rectInter2 = new Rectangle(39,139,1,5);
+	Rectangle rectNotInter12 = new Rectangle(40,50,5,15);
+	
+	
+	Region reg = new Region();
+	reg.dispose();
+	try {
+		boolean res = reg.intersects(rectInter1);
+		fail("no exception thrown on disposed region");
+	}
+	catch (Exception e) {
+	}
+	
+	reg = new Region();
+	if (reg.intersects(rect1)) {
+		reg.dispose();
+		fail("intersects can't return true on empty region");
+	}
+	reg.add(rect1);
+	if (!reg.intersects(rect1)) {
+		reg.dispose();
+		fail("intersects didn't return true");
+	}
+	if (!reg.intersects(rectInter1)) {
+		reg.dispose();
+		fail("intersects didn't return true ");
+	}
+	if (reg.intersects(rectNotInter1)) {
+		reg.dispose();
+		fail("intersects return true on rectangle not intersecting with region");
+	}
+	
+	reg.add(rect2);
+	if (!reg.intersects(rect2)) {
+		reg.dispose();
+		fail("intersects didn't return true");
+	}
+	if (!reg.intersects(rectInter2)) {
+		reg.dispose();
+		fail("intersects didn't return true ");
+	}
+	if (reg.intersects(rectNotInter12)) {
+		reg.dispose();
+		fail("intersects return true on rectangle not intersecting with region");
+	}
+	reg.dispose();
+}
+
+public void test_isDisposed(){
+	// test in dispose()
+}
+
+public void test_isEmpty(){
+	Region reg = new Region();
+	Rectangle emptyRect1 = new Rectangle(10,20,0,200);
+	Rectangle emptyRect2 = new Rectangle(10,20,10,0);
+	Rectangle rect = new Rectangle(10,20,50,100);
+	
+	if (!reg.isEmpty()) {
+		reg.dispose();
+		fail("isEmpty didn't return true on empty region");
+	}
+	
+	reg.add(emptyRect1);
+	if (!reg.isEmpty()) {
+		reg.dispose();
+		fail("isEmpty didn't return true on empty region");
+	}
+
+	reg.add(emptyRect2);
+	if (!reg.isEmpty()) {
+		reg.dispose();
+		fail("isEmpty didn't return true on empty region");
+	}
+
+	reg.add(rect);
+	if (reg.isEmpty()) {
+		reg.dispose();
+		fail("isEmpty returned true on non empty region");
+	}
+	
+	reg.dispose();	
+}
+
+public void test_win32_newI(){
+	// not part of public api
+}
+
+public void test_toString(){
+	Region reg = new Region();
+	
+	String s = reg.toString();
+	
+	if (s == null || s.length() == 0) {
+		fail("toString returns null or empty string");
+	}
+	
+	reg.add(new Rectangle(1,1,10,20));
+	s = reg.toString();
+	
+	if (s == null || s.length() == 0) {
+		fail("toString returns null or empty string");
+	}
+
+	reg.dispose();
+	s = reg.toString();
+	
+	if (s == null || s.length() == 0) {
+		fail("toString returns null or empty string");
+	}				
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_graphics_Region((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	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_intersectsIIII");
+	methodNames.addElement("test_intersectsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_isEmpty");
+	methodNames.addElement("test_win32_newI");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	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_intersectsIIII")) test_intersectsIIII();
+	else if (getName().equals("test_intersectsLorg_eclipse_swt_graphics_Rectangle")) test_intersectsLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_isEmpty")) test_isEmpty();
+	else if (getName().equals("test_win32_newI")) test_win32_newI();
+	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_layout_FillLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FillLayout.java
new file mode 100644
index 0000000000..f070c41955
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FillLayout.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.layout.FillLayout
+ *
+ * @see org.eclipse.swt.layout.FillLayout
+ */
+public class Test_org_eclipse_swt_layout_FillLayout extends Test_org_eclipse_swt_widgets_Layout {
+
+public Test_org_eclipse_swt_layout_FillLayout(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ() {
+	warnUnimpl("Test test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ not written");
+}
+
+public void test_layoutLorg_eclipse_swt_widgets_CompositeZ() {
+	warnUnimpl("Test test_layoutLorg_eclipse_swt_widgets_CompositeZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_layout_FillLayout((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ");
+	methodNames.addElement("test_layoutLorg_eclipse_swt_widgets_CompositeZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Layout.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ")) test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ();
+	else if (getName().equals("test_layoutLorg_eclipse_swt_widgets_CompositeZ")) test_layoutLorg_eclipse_swt_widgets_CompositeZ();
+	else super.runTest();
+}
+}
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
new file mode 100644
index 0000000000..751e556011
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
@@ -0,0 +1,60 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_ConstructorI() {
+	warnUnimpl("Test test_ConstructorI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_layout_GridData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorI");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_ConstructorI")) test_ConstructorI();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridLayout.java
new file mode 100644
index 0000000000..832c4a4255
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridLayout.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.layout.GridLayout
+ *
+ * @see org.eclipse.swt.layout.GridLayout
+ */
+public class Test_org_eclipse_swt_layout_GridLayout extends Test_org_eclipse_swt_widgets_Layout {
+
+public Test_org_eclipse_swt_layout_GridLayout(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ() {
+	warnUnimpl("Test test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ not written");
+}
+
+public void test_layoutLorg_eclipse_swt_widgets_CompositeZ() {
+	warnUnimpl("Test test_layoutLorg_eclipse_swt_widgets_CompositeZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_layout_GridLayout((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ");
+	methodNames.addElement("test_layoutLorg_eclipse_swt_widgets_CompositeZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Layout.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ")) test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ();
+	else if (getName().equals("test_layoutLorg_eclipse_swt_widgets_CompositeZ")) test_layoutLorg_eclipse_swt_widgets_CompositeZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowData.java
new file mode 100644
index 0000000000..2f9c957c1a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowData.java
@@ -0,0 +1,66 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.layout.RowData
+ *
+ * @see org.eclipse.swt.layout.RowData
+ */
+public class Test_org_eclipse_swt_layout_RowData extends SwtTestCase {
+
+public Test_org_eclipse_swt_layout_RowData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_ConstructorII() {
+	warnUnimpl("Test test_ConstructorII not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_Point not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_layout_RowData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorII");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_Point");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_ConstructorII")) test_ConstructorII();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_Point")) test_ConstructorLorg_eclipse_swt_graphics_Point();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowLayout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowLayout.java
new file mode 100644
index 0000000000..dd2891d14b
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_RowLayout.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.layout.RowLayout
+ *
+ * @see org.eclipse.swt.layout.RowLayout
+ */
+public class Test_org_eclipse_swt_layout_RowLayout extends Test_org_eclipse_swt_widgets_Layout {
+
+public Test_org_eclipse_swt_layout_RowLayout(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ() {
+	warnUnimpl("Test test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ not written");
+}
+
+public void test_layoutLorg_eclipse_swt_widgets_CompositeZ() {
+	warnUnimpl("Test test_layoutLorg_eclipse_swt_widgets_CompositeZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_layout_RowLayout((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ");
+	methodNames.addElement("test_layoutLorg_eclipse_swt_widgets_CompositeZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Layout.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ")) test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ();
+	else if (getName().equals("test_layoutLorg_eclipse_swt_widgets_CompositeZ")) test_layoutLorg_eclipse_swt_widgets_CompositeZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrintDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrintDialog.java
new file mode 100644
index 0000000000..e8a092cabd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrintDialog.java
@@ -0,0 +1,143 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.printing.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.printing.PrintDialog
+ *
+ * @see org.eclipse.swt.printing.PrintDialog
+ */
+public class Test_org_eclipse_swt_printing_PrintDialog extends Test_org_eclipse_swt_widgets_Dialog {
+
+	PrintDialog printDialog;
+	
+public Test_org_eclipse_swt_printing_PrintDialog(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	printDialog = new PrintDialog(shell, SWT.NONE);
+	setDialog(printDialog);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	new PrintDialog(shell);
+	
+	try {
+		new PrintDialog(null);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	new PrintDialog(shell, SWT.NONE);
+	
+	try {
+		new PrintDialog(null, SWT.NONE);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getScope() {
+	warnUnimpl("Test test_getScope not written");
+}
+
+public void test_setScopeI() {
+	warnUnimpl("Test test_setScopeI not written");
+}
+
+public void test_getStartPage() {
+	warnUnimpl("Test test_getStartPage not written");
+}
+
+public void test_setStartPageI() {
+	warnUnimpl("Test test_setStartPageI not written");
+}
+
+public void test_getEndPage() {
+	warnUnimpl("Test test_getEndPage not written");
+}
+
+public void test_setEndPageI() {
+	warnUnimpl("Test test_setEndPageI not written");
+}
+
+public void test_getPrintToFile() {
+	warnUnimpl("Test test_getPrintToFile not written");
+}
+
+public void test_setPrintToFileZ() {
+	warnUnimpl("Test test_setPrintToFileZ not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_open() {
+	warnUnimpl("Test test_open not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_printing_PrintDialog((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getScope");
+	methodNames.addElement("test_setScopeI");
+	methodNames.addElement("test_getStartPage");
+	methodNames.addElement("test_setStartPageI");
+	methodNames.addElement("test_getEndPage");
+	methodNames.addElement("test_setEndPageI");
+	methodNames.addElement("test_getPrintToFile");
+	methodNames.addElement("test_setPrintToFileZ");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_open");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getScope")) test_getScope();
+	else if (getName().equals("test_setScopeI")) test_setScopeI();
+	else if (getName().equals("test_getStartPage")) test_getStartPage();
+	else if (getName().equals("test_setStartPageI")) test_setStartPageI();
+	else if (getName().equals("test_getEndPage")) test_getEndPage();
+	else if (getName().equals("test_setEndPageI")) test_setEndPageI();
+	else if (getName().equals("test_getPrintToFile")) test_getPrintToFile();
+	else if (getName().equals("test_setPrintToFileZ")) test_setPrintToFileZ();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_open")) test_open();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_Printer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_Printer.java
new file mode 100644
index 0000000000..9fc81d5707
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_Printer.java
@@ -0,0 +1,166 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.printing.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.printing.Printer
+ *
+ * @see org.eclipse.swt.printing.Printer
+ */
+public class Test_org_eclipse_swt_printing_Printer extends Test_org_eclipse_swt_graphics_Device {
+
+public Test_org_eclipse_swt_printing_Printer(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_getPrinterList() {
+	warnUnimpl("Test test_getPrinterList not written");
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_printing_PrinterData() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_printing_PrinterData not written");
+}
+
+public void test_createLorg_eclipse_swt_graphics_DeviceData() {
+	warnUnimpl("Test test_createLorg_eclipse_swt_graphics_DeviceData not written");
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_new_GCLorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_startJobLjava_lang_String() {
+	warnUnimpl("Test test_startJobLjava_lang_String not written");
+}
+
+public void test_endJob() {
+	warnUnimpl("Test test_endJob not written");
+}
+
+public void test_cancelJob() {
+	warnUnimpl("Test test_cancelJob not written");
+}
+
+public void test_startPage() {
+	warnUnimpl("Test test_startPage not written");
+}
+
+public void test_endPage() {
+	warnUnimpl("Test test_endPage not written");
+}
+
+public void test_getDPI() {
+	warnUnimpl("Test test_getDPI not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_getPrinterData() {
+	warnUnimpl("Test test_getPrinterData not written");
+}
+
+public void test_checkDevice() {
+	warnUnimpl("Test test_checkDevice not written");
+}
+
+public void test_release() {
+	warnUnimpl("Test test_release not written");
+}
+
+public void test_destroy() {
+	warnUnimpl("Test test_destroy not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_printing_Printer((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_getPrinterList");
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_printing_PrinterData");
+	methodNames.addElement("test_createLorg_eclipse_swt_graphics_DeviceData");
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_startJobLjava_lang_String");
+	methodNames.addElement("test_endJob");
+	methodNames.addElement("test_cancelJob");
+	methodNames.addElement("test_startPage");
+	methodNames.addElement("test_endPage");
+	methodNames.addElement("test_getDPI");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getPrinterData");
+	methodNames.addElement("test_checkDevice");
+	methodNames.addElement("test_release");
+	methodNames.addElement("test_destroy");
+	methodNames.addAll(Test_org_eclipse_swt_graphics_Device.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_getPrinterList")) test_getPrinterList();
+	else if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_printing_PrinterData")) test_ConstructorLorg_eclipse_swt_printing_PrinterData();
+	else if (getName().equals("test_createLorg_eclipse_swt_graphics_DeviceData")) test_createLorg_eclipse_swt_graphics_DeviceData();
+	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_startJobLjava_lang_String")) test_startJobLjava_lang_String();
+	else if (getName().equals("test_endJob")) test_endJob();
+	else if (getName().equals("test_cancelJob")) test_cancelJob();
+	else if (getName().equals("test_startPage")) test_startPage();
+	else if (getName().equals("test_endPage")) test_endPage();
+	else if (getName().equals("test_getDPI")) test_getDPI();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getPrinterData")) test_getPrinterData();
+	else if (getName().equals("test_checkDevice")) test_checkDevice();
+	else if (getName().equals("test_release")) test_release();
+	else if (getName().equals("test_destroy")) test_destroy();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrinterData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrinterData.java
new file mode 100644
index 0000000000..f10f9965e6
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_printing_PrinterData.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.printing.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.printing.PrinterData
+ *
+ * @see org.eclipse.swt.printing.PrinterData
+ */
+public class Test_org_eclipse_swt_printing_PrinterData extends Test_org_eclipse_swt_graphics_DeviceData {
+
+public Test_org_eclipse_swt_printing_PrinterData(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	PrinterData data = new PrinterData();
+}
+
+public void test_ConstructorLjava_lang_StringLjava_lang_String() {
+	PrinterData data = new PrinterData("hello", "there");
+}
+
+public void test_toString() {
+	PrinterData data = new PrinterData();
+	assertNotNull(data.toString());
+	assertTrue(data.toString().length() > 0);
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_printing_PrinterData((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorLjava_lang_StringLjava_lang_String");
+	methodNames.addElement("test_toString");
+	methodNames.addAll(Test_org_eclipse_swt_graphics_DeviceData.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_ConstructorLjava_lang_StringLjava_lang_String")) test_ConstructorLjava_lang_StringLjava_lang_String();
+	else if (getName().equals("test_toString")) test_toString();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_program_Program.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_program_Program.java
new file mode 100644
index 0000000000..ecfcfc43da
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_program_Program.java
@@ -0,0 +1,108 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.program.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.program.Program
+ *
+ * @see org.eclipse.swt.program.Program
+ */
+public class Test_org_eclipse_swt_program_Program extends SwtTestCase {
+
+public Test_org_eclipse_swt_program_Program(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_findProgramLjava_lang_String() {
+	warnUnimpl("Test test_findProgramLjava_lang_String not written");
+}
+
+public void test_getExtensions() {
+	warnUnimpl("Test test_getExtensions not written");
+}
+
+public void test_getPrograms() {
+	warnUnimpl("Test test_getPrograms not written");
+}
+
+public void test_launchLjava_lang_String() {
+	warnUnimpl("Test test_launchLjava_lang_String not written");
+}
+
+public void test_executeLjava_lang_String() {
+	warnUnimpl("Test test_executeLjava_lang_String not written");
+}
+
+public void test_getImageData() {
+	warnUnimpl("Test test_getImageData not written");
+}
+
+public void test_getName() {
+	warnUnimpl("Test test_getName not written");
+}
+
+public void test_equalsLjava_lang_Object() {
+	warnUnimpl("Test test_equalsLjava_lang_Object not written");
+}
+
+public void test_hashCode() {
+	warnUnimpl("Test test_hashCode not written");
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_program_Program((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_findProgramLjava_lang_String");
+	methodNames.addElement("test_getExtensions");
+	methodNames.addElement("test_getPrograms");
+	methodNames.addElement("test_launchLjava_lang_String");
+	methodNames.addElement("test_executeLjava_lang_String");
+	methodNames.addElement("test_getImageData");
+	methodNames.addElement("test_getName");
+	methodNames.addElement("test_equalsLjava_lang_Object");
+	methodNames.addElement("test_hashCode");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_findProgramLjava_lang_String")) test_findProgramLjava_lang_String();
+	else if (getName().equals("test_getExtensions")) test_getExtensions();
+	else if (getName().equals("test_getPrograms")) test_getPrograms();
+	else if (getName().equals("test_launchLjava_lang_String")) test_launchLjava_lang_String();
+	else if (getName().equals("test_executeLjava_lang_String")) test_executeLjava_lang_String();
+	else if (getName().equals("test_getImageData")) test_getImageData();
+	else if (getName().equals("test_getName")) test_getName();
+	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_widgets_Button.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Button.java
new file mode 100644
index 0000000000..cc723f9cfc
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Button.java
@@ -0,0 +1,270 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Button
+ *
+ * @see org.eclipse.swt.widgets.Button
+ */
+public class Test_org_eclipse_swt_widgets_Button extends Test_org_eclipse_swt_widgets_Control {
+
+Button button;
+
+public Test_org_eclipse_swt_widgets_Button(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	button = new Button(shell, SWT.PUSH);
+	setWidget(button);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	// Test Button(Composite parent, int style)
+	Button button = new Button(shell, SWT.NULL);
+
+	button = new Button(shell, SWT.PUSH);
+
+	button = new Button(shell, SWT.CHECK);
+
+	button = new Button(shell, SWT.TOGGLE);
+
+	button = new Button(shell, SWT.ARROW);
+
+	button = new Button(shell, SWT.PUSH | SWT.CHECK);
+
+	try {
+		button = new Button(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	button.computeSize(0, 0);
+
+	button.computeSize(0, 0, false);
+
+	button.computeSize(-10, -10);
+
+	button.computeSize(-10, -10, false);
+
+	button.computeSize(10, 10);
+
+	button.computeSize(10, 10, false);
+
+	button.computeSize(10000, 10000);
+
+	button.computeSize(10000, 10000, false);
+}
+
+public void test_getAlignment() {
+	warnUnimpl("Test test_getAlignment not written");
+}
+
+public void test_getImage() {
+	// tested in test_setImageLorg_eclipse_swt_graphics_Image
+}
+
+public void test_getSelection() {
+	// tested in test_setSelectionZ
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setAlignmentI() {
+	button.setAlignment(SWT.LEFT);
+	assertEquals(SWT.LEFT, button.getAlignment());
+
+	button.setAlignment(SWT.RIGHT);
+	assertEquals(SWT.RIGHT, button.getAlignment());
+
+	button.setAlignment(SWT.CENTER);
+	assertEquals(SWT.CENTER, button.getAlignment());
+
+	button.setAlignment(SWT.UP); // bad value for push button
+	assertTrue(SWT.UP != button.getAlignment());
+
+	Button arrowButton = new Button(shell, SWT.ARROW);
+	arrowButton.setAlignment(SWT.LEFT);
+	assertEquals(SWT.LEFT, arrowButton.getAlignment());
+
+	arrowButton.setAlignment(SWT.RIGHT);
+	assertEquals(SWT.RIGHT, arrowButton.getAlignment());
+
+	arrowButton.setAlignment(SWT.UP);
+	assertEquals(SWT.UP, arrowButton.getAlignment());
+
+	arrowButton.setAlignment(SWT.DOWN);
+	assertEquals(SWT.DOWN, arrowButton.getAlignment());
+
+	arrowButton.setAlignment(SWT.CENTER); // bad value for arrow button
+	assertTrue(SWT.CENTER != arrowButton.getAlignment());
+	arrowButton.dispose();
+
+	int alignment = 55; // some bogus number
+	button.setAlignment(alignment);
+	assertTrue(alignment != button.getAlignment());
+}
+
+public void test_setFocus() {
+	warnUnimpl("Test test_setFocus not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	Image image = button.getImage();
+	button.setImage(image);
+	assertEquals(image, button.getImage());
+
+	button.setImage(null);
+	assertNull(button.getImage());
+
+	image = new Image(shell.getDisplay(), 10, 10);
+	button.setImage(image);
+	assertEquals(image, button.getImage());
+
+	button.setImage(null);
+	image.dispose();
+	try {
+		button.setImage(image);
+		button.setImage(null);
+		fail("No exception thrown for disposed image");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setSelectionZ() {
+	// test setSelection for check box
+	button = new Button(shell, SWT.CHECK);
+	button.setSelection(true);
+	assertTrue(button.getSelection());
+	button.setSelection(false);
+	assertTrue(!button.getSelection());
+
+	// test setSelection for arrow button
+	Button newButton = new Button(shell, SWT.ARROW);
+	newButton.setSelection(true);
+	assertTrue(!newButton.getSelection());
+	newButton.setSelection(false);
+	assertTrue(!newButton.getSelection());
+	newButton.dispose();
+
+	// test setSelection for push button
+	newButton = new Button(shell, SWT.PUSH);
+	newButton.setSelection(true);
+	assertTrue(!newButton.getSelection());
+	newButton.setSelection(false);
+	assertTrue(!newButton.getSelection());
+	newButton.dispose();
+
+	// test setSelection for radio button
+	newButton = new Button(shell, SWT.RADIO);
+	newButton.setSelection(true);
+	assertTrue(newButton.getSelection());
+	newButton.setSelection(false);
+	assertTrue(!newButton.getSelection());
+	newButton.dispose();
+
+	// test setSelection for toggle button
+	newButton = new Button(shell, SWT.TOGGLE);
+	newButton.setSelection(true);
+	assertTrue(newButton.getSelection());
+	newButton.setSelection(false);
+	assertTrue(!newButton.getSelection());
+	newButton.dispose();
+}
+
+public void test_setTextLjava_lang_String() {
+	String[] cases = {"", "some text", "ldkashdoehufweovcnhslvhregojebckreavbkuhxbiufvcyhbifuyewvbiureyd.,cmnesljliewjfchvbwoifivbeworixuieurvbiuvbohflksjeahfcliureafgyciabelitvyrwtlicuyrtliureybcliuyreuceyvbliureybct", "\n \n \b \t ", "\0"};
+	int goodCases = 4;
+	for (int i=0; i<goodCases; i++){
+		button.setText(cases[i]);
+		assertTrue("good case: " + String.valueOf(i), button.getText().equals(cases[i]));
+	};
+
+	try {
+		button.setText(null);
+		fail("No exception thrown for text == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	button.setText("");
+
+	button.setText("some name ");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Button((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getAlignment");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setAlignmentI");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setSelectionZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getAlignment")) test_getAlignment();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setAlignmentI")) test_setAlignmentI();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setSelectionZ")) test_setSelectionZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Canvas.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Canvas.java
new file mode 100644
index 0000000000..b4ec4c854d
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Canvas.java
@@ -0,0 +1,111 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Canvas
+ *
+ * @see org.eclipse.swt.widgets.Canvas
+ */
+public class Test_org_eclipse_swt_widgets_Canvas extends Test_org_eclipse_swt_widgets_Composite {
+
+Canvas canvas;
+
+public Test_org_eclipse_swt_widgets_Canvas(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	canvas = new Canvas(shell, 0);
+	super.setWidget(canvas);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+protected void setWidget(Widget w) {
+	if (!canvas.isDisposed())
+		canvas.dispose();
+	canvas = (Canvas)w;
+	super.setWidget(w);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	Canvas newCanvas;
+	try {
+		newCanvas = new Canvas(null, SWT.NONE);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getCaret() {
+	// tested in test_setCaretLorg_eclipse_swt_widgets_Caret
+}
+
+public void test_scrollIIIIIIZ() {
+	warnUnimpl("Test test_scrollIIIIIIZ not written");
+}
+
+public void test_setCaretLorg_eclipse_swt_widgets_Caret() {
+	int number = 5;
+	Caret[] carets = new Caret[number];
+	for (int i = 0; i < number; i++) {
+		carets[i] = new Caret(canvas, SWT.NONE);
+	}
+	for (int i = 0; i < number; i++) {
+		canvas.setCaret(carets[i]);
+		assertEquals("Caret # " + i + "not set properly", canvas.getCaret(), carets[i]);
+	}
+
+	canvas.setCaret(null);
+	assertNull("Caret should be null" , canvas.getCaret());
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Canvas((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_getCaret");
+	methodNames.addElement("test_scrollIIIIIIZ");
+	methodNames.addElement("test_setCaretLorg_eclipse_swt_widgets_Caret");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_getCaret")) test_getCaret();
+	else if (getName().equals("test_scrollIIIIIIZ")) test_scrollIIIIIIZ();
+	else if (getName().equals("test_setCaretLorg_eclipse_swt_widgets_Caret")) test_setCaretLorg_eclipse_swt_widgets_Caret();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Caret.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Caret.java
new file mode 100644
index 0000000000..ef8cbc203c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Caret.java
@@ -0,0 +1,208 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Caret
+ *
+ * @see org.eclipse.swt.widgets.Caret
+ */
+public class Test_org_eclipse_swt_widgets_Caret extends Test_org_eclipse_swt_widgets_Widget {
+
+Canvas canvas;
+Caret caret;
+
+public Test_org_eclipse_swt_widgets_Caret(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	canvas = new Canvas(shell, SWT.NULL);
+	caret = new Caret(canvas, SWT.NULL);
+	setWidget(caret);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CanvasI() {
+	Caret newCaret;
+	try {
+		newCaret = new Caret(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getBounds() {
+	Rectangle rect = new Rectangle(0,0,30,30);
+	caret.setBounds(rect);
+	assertTrue(caret.getBounds().equals(rect));
+
+	rect = new Rectangle(0,0,30,30);
+	caret.setBounds(rect);
+	assertTrue(!caret.getBounds().equals(new Rectangle (0,0,60,70)));
+}
+
+public void test_getFont() {
+	// tested in test_setFontLorg_eclipse_swt_graphics_Font
+}
+
+public void test_getImage() {
+	// tested in test_setImageLorg_eclipse_swt_graphics_Image
+}
+
+public void test_getParent() {
+	assertEquals(canvas, caret.getParent());
+
+	assertTrue(caret.getDisplay()==shell.getDisplay());
+}
+
+public void test_getVisible() {
+	// tested in test_setVisibleZ
+}
+
+public void test_isVisible() {
+	caret.setVisible(true);
+	assertTrue(!caret.isVisible()); //because the shell is not visible
+
+	caret.setVisible(false);
+	assertTrue(!caret.isVisible());
+
+	caret.setVisible(true);
+	canvas.setVisible(true);
+	shell.setVisible(true);
+	assertTrue(caret.getVisible() == true);
+	canvas.setVisible(false);
+	if (fCheckVisibility) {
+		assertTrue(!caret.getVisible());
+	}
+
+	shell.setVisible(false);
+	canvas.setVisible(false);
+	caret.setVisible(false);
+	assertTrue(!caret.getVisible());
+}
+
+public void test_setBoundsIIII() {
+	caret.setBounds(0, 0, 30, 30);
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	caret.setBounds(new Rectangle(0,0,30,30));
+
+	try {
+		caret.setBounds(null);
+		fail("No exception thrown for bounds == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	Font font = caret.getFont();
+	caret.setFont(font);
+	assertEquals(font, caret.getFont());
+	
+	font = new Font(caret.getDisplay(), SwtJunit.testFontName, 10, SWT.NORMAL);
+	caret.setFont(font);
+	assertEquals(font, caret.getFont());
+
+	caret.setFont(null);
+	font.dispose();
+	try {
+		caret.setFont(font);
+		caret.setFont(null);
+		fail("No exception thrown for disposed font");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	Image image = caret.getImage();
+	caret.setImage(image);
+	assertEquals(image, caret.getImage());
+
+	caret.setImage(null);
+	assertNull(caret.getImage());
+
+	image = new Image(shell.getDisplay(), 10, 10);
+	caret.setImage(image);
+	assertEquals(image, caret.getImage());
+
+	caret.setImage(null);
+	image.dispose();
+	try {
+		caret.setImage(image);
+		caret.setImage(null);
+		fail("No exception thrown for disposed image");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setVisibleZ() {
+	caret.setVisible(true);
+	assertTrue("Caret should be visible", caret.getVisible()==true);
+
+	caret.setVisible(false);
+	assertTrue("Caret should not be visible", caret.getVisible()==false);
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Caret((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CanvasI");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getFont");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getVisible");
+	methodNames.addElement("test_isVisible");
+	methodNames.addElement("test_setBoundsIIII");
+	methodNames.addElement("test_setBoundsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CanvasI")) test_ConstructorLorg_eclipse_swt_widgets_CanvasI();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getFont")) test_getFont();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getVisible")) test_getVisible();
+	else if (getName().equals("test_isVisible")) test_isVisible();
+	else if (getName().equals("test_setBoundsIIII")) test_setBoundsIIII();
+	else if (getName().equals("test_setBoundsLorg_eclipse_swt_graphics_Rectangle")) test_setBoundsLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ColorDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ColorDialog.java
new file mode 100644
index 0000000000..095187b219
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ColorDialog.java
@@ -0,0 +1,116 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ColorDialog
+ *
+ * @see org.eclipse.swt.widgets.ColorDialog
+ */
+public class Test_org_eclipse_swt_widgets_ColorDialog extends Test_org_eclipse_swt_widgets_Dialog {
+
+ColorDialog colorDialog;
+
+public Test_org_eclipse_swt_widgets_ColorDialog(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	colorDialog = new ColorDialog(shell, SWT.NULL);
+	setDialog(colorDialog);
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	new ColorDialog(shell);
+	
+	try {
+		new ColorDialog(null);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	new ColorDialog(shell, SWT.NULL);
+	
+	try {
+		new ColorDialog(null, SWT.NULL);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getRGB() {
+	// tested in test_setRGBLorg_eclipse_swt_graphics_RGB
+}
+
+public void test_open() {
+	warnUnimpl("Test test_open not written");
+}
+
+public void test_setRGBLorg_eclipse_swt_graphics_RGB() {
+	RGB rgb = new RGB(0, 0, 0);
+
+	assertTrue(":a:", colorDialog.getRGB() == null);	
+		
+	colorDialog.setRGB(rgb);
+	assertTrue(":b:", colorDialog.getRGB() == rgb);
+
+	if (fCheckSwtNullExceptions) {
+		try {
+			colorDialog.setRGB(null);
+			fail("No exception thrown for rgb == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+	assertTrue(":c:", colorDialog.getRGB() == rgb);	
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_ColorDialog((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getRGB");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_setRGBLorg_eclipse_swt_graphics_RGB");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getRGB")) test_getRGB();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_setRGBLorg_eclipse_swt_graphics_RGB")) test_setRGBLorg_eclipse_swt_graphics_RGB();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java
new file mode 100644
index 0000000000..5a0f6be0a0
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Combo.java
@@ -0,0 +1,679 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Combo
+ *
+ * @see org.eclipse.swt.widgets.Combo
+ */
+public class Test_org_eclipse_swt_widgets_Combo extends Test_org_eclipse_swt_widgets_Composite {
+
+Combo combo;
+
+public Test_org_eclipse_swt_widgets_Combo(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	combo = new Combo(shell, 0);
+	setWidget(combo);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	try {
+		combo = new Combo(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {SWT.DROP_DOWN, SWT.SIMPLE};
+	for (int i = 0; i < cases.length; i++) {
+		combo = new Combo(shell, cases[i]);
+		assertTrue(":a:" + String.valueOf(i), combo.getStyle() == cases[i]);
+	}
+}
+
+public void test_addLjava_lang_String() {
+	try {
+		combo.add(null);
+		fail("No exception thrown for item == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	combo.add("");
+	assertEquals(":a:", new String[]{""}, combo.getItems());
+	combo.add("");
+	assertEquals(":b:", new String[]{"", ""}, combo.getItems());
+	combo.add("fred");
+	assertEquals(":c:", new String[]{"", "", "fred"}, combo.getItems());
+
+}
+
+public void test_addLjava_lang_StringI() {
+	combo.add("fred", 0);
+	assertEquals("fred", new String[]{"fred"}, combo.getItems());
+	combo.add("fred", 0);
+	assertEquals("fred fred", new String[]{"fred", "fred"}, combo.getItems());
+	combo.add("fred");
+	assertEquals("fred fred fred", new String[]{"fred", "fred", "fred"}, combo.getItems());
+	combo.removeAll();
+	
+	int number = 3;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.add("fred", number);
+	assertEquals("fred0 fred1 fred2 fred", new String[]{"fred0", "fred1", "fred2", "fred"}, combo.getItems());
+
+	combo.removeAll();
+	number = 3;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.add("fred", 1);
+	assertEquals("fred0 fred fred1 fred2", new String[]{"fred0", "fred", "fred1", "fred2"}, combo.getItems());
+	combo.add("fred", 0);
+	assertEquals("fred fred0 fred fred1 fred2", new String[]{"fred", "fred0", "fred", "fred1", "fred2"}, combo.getItems());
+	combo.add("fred", 4);
+	assertEquals("fred fred0 fred fred1 fred fred2", new String[]{"fred", "fred0", "fred", "fred1", "fred", "fred2"}, combo.getItems());
+}
+
+public void test_addModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_addModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_clearSelection() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.clearSelection();
+	assertTrue(":a:", combo.getSelection().equals(new Point(0, 0)));
+	combo.setSelection(new Point(0, 5));
+	assertTrue(":b:", combo.getSelection().equals(new Point(0, 0)));  //nothing is selected
+	combo.setText("some text");
+	combo.setSelection(new Point(0, 5));
+	assertTrue(":c:", combo.getSelection().equals(new Point(0, 5)));
+	combo.clearSelection();
+	assertTrue(":d:", combo.getSelection().x==combo.getSelection().y);
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_deselectI() {
+	combo.deselect(2);
+
+	int number = 10;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	for (int i = 0; i < number; i++) {
+		combo.select(i);
+		assertTrue(":a:" + i, combo.getSelectionIndex()==i);
+		combo.deselect(i);
+		assertTrue(":b:" + i, combo.getSelectionIndex()==-1);
+	}
+}
+
+public void test_deselectAll() {
+	warnUnimpl("Test test_deselectAll not written");
+}
+
+public void test_getChildren() {
+	// Combo cannot have children
+}
+
+public void test_getItemI() {
+	try {
+		combo.getItem(0);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int number = 10;
+	for (int i = 0; i < number; i++) {
+		combo.add("fred" + i);
+	}
+	for (int i = 0; i < number; i++)
+		assertTrue(combo.getItem(i).equals("fred" + i));
+}
+
+public void test_getItemCount() {
+	int number = 10;
+	for (int i = 0; i < number; i++) {
+		assertTrue(":a:" + i, combo.getItemCount() == i);
+		combo.add("fred" + i);
+	}
+	assertTrue(":aa:", combo.getItemCount() == number);
+
+	for (int i = 0; i < number; i++) {
+		assertTrue(":b:" + i, combo.getItemCount() == number-i);
+		combo.remove(0);
+	}
+	combo.removeAll();
+	assertTrue(":c:", combo.getItemCount() == 0);
+}
+
+public void test_getItemHeight() {
+	combo.getItemHeight();
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionIndex() {
+	int number = 5;
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	assertEquals(-1, combo.getSelectionIndex());
+	for (int i = 0; i < number; i++) {
+		combo.select(i);
+		assertEquals(i, combo.getSelectionIndex());
+	}
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	assertEquals(-1, combo.getSelectionIndex());
+	for (int i = 0; i < number; i++) {
+		combo.select(i);
+		combo.deselect(i);
+		assertEquals(-1, combo.getSelectionIndex());
+	}
+}
+
+public void test_getText() {
+	String[] cases = {"", "fred", "fredfred"};
+	for (int i = 0; i < cases.length; i++) {
+		combo.setText(cases[i]);
+		assertTrue(":a:" + String.valueOf(i), cases[i].equals(combo.getText()));
+	}
+}
+
+public void test_getTextHeight() {
+	combo.getTextHeight();
+}
+
+public void test_getTextLimit() {
+	warnUnimpl("Test test_getTextLimit not written");
+}
+
+public void test_hasFocus() {
+	warnUnimpl("Test test_hasFocus not written");
+}
+
+public void test_indexOfLjava_lang_String() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	for (int i = 0; i < number; i++)
+		assertEquals(i, combo.indexOf("fred" + i));
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.removeAll();
+	for (int i = 0; i < number; i++)
+		assertEquals(-1, combo.indexOf("fred" + i));
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.remove("fred3");
+	for (int i = 0; i < 3; i++)
+		assertEquals(i, combo.indexOf("fred" + i));
+	assertEquals(-1, combo.indexOf("fred3"));
+	for (int i = 4; i < number; i++)
+		assertEquals(i - 1, combo.indexOf("fred" + i));
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.remove(2);
+	for (int i = 0; i < 2; i++)
+		assertEquals(i, combo.indexOf("fred" + i));
+	assertEquals(-1, combo.indexOf("fred2"));
+	for (int i = 3; i < number; i++)
+		assertEquals(i - 1, combo.indexOf("fred" + i));
+}
+
+public void test_indexOfLjava_lang_StringI() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	for (int i = 0; i < number; i++)
+		assertTrue(":a:" + i, combo.indexOf("fred" + i, 0) == i);
+	for (int i = 0; i < number; i++)
+		assertTrue(":b:" + i, combo.indexOf("fred" + i, i + 1) == -1);
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	for (int i = 0; i < 3; i++)
+		assertTrue(":a:" + i, combo.indexOf("fred" + i, 0) == i);
+	for (int i = 3; i < number; i++)
+		assertTrue(":b:" + i, combo.indexOf("fred" + i, 3) == i);
+	for (int i = 0; i < number; i++)
+		assertTrue(":b:" + i, combo.indexOf("fred" + i, i) == i);
+}
+
+public void test_removeI() {
+	try {
+		combo.remove(0);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		combo.remove(3);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int number = 5;
+	for (int i = 0; i < number; i++) {
+		combo.add("fred" + i);
+	}
+	for (int i = 0; i < number; i++) {
+		assertEquals("Wrong number of items", number - i, combo.getItemCount());
+		combo.remove(0);
+	}
+
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");  // all items the same
+	}
+	for (int i = 0; i < number; i++) {
+		assertEquals("Wrong number of items", number - i, combo.getItemCount());
+		combo.remove(0);
+	}
+
+	for (int i = 0; i < number; i++) {
+		combo.add("fred" + i); // different items
+	}
+	for (int i = 0; i < number; i++) {
+		assertEquals("index " + i, number - i, combo.getItemCount());
+		combo.select(0);
+		assertEquals("index " + i, 0, combo.getSelectionIndex());
+		combo.remove(0);
+		if (SwtJunit.isWindows) {
+			// The behavior on Windows when the selected item is removed
+			// is to simply say that no items are selected.
+			assertEquals("index " + i, -1, combo.getSelectionIndex());
+		} else {
+			// The behavior on other platforms when the selected item is removed
+			// is to select the item that is now at the same index, and send a
+			// selection event. If there is no item at the selected index, then
+			// the platform says that no items are selected.
+			if (i < number - 1) {
+				assertEquals("index " + i, 0, combo.getSelectionIndex());
+			} else {
+				assertEquals("index " + i, -1, combo.getSelectionIndex());
+			}
+		}
+	}
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i); // different items
+	for (int i = 0; i < number; i++) {
+		assertEquals("index " + i, number - i, combo.getItemCount());
+		combo.remove(number-i-1);
+	}
+}
+
+public void test_removeII() {
+	int number = 5;
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	combo.remove(0, 4);
+	assertEquals(0, combo.getItemCount());
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	combo.remove(0, 2);
+	assertEquals(2, combo.getItemCount());
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	combo.remove(2, 4);
+	assertEquals(2, combo.getItemCount());
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+	combo.remove(3, 2);
+	assertEquals(number, combo.getItemCount());
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++) {
+		combo.add("fred");
+	}
+
+	try {
+		combo.remove(2, 100);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_removeLjava_lang_String() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	for (int i = 0; i < number; i++) {
+		assertEquals(number - i, combo.getItemCount());
+		combo.remove("fred" + i);
+	}
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred");
+	for (int i = 0; i < number; i++) {
+		assertEquals(number - i, combo.getItemCount());
+		combo.remove("fred");
+	}
+
+	for (int i = 0; i < number; i++)
+		combo.add("fred");
+	try {
+		combo.remove(null);
+		fail("No exception thrown for item == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	combo.removeAll();
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	try {	
+		combo.remove("fred");
+		fail("No exception thrown for item not found");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	assertEquals(number, combo.getItemCount());
+}
+
+public void test_removeAll() {
+	warnUnimpl("Test test_removeAll not written");
+}
+
+public void test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_selectI() {
+	warnUnimpl("Test test_selectI not written");
+}
+
+public void test_setBoundsIIII() {
+	combo.setBounds(10, 20, 30, 40);
+	// only check x, y, and width - you can't set the height of a combo
+	assertTrue(combo.getBounds().x == 10);
+	assertTrue(combo.getBounds().y == 20);
+	assertTrue(combo.getBounds().width == 30);
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	combo.setBounds(new Rectangle(10, 20, 30, 40));
+	// only check x, y, and width - you can't set the height of a combo
+	assertTrue(combo.getBounds().x == 10);
+	assertTrue(combo.getBounds().y == 20);
+	assertTrue(combo.getBounds().width == 30);
+}
+
+public void test_setItemILjava_lang_String() {
+	try {
+		combo.setItem(0, null);
+		fail("No exception thrown for item == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		combo.setItem(3, null);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		combo.setItem(0, "fred");
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	combo.add("joe");
+	combo.setItem(0, "fred");	
+	assertTrue("fred", combo.getItem(0).equals("fred"));
+
+	try {
+		combo.setItem(4, "fred");
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	combo.removeAll();
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred");
+	for (int i = 0; i < number; i++)
+		combo.setItem(i, "fred" + i);
+	assertEquals(":a:", new String[]{"fred0", "fred1", "fred2", "fred3", "fred4"}, combo.getItems());
+}
+
+public void test_setItems$Ljava_lang_String() {
+	try {
+		combo.setItems(null);
+		fail("No exception thrown for items == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	String[][] items = {{}, {""}, {"", ""}, {"fred"}, {"fred0", "fred0"}, {"fred", "fred"}};
+
+	for (int i = 0 ; i< items.length; i++){
+		combo.setItems(items[i]);
+		assertEquals(":a:" + i, items[i], combo.getItems());}
+}
+
+public void test_setSelectionLorg_eclipse_swt_graphics_Point() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		combo.add("fred" + i);
+	combo.setSelection(new Point(0, 5));
+	assertTrue(":a:", combo.getSelection().equals(new Point(0, 0)));
+	combo.setText("some text");
+	combo.setSelection(new Point(0, 5));
+	assertTrue(":b:", combo.getSelection().equals(new Point(0, 5)));
+}
+
+public void test_setSizeII() {
+	combo.setSize(30, 40);
+	// only check the width - you can't set the height of a combo
+	assertTrue(combo.getSize().x == 30);
+
+	combo.setSize(32, 43);
+	// only check the width - you can't set the height of a combo
+	assertTrue(combo.getSize().x == 32);
+}
+
+public void test_setSizeLorg_eclipse_swt_graphics_Point() {
+	combo.setSize(new Point(30, 40));
+	// only check the width - you can't set the height of a combo
+	assertTrue(combo.getSize().x == 30);
+
+	combo.setBounds(32, 43, 33, 44);
+	// only check the width - you can't set the height of a combo
+	assertTrue(combo.getSize().x == 33);
+
+	combo.setBounds(32, 43, 30, 40);
+	combo.setLocation(11, 22);
+	combo.setSize(new Point(32, 43));
+	// only check the width - you can't set the height of a combo
+	assertTrue(combo.getSize().x == 32);
+}
+
+public void test_setTabGroupFocus() {
+	warnUnimpl("Test test_setTabGroupFocus not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	String[] cases = {"", "fred", "fred0"};
+	for (int i = 0; i < cases.length; i++) {
+		combo.setText(cases[i]);
+		assertTrue(":a:" + i, combo.getText().equals(cases[i]));
+	}
+	for (int i = 0; i < 5; i++) {
+		combo.add("fred");
+	}
+	for (int i = 0; i < cases.length; i++) {
+		combo.setText(cases[i]);
+		assertTrue(":b:" + i, combo.getText().equals(cases[i]));
+	}
+	for (int i = 0; i < 5; i++) {
+		combo.add("fred" + i);
+	}
+	for (int i = 0; i < cases.length; i++) {
+		combo.setText(cases[i]);
+		assertTrue(":c:" + i, combo.getText().equals(cases[i]));
+	}
+}
+
+public void test_setTextLimitI() {
+	warnUnimpl("Test test_setTextLimitI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Combo((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addLjava_lang_String");
+	methodNames.addElement("test_addLjava_lang_StringI");
+	methodNames.addElement("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_clearSelection");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_deselectI");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getTextHeight");
+	methodNames.addElement("test_getTextLimit");
+	methodNames.addElement("test_hasFocus");
+	methodNames.addElement("test_indexOfLjava_lang_String");
+	methodNames.addElement("test_indexOfLjava_lang_StringI");
+	methodNames.addElement("test_removeI");
+	methodNames.addElement("test_removeII");
+	methodNames.addElement("test_removeLjava_lang_String");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_selectI");
+	methodNames.addElement("test_setItemILjava_lang_String");
+	methodNames.addElement("test_setItems$Ljava_lang_String");
+	methodNames.addElement("test_setSelectionLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setTabGroupFocus");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setTextLimitI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addLjava_lang_String")) test_addLjava_lang_String();
+	else if (getName().equals("test_addLjava_lang_StringI")) test_addLjava_lang_StringI();
+	else if (getName().equals("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_addModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_clearSelection")) test_clearSelection();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_deselectI")) test_deselectI();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getTextHeight")) test_getTextHeight();
+	else if (getName().equals("test_getTextLimit")) test_getTextLimit();
+	else if (getName().equals("test_hasFocus")) test_hasFocus();
+	else if (getName().equals("test_indexOfLjava_lang_String")) test_indexOfLjava_lang_String();
+	else if (getName().equals("test_indexOfLjava_lang_StringI")) test_indexOfLjava_lang_StringI();
+	else if (getName().equals("test_removeI")) test_removeI();
+	else if (getName().equals("test_removeII")) test_removeII();
+	else if (getName().equals("test_removeLjava_lang_String")) test_removeLjava_lang_String();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_selectI")) test_selectI();
+	else if (getName().equals("test_setItemILjava_lang_String")) test_setItemILjava_lang_String();
+	else if (getName().equals("test_setItems$Ljava_lang_String")) test_setItems$Ljava_lang_String();
+	else if (getName().equals("test_setSelectionLorg_eclipse_swt_graphics_Point")) test_setSelectionLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setTabGroupFocus")) test_setTabGroupFocus();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setTextLimitI")) test_setTextLimitI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Composite.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Composite.java
new file mode 100644
index 0000000000..44b737a43a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Composite.java
@@ -0,0 +1,161 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.layout.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Composite
+ *
+ * @see org.eclipse.swt.widgets.Composite
+ */
+public class Test_org_eclipse_swt_widgets_Composite extends Test_org_eclipse_swt_widgets_Scrollable {
+
+Composite composite;
+
+public Test_org_eclipse_swt_widgets_Composite(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	composite = new Composite(shell, 0);
+	super.setWidget(composite);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+protected void setWidget(Widget w) {
+	if (composite != null)
+		composite.dispose();
+	composite = (Composite)w;
+	super.setWidget(w);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	try {
+		composite = new Composite(null, 0);
+		fail("No exception thrown");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {SWT.H_SCROLL, SWT.V_SCROLL, SWT.H_SCROLL | SWT.V_SCROLL};
+	for (int i = 0; i < cases.length; i++)
+		composite = new Composite(shell, cases[i]);
+}
+
+public void test_getChildren() {
+	assertEquals(":a:", new Control[]{}, composite.getChildren());
+	Composite c1 = new Composite(composite, 0);
+	assertEquals(":b:", new Control[]{c1}, composite.getChildren());
+
+	List c2 = new List(composite, 0);
+	assertEquals(":c:", new Control[]{c1, c2}, composite.getChildren());
+
+	Scale c3 = new Scale(composite, 0);
+	assertEquals(":c:", new Control[]{c1, c2, c3}, composite.getChildren());
+
+	c2.dispose();
+	assertEquals(":d:", new Control[]{c1, c3}, composite.getChildren());
+	
+	Control[] children = composite.getChildren();
+	for (int i = 0; i < children.length; i++)
+		children[i].dispose();
+
+	assertEquals(":e:", new Control[]{}, composite.getChildren());
+}
+
+public void test_getLayout() {
+	// tested in test_setLayoutLorg_eclipse_swt_widgets_Layout
+}
+
+public void test_getTabList() {
+	// tested in test_setTabList$Lorg_eclipse_swt_widgets_Control
+}
+
+public void test_layout() {
+	// tested in test_layoutZ
+}
+
+public void test_layoutZ() {
+	Layout[] layouts = {null, new FillLayout(), new RowLayout(), new GridLayout()};
+	for (int i = 0; i < layouts.length; i++) {
+		composite.setLayout(layouts[i]);
+		composite.layout(false);
+		composite.layout(true);
+		composite.layout();
+	}
+}
+
+public void test_setLayoutLorg_eclipse_swt_widgets_Layout() {
+	Layout[] layouts = {null, new FillLayout(), new RowLayout(), new GridLayout()};
+	for (int i = 0; i < layouts.length; i++) {
+		composite.setLayout(layouts[i]);
+		assertEquals(layouts[i], composite.getLayout());
+	}
+}
+
+public void test_setTabList$Lorg_eclipse_swt_widgets_Control() {
+	Button button1 = new Button(composite, SWT.PUSH);
+	Button button2 = new Button(composite, SWT.PUSH);
+	Control[] tablist = new Control[] {button1, button2};
+	composite.setTabList(tablist);
+	button1.dispose();
+	button2.dispose();
+	
+	try {
+		composite.setTabList(null);
+		fail("No exception thrown for tabList == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Composite((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_getChildren");
+	methodNames.addElement("test_getLayout");
+	methodNames.addElement("test_getTabList");
+	methodNames.addElement("test_layout");
+	methodNames.addElement("test_layoutZ");
+	methodNames.addElement("test_setLayoutLorg_eclipse_swt_widgets_Layout");
+	methodNames.addElement("test_setTabList$Lorg_eclipse_swt_widgets_Control");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Scrollable.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_getChildren")) test_getChildren();
+	else if (getName().equals("test_getLayout")) test_getLayout();
+	else if (getName().equals("test_getTabList")) test_getTabList();
+	else if (getName().equals("test_layout")) test_layout();
+	else if (getName().equals("test_layoutZ")) test_layoutZ();
+	else if (getName().equals("test_setLayoutLorg_eclipse_swt_widgets_Layout")) test_setLayoutLorg_eclipse_swt_widgets_Layout();
+	else if (getName().equals("test_setTabList$Lorg_eclipse_swt_widgets_Control")) test_setTabList$Lorg_eclipse_swt_widgets_Control();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java
new file mode 100644
index 0000000000..596bbd5667
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Control.java
@@ -0,0 +1,823 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.events.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Control
+ *
+ * @see org.eclipse.swt.widgets.Control
+ */
+public class Test_org_eclipse_swt_widgets_Control extends Test_org_eclipse_swt_widgets_Widget {
+
+	Control control;
+	boolean eventOccurred;
+
+public Test_org_eclipse_swt_widgets_Control(String name) {
+	super(name);
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+protected void setWidget(Widget w) {
+	control = (Control)w;
+	super.setWidget(w);
+}
+
+public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
+	ControlListener listener = new ControlListener() {
+		public void controlMoved(ControlEvent e) {
+			eventOccurred = true;
+		};
+		public void controlResized(ControlEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addControlListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.Move, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.Resize, new Event());
+	assertTrue(eventOccurred);
+	control.removeControlListener(listener);
+}
+
+public void test_addFocusListenerLorg_eclipse_swt_events_FocusListener() {
+	FocusListener listener = new FocusListener() {
+		public void focusGained(FocusEvent e) {
+			eventOccurred = true;
+		};
+		public void focusLost(FocusEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addFocusListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.FocusIn, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.FocusOut, new Event());
+	assertTrue(eventOccurred);
+	control.removeFocusListener(listener);
+}
+
+public void test_addHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	HelpListener listener = new HelpListener() {
+		public void helpRequested(HelpEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addHelpListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.Help, new Event());
+	assertTrue(eventOccurred);
+	control.removeHelpListener(listener);
+}
+
+public void test_addKeyListenerLorg_eclipse_swt_events_KeyListener() {
+	KeyListener listener = new KeyListener() {
+		public void keyPressed(KeyEvent e) {
+			eventOccurred = true;
+		};
+		public void keyReleased(KeyEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addKeyListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.KeyDown, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.KeyUp, new Event());
+	assertTrue(eventOccurred);
+	control.removeKeyListener(listener);
+}
+
+public void test_addMouseListenerLorg_eclipse_swt_events_MouseListener() {
+	MouseListener listener = new MouseListener() {
+		public void mouseDown(MouseEvent e) {
+			eventOccurred = true;
+		};
+		public void mouseUp(MouseEvent e) {
+			eventOccurred = true;
+		};
+		public void mouseDoubleClick(MouseEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addMouseListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseDown, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseUp, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseDoubleClick, new Event());
+	assertTrue(eventOccurred);
+	control.removeMouseListener(listener);
+}
+
+public void test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
+	MouseTrackListener listener = new MouseTrackListener() {
+		public void mouseEnter(MouseEvent e) {
+			eventOccurred = true;
+		};
+		public void mouseExit(MouseEvent e) {
+			eventOccurred = true;
+		};
+		public void mouseHover(MouseEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addMouseTrackListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseEnter, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseExit, new Event());
+	assertTrue(eventOccurred);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseHover, new Event());
+	assertTrue(eventOccurred);
+	control.removeMouseTrackListener(listener);
+}
+
+public void test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
+	MouseMoveListener listener = new MouseMoveListener() {
+		public void mouseMove(MouseEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addMouseMoveListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.MouseMove, new Event());
+	assertTrue(eventOccurred);
+	control.removeMouseMoveListener(listener);
+}
+
+public void test_addPaintListenerLorg_eclipse_swt_events_PaintListener() {
+	PaintListener listener = new PaintListener() {
+		public void paintControl(PaintEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addPaintListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.Paint, new Event());
+	assertTrue(eventOccurred);
+	control.removePaintListener(listener);
+}
+
+public void test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
+	TraverseListener listener = new TraverseListener() {
+		public void keyTraversed(TraverseEvent e) {
+			eventOccurred = true;
+		};
+	};
+	control.addTraverseListener(listener);
+	eventOccurred = false;
+	control.notifyListeners(SWT.Traverse, new Event());
+	assertTrue(eventOccurred);
+	control.removeTraverseListener(listener);
+}
+
+public void test_computeSizeII() {
+	control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+	Point size = control.getSize();
+	control.computeSize(size.x, size.y);
+	assertEquals(size.x, control.getSize().x);
+	assertEquals(size.y, control.getSize().y);
+}
+
+public void test_computeSizeIIZ() {
+	control.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
+	Point size = control.getSize();
+	control.computeSize(size.x, size.y, false);
+	assertEquals(size.x, control.getSize().x);
+	assertEquals(size.y, control.getSize().y);
+}
+
+public void test_forceFocus() {
+	// this is difficult to test in Control.
+	// subclasses that wish to test this should override.
+}
+
+public void test_getBackground() {
+	// tested in test_setBackgroundLorg_eclipse_swt_graphics_Color
+}
+
+public void test_getBorderWidth() {
+	control.getBorderWidth();
+}
+
+public void test_getBounds() {
+	// tested in test_setBoundsIIII and test_setBoundsLorg_eclipse_swt_graphics_Rectangle
+}
+
+public void test_getDisplay() {
+	assertEquals(control.getDisplay(), control.getShell().getDisplay());
+}
+
+public void test_getEnabled() {
+	// tested in test_setEnabledZ
+}
+
+public void test_getFont() {
+	// tested in test_setFontLorg_eclipse_swt_graphics_Font
+}
+
+public void test_getForeground() {
+	// tested in test_setForegroundLorg_eclipse_swt_graphics_Color
+}
+
+public void test_getLayoutData() {
+	// tested in test_setLayoutDataLjava_lang_Object
+}
+
+public void test_getLocation() {
+	control.setBounds(32, 43, 30, 40);
+	assertTrue(control.getLocation().equals(new Point(32, 43)));
+}
+
+public void test_getMenu() {
+	// tested in test_setMenuLorg_eclipse_swt_widgets_Menu
+}
+
+public void test_getParent() {
+	assertEquals(shell, control.getParent());
+}
+
+public void test_getShell() {
+	assertEquals(shell, control.getShell());
+}
+
+public void test_getSize() {
+	// tested in test_setSizeII
+}
+
+public void test_getToolTipText() {
+	// tested in test_setToolTipTextLjava_lang_String
+}
+
+public void test_getVisible() {
+	// tested in test_setVisibleZ
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	GCData data = new GCData();
+	int hDC = control.internal_new_GC(data);
+	control.internal_dispose_GC(hDC, data);
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	// tested in test_internal_new_GCLorg_eclipse_swt_graphics_GCData
+}
+
+public void test_isDisposed() {
+	assertTrue(!control.isDisposed());
+}
+
+public void test_isEnabled() {
+	control.setEnabled(true);
+	assertTrue(control.isEnabled());
+
+	control.setEnabled(false);
+	assertTrue(!control.isEnabled());
+}
+
+public void test_isFocusControl() {
+	assertTrue(!control.isFocusControl());
+}
+
+public void test_isReparentable() {
+	if (SwtJunit.isWindows) {
+		assertTrue(control.isReparentable());
+	} else {
+		assertTrue(!control.isReparentable());
+	}
+}
+
+public void test_isVisible() {
+	control.setVisible(true);
+	assertTrue(!control.isVisible());  //because the shell is not visible
+
+	control.setVisible(false);
+	assertTrue(!control.isVisible());
+
+	if (!SwtJunit.isAIX) {
+		control.setVisible(true);
+		shell.setVisible(true);
+		assertTrue("Window should be visible", control.isVisible());
+		shell.setVisible(false);
+		assertTrue("Window should not be visible", !control.isVisible());
+	}
+}
+
+public void test_moveAboveLorg_eclipse_swt_widgets_Control() {
+	control.moveAbove(null);
+
+	control.moveAbove(control);
+
+	Button b = new Button(shell, 0);
+	control.moveAbove(b);
+	b.dispose();
+}
+
+public void test_moveBelowLorg_eclipse_swt_widgets_Control() {
+	control.moveBelow(null);
+
+	control.moveBelow(control);
+
+	Button b = new Button(shell, 0);
+	control.moveBelow(b);
+	b.dispose();
+}
+
+public void test_pack() {
+	control.pack();
+}
+
+public void test_packZ() {
+	control.pack(true);
+	control.pack(false);
+}
+
+public void test_redraw() {
+	control.redraw();
+}
+
+public void test_redrawIIIIZ() {
+	control.redraw(0, 0, 0, 0, false);
+
+	control.redraw(0, 0, 0, 0, true);
+
+	control.redraw(-10, -10, -10, -10, true);
+
+	control.redraw(10, 10, 10, 10, true);
+
+	control.redraw(10, 10, 10, 10, false);
+
+	control.redraw(10000, 10000, 10000, 10000, false);
+}
+
+public void test_removeControlListenerLorg_eclipse_swt_events_ControlListener() {
+	// tested in test_addControlListenerLorg_eclipse_swt_events_ControlListener
+}
+
+public void test_removeFocusListenerLorg_eclipse_swt_events_FocusListener() {
+	// tested in test_addFocusListenerLorg_eclipse_swt_events_FocusListener
+}
+
+public void test_removeHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	// tested in test_addHelpListenerLorg_eclipse_swt_events_HelpListener
+}
+
+public void test_removeKeyListenerLorg_eclipse_swt_events_KeyListener() {
+	// tested in test_addKeyListenerLorg_eclipse_swt_events_KeyListener
+}
+
+public void test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
+	// tested in test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener
+}
+
+public void test_removeMouseListenerLorg_eclipse_swt_events_MouseListener() {
+	// tested in test_addMouseListenerLorg_eclipse_swt_events_MouseListener
+}
+
+public void test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
+	// tested in test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener
+}
+
+public void test_removePaintListenerLorg_eclipse_swt_events_PaintListener() {
+	// tested in test_addPaintListenerLorg_eclipse_swt_events_PaintListener
+}
+
+public void test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
+	// tested in test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener
+}
+
+public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
+	Color color = new Color(control.getDisplay(), 255, 0, 0);
+	control.setBackground(color);
+	assertEquals(color, control.getBackground());
+	control.setBackground(null);
+	assertTrue(!control.getBackground().equals(color));
+	color.dispose();
+}
+
+public void test_setBoundsIIII() {
+	control.setBounds(10, 20, 30, 40);
+	assertEquals(new Rectangle(10, 20, 30, 40), control.getBounds());
+
+	control.setBounds(20, 30, 40, 50);
+	assertEquals(false, control.getBounds().equals(new Rectangle(10, 20, 30, 40)));
+
+	control.setBounds(10, 20, 30, 40);
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	control.setBounds(new Rectangle(10, 20, 30, 40));
+	assertEquals(new Rectangle(10, 20, 30, 40), control.getBounds());
+
+	control.setBounds(new Rectangle(20, 30, 40, 50));
+	assertEquals(false, control.getBounds().equals(new Rectangle(10, 20, 30, 40)));
+
+	try {
+		control.setBounds(null);
+		fail("No exception thrown for rectangle == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	control.setBounds(new Rectangle(10, 20, 30, 40));
+}
+
+public void test_setCaptureZ() {
+	control.setCapture(true);
+
+	control.setCapture(false);
+}
+
+public void test_setCursorLorg_eclipse_swt_graphics_Cursor() {
+	control.setCursor(null);
+
+	Cursor c = new Cursor(control.getDisplay(), 0);
+	control.setCursor(c);
+	c.dispose();
+}
+
+public void test_setEnabledZ() {
+	control.setEnabled(true);
+	assertTrue(control.getEnabled());
+
+	control.setEnabled(false);
+	assertTrue(!control.getEnabled());
+}
+
+public void test_setFocus() {
+	control.setFocus();
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	Font font = control.getFont();
+	control.setFont(font);
+	assertEquals(font, control.getFont());
+	
+	font = new Font(control.getDisplay(), SwtJunit.testFontName, 10, SWT.NORMAL);
+	control.setFont(font);
+	assertEquals(font, control.getFont());
+
+	control.setFont(null);
+	font.dispose();
+	try {
+		control.setFont(font);
+		control.setFont(null);
+		fail("No exception thrown for disposed font");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
+	Color color = new Color(control.getDisplay(), 255, 0, 0);
+	control.setForeground(color);
+	assertEquals(color, control.getForeground());
+	control.setForeground(null);
+	assertTrue(!control.getForeground().equals(color));
+	color.dispose();
+}
+
+public void test_setLayoutDataLjava_lang_Object() {
+	control.setLayoutData(this);
+	assertEquals(this, control.getLayoutData());
+
+	control.setLayoutData("asldsahdahcaslcshdac");
+	assertEquals("asldsahdahcaslcshdac", control.getLayoutData());
+
+	control.setLayoutData(this.getClass());
+	assertEquals(this.getClass(), control.getLayoutData());
+
+	control.setLayoutData(null);
+	assertNull(control.getLayoutData());
+}
+
+public void test_setLocationII() {
+	control.setBounds(32, 43, 30, 40);
+	control.setLocation(11, 22);
+	control.setSize(32, 43);
+	assertEquals(control.getLocation(), new Point(11, 22));
+
+	control.setLocation(10, 10);
+	assertEquals(control.getLocation(), new Point(10, 10));
+}
+
+public void test_setLocationLorg_eclipse_swt_graphics_Point() {
+	try {
+		control.setLocation(null);
+		fail("No exception thrown for location == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	Point loc = new Point(30, 40);
+	control.setLocation(loc);
+	assertEquals(control.getLocation(), loc);
+
+	loc = new Point(10, 10);
+	control.setLocation(loc);
+	assertEquals(control.getLocation(), loc);
+
+	loc = new Point(10000, 10000);
+	control.setLocation(loc);
+	assertEquals(control.getLocation(), loc);
+
+	loc = new Point(-10, -10);
+	control.setLocation(loc);
+	assertEquals(control.getLocation(), loc);
+}
+
+public void test_setMenuLorg_eclipse_swt_widgets_Menu () {
+	/* this is a valid thing to do, you can reset a menu to nothing */
+	control.setMenu(null);
+
+	Menu m = new Menu(control);
+	control.setMenu(m);
+	assertEquals(m, control.getMenu());
+}
+
+public void test_setRedrawZ() {
+	control.setRedraw(false);
+
+	control.setRedraw(true);
+}
+
+public void test_setSizeII() {
+	control.setBounds(32, 43, 30, 40);
+	assertEquals(new Point(30, 40), control.getSize());
+
+	control.setBounds(32, 43, 30, 40);
+	control.setLocation(11, 22);
+	control.setSize(32, 43);
+	assertEquals(new Point(32, 43), control.getSize());
+
+	control.setSize(0, 0);
+	
+	control.setSize(10, 10);
+
+	control.setSize(10000, 10000);
+
+	control.setSize(-10, -10);
+}
+
+public void test_setSizeLorg_eclipse_swt_graphics_Point() {
+	control.setSize(new Point(30, 40));
+	assertEquals(new Point(30, 40), control.getSize());
+
+	try {
+		control.setSize(null);
+		fail("No exception thrown for size == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	control.setSize(new Point(0, 0));
+	
+	control.setSize(new Point(10, 10));
+
+	control.setSize(new Point(10000, 10000));
+
+	control.setSize(new Point(-10, -10));
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	control.setToolTipText("This is a tip");
+	assertEquals("This is a tip", control.getToolTipText());
+
+	control.setToolTipText(null);
+	assertNull(control.getToolTipText());
+}
+
+public void test_setVisibleZ() {
+	control.setVisible(true);
+	assertTrue(control.getVisible());
+
+	control.setVisible(false);
+	assertTrue(!control.getVisible());
+}
+
+public void test_toControlLorg_eclipse_swt_graphics_Point() {
+	Point controlCoords = control.toControl(new Point(0, 0));
+	assertEquals(new Point(0, 0), control.toDisplay(controlCoords));
+	try {
+		control.toControl(null);
+		fail("No exception thrown for size == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_toDisplayLorg_eclipse_swt_graphics_Point() {
+	Point displayCoords = control.toDisplay(new Point(0, 0));
+	assertEquals(new Point(0, 0), control.toControl(displayCoords));
+	try {
+		control.toDisplay(null);
+		fail("No exception thrown for size == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_traverseI() {
+	control.traverse(SWT.TRAVERSE_ESCAPE);
+	control.traverse(SWT.TRAVERSE_RETURN);
+	control.traverse(SWT.TRAVERSE_TAB_NEXT);
+	control.traverse(SWT.TRAVERSE_TAB_PREVIOUS);
+	control.traverse(SWT.TRAVERSE_ARROW_NEXT);
+	control.traverse(SWT.TRAVERSE_ARROW_PREVIOUS);
+}
+
+public void test_update() {
+	control.update();
+}
+
+public void test_setParentLorg_eclipse_swt_widgets_Composite() {
+	if (control.isReparentable()) {
+		Shell originalParent = new Shell();
+		Shell newParent = new Shell();
+		Button b = new Button(originalParent, SWT.PUSH);
+		b.setParent(newParent);
+		originalParent.dispose();
+		assertTrue(!b.isDisposed());
+		newParent.dispose();
+	}
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_addControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_addFocusListenerLorg_eclipse_swt_events_FocusListener");
+	methodNames.addElement("test_addHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_addKeyListenerLorg_eclipse_swt_events_KeyListener");
+	methodNames.addElement("test_addMouseListenerLorg_eclipse_swt_events_MouseListener");
+	methodNames.addElement("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener");
+	methodNames.addElement("test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener");
+	methodNames.addElement("test_addPaintListenerLorg_eclipse_swt_events_PaintListener");
+	methodNames.addElement("test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener");
+	methodNames.addElement("test_computeSizeII");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_forceFocus");
+	methodNames.addElement("test_getBackground");
+	methodNames.addElement("test_getBorderWidth");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getFont");
+	methodNames.addElement("test_getForeground");
+	methodNames.addElement("test_getLayoutData");
+	methodNames.addElement("test_getLocation");
+	methodNames.addElement("test_getMenu");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getShell");
+	methodNames.addElement("test_getSize");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_getVisible");
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_isFocusControl");
+	methodNames.addElement("test_isReparentable");
+	methodNames.addElement("test_isVisible");
+	methodNames.addElement("test_moveAboveLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_moveBelowLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_pack");
+	methodNames.addElement("test_packZ");
+	methodNames.addElement("test_redraw");
+	methodNames.addElement("test_redrawIIIIZ");
+	methodNames.addElement("test_removeControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_removeFocusListenerLorg_eclipse_swt_events_FocusListener");
+	methodNames.addElement("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_removeKeyListenerLorg_eclipse_swt_events_KeyListener");
+	methodNames.addElement("test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener");
+	methodNames.addElement("test_removeMouseListenerLorg_eclipse_swt_events_MouseListener");
+	methodNames.addElement("test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener");
+	methodNames.addElement("test_removePaintListenerLorg_eclipse_swt_events_PaintListener");
+	methodNames.addElement("test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener");
+	methodNames.addElement("test_setBackgroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setBoundsIIII");
+	methodNames.addElement("test_setBoundsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_setCaptureZ");
+	methodNames.addElement("test_setCursorLorg_eclipse_swt_graphics_Cursor");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setForegroundLorg_eclipse_swt_graphics_Color");
+	methodNames.addElement("test_setLayoutDataLjava_lang_Object");
+	methodNames.addElement("test_setLocationII");
+	methodNames.addElement("test_setLocationLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setMenuLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_setRedrawZ");
+	methodNames.addElement("test_setSizeII");
+	methodNames.addElement("test_setSizeLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addElement("test_toControlLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_toDisplayLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_traverseI");
+	methodNames.addElement("test_update");
+	methodNames.addElement("test_setParentLorg_eclipse_swt_widgets_Composite");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_addControlListenerLorg_eclipse_swt_events_ControlListener")) test_addControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_addFocusListenerLorg_eclipse_swt_events_FocusListener")) test_addFocusListenerLorg_eclipse_swt_events_FocusListener();
+	else if (getName().equals("test_addHelpListenerLorg_eclipse_swt_events_HelpListener")) test_addHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_addKeyListenerLorg_eclipse_swt_events_KeyListener")) test_addKeyListenerLorg_eclipse_swt_events_KeyListener();
+	else if (getName().equals("test_addMouseListenerLorg_eclipse_swt_events_MouseListener")) test_addMouseListenerLorg_eclipse_swt_events_MouseListener();
+	else if (getName().equals("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener")) test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener();
+	else if (getName().equals("test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener")) test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener();
+	else if (getName().equals("test_addPaintListenerLorg_eclipse_swt_events_PaintListener")) test_addPaintListenerLorg_eclipse_swt_events_PaintListener();
+	else if (getName().equals("test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener")) test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener();
+	else if (getName().equals("test_computeSizeII")) test_computeSizeII();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_forceFocus")) test_forceFocus();
+	else if (getName().equals("test_getBackground")) test_getBackground();
+	else if (getName().equals("test_getBorderWidth")) test_getBorderWidth();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getFont")) test_getFont();
+	else if (getName().equals("test_getForeground")) test_getForeground();
+	else if (getName().equals("test_getLayoutData")) test_getLayoutData();
+	else if (getName().equals("test_getLocation")) test_getLocation();
+	else if (getName().equals("test_getMenu")) test_getMenu();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getShell")) test_getShell();
+	else if (getName().equals("test_getSize")) test_getSize();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_getVisible")) test_getVisible();
+	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_isFocusControl")) test_isFocusControl();
+	else if (getName().equals("test_isReparentable")) test_isReparentable();
+	else if (getName().equals("test_isVisible")) test_isVisible();
+	else if (getName().equals("test_moveAboveLorg_eclipse_swt_widgets_Control")) test_moveAboveLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_moveBelowLorg_eclipse_swt_widgets_Control")) test_moveBelowLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_pack")) test_pack();
+	else if (getName().equals("test_packZ")) test_packZ();
+	else if (getName().equals("test_redraw")) test_redraw();
+	else if (getName().equals("test_redrawIIIIZ")) test_redrawIIIIZ();
+	else if (getName().equals("test_removeControlListenerLorg_eclipse_swt_events_ControlListener")) test_removeControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_removeFocusListenerLorg_eclipse_swt_events_FocusListener")) test_removeFocusListenerLorg_eclipse_swt_events_FocusListener();
+	else if (getName().equals("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener")) test_removeHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_removeKeyListenerLorg_eclipse_swt_events_KeyListener")) test_removeKeyListenerLorg_eclipse_swt_events_KeyListener();
+	else if (getName().equals("test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener")) test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener();
+	else if (getName().equals("test_removeMouseListenerLorg_eclipse_swt_events_MouseListener")) test_removeMouseListenerLorg_eclipse_swt_events_MouseListener();
+	else if (getName().equals("test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener")) test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener();
+	else if (getName().equals("test_removePaintListenerLorg_eclipse_swt_events_PaintListener")) test_removePaintListenerLorg_eclipse_swt_events_PaintListener();
+	else if (getName().equals("test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener")) test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener();
+	else if (getName().equals("test_setBackgroundLorg_eclipse_swt_graphics_Color")) test_setBackgroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setBoundsIIII")) test_setBoundsIIII();
+	else if (getName().equals("test_setBoundsLorg_eclipse_swt_graphics_Rectangle")) test_setBoundsLorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_setCaptureZ")) test_setCaptureZ();
+	else if (getName().equals("test_setCursorLorg_eclipse_swt_graphics_Cursor")) test_setCursorLorg_eclipse_swt_graphics_Cursor();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setForegroundLorg_eclipse_swt_graphics_Color")) test_setForegroundLorg_eclipse_swt_graphics_Color();
+	else if (getName().equals("test_setLayoutDataLjava_lang_Object")) test_setLayoutDataLjava_lang_Object();
+	else if (getName().equals("test_setLocationII")) test_setLocationII();
+	else if (getName().equals("test_setLocationLorg_eclipse_swt_graphics_Point")) test_setLocationLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setMenuLorg_eclipse_swt_widgets_Menu")) test_setMenuLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_setRedrawZ")) test_setRedrawZ();
+	else if (getName().equals("test_setSizeII")) test_setSizeII();
+	else if (getName().equals("test_setSizeLorg_eclipse_swt_graphics_Point")) test_setSizeLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else if (getName().equals("test_toControlLorg_eclipse_swt_graphics_Point")) test_toControlLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_toDisplayLorg_eclipse_swt_graphics_Point")) test_toDisplayLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_traverseI")) test_traverseI();
+	else if (getName().equals("test_update")) test_update();
+	else if (getName().equals("test_setParentLorg_eclipse_swt_widgets_Composite")) test_setParentLorg_eclipse_swt_widgets_Composite();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolBar.java
new file mode 100644
index 0000000000..a04fde5f85
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolBar.java
@@ -0,0 +1,128 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.CoolBar
+ *
+ * @see org.eclipse.swt.widgets.CoolBar
+ */
+public class Test_org_eclipse_swt_widgets_CoolBar extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_widgets_CoolBar(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	CoolBar coolBar = new CoolBar(shell, 0);
+	setWidget(coolBar);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeIIZ(){
+	warnUnimpl( "Test test_computeSizeIIZ not written");
+}
+
+public void test_getItemI() {
+	warnUnimpl("Test test_getItemI not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItems() {
+	warnUnimpl("Test test_getItems not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_CoolItem() {
+	warnUnimpl("Test test_indexOfLorg_eclipse_swt_widgets_CoolItem not written");
+}
+
+public void test_getItemOrder() {
+	warnUnimpl("Test test_getItemOrder not written");
+}
+
+public void test_getItemSizes() {
+	warnUnimpl("Test test_getItemSizes not written");
+}
+
+public void test_getWrapIndices() {
+	warnUnimpl("Test test_getWrapIndices not written");
+}
+
+public void test_setWrapIndices$I() {
+	warnUnimpl("Test test_setWrapIndices$I not written");
+}
+
+public void test_setItemLayout$I$I$Lorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_setItemLayout$I$I$Lorg_eclipse_swt_graphics_Point not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_CoolBar((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_CoolItem");
+	methodNames.addElement("test_getItemOrder");
+	methodNames.addElement("test_getItemSizes");
+	methodNames.addElement("test_getWrapIndices");
+	methodNames.addElement("test_setWrapIndices$I");
+	methodNames.addElement("test_setItemLayout$I$I$Lorg_eclipse_swt_graphics_Point");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_CoolItem")) test_indexOfLorg_eclipse_swt_widgets_CoolItem();
+	else if (getName().equals("test_getItemOrder")) test_getItemOrder();
+	else if (getName().equals("test_getItemSizes")) test_getItemSizes();
+	else if (getName().equals("test_getWrapIndices")) test_getWrapIndices();
+	else if (getName().equals("test_setWrapIndices$I")) test_setWrapIndices$I();
+	else if (getName().equals("test_setItemLayout$I$I$Lorg_eclipse_swt_graphics_Point")) test_setItemLayout$I$I$Lorg_eclipse_swt_graphics_Point();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolItem.java
new file mode 100644
index 0000000000..965b56f3aa
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_CoolItem.java
@@ -0,0 +1,334 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.CoolItem
+ *
+ * @see org.eclipse.swt.widgets.CoolItem
+ */
+public class Test_org_eclipse_swt_widgets_CoolItem extends Test_org_eclipse_swt_widgets_Item {
+
+static final boolean MINIMAL_CONFORMANCE = false;
+
+public Test_org_eclipse_swt_widgets_CoolItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	setWidget(coolItem);
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CoolBarI() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	
+	try {
+		coolItem = new CoolItem(null, 0);
+		fail("No exception thrown for parent == null");	
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CoolBarII() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0, 0);
+	try {
+		coolItem = new CoolItem(coolBar, 0, -1);
+		fail("No exception thrown for index == -1");
+	}
+	catch (IllegalArgumentException e){
+	}
+	try {
+		coolItem = new CoolItem(coolBar, 0, 2);
+		fail("No exception thrown for index == 2");
+	}
+	catch (IllegalArgumentException e){
+	}
+	assertEquals(1, coolBar.getItemCount());
+	coolItem = new CoolItem(coolBar, 0, 1);
+	assertEquals(2, coolBar.getItemCount());
+	coolItem = new CoolItem(coolBar, 0, 0);
+	assertEquals(3, coolBar.getItemCount());
+	assertEquals(coolItem, coolBar.getItem(0));	
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeII() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foo");
+
+	Point size = coolItem.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+	Point size2 = coolItem.computeSize(0, 0);
+	assertEquals(size, size2);
+	
+	coolItem.setControl(button);
+	size2 = coolItem.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+	assertTrue(size2.x > size.x);
+
+	size = coolItem.computeSize(50, 25);
+	size2 = coolItem.computeSize(100, 25);
+	assertEquals(size.x + 50, size2.x);
+	assertEquals(size.y, size2.y);
+
+	size = coolItem.computeSize(1,1);
+	size2 = coolItem.computeSize(26, 26);
+	assertEquals(25, size2.x - size.x);
+}
+
+public void test_getBounds() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foo");
+	coolItem.setControl(button);
+	
+	Rectangle rect = coolItem.getBounds();
+	Point size = coolItem.getSize();
+	assertEquals(size.x, rect.width);
+	assertEquals(size.y, rect.height);
+	
+	coolItem.setSize(25, 25);
+	rect = coolItem.getBounds();
+	coolItem.setSize(100, 25);
+	Rectangle newRect = coolItem.getBounds();
+	assertEquals(rect.width + 75, newRect.width);
+	assertEquals(rect.x, newRect.x);
+	assertEquals(rect.y, newRect.y);
+}
+
+public void test_getControl() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	assertNull(coolItem.getControl());
+
+	Button button = new Button(coolBar, SWT.PUSH);
+	coolItem.setControl(button);
+	Control control = coolItem.getControl();
+	assertEquals(button, control);
+
+	button = new Button(coolBar, SWT.PUSH);
+	coolItem.setControl(button);
+	control = coolItem.getControl();
+	assertEquals(button, control);
+}
+
+public void test_getDisplay() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	assertEquals(coolBar.getDisplay(), coolItem.getDisplay());
+	
+	coolBar.dispose();
+	try {
+		coolItem.getDisplay();
+		fail("No exception thrown for getDisplay() when parent is disposed");	
+	}
+	catch (SWTException e) {
+	}
+}
+
+public void test_getParent() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	assertEquals(coolBar, coolItem.getParent());
+}
+
+public void test_setControlLorg_eclipse_swt_widgets_Control() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	coolItem.setControl(null);
+	
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foobar");
+	
+	Point size = coolItem.getSize();
+	coolItem.setControl(button);
+	Point size2 = coolItem.getSize();
+	assertTrue(size2.x > size.x);
+	
+	if (!MINIMAL_CONFORMANCE) {
+		size = button.computeSize(SWT.DEFAULT, SWT.DEFAULT);
+		size2 = coolItem.computeSize(size.x, size.y);
+		assertEquals(size2, coolItem.getSize());
+	}
+	
+	button = new Button(coolBar, SWT.PUSH);
+	button.dispose();
+	try {
+		coolItem.setControl(button);
+		fail("No exception when control.isDisposed()");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	button = new Button(shell, SWT.PUSH);
+	try {
+		coolItem.setControl(button);
+		fail("No exception thrown when control has wrong parent");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getPreferredSize() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foobar");
+	coolItem.setControl(button);
+	
+	Point pref = coolItem.getPreferredSize();
+	coolItem.setPreferredSize(pref);
+	assertEquals(pref, coolItem.getPreferredSize());
+}
+
+public void test_setPreferredSizeII() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foobar");
+	coolItem.setControl(button);
+	
+	Point size = coolItem.getSize();
+	coolItem.setPreferredSize(size);
+	assertEquals(size.x, coolItem.getSize().x);
+	coolItem.setSize(coolItem.getPreferredSize());
+	assertEquals(size, coolItem.getSize());
+}
+
+public void test_setPreferredSizeLorg_eclipse_swt_graphics_Point() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foobar");
+	coolItem.setControl(button);
+	
+	Point size = new Point(50, 30);
+	coolItem.setPreferredSize(size);
+	Point size2 = coolItem.getPreferredSize();
+	coolItem.setPreferredSize(50, 30);
+	assertEquals(size2, coolItem.getPreferredSize());
+}
+
+public void test_getSize() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foo");
+	coolItem.setControl(button);
+	
+	Point size = coolItem.getSize();
+	Rectangle rect = coolItem.getBounds();
+	assertEquals(rect.width, size.x);
+	assertEquals(rect.height, size.y);
+}
+
+public void test_setSizeII() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foo");
+	coolItem.setControl(button);
+
+	coolItem.setSize(50, 50);
+	assertEquals(new Point(50, 50), coolItem.getSize());
+
+	coolItem.setSize(0, 0);
+	Point smallest = coolItem.getSize();
+	coolItem.setSize(1, 1);
+	assertEquals(smallest, coolItem.getSize());
+	
+	Rectangle rect = coolItem.getBounds();
+	Point size = coolItem.getSize();
+	coolItem.setSize(rect.width, rect.height);
+	assertEquals(size, coolItem.getSize());
+}
+
+public void test_setSizeLorg_eclipse_swt_graphics_Point() {
+	CoolBar coolBar = new CoolBar(shell, 0);
+	CoolItem coolItem = new CoolItem(coolBar, 0);
+	Button button = new Button(coolBar, SWT.PUSH);
+	button.setText("foo");
+	coolItem.setControl(button);
+	
+	Point size = new Point(50, 50);
+	coolItem.setSize(size);
+	Point size2 = coolItem.getSize();
+	coolItem.setSize(50, 50);
+	assertEquals(size2, coolItem.getSize());
+}
+
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_CoolItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CoolBarI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CoolBarII");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeII");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_setControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_getPreferredSize");
+	methodNames.addElement("test_setPreferredSizeII");
+	methodNames.addElement("test_setPreferredSizeLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getSize");
+	methodNames.addElement("test_setSizeII");
+	methodNames.addElement("test_setSizeLorg_eclipse_swt_graphics_Point");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CoolBarI")) test_ConstructorLorg_eclipse_swt_widgets_CoolBarI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CoolBarII")) test_ConstructorLorg_eclipse_swt_widgets_CoolBarII();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeII")) test_computeSizeII();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_setControlLorg_eclipse_swt_widgets_Control")) test_setControlLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_getPreferredSize")) test_getPreferredSize();
+	else if (getName().equals("test_setPreferredSizeII")) test_setPreferredSizeII();
+	else if (getName().equals("test_setPreferredSizeLorg_eclipse_swt_graphics_Point")) test_setPreferredSizeLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getSize")) test_getSize();
+	else if (getName().equals("test_setSizeII")) test_setSizeII();
+	else if (getName().equals("test_setSizeLorg_eclipse_swt_graphics_Point")) test_setSizeLorg_eclipse_swt_graphics_Point();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java
new file mode 100644
index 0000000000..c5ce7af266
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Decorations.java
@@ -0,0 +1,246 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Decorations
+ *
+ * @see org.eclipse.swt.widgets.Decorations
+ */
+public class Test_org_eclipse_swt_widgets_Decorations extends Test_org_eclipse_swt_widgets_Canvas {
+
+Decorations decorations;
+Image[] images = new Image [3];
+
+public Test_org_eclipse_swt_widgets_Decorations(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	decorations = new Decorations(shell, SWT.NULL);
+	super.setWidget(decorations);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+protected void setWidget(Widget w) {
+	if (!decorations.isDisposed())
+		decorations.dispose();
+	decorations = (Decorations)w;
+	super.setWidget(w);
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void loadImages() {
+	images [0] = new Image (shell.getDisplay(), this.getClass().getResourceAsStream("folder.bmp"));
+	images [1] = new Image (shell.getDisplay(), this.getClass().getResourceAsStream("folderOpen.bmp"));
+	images [2] = new Image (shell.getDisplay(), this.getClass().getResourceAsStream("target.bmp"));
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void freeImages() {
+	for (int i=0; i<images.length; i++) images[i].dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getDefaultButton() {
+	warnUnimpl("Test test_getDefaultButton not written");
+}
+
+public void test_getImage() {
+	warnUnimpl("Test test_getImage not written");
+}
+
+public void test_getLocation() {
+	warnUnimpl("Test test_getLocation not written");
+}
+
+public void test_getMaximized() {
+	warnUnimpl("Test test_getMaximized not written");
+}
+
+public void test_getMenuBar() {
+	warnUnimpl("Test test_getMenuBar not written");
+}
+
+public void test_getMinimized() {
+	warnUnimpl("Test test_getMinimized not written");
+}
+
+public void test_getSize() {
+	warnUnimpl("Test test_getSize not written");
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_setDefaultButtonLorg_eclipse_swt_widgets_Button() {
+	assertNull(decorations.getDefaultButton());
+	Button button = new Button(decorations, SWT.NULL);
+	decorations.setDefaultButton(button);
+	assertTrue("button not default", decorations.getDefaultButton() == button);
+	if (fCheckBogusTestCases) {
+		decorations.setDefaultButton(null);
+		assertNull(decorations.getDefaultButton());
+	}
+}
+
+public void test_setFocus() {
+	decorations.setFocus();
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	assertNull(":a:", decorations.getImage());
+	loadImages();
+	decorations.setImage(images[0]);
+	assertTrue(":b:", images[0] == decorations.getImage());
+	assertTrue(":c:", images[1] != decorations.getImage());
+	decorations.setImage(null);
+	assertNull(":d:", decorations.getImage());
+	freeImages();
+}
+
+public void test_setMaximizedZ() {
+	decorations.setMaximized(false);
+	assertTrue(":1:", decorations.getMaximized() == false);
+	decorations.setMaximized(true);
+	assertTrue(":2:", decorations.getMaximized() == true);
+	assertTrue(":3:", decorations.getMinimized() == false);
+}
+
+public void test_setMenuBarLorg_eclipse_swt_widgets_Menu() {
+	assertNull(decorations.getMenu());
+	Menu testMenu = new Menu(decorations);
+	decorations.setMenu(testMenu);
+	assertTrue("Incorrect menu", decorations.getMenu() == testMenu);
+	decorations.setMenu(null);
+	assertNull(decorations.getMenu());
+}
+
+public void test_setMinimizedZ() {
+	decorations.setMinimized(false);
+	assertTrue(":1:", decorations.getMinimized() == false);
+	decorations.setMinimized(true);
+	assertTrue(":2:", decorations.getMinimized() == true);
+	assertTrue(":3:", decorations.getMaximized() == false);
+}
+
+public void test_setTextLjava_lang_String() {
+	try {
+		decorations.setText(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	String testStr = "test string";
+	decorations.setText(testStr);
+	assertTrue("a", decorations.getText().equals(testStr));
+	decorations.setText("");
+	assertTrue("b", decorations.getText().equals(""));
+	try {
+		decorations.setText(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setVisibleZ() {
+	decorations.setVisible(false);
+	assertTrue(!decorations.getVisible());
+	
+	decorations.setVisible(true);
+	assertTrue(decorations.getVisible());
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Decorations((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getDefaultButton");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getLocation");
+	methodNames.addElement("test_getMaximized");
+	methodNames.addElement("test_getMenuBar");
+	methodNames.addElement("test_getMinimized");
+	methodNames.addElement("test_getSize");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setDefaultButtonLorg_eclipse_swt_widgets_Button");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setMaximizedZ");
+	methodNames.addElement("test_setMenuBarLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_setMinimizedZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Canvas.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getDefaultButton")) test_getDefaultButton();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getLocation")) test_getLocation();
+	else if (getName().equals("test_getMaximized")) test_getMaximized();
+	else if (getName().equals("test_getMenuBar")) test_getMenuBar();
+	else if (getName().equals("test_getMinimized")) test_getMinimized();
+	else if (getName().equals("test_getSize")) test_getSize();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setDefaultButtonLorg_eclipse_swt_widgets_Button")) test_setDefaultButtonLorg_eclipse_swt_widgets_Button();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setMaximizedZ")) test_setMaximizedZ();
+	else if (getName().equals("test_setMenuBarLorg_eclipse_swt_widgets_Menu")) test_setMenuBarLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_setMinimizedZ")) test_setMinimizedZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java
new file mode 100644
index 0000000000..f33855a534
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Dialog.java
@@ -0,0 +1,108 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Dialog
+ *
+ * @see org.eclipse.swt.widgets.Dialog
+ */
+public class Test_org_eclipse_swt_widgets_Dialog extends SwtTestCase {
+
+public Shell shell;
+private Dialog dialog;
+private int junitStyle;
+
+public Test_org_eclipse_swt_widgets_Dialog(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+	shell = new Shell();
+}
+
+protected void tearDown() {
+	shell.dispose();
+}
+
+protected void setDialog(Dialog newDialog) {
+	dialog = newDialog;
+}
+protected void setStyle(int style) {
+	style = junitStyle;
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Shell not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ShellI not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getParent() {
+	assertTrue(":a:", dialog.getParent() == shell);
+}
+
+public void test_getStyle () {
+	// we use this call in a Constructor test so that we can
+	// check if the style is the one that was created
+	dialog.getStyle();
+}
+
+public void test_getText() {
+	warnUnimpl("Test test_getText not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	assertTrue(":1:", dialog.getText() == "");
+	String testStr = "test string";
+	dialog.setText(testStr);
+	assertTrue(":2:", dialog.getText().equals(testStr));
+	dialog.setText("");
+	assertTrue(":3:", dialog.getText().equals(""));
+	if (fCheckSwtNullExceptions) {
+		try {
+			dialog.setText(null);
+			fail("No exception thrown for string = null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getStyle");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getStyle")) test_getStyle();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java
new file mode 100644
index 0000000000..c7c4576eff
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DirectoryDialog.java
@@ -0,0 +1,135 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.DirectoryDialog
+ *
+ * @see org.eclipse.swt.widgets.DirectoryDialog
+ */
+public class Test_org_eclipse_swt_widgets_DirectoryDialog extends Test_org_eclipse_swt_widgets_Dialog {
+
+DirectoryDialog dirDialog;
+
+public Test_org_eclipse_swt_widgets_DirectoryDialog(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	dirDialog = new DirectoryDialog(shell, SWT.NULL);
+	setDialog(dirDialog);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	if (fCheckSwtNullExceptions) {
+		DirectoryDialog dd = new DirectoryDialog(shell);
+		try {
+			dd = new DirectoryDialog(null);
+			fail("No exception thrown for null parent");
+		}
+		catch (IllegalArgumentException e) {
+		}		
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ShellI not written");
+}
+
+public void test_getFilterPath() {
+	// tested in test_setFilterPathLjava_lang_String
+}
+
+public void test_getMessage() {
+	// tested in test_setMessageLjava_lang_String
+}
+
+public void test_open() {
+	if (fTestDialogOpen)
+		dirDialog.open();
+}
+
+public void test_setFilterPathLjava_lang_String() {
+	assertTrue(":1:", dirDialog.getFilterPath() == "");
+	String testStr = "./*";
+	dirDialog.setFilterPath(testStr);
+	assertTrue(":2:", dirDialog.getFilterPath().equals(testStr));
+	dirDialog.setFilterPath("");
+	assertTrue(":3:", dirDialog.getFilterPath().equals(""));
+	if (fCheckSwtNullExceptions) {
+		try {
+			dirDialog.setFilterPath(null);
+			fail("No exception thrown for filterPath == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_setMessageLjava_lang_String() {
+	assertTrue(":1:", dirDialog.getMessage() == "");
+	String testStr = "test string";
+	dirDialog.setMessage(testStr);
+	assertTrue(":2:", dirDialog.getMessage().equals(testStr));
+	dirDialog.setMessage("");
+	assertTrue(":3:", dirDialog.getMessage().equals(""));
+	if (fCheckSwtNullExceptions) {
+		try {
+			dirDialog.setMessage(null);
+			fail("No exception thrown for message == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_DirectoryDialog((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getFilterPath");
+	methodNames.addElement("test_getMessage");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_setFilterPathLjava_lang_String");
+	methodNames.addElement("test_setMessageLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getFilterPath")) test_getFilterPath();
+	else if (getName().equals("test_getMessage")) test_getMessage();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_setFilterPathLjava_lang_String")) test_setFilterPathLjava_lang_String();
+	else if (getName().equals("test_setMessageLjava_lang_String")) test_setMessageLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java
new file mode 100644
index 0000000000..679d5d1c09
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java
@@ -0,0 +1,363 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Display
+ *
+ * @see org.eclipse.swt.widgets.Display
+ */
+public class Test_org_eclipse_swt_widgets_Display extends Test_org_eclipse_swt_graphics_Device {
+
+boolean disposeExecRan;
+
+public Test_org_eclipse_swt_widgets_Display(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	// There can only be one Display object per thread.
+	// If a second Display is created on the same thread, an 
+	// InvalidThreadAccessException is thrown.
+	//
+	// Each test will create its own Display and must dispose of it 
+	// before completing.
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	Display disp = new Display();
+	disp.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_graphics_DeviceData() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_graphics_DeviceData not written");
+}
+
+public void test_asyncExecLjava_lang_Runnable() {
+	warnUnimpl("Test test_asyncExecLjava_lang_Runnable not written");
+}
+
+public void test_beep() {
+	Display display = new Display();
+	try {
+		display.beep();
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_checkDevice() {
+	warnUnimpl("Test test_checkDevice not written");
+}
+
+public void test_createLorg_eclipse_swt_graphics_DeviceData() {
+	warnUnimpl("Test test_createLorg_eclipse_swt_graphics_DeviceData not written");
+}
+
+public void test_destroy() {
+	warnUnimpl("Test test_destroy not written");
+}
+
+public void test_disposeExecLjava_lang_Runnable() {
+	// Also tests dispose and isDisposed
+	Display testDisplay = new Display();
+	disposeExecRan = false;
+	testDisplay.disposeExec(new Runnable() {
+		public void run() {
+			disposeExecRan = true;
+		}
+	});
+	assertEquals("Display should not be disposed", false, testDisplay.isDisposed());
+	testDisplay.dispose();
+	assertTrue("Display should be disposed", testDisplay.isDisposed());
+	assertTrue("DisposeExec Runnable did not run", disposeExecRan);
+}
+
+public void test_findWidgetI() {
+	warnUnimpl("Test test_findWidgetI not written");
+}
+
+public void test_findDisplayLjava_lang_Thread() {
+	warnUnimpl("Test test_findDisplayLjava_lang_Thread not written");
+}
+
+public void test_getActiveShell() {
+	warnUnimpl("Test test_getActiveShell not written");
+}
+
+public void test_getBounds() {
+	Display display = new Display();
+	try {
+		Rectangle rect = display.getBounds();
+		assertNotNull(rect);
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_getCurrent() {
+	warnUnimpl("Test test_getCurrent not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getCursorControl() {
+	Display display = new Display();
+	try {
+		display.getCursorControl();
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_getCursorLocation() {
+	warnUnimpl("Test test_getCursorLocation not written");
+}
+
+public void test_getDefault() {
+	Display display = new Display();
+	try {
+		assertNotNull(display.getDefault());
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_getDataLjava_lang_String() {
+	warnUnimpl("Test test_getDataLjava_lang_String not written");
+}
+
+public void test_getData() {
+	warnUnimpl("Test test_getData not written");
+}
+
+public void test_getDoubleClickTime() {
+	warnUnimpl("Test test_getDoubleClickTime not written");
+}
+
+public void test_getFocusControl() {
+	Display display = new Display();
+	try {
+		display.getFocusControl();
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_getIconDepth() {
+	warnUnimpl("Test test_getIconDepth not written");
+}
+
+public void test_getShells() {
+	warnUnimpl("Test test_getShells not written");
+}
+
+public void test_getSyncThread() {
+	warnUnimpl("Test test_getSyncThread not written");
+}
+
+public void test_getSystemColorI() {
+	Display display = new Display();
+	try {
+		int [] colorIds = {
+			SWT.COLOR_WIDGET_DARK_SHADOW, SWT.COLOR_WIDGET_NORMAL_SHADOW,
+			SWT.COLOR_WIDGET_LIGHT_SHADOW, SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW,
+			SWT.COLOR_WIDGET_BACKGROUND, SWT.COLOR_WIDGET_BORDER,
+			SWT.COLOR_WIDGET_FOREGROUND, SWT.COLOR_LIST_FOREGROUND,
+			SWT.COLOR_LIST_BACKGROUND, SWT.COLOR_LIST_SELECTION,
+			SWT.COLOR_LIST_SELECTION_TEXT,
+		};
+		for (int i=0; i < colorIds.length; i++) {
+			assertNotNull(display.getSystemColor(colorIds[i]));
+		}
+	} finally {
+		display.dispose();
+	}
+}
+
+public void test_getSystemFont() {
+	warnUnimpl("Test test_getSystemFont not written");
+}
+
+public void test_getThread() {
+	warnUnimpl("Test test_getThread not written");
+}
+
+public void test_internal_new_GCLorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_new_GCLorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_init() {
+	warnUnimpl("Test test_init not written");
+}
+
+public void test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData() {
+	warnUnimpl("Test test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData not written");
+}
+
+public void test_readAndDispatch() {
+	warnUnimpl("Test test_readAndDispatch not written");
+}
+
+public void test_release() {
+	warnUnimpl("Test test_release not written");
+}
+
+public void test_setDataLjava_lang_StringLjava_lang_Object() {
+	warnUnimpl("Test test_setDataLjava_lang_StringLjava_lang_Object not written");
+}
+
+public void test_setDataLjava_lang_Object() {
+	warnUnimpl("Test test_setDataLjava_lang_Object not written");
+}
+
+public void test_setAppNameLjava_lang_String() {
+	warnUnimpl("Test test_setAppNameLjava_lang_String not written");
+}
+
+public void test_setSynchronizerLorg_eclipse_swt_widgets_Synchronizer() {
+	warnUnimpl("Test test_setSynchronizerLorg_eclipse_swt_widgets_Synchronizer not written");
+}
+
+public void test_sleep() {
+	warnUnimpl("Test test_sleep not written");
+}
+
+public void test_syncExecLjava_lang_Runnable() {
+	warnUnimpl("Test test_syncExecLjava_lang_Runnable not written");
+}
+
+public void test_timerExecILjava_lang_Runnable() {
+	warnUnimpl("Test test_timerExecILjava_lang_Runnable not written");
+}
+
+public void test_update() {
+	warnUnimpl("Test test_update not written");
+}
+
+public void test_wake() {
+	warnUnimpl("Test test_wake not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Display((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_graphics_DeviceData");
+	methodNames.addElement("test_asyncExecLjava_lang_Runnable");
+	methodNames.addElement("test_beep");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_checkDevice");
+	methodNames.addElement("test_createLorg_eclipse_swt_graphics_DeviceData");
+	methodNames.addElement("test_destroy");
+	methodNames.addElement("test_disposeExecLjava_lang_Runnable");
+	methodNames.addElement("test_findWidgetI");
+	methodNames.addElement("test_findDisplayLjava_lang_Thread");
+	methodNames.addElement("test_getActiveShell");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getCurrent");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getCursorControl");
+	methodNames.addElement("test_getCursorLocation");
+	methodNames.addElement("test_getDefault");
+	methodNames.addElement("test_getDataLjava_lang_String");
+	methodNames.addElement("test_getData");
+	methodNames.addElement("test_getDoubleClickTime");
+	methodNames.addElement("test_getFocusControl");
+	methodNames.addElement("test_getIconDepth");
+	methodNames.addElement("test_getShells");
+	methodNames.addElement("test_getSyncThread");
+	methodNames.addElement("test_getSystemColorI");
+	methodNames.addElement("test_getSystemFont");
+	methodNames.addElement("test_getThread");
+	methodNames.addElement("test_internal_new_GCLorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_init");
+	methodNames.addElement("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData");
+	methodNames.addElement("test_readAndDispatch");
+	methodNames.addElement("test_release");
+	methodNames.addElement("test_setDataLjava_lang_StringLjava_lang_Object");
+	methodNames.addElement("test_setDataLjava_lang_Object");
+	methodNames.addElement("test_setAppNameLjava_lang_String");
+	methodNames.addElement("test_setSynchronizerLorg_eclipse_swt_widgets_Synchronizer");
+	methodNames.addElement("test_sleep");
+	methodNames.addElement("test_syncExecLjava_lang_Runnable");
+	methodNames.addElement("test_timerExecILjava_lang_Runnable");
+	methodNames.addElement("test_update");
+	methodNames.addElement("test_wake");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_graphics_DeviceData")) test_ConstructorLorg_eclipse_swt_graphics_DeviceData();
+	else if (getName().equals("test_asyncExecLjava_lang_Runnable")) test_asyncExecLjava_lang_Runnable();
+	else if (getName().equals("test_beep")) test_beep();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_checkDevice")) test_checkDevice();
+	else if (getName().equals("test_createLorg_eclipse_swt_graphics_DeviceData")) test_createLorg_eclipse_swt_graphics_DeviceData();
+	else if (getName().equals("test_destroy")) test_destroy();
+	else if (getName().equals("test_disposeExecLjava_lang_Runnable")) test_disposeExecLjava_lang_Runnable();
+	else if (getName().equals("test_findWidgetI")) test_findWidgetI();
+	else if (getName().equals("test_findDisplayLjava_lang_Thread")) test_findDisplayLjava_lang_Thread();
+	else if (getName().equals("test_getActiveShell")) test_getActiveShell();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getCurrent")) test_getCurrent();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getCursorControl")) test_getCursorControl();
+	else if (getName().equals("test_getCursorLocation")) test_getCursorLocation();
+	else if (getName().equals("test_getDefault")) test_getDefault();
+	else if (getName().equals("test_getDataLjava_lang_String")) test_getDataLjava_lang_String();
+	else if (getName().equals("test_getData")) test_getData();
+	else if (getName().equals("test_getDoubleClickTime")) test_getDoubleClickTime();
+	else if (getName().equals("test_getFocusControl")) test_getFocusControl();
+	else if (getName().equals("test_getIconDepth")) test_getIconDepth();
+	else if (getName().equals("test_getShells")) test_getShells();
+	else if (getName().equals("test_getSyncThread")) test_getSyncThread();
+	else if (getName().equals("test_getSystemColorI")) test_getSystemColorI();
+	else if (getName().equals("test_getSystemFont")) test_getSystemFont();
+	else if (getName().equals("test_getThread")) test_getThread();
+	else if (getName().equals("test_internal_new_GCLorg_eclipse_swt_graphics_GCData")) test_internal_new_GCLorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_init")) test_init();
+	else if (getName().equals("test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData")) test_internal_dispose_GCILorg_eclipse_swt_graphics_GCData();
+	else if (getName().equals("test_readAndDispatch")) test_readAndDispatch();
+	else if (getName().equals("test_release")) test_release();
+	else if (getName().equals("test_setDataLjava_lang_StringLjava_lang_Object")) test_setDataLjava_lang_StringLjava_lang_Object();
+	else if (getName().equals("test_setDataLjava_lang_Object")) test_setDataLjava_lang_Object();
+	else if (getName().equals("test_setAppNameLjava_lang_String")) test_setAppNameLjava_lang_String();
+	else if (getName().equals("test_setSynchronizerLorg_eclipse_swt_widgets_Synchronizer")) test_setSynchronizerLorg_eclipse_swt_widgets_Synchronizer();
+	else if (getName().equals("test_sleep")) test_sleep();
+	else if (getName().equals("test_syncExecLjava_lang_Runnable")) test_syncExecLjava_lang_Runnable();
+	else if (getName().equals("test_timerExecILjava_lang_Runnable")) test_timerExecILjava_lang_Runnable();
+	else if (getName().equals("test_update")) test_update();
+	else if (getName().equals("test_wake")) test_wake();
+}
+}
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
new file mode 100644
index 0000000000..23c1738b36
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
@@ -0,0 +1,72 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * 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());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_setBoundsLorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_toString() {
+	warnUnimpl("Test test_toString not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Event((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_setBoundsLorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_setBoundsLorg_eclipse_swt_graphics_Rectangle")) test_setBoundsLorg_eclipse_swt_graphics_Rectangle();
+	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_FileDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java
new file mode 100644
index 0000000000..6ad0b02e1c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FileDialog.java
@@ -0,0 +1,153 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.FileDialog
+ *
+ * @see org.eclipse.swt.widgets.FileDialog
+ */
+public class Test_org_eclipse_swt_widgets_FileDialog extends Test_org_eclipse_swt_widgets_Dialog {
+
+FileDialog fileDialog;
+
+public Test_org_eclipse_swt_widgets_FileDialog(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	fileDialog = new FileDialog(shell, SWT.NULL);
+	setDialog(fileDialog);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	// Test FileDialog(Shell)
+	if (fCheckSwtNullExceptions) {
+		FileDialog fd = new FileDialog(shell);
+		try {
+			fd = new FileDialog(null);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ShellI not written");
+}
+
+public void test_getFileName() {
+	warnUnimpl("Test test_getFileName not written");
+}
+
+public void test_getFileNames() {
+	warnUnimpl("Test test_getFileNames not written");
+}
+
+public void test_getFilterExtensions() {
+	warnUnimpl("Test test_getFilterExtensions not written");
+}
+
+public void test_getFilterNames() {
+	warnUnimpl("Test test_getFilterNames not written");
+}
+
+public void test_getFilterPath() {
+	// tested in test_setFilterPathLjava_lang_String
+}
+
+public void test_open() {
+	if (fTestDialogOpen)
+		fileDialog.open();
+}
+
+public void test_setFileNameLjava_lang_String() {
+	warnUnimpl("Test test_setFileNameLjava_lang_String not written");
+}
+
+public void test_setFilterExtensions$Ljava_lang_String() {
+	warnUnimpl("Test test_setFilterExtensions$Ljava_lang_String not written");
+}
+
+public void test_setFilterNames$Ljava_lang_String() {
+	warnUnimpl("Test test_setFilterNames$Ljava_lang_String not written");
+}
+
+public void test_setFilterPathLjava_lang_String() {
+	assertTrue(":1:", fileDialog.getFilterPath() == "");
+	String testStr = "./*";
+	fileDialog.setFilterPath(testStr);
+	assertTrue(":2:", fileDialog.getFilterPath().equals(testStr));
+	fileDialog.setFilterPath("");
+	assertTrue(":3:", fileDialog.getFilterPath().equals(""));
+	if (fCheckSwtNullExceptions) {
+		try {
+			fileDialog.setFilterPath(null);
+			fail("No exception thrown for filterPath == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_FileDialog((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getFileName");
+	methodNames.addElement("test_getFileNames");
+	methodNames.addElement("test_getFilterExtensions");
+	methodNames.addElement("test_getFilterNames");
+	methodNames.addElement("test_getFilterPath");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_setFileNameLjava_lang_String");
+	methodNames.addElement("test_setFilterExtensions$Ljava_lang_String");
+	methodNames.addElement("test_setFilterNames$Ljava_lang_String");
+	methodNames.addElement("test_setFilterPathLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getFileName")) test_getFileName();
+	else if (getName().equals("test_getFileNames")) test_getFileNames();
+	else if (getName().equals("test_getFilterExtensions")) test_getFilterExtensions();
+	else if (getName().equals("test_getFilterNames")) test_getFilterNames();
+	else if (getName().equals("test_getFilterPath")) test_getFilterPath();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_setFileNameLjava_lang_String")) test_setFileNameLjava_lang_String();
+	else if (getName().equals("test_setFilterExtensions$Ljava_lang_String")) test_setFilterExtensions$Ljava_lang_String();
+	else if (getName().equals("test_setFilterNames$Ljava_lang_String")) test_setFilterNames$Ljava_lang_String();
+	else if (getName().equals("test_setFilterPathLjava_lang_String")) test_setFilterPathLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FontDialog.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FontDialog.java
new file mode 100644
index 0000000000..6192f3bbae
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_FontDialog.java
@@ -0,0 +1,106 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.FontDialog
+ *
+ * @see org.eclipse.swt.widgets.FontDialog
+ */
+public class Test_org_eclipse_swt_widgets_FontDialog extends Test_org_eclipse_swt_widgets_Dialog {
+
+FontDialog fontDialog;
+
+public Test_org_eclipse_swt_widgets_FontDialog(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	fontDialog = new FontDialog(shell, SWT.NULL);
+	setDialog(fontDialog);
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell() {
+	FontDialog fd = new FontDialog(shell);
+	try {
+		new FontDialog(null);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	try {
+		new FontDialog(null, SWT.NULL);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getFontData() {
+	// tested in test_setFontDataLorg_eclipse_swt_graphics_FontData
+}
+
+public void test_open() {
+	warnUnimpl("Test test_open not written");
+}
+
+public void test_setFontDataLorg_eclipse_swt_graphics_FontData() {
+	FontData fontData = new FontData();
+
+	assertNull(fontDialog.getFontData());	
+		
+	fontDialog.setFontData(fontData);
+	assertEquals(fontDialog.getFontData(), fontData);
+
+	fontDialog.setFontData(null);
+	assertNull(fontDialog.getFontData());	
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_FontDialog((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getFontData");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_setFontDataLorg_eclipse_swt_graphics_FontData");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getFontData")) test_getFontData();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_setFontDataLorg_eclipse_swt_graphics_FontData")) test_setFontDataLorg_eclipse_swt_graphics_FontData();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java
new file mode 100644
index 0000000000..06e8e73898
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Group.java
@@ -0,0 +1,113 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Group
+ *
+ * @see org.eclipse.swt.widgets.Group
+ */
+public class Test_org_eclipse_swt_widgets_Group extends Test_org_eclipse_swt_widgets_Composite {
+
+Group group;
+
+public Test_org_eclipse_swt_widgets_Group(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	group = new Group(shell, 0);
+	setWidget(group);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	try {
+		group = new Group(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {SWT.SHADOW_IN, SWT.SHADOW_OUT, SWT.SHADOW_ETCHED_IN, SWT.SHADOW_ETCHED_OUT};
+	for (int i = 0; i < cases.length; i++)
+		group = new Group(shell, cases[i]);
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getText() {
+	// tested in test_setTextLjava_lang_String
+}
+
+public void test_setTextLjava_lang_String() {
+	String[] cases = {"", "some text", "ldkashdoehufweovcnhslvhregojebckreavbkuhxbiufvcyhbifuyewvbiureyd.,cmnesljliewjfchvbwoifivbeworixuieurvbiuvbohflksjeahfcliureafgyciabelitvyrwtlicuyrtliureybcliuyreuceyvbliureybct"};
+	for (int i = 0; i < cases.length; i++) {
+		group.setText(cases[i]);
+		assertTrue("case: " + String.valueOf(i), group.getText().equals(cases[i]));
+	};
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Group((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java
new file mode 100644
index 0000000000..b68d3af6a9
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Item.java
@@ -0,0 +1,117 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Item
+ *
+ * @see org.eclipse.swt.widgets.Item
+ */
+public class Test_org_eclipse_swt_widgets_Item extends Test_org_eclipse_swt_widgets_Widget {
+
+Item item;
+protected Image[] images = new Image [3];
+
+public Test_org_eclipse_swt_widgets_Item(String name) {
+	super(name);
+}
+
+protected void setUp() {
+	super.setUp();
+	loadImages();
+}
+
+protected void tearDown() {
+	super.tearDown();
+	freeImages();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void loadImages() {
+	java.io.InputStream in1 = this.getClass().getResourceAsStream("folder.bmp");
+	java.io.InputStream in2 = this.getClass().getResourceAsStream("folderOpen.bmp");
+	java.io.InputStream in3 = this.getClass().getResourceAsStream("target.bmp");
+	Display display = shell.getDisplay();
+		
+	images [0] = new Image (display, in1);
+	images [1] = new Image (display, in2);
+	images [2] = new Image (display, in3);
+	
+	try {
+		in1.close();
+		in2.close();
+		in3.close();
+	} catch (java.io.IOException e) {
+	}
+}
+protected void setWidget(Widget widget) {
+	item = (Item) widget;
+	super.setWidget(widget);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void freeImages() {
+	for (int i=0; i<images.length; i++) {
+		if (images[i] != null)
+			images[i].dispose();
+	}
+}
+
+public void test_getImage() {
+	// tested in test_setImageLorg_eclipse_swt_graphics_Image
+}
+
+public void test_getText() {
+	// tested in test_setTextLjava_lang_String
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	assertNull(item.getImage());
+	item.setImage(images[0]);
+	assertEquals(images[0], item.getImage());
+	assertTrue(item.getImage() != images[1]);
+	item.setImage(null);
+	assertNull(item.getImage());
+}
+
+public void test_setTextLjava_lang_String() {
+	String testStr = "test string";
+	item.setText(testStr);
+	assertTrue("a", item.getText().equals(testStr));
+	item.setText("");
+	assertTrue("b", item.getText().equals(""));
+	if (fCheckSwtNullExceptions) {
+		try {
+			item.setText(null);
+			fail("No exception thrown for string == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Label.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Label.java
new file mode 100644
index 0000000000..c18de97e9a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Label.java
@@ -0,0 +1,205 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Label
+ *
+ * @see org.eclipse.swt.widgets.Label
+ */
+public class Test_org_eclipse_swt_widgets_Label extends Test_org_eclipse_swt_widgets_Control {
+
+Label label;
+
+public Test_org_eclipse_swt_widgets_Label(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	label = new Label(shell, 0);
+	setWidget(label);
+}
+
+protected void tearDown() {
+//	super.tearDown();
+
+	if (label != null) {
+		assertEquals(shell.isDisposed(), false);
+		assertEquals(label.isDisposed(), false);
+	}
+
+	shell.dispose();
+	if (label != null) {
+		assertTrue(shell.isDisposed());
+		assertTrue(label.isDisposed());
+	}
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		label = new Label(null, 0);
+		fail("No exception thrown"); //should never get here
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	label = new Label(shell, 0);
+
+	int[] cases = {SWT.LEFT, SWT.RIGHT, SWT.CENTER, SWT.SEPARATOR, SWT.HORIZONTAL, SWT.VERTICAL, SWT.SHADOW_IN, SWT.SHADOW_OUT};
+	for (int i = 0; i < cases.length; i++)
+		label = new Label(shell, cases[i]);
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+/**
+ * Returns a value which describes the position of the
+ * text or image in the receiver. The value will be one of
+ * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>
+ * unless the receiver is a <code>SEPARATOR</code> label, in 
+ * which case, <code>NONE</code> is returned.
+ */
+public void test_getAlignment(){
+	int[] cases = {SWT.LEFT, SWT.RIGHT, SWT.CENTER};
+	for (int i=0; i<cases.length; i++)
+	{
+ 	  label = new Label(shell, cases[i]);
+	  assertEquals(label.getAlignment(), cases[i]);
+	} 
+}
+
+/**
+ * Returns the receiver's image if it has one, or null
+ * if it does not.
+ */
+public void test_getImage(){
+	Image[] cases = {null, new Image(null, 100, 100)};
+	for(int i=0; i<cases.length; i++){
+	 label.setImage(cases[i]);
+	 assertEquals(label.getImage(), cases[i]);
+	 if (cases[i]!=null)
+	  cases[i].dispose();
+	}
+}
+
+/**
+ * Returns the receiver's text, which will be an empty
+ * string if it has never been set or if the receiver is
+ * a <code>SEPARATOR</code> label.
+ */
+public void test_getText(){
+	String[] cases = {"", "some name", "sdasdlkjshcdascecoewcwe"};
+	for(int i=0; i<cases.length; i++){
+	 label.setText(cases[i]);
+	 assertEquals(label.getText(), cases[i]);
+	}
+}
+
+/**
+ * Controls how text and images will be displayed in the receiver.
+ * The argument should be one of <code>LEFT</code>, <code>RIGHT</code>
+ * or <code>CENTER</code>.  If the receiver is a <code>SEPARATOR</code>
+ * label, the argument is ignored and the alignment is not changed.
+ */
+public void test_setAlignmentI(){
+	int[] cases = {SWT.LEFT, SWT.RIGHT, SWT.CENTER};
+	for (int i=0; i<cases.length; i++)
+	{
+ 	  label.setAlignment(cases[i]);
+	  assertEquals(label.getAlignment(), cases[i]);
+	} 
+}
+
+public void test_setFocus() {
+	warnUnimpl("Test test_setFocus not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+/**
+ * Sets the receiver's text.
+ * <p>
+ * This method sets the widget label.  The label may include
+ * the mnemonic characters and line delimiters.
+ * </p>
+ * 
+ * @param string the new text
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
+ * </ul>
+ */
+public void test_setTextLjava_lang_String(){
+	try {
+		label.setText(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Label((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getAlignment");
+	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_setAlignmentI");
+	methodNames.addElement("test_setFocus");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getAlignment")) test_getAlignment();
+	else if (getName().equals("test_getImage")) test_getImage();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_setAlignmentI")) test_setAlignmentI();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Layout.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Layout.java
new file mode 100644
index 0000000000..210625c3b5
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Layout.java
@@ -0,0 +1,54 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Layout
+ *
+ * @see org.eclipse.swt.widgets.Layout
+ */
+public class Test_org_eclipse_swt_widgets_Layout extends SwtTestCase {
+
+public Test_org_eclipse_swt_widgets_Layout(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ() {
+	warnUnimpl("Test test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ not written");
+}
+
+public void test_layoutLorg_eclipse_swt_widgets_CompositeZ() {
+	warnUnimpl("Test test_layoutLorg_eclipse_swt_widgets_CompositeZ not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ");
+	methodNames.addElement("test_layoutLorg_eclipse_swt_widgets_CompositeZ");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_Constructor")) test_Constructor();
+	else if (getName().equals("test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ")) test_computeSizeLorg_eclipse_swt_widgets_CompositeIIZ();
+	else if (getName().equals("test_layoutLorg_eclipse_swt_widgets_CompositeZ")) test_layoutLorg_eclipse_swt_widgets_CompositeZ();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java
new file mode 100644
index 0000000000..5eaa41cbee
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_List.java
@@ -0,0 +1,2143 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.List
+ *
+ * @see org.eclipse.swt.widgets.List
+ */
+public class Test_org_eclipse_swt_widgets_List extends Test_org_eclipse_swt_widgets_Scrollable {
+
+List list;
+
+public Test_org_eclipse_swt_widgets_List(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	list = new List(shell, SWT.MULTI);
+
+	setWidget(list);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Test if 'deselect(u, v)' is the same as 'for (i=u; i<=v; ++i) deselect(i);'
+ */
+protected void deselectII_helper(
+	String[] items,
+	int start,
+	int end,
+	int[] expectedIndices) {
+		
+	list.setItems(items);
+	list.setSelection(items);
+
+	list.deselect(start, end);
+	assertEquals(
+		":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.setSelection(items);
+	if ( 0 != (list.getStyle() & SWT.MULTI) ) {
+		assertEquals("setSelection(items):", items, list.getSelection());
+	}
+
+	for (int i = start; i <= end; ++i) {
+		list.deselect(i);
+	}
+	assertEquals(
+		":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.deselectAll();
+}
+/**
+ * Dispose of the main list and create a new, single-selection one.
+ */
+protected List setSingleList() {
+	list.dispose();
+	list = new List(shell, SWT.SINGLE);
+	setWidget(list);
+	return list;
+}
+/**
+ * Similar to deselectII_helper, checks if select(u, v) is the same as
+ * for (i=u; i<=v; ++i) select(i)
+ */
+protected void selectII_helper(
+	String[] items,
+	int start,
+	int end,
+	int[] expectedIndices) {
+	list.setItems(items);
+	list.select(start, end);
+	assertEquals(
+		":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.deselectAll();
+	assertEquals("deselectAll:", list.getSelectionIndices(), new int[] {});
+
+	for (int i = start; i <= end; i++) // <= on purpose
+		list.select(i);
+
+	assertEquals(":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.deselectAll();
+}
+/**
+ * Similar to deselectII_helper, checks if select(int []arr) gives the same
+ * result as several individual select(int) calls. The int[] used for selection
+ * will be filled all integers from start to end inclusive, in order.
+ */
+protected void select$I_helper(
+	String[] items,
+	int start,
+	int end,
+	int[] expectedIndices) {
+	int[] selection = new int[end - start + 1];
+	for (int i = 0; i < selection.length; ++i) {
+		selection[i] = i + start;
+	}
+
+	list.select(selection);
+
+	assertEquals(
+		":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.deselectAll();
+	assertEquals("deselectAll:", list.getSelectionIndices(), new int[] {});
+
+	for (int i = start; i <= end; i++) // <= on purpose
+		list.select(i);
+
+	assertEquals(
+		":(" + start + ", " + end + "):",
+		expectedIndices, list.getSelectionIndices());
+
+	list.deselectAll();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	try {
+		list = new List(null, 0);
+		fail("No exception thrown"); //should never get here
+	} catch (IllegalArgumentException e) {
+	}
+
+	int[] cases =
+		{
+			0,
+			SWT.SINGLE,
+			SWT.MULTI,
+			SWT.MULTI | SWT.V_SCROLL,
+			SWT.MULTI | SWT.H_SCROLL,
+			SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL };
+	for (int i = 0; i < cases.length; i++)
+		list = new List(shell, cases[i]);
+}
+
+/**
+ * Adds the argument to the end of the receiver's list.
+ *
+ * @param string the new item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ */
+public void test_addLjava_lang_String() {
+	try {
+		list.add(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	list.add("");
+	list.add("some \n text");
+	list.add("some text");
+
+	// test single-selection list
+
+	setSingleList();
+
+	try {
+		list.add(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	list.add("");
+	list.add("some \n text");
+	list.add("some text");
+}
+
+/**
+ * Adds the argument to the receiver's list at the given
+ * zero-relative index.
+ * <p>
+ * Note: To add an item at the end of the list, use the
+ * result of calling <code>getItemCount()</code> as the
+ * index or use <code>add(String)</code>.
+ * </p>
+ *
+ * @param string the new item
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ *
+ * @see #add(String)
+ */
+public void test_addLjava_lang_StringI() {
+	try {
+		list.add("some text", 2);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(0, list.getItemCount());
+
+	// test single-selection list
+
+	setSingleList();
+
+	try {
+		list.add("some text", 2);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(0, list.getItemCount());
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_deselect$I() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	String[] empty = {
+	};
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(":a:", list.getSelection(), items);
+	try {
+		list.deselect(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getSelection(), items);
+	list.deselect(new int[] {
+	});
+	assertEquals(list.getSelection(), items);
+	list.deselect(new int[] { 0 });
+	assertEquals(list.isSelected(0), false);
+	assertTrue(list.isSelected(1));
+	list.deselect(new int[] { 2, 0, 0 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 3 });
+	/*	assert(":d:", !list.isSelected(0));
+	assert(":dd:", !list.isSelected(2));
+	assert(":ddd:", list.isSelected(1));
+	assert(":ddd:", list.isSelected(1));*/
+
+	
+	setSingleList();
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(list.getSelection(), new String[] { "item3" });
+	try {
+		list.deselect(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(list.getSelection(), new String[] { "item3" });
+	list.deselect(new int[] {
+	});
+	assertEquals(list.getSelection(), new String[] { "item3" });
+	list.deselect(new int[] { 1 });
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+	list.deselect(new int[] { 0 });
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+	list.deselect(new int[] { 3 });
+	assertEquals(list.getSelectionIndices(), new int[] {});
+	list.deselect(new int[] { 2, 0, 0 });
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+}
+
+public void test_deselectI() {
+	int number = 5;
+	String[] items = new String[number];
+	for (int i = 0; i < number; i++)
+		items[i] = "fred" + i;
+	list.setItems(items);
+
+	String[] items2 = { "item0", "item1", "item2", "item3" };
+	String[] empty = {
+	};
+	list.setItems(items2);
+	list.setSelection(items2);
+	assertEquals(items2, list.getSelection());
+	list.deselect(5);
+	assertEquals(items2, list.getSelection());
+	list.deselect(1);
+	assertEquals(false, list.isSelected(1));
+	list.deselect(1);
+	assertEquals(false, list.isSelected(1));
+
+	
+	setSingleList();
+	list.setItems(items2);
+	list.setSelection(items2);
+	assertEquals(new String[] { "item3" }, list.getSelection());
+	list.deselect(5);
+	assertEquals(new String[] { "item3" }, list.getSelection());
+	list.deselect(2);
+	assertEquals(false, list.isSelected(2));
+	list.deselect(1);
+	assertEquals(false, list.isSelected(1));
+	list.deselect(1);
+	assertEquals(false, list.isSelected(1));
+	//	assert(":e:", list.getSe);
+
+}
+
+public void test_deselectII() {
+	int number = 5;
+	String[] items = new String[number];
+	for (int i = 0; i < number; i++)
+		items[i] = "fred" + i;
+	list.setItems(items);
+	list.setSelection(items);
+
+	// tests if deselect(i, j) is the same as for (i=0; i<=j; ++i) deselect(i);
+	int[][] cases = { { 3, 1 }, {
+			-3, -2 }, {
+			-2, -1 }, {
+			-1, -1 }, {
+			10, 1 }
+	};
+
+	for (int i = 0; i < cases.length; ++i) {
+		deselectII_helper(items, cases[i][0], cases[i][1], new int[] { 0, 1, 2, 3, 4 });
+	}
+	if (fCheckSWTPolicy) {
+		deselectII_helper(items, -1, 3, new int[] { 4 });
+		deselectII_helper(items, -1, 30, new int[] {
+		});
+	}
+	deselectII_helper(items, 1, 3, new int[] { 0, 4 });
+	deselectII_helper(items, 1, 1, new int[] { 0, 2, 3, 4 });
+	// done
+
+	String[] items2 = { "item0", "item1", "item2", "item3" };
+	String[] empty = {
+	};
+	list.setItems(items2);
+	list.setSelection(items2);
+	assertEquals(":a:", items2, list.getSelection());
+	list.deselect(0, 0);
+	assertEquals(":b:", list.getSelectionIndices(), new int[] { 1, 2, 3 });
+	list.deselect(0, 0);
+	assertEquals(":bbb:", list.getSelectionIndices(), new int[] { 1, 2, 3 });
+	list.deselect(2, 3);
+	assertEquals(":bb:", list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(items2);
+	list.deselect(0, 2);
+	assertEquals(":dddd:", list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(items2);
+	list.deselect(2, 0);
+	assertEquals(
+		":ddddd:",
+		list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	
+	setSingleList();
+	deselectII_helper(items, 3, 1, new int[]{4});
+	deselectII_helper(items, -1, -1, new int[]{4});
+	deselectII_helper(items, 1, 3, new int[]{4});
+	deselectII_helper(items, -1, 3, new int[]{4});
+	deselectII_helper(items, -1, 30, new int[]{});
+	deselectII_helper(items, 1, 1, new int[]{4});
+	deselectII_helper(items, 10, 1, new int[]{4});
+	
+
+	
+	list.setItems(items2);
+	list.deselectAll();
+	
+	list.select(0);
+
+	list.deselect(-3, -2);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.deselect(-2, -1);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.deselect(-1, -1);
+	assertEquals(":e:", list.getSelectionIndices(), new int[] { 0 });
+
+	
+	list.setSelection(items2);
+	assertEquals(list.getSelection(), new String[] { "item3" });
+
+	list.deselect(1, 1);
+	assertEquals(list.getSelection(), new String[] { "item3" });
+
+	list.deselect(0, 0);
+	assertEquals(list.getSelection(), new String[] { "item3" });
+
+	list.deselect(3, 3);
+	assertEquals(list.getSelection(), new String[] {});
+
+	list.setSelection(items2);
+	list.deselect(1, 2);
+	assertEquals(list.getSelection(), new String[] { "item3" });
+
+	list.setSelection(items2);
+	list.deselect(0, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(items2);
+	list.deselect(1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+}
+
+public void test_deselectAll() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	String[] empty = {
+	};
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(items, list.getSelection());
+	list.deselectAll();
+	assertEquals(empty, list.getSelection());
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(new String[] { "item3" }, list.getSelection());
+	list.deselectAll();
+	assertEquals(empty, list.getSelection());
+
+}
+
+public void test_getFocusIndex() {
+	warnUnimpl("Test test_getFocusIndex not written");
+}
+
+/**
+ * Returns the item at the given, zero-relative index in the
+ * receiver. Throws an exception if the index is out of range.
+ *
+ * @param index the index of the item to return
+ * @return the item at the given index
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_ITEM - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_getItemI() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	String[] empty = {
+	};
+	list.setItems(items);
+	String item = null;
+	try {
+		item = list.getItem(5);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getItem(3), "item3");
+
+	
+	setSingleList();
+	list.setItems(items);
+	try {
+		item = list.getItem(5);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	//assert(":a:", list.getItem(5)==null);
+	assertEquals("item3", list.getItem(3));
+
+}
+
+public void test_getItemCount() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+
+	assertEquals(0, list.getItemCount());
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+	list.remove(2);
+	assertEquals(3, list.getItemCount());
+	list.removeAll();
+	assertEquals(0, list.getItemCount());
+
+	
+	setSingleList();
+	assertEquals(0, list.getItemCount());
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+	list.remove(2);
+	assertEquals(3, list.getItemCount());
+	list.removeAll();
+	assertEquals(0, list.getItemCount());
+
+}
+
+public void test_getItemHeight() {
+	warnUnimpl("Test test_getItemHeight not written");
+}
+
+public void test_getItems() {
+	String[][] cases = { {
+		}, {
+			"" }, {
+			"", "" }, {
+			"text1", "text2" }
+	};
+	for (int i = 0; i < cases.length; i++) {
+		list.setItems(cases[i]);
+		assertEquals("case: " + i, cases[i], list.getItems());
+	}
+}
+
+public void test_getSelection() {
+	String[][] cases = { {
+		}, {
+			"" }, {
+			"", "" }, {
+			"text1", "text2" }
+	};
+	for (int i = 0; i < cases.length; i++) {
+		//		System.out.println("loop:" + i);
+		list.setItems(cases[i]);
+		list.setSelection(cases[i]);
+		//		System.out.println("list:" + list.getSelection());
+		//		System.out.println("case:" + i + cases[i]);
+		assertEquals("case: " + i, cases[i], list.getSelection());
+	}
+
+	for (int i = 1; i < cases.length; i++) {
+		list.setItems(cases[i]);
+		list.setSelection(0);
+		assertEquals(
+			"case: " + String.valueOf(i),
+			list.getSelection(), new String[] { cases[i][0] });
+	}
+
+	String[] items = { "text1", "text2", "text3" };
+	list.setItems(items);
+	int[] sel = { 0, 2 };
+	list.setSelection(sel);
+	assertEquals(list.getSelection().length, 2);
+	assertEquals(list.getSelection()[0], items[0]);
+	assertEquals(list.getSelection()[1], items[2]);
+
+	list.setSelection(0, 1);
+	assertEquals(list.getSelection().length, 2);
+	assertEquals(list.getSelection()[0], items[0]);
+	assertEquals(list.getSelection()[1], items[1]);
+
+	list.setSelection(1, 1);
+	assertEquals(list.getSelection().length, 1);
+	assertEquals(list.getSelection()[0], items[1]);
+
+	list.setSelection(1, 0);
+	String[] empty = {
+	};
+	assertEquals(empty, list.getSelection());
+
+	String[] bogus_items = { "bogus_text1", "bogus_text2", "bogus_text3" };
+	list.setSelection(bogus_items);
+	assertEquals(empty, list.getSelection());
+
+	// test single-selection lists 
+
+	setSingleList();
+
+	list.setItems(items);
+	sel = new int[] { 0, 2 };
+	list.setSelection(sel);
+	assertEquals(1, list.getSelection().length);
+	assertEquals(items[0], list.getSelection()[0]);
+
+	list.setSelection(0, 1);
+	assertEquals(1, list.getSelection().length);
+	assertEquals(items[1], list.getSelection()[0]);
+}
+
+/**
+ * Returns the number of selected items contained in the receiver.
+ *
+ * @return the number of selected items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_CANNOT_GET_COUNT - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_getSelectionCount() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(0, list.getSelectionCount());
+
+	list.setSelection(items);
+	assertEquals(3, list.getSelectionCount());
+
+	list.deselectAll();
+	try {
+		list.setSelection((String[]) null);
+		fail("No exception thrown for selection == null");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getSelectionCount(), 0);
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(1, list.getSelectionCount());
+}
+
+public void test_getSelectionIndex() {
+	String[] items = { "text1", "text2", "text3" };
+
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	assertEquals(items.length - 1, list.getSelectionIndex());
+}
+
+public void test_getSelectionIndices() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(items);
+	int[] sel = { 0, 1, 2 };
+	assertEquals(sel, list.getSelectionIndices());
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	sel = new int[]{ items.length - 1 };
+	assertEquals(sel, list.getSelectionIndices());
+
+	
+	list.setItems(items);
+	assertEquals(new int[] {}, list.getSelectionIndices());
+
+}
+
+public void test_getTopIndex() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(0, list.getTopIndex());
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	assertEquals(0, list.getTopIndex());
+
+}
+
+/**
+ * Gets the index of an item.
+ * <p>
+ * The list is searched starting at 0 until an
+ * item is found that is equal to the search item.
+ * If no item is found, -1 is returned.  Indexing
+ * is zero based.
+ *
+ * @param string the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ */
+public void test_indexOfLjava_lang_String() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(list.indexOf("text3"), 2);
+	assertEquals(list.indexOf("text4"), -1);
+
+	int ind;
+	try {
+		ind = list.indexOf(null);
+		fail("No exception thrown for item == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	String[] items2 = { "text1", "text2", "text2" }; //two identical
+
+	list.setItems(items2);
+	assertEquals(list.indexOf("text2"), 1);
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	assertEquals(-1, list.indexOf("text3", 4));
+
+	
+	assertEquals(2, list.indexOf("text3"));
+
+	
+	assertEquals(-1, list.indexOf("text4"));
+
+	
+	try {
+		ind = list.indexOf(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	
+	assertEquals(1, list.indexOf("text2"));
+}
+
+public void test_indexOfLjava_lang_StringI() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(-1, list.indexOf("text3", 4));
+	assertEquals(2, list.indexOf("text3", 2));
+	assertEquals(1, list.indexOf("text2", 0));
+	assertEquals(1, list.indexOf("text2", 1));
+	assertEquals(-1, list.indexOf("text2", 2));
+
+	String[] items2 = { "text1", "text2", "text2" }; //two identical
+	list.setItems(items2);
+	assertEquals(list.indexOf("text2", 2), 2);
+
+	
+	setSingleList();
+
+	list.setItems(items2);
+	//	assert("list.indexOf(\"text2\", -1)==1", list.indexOf("text2", -1)==1);
+	assertEquals(1, list.indexOf("text2", 0));
+	assertEquals(1, list.indexOf("text2", 1));
+	assertEquals(2, list.indexOf("text2", 2));
+}
+
+public void test_isSelectedI() {
+	String[] items = { "text1", "text2", "text2" }; //two identical
+
+	list.setItems(items);
+	list.setSelection(items);
+	assertTrue(list.isSelected(0));
+	assertTrue(list.isSelected(1));
+	assertTrue(list.isSelected(2));
+	assertEquals(false, list.isSelected(3));
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	if (fCheckSWTPolicy) {
+		assertEquals(false, list.isSelected(0));
+		assertTrue(list.isSelected(1));
+		assertEquals(false, list.isSelected(2));
+		assertEquals(false, list.isSelected(3));
+	}
+
+}
+
+/**
+ * Removes the items from the receiver which are
+ * between the given zero-relative start and end 
+ * indices (inclusive).
+ *
+ * @param start the start of the range
+ * @param end the end of the range
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_remove$I() {
+	String[] items = { "text0", "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	list.setItems(items);
+	list.remove(new int[] { 1, 0, 1 });
+	assertEquals(list.getItemCount(), 2);
+
+	list.setItems(items);
+
+	try {
+		list.remove(new int[] { 3, 1, -1 });
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(":a:", list.getItems(), new String[] { "text0", "text2" });
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	try {
+		list.remove(new int[] { -1, -1 });
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(":b:", list.getItems(), items);
+
+	try {
+		list.remove(new int[] { -2, -1 });
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(":c:", list.getItems(), items);
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	list.remove(new int[] { 1, 1, 1 });
+	assertEquals(
+		":d:",
+		list.getItems(), new String[] { "text0", "text2", "text3" });
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	list.remove(new int[] { 1, 3 });
+	assertEquals(":e:", list.getItems(), new String[] { "text0", "text2" });
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	list.remove(new int[] { 1, 3 });
+	assertEquals(":f:", list.getItems(), new String[] { "text0", "text2" });
+
+	
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	list.remove(new int[] { 3, 1 });
+	assertEquals(":g:", list.getItems(), new String[] { "text0", "text2" });
+
+	
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	try {
+		list.remove(new int[] { 3, 1, -1 });
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	} 
+	assertEquals(":h:", list.getItems(), new String[] { "text0", "text2" });
+
+	
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	try {
+		list.remove(new int[] { -1, -1 });
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(":i:", items, list.getItems());
+
+	
+	assertEquals(4, list.getItemCount());
+
+	list.remove(new int[] { 1, 1, 1 });
+	assertEquals(":j:",
+		new String[] { "text0", "text2", "text3" }, list.getItems());
+
+}
+
+/**
+ * Removes the item from the receiver at the given
+ * zero-relative index.
+ *
+ * @param index the index for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_removeI() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 3);
+
+	try {
+		list.remove(3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getItemCount(), 3);
+
+	try {
+		list.remove(-1);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getItemCount(), 3);
+
+	list.remove(1);
+	assertEquals(list.getItemCount(), 2);
+	assertEquals(list.getItem(1), "text3");
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 3);
+
+	try {
+		list.remove(3, 4);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(list.getItemCount(), 3);
+
+	try {
+		list.remove(3, 3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(list.getItemCount(), 3);
+
+	list.remove(1, 2);
+	assertEquals(list.getItemCount(), 1);
+	assertEquals(list.getItem(0), "text1");
+
+	
+	setSingleList();
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+	try {
+		list.remove(3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	} 
+	assertEquals(3, list.getItemCount());
+	/////////////////////////////////////////////////
+	try {
+		list.remove(-1);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	
+	assertEquals(3, list.getItemCount());
+	////////////////////////////////////////////////
+	list.remove(1);
+	assertEquals(2, list.getItemCount());
+	//////////////////////////////////////////////////////
+	assertTrue(list.getItem(1).equals("text3"));
+
+}
+
+/**
+ * Removes the items from the receiver which are
+ * between the given zero-relative start and end 
+ * indices (inclusive).
+ *
+ * @param start the start of the range
+ * @param end the end of the range
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_removeII() {
+	String[] items = { "text1", "text2", "text3" };
+
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+
+	try {
+		list.remove(3, 4);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(3, list.getItemCount());
+
+	try {
+		list.remove(3, 3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(3, list.getItemCount());
+
+	list.remove(0, 0);
+	assertEquals(2, list.getItemCount());
+	assertEquals("text3", list.getItem(1));
+
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+
+	try {
+		list.remove(3, 4);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(3, list.getItemCount());
+
+	list.remove(0, 2);
+	assertEquals(0, list.getItemCount());
+
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+
+	try {
+		list.remove(3, 3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(3, list.getItemCount());
+
+	list.remove(2, 0);
+	assertEquals(3, list.getItemCount());
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+	//////////////////////////////////////////////////////////////
+	try {
+		list.remove(3, 4);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(3, list.getItemCount());
+	/////////////////////////////////////////////////////////
+	try {
+		list.remove(3, 3);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	assertEquals(3, list.getItemCount());
+	//////////////////////////////////////////////////////////////
+	list.remove(1, 2);
+	assertEquals(1, list.getItemCount());
+	assertEquals("text1", list.getItem(0));
+
+	
+	list.setItems(items);
+	assertEquals(3, list.getItemCount());
+
+	try {
+		list.remove(2, 10);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(2, list.getItemCount());
+	assertEquals("text2", list.getItem(1));
+
+	list.remove(2, 0);
+	assertEquals(2, list.getItemCount());
+}
+
+/**
+ * Searches the receiver's list starting at the first item
+ * until an item is found that is equal to the argument, 
+ * and removes that item from the list.
+ *
+ * @param string the item to remove
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_removeLjava_lang_String() {
+	String[] items = { "text1", "text2", "text3", "test2" };
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	try {
+		list.remove((String) null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getItemCount(), 4);
+
+	try {
+		list.remove("items989");
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(list.getItemCount(), 4);
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	list.remove("text3");
+	assertEquals(list.getItemCount(), 3);
+
+	list.remove("text2");
+	assertEquals(list.getItemCount(), 2);
+
+	
+	setSingleList();
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	try {
+		list.remove((String) null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(4, list.getItemCount());
+	////////////////////////////////////////
+	try {
+		list.remove("items989");
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+	assertEquals(4, list.getItemCount());
+
+	
+	assertEquals(4, list.getItemCount());
+
+	list.remove("text3");
+	assertEquals(3, list.getItemCount());
+
+	list.remove("text2");
+	assertEquals(2, list.getItemCount());
+
+}
+
+public void test_removeAll() {
+	String[] items = { "text1", "text2", "text3", "test2" };
+
+	list.setItems(items);
+	assertEquals(list.getItemCount(), 4);
+
+	list.removeAll();
+	assertEquals(list.getItemCount(), 0);
+	list.removeAll();
+	assertEquals(list.getItemCount(), 0);
+
+	
+	setSingleList();
+	list.setItems(items);
+	assertEquals(4, list.getItemCount());
+
+	list.removeAll();
+	assertEquals(0, list.getItemCount());
+
+	
+	setSingleList();
+	assertEquals(0, list.getItemCount());
+	list.removeAll();
+	assertEquals(0, list.getItemCount());
+
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+/**
+ * Selects the items at the given zero-relative indices in the receiver.
+ * If the item at the given zero-relative index in the receiver 
+ * is not selected, it is selected.  If the item at the index
+ * was selected, it remains selected. Indices that are out
+ * of range and duplicate indices are ignored.
+ */
+public void test_select$I() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+
+	list.select(new int[] { 0, 2 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 2 });
+
+	list.select(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	list.select(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	list.select(new int[] { 1 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	list.add("item4");
+
+	int[] ind = { -1, 0, 1, 2, 3 };
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	ind = new int[32];
+	for (int i = 0; i < ind.length; i++)
+		ind[i] = i;
+
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3, 4 });
+
+	list.setSelection(new int[] {
+	});
+	list.select(new int[] { 1 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(new int[] {
+	});
+	list.select(new int[] { -1 });
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.deselectAll();
+	items = list.getItems();
+
+	select$I_helper(items, 0, 3, new int[] { 0, 1, 2, 3 });
+	select$I_helper(items, -1, 3, new int[] { 0, 1, 2, 3 });
+	select$I_helper(items, -1, 30, new int[] { 0, 1, 2, 3, 4 });
+
+	
+	setSingleList();
+	list.setItems(items);
+	
+	ind = new int[]{ -1, 0, 1, 2, 3 };
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	ind = new int[32];
+	for (int i = 0; i < ind.length; i++)
+		ind[i] = i;
+
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	ind = new int[]{ 1 };
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+	list.deselectAll();
+
+	
+	ind = new int[]{ -1 };
+	list.select(ind);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	
+	setSingleList();
+	list.setItems(items);
+
+	list.select(new int[] { 0, 2 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.select(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.select(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.select(new int[] { 2, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+	list.select(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	
+	try {
+		list.select((int[]) null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	
+	int[] selection = { 0, 1, 2, 3 };
+	list.select(selection);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	selection = new int[]{ -1, 0, 1, 2, 3 };
+	list.select(selection);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	selection = new int[32];
+	for (int i = -1; i <= 30; i++)
+		selection[i + 1] = i;
+
+	list.select(selection);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	selection = new int[]{1};
+	list.select(selection);
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+}
+
+/**
+ * Selects the item at the given zero-relative index in the receiver's 
+ * list.  If the item at the index was already selected, it remains
+ * selected. Indices that are out of range are ignored.
+ */
+public void test_selectI() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+
+	list.select(2);
+	assertEquals("select(2):", list.getSelectionIndices(), new int[] { 2 });
+
+	list.select(1);
+	assertEquals("select(1):", list.getSelectionIndices(), new int[] { 1, 2 });
+
+	list.select(3);
+	assertEquals(
+		"select(3):",
+		list.getSelectionIndices(), new int[] { 1, 2, 3 });
+
+	list.select(5);
+	assertEquals(
+		"select(5):",
+		list.getSelectionIndices(), new int[] { 1, 2, 3 });
+
+	
+	setSingleList();
+	list.setItems(items);
+
+	list.select(2);
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.select(1);
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.select(3);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.select(5);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+}
+
+/**
+ * Selects the items at the given zero-relative indices in the receiver.
+ * If the item at the index was already selected, it remains
+ * selected. The range of the indices is inclusive. Indices that are
+ * out of range are ignored.
+ */
+public void test_selectII() {
+	int number = 5;
+
+	String[] items = new String[number];
+	int[] empty = {
+	};
+
+	for (int i = 0; i < number; i++)
+		items[i] = "item" + i;
+
+	selectII_helper(items, 10, 1, empty);
+	selectII_helper(items, 3, 1, empty);
+	selectII_helper(items, -1, -1, empty);
+	selectII_helper(items, 2, 4, new int[] { 2, 3, 4 });
+	selectII_helper(items, 0, 3, new int[] { 0, 1, 2, 3 });
+	selectII_helper(items, 1, 1, new int[] { 1 });
+
+	if (fCheckSWTPolicy == true) {
+		selectII_helper(items, -1, 30, new int[] { 0, 1, 2, 3, 4 });
+		selectII_helper(items, -1, 3, new int[] { 0, 1, 2, 3 });
+	}
+
+	list.select(0);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.select(-10, -9);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+	list.deselectAll();
+
+	list.select(1000, 2000);
+	assertEquals(list.getSelectionCount(), 0);
+
+	list.deselectAll();
+	list.select(1, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2 });
+
+	list.select(1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2, 3 });
+
+	list.select(2, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2, 3 });
+
+	list.select(3, 5);
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2, 3, 4 });
+
+	
+	setSingleList();
+	list.setItems(items);
+	list.select(0);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+	list.select(-10, -9);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	list.deselectAll();
+	assertEquals(0, list.getSelectionCount());
+	
+	list.select(1000, 2000);
+	if (fCheckOutOfRangeBehaviour) {
+		assertEquals(0, list.getSelectionCount());
+	}
+
+	
+	list.deselectAll();
+	assertEquals(0, list.getSelectionCount());
+
+	list.select(1, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.select(1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.select(2, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.select(3, 5);
+	assertEquals(list.getSelectionIndices(), new int[] { 4 });
+
+	selectII_helper(items, 1, 1, new int[]{1});
+	selectII_helper(items, -1, 30, new int[]{4});
+	selectII_helper(items, 10, 1, new int[]{});
+	selectII_helper(items, 3, 1, new int[]{});
+	selectII_helper(items, -1, -1, new int[]{});
+	selectII_helper(items, 2, 4, new int[]{4});
+	selectII_helper(items, 0, 3, new int[]{3});
+}
+
+public void test_selectAll() {
+	String[] items = { "text1", "text2", "text3", "test2" };
+
+	list.setItems(items);
+	assertEquals(list.getSelectionCount(), 0);
+	list.selectAll();
+	assertEquals(list.getSelectionCount(), 4);
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	assertEquals(0, list.getSelectionCount());
+	list.selectAll();
+	assertEquals(0, list.getSelectionCount());
+
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+/**
+ * Sets the text of the item in the receiver's list at the given
+ * zero-relative index to the string argument. This is equivalent
+ * to <code>remove</code>'ing the old item at the index, and then
+ * <code>add</code>'ing the new item at that index.
+ *
+ * @param index the index for the item
+ * @param string the new text for the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_REMOVED - if the remove operation fails because of an operating system failure</li>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the add operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_setItemILjava_lang_String() {
+	assertEquals(list.getItemCount(), 0);
+	int[] cases = { -10, 0, 10 };
+	for (int i = 0; i < cases.length; i++) {
+		try {
+			list.setItem(cases[i], null);
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+	}
+	assertEquals(list.getItemCount(), 0);
+
+	for (int i = 0; i < cases.length; i++) {
+		try {
+			list.setItem(cases[i], "");
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+	}
+	assertEquals(list.getItemCount(), 0);
+
+	int cases2[] = { 10, 15, 0 };
+	for (int i = 0; i < cases2.length; i++) {
+		try {
+			list.setItem(cases2[i], "fred");
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+		assertEquals(list.getItemCount(), 0);
+	}
+
+	
+	setSingleList();
+	assertEquals(0, list.getItemCount());
+	for (int i = 0; i < cases.length; i++) {
+		try {
+			list.setItem(cases[i], null);
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+
+	}
+
+	
+	setSingleList();
+	for (int i = 0; i < cases.length; i++) {
+		try {
+			list.setItem(cases[i], "");
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+	}
+
+	assertEquals(0, list.getItemCount());
+
+	
+	setSingleList();
+	for (int i = 0; i < cases2.length; i++) {
+		try {
+			list.setItem(cases2[i], "fred");
+			fail("No exception thrown");
+		} catch (IllegalArgumentException e) {
+		}
+
+		assertEquals(0, list.getItemCount());
+	}
+
+}
+
+/**
+ * Sets the receiver's items to be the given array of items.
+ *
+ * @param items the array of items
+ *
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ * @exception SWTError <ul>
+ *    <li>ERROR_ITEM_NOT_ADDED - if the operation fails because of an operating system failure</li>
+ * </ul>
+ */
+public void test_setItems$Ljava_lang_String() {
+	try {
+		list.setItems(null);
+		fail("No exception thrown for items == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	String[][] cases = { { null }, {
+			"dsada", null, "dsdasdasd" }
+	};
+	for (int i = 0; i < cases.length; i++) {
+		try {
+			list.setItems(cases[i]);
+			fail("No exception thrown for items not found");
+		} catch (SWTError e) {
+		}
+	}
+
+	String[][] itemArr = { {
+		}, {
+			"" }, {
+			"sdasd" }, {
+			"sdasd", "323434" }
+	};
+	for (int i = 0; i < itemArr.length; i++) {
+		list.setItems(itemArr[i]);
+		assertEquals(itemArr[i], list.getItems());
+	}
+
+	try {
+		list.setItems(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+
+	
+	setSingleList();
+	for (int i = 0; i < itemArr.length; i++) {
+		list.setItems(itemArr[i]);
+		assertEquals("case:" + i, itemArr[i], list.getItems());
+	}
+
+	
+	try {
+		list.setItems(null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setSelection$I() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		list.add("fred" + i);
+
+	int[] ind = { 1 };
+	list.setSelection(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	String[][] cases = { { "" }, {
+			"", "" }, {
+			"text1", "text2" }
+	};
+	int[] items = { 0 };
+	for (int i = 0; i < cases.length; i++) {
+		list.setItems(cases[i]);
+		list.setSelection(items);
+		assertEquals(
+			"case: " + String.valueOf(i),
+			list.getSelection(), new String[] { cases[i][0] });
+	}
+
+	String[] items2 = { "item0", "item1", "item2", "item3" };
+	list.setItems(items2);
+
+	list.setSelection(new int[] { 0, 2 });
+	assertEquals("{0, 2}", list.getSelectionIndices(), new int[] { 0, 2 });
+
+	list.setSelection(new int[] { 1, 3 });
+	assertEquals("{1, 3}", list.getSelectionIndices(), new int[] { 1, 3 });
+
+	list.setSelection(new int[] { 0, 1, 2, 3 });
+	assertEquals(
+		"{0, 1, 2, 3}",
+		list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	list.setSelection(new int[] { 1 });
+	assertEquals("{1}", list.getSelectionIndices(), new int[] { 1 });
+
+	ind = new int[] { -1, 0, 1, 2, 3 };
+	list.setSelection(ind);
+	assertEquals(
+		"setSelection(" + ind + "):",
+		list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	
+	setSingleList();
+	for (int i = 0; i < number; i++)
+		list.add("fred" + i);
+
+	ind = new int[]{ -1, 0, 1, 2, 3 };
+	list.setSelection(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	ind = new int[32];
+	for (int i = 0; i < ind.length; i++)
+		ind[i] = i;
+
+	list.setSelection(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	
+	ind = new int[]{ 1 };
+	list.setSelection(ind);
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	
+	list.deselectAll();
+	assertEquals(0, list.getSelectionCount());
+	
+	ind = new int[]{ -1 };
+	list.setSelection(ind);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	
+	list.setSelection(new int[] { 0, 2 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.setSelection(new int[] { 1, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(new int[] { 0, 1, 2, 3 });
+	assertEquals(list.getSelectionIndices(), new int[] { 0 });
+
+	list.setSelection(new int[] { 1 });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	try {
+		list.setSelection((int[]) null);
+		fail("No exception thrown");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+/**
+ * Sets the receiver's selection to be the given array of items.
+ * The current selected is first cleared, then the new items are
+ * selected.
+ *
+ * @param items the array of items
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ */
+public void test_setSelection$Ljava_lang_String() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+
+	list.setSelection(new String[] {});
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(new String[] { "" });
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(new String[] { "item2" });
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.setSelection(new String[] { "item2", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2 });
+
+	list.setSelection(new String[] { "item5", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(new String[] { "item1", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setItems(items);
+	try {
+		list.setSelection((int[]) null);
+		fail("No exception thrown for selection == null");
+	} catch (IllegalArgumentException e) {
+	}
+
+	
+	setSingleList();
+	list.setItems(items);
+
+	list.setSelection(new String[] {});
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(new String[] { "" });
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(new String[] { "item2" });
+	assertEquals(1, list.getSelectionCount());
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.setSelection(new String[] { "item2", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(new String[] { "item5", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	list.setSelection(new String[] { "item1", "item1" });
+	assertEquals(list.getSelectionIndices(), new int[] { 1 });
+
+	
+	try {
+		list.setSelection((String[]) null);
+		fail("No exception thrown for selection == null");
+	} catch (IllegalArgumentException e) {
+	}
+}
+
+/**
+ * Selects the item at the given zero-relative index in the receiver. 
+ * If the item at the index was already selected, it remains selected.
+ * The current selected is first cleared, then the new items are selected.
+ * Indices that are out of range are ignored.
+ */
+public void test_setSelectionI() {
+	int number = 5;
+	for (int i = 0; i < number; i++)
+		list.add("fred" + i);
+
+	int[] ind = new int[32];
+	for (int i = 0, j = 0; i < ind.length; i++, j++)
+		ind[j] = i;
+
+	list.setSelection(ind);
+	assertEquals(
+		"setSelection(" + ind + "):",
+		list.getSelectionIndices(), new int[] { 0, 1, 2, 3, 4 });
+
+	list.deselectAll();
+	int[] ind2 = { -1 };
+	list.setSelection(ind2);
+	assertEquals(
+		"setSelection(" + ind2 + "):",
+		list.getSelectionIndices(), new int[] {});
+
+	list.deselectAll();
+	list.setSelection(2);
+	assertEquals("2", list.getSelectionIndices(), new int[] { 2 });
+
+	list.setSelection(3);
+	assertEquals("3", list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(5);
+	assertEquals("5", list.getSelectionIndices(), new int[] {});
+
+	
+	setSingleList();
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+
+	list.setSelection(2);
+	assertEquals("2", list.getSelectionIndices(), new int[] { 2 });
+
+	list.setSelection(3);
+	assertEquals("3", list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(4);
+	assertEquals("4", list.getSelectionIndices(), new int[] { 3 });
+
+}
+
+/**
+ * Selects the items at the given zero-relative indices in the receiver. 
+ * The current selected if first cleared, then the new items are selected.
+ */
+public void test_setSelectionII() {
+	int number = 5;
+	String[] items = new String[number];
+	for (int i = 0; i < number; i++)
+		items[i] = "fred" + i;
+
+	list.setItems(items);
+	
+	list.setSelection(1, 1);
+	assertEquals(list.getSelectionIndices(), new int[] {1});
+
+	list.setSelection(10, 1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(3, 1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(-1, -1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] {1, 2, 3});
+
+	if (fCheckSWTPolicy == true) {
+		list.setSelection(-1, 3);
+		assertEquals(list.getSelectionIndices(), new int[] {0, 1, 2, 3});
+
+		list.setSelection(-1, 30);
+		assertEquals(list.getSelectionIndices(), new int[] {0, 1, 2, 3, 4});
+	}
+
+	items = new String[] { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+	list.setSelection(1, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 1, 2 });
+	list.setSelection(3, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+	list.setSelection(3, 2);
+	assertEquals(list.getSelectionIndices(), new int[] {}); ///IS THAT THE CORRECT ANSWER ??
+
+	list.setSelection(0, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+	list.setSelection(4, 4);
+	assertEquals(list.getSelectionIndices(), new int[] {}); ///IS THAT THE CORRECT ANSWER ??
+
+	list.setSelection(2, 5);
+	assertEquals(list.getSelectionIndices(), new int[] { 2, 3 });
+	list.setSelection(-2, 500);
+	if (fCheckOutOfRangeBehaviour)
+		assertEquals(list.getSelectionIndices(), new int[] { 0, 1, 2, 3 });
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	
+	list.setSelection(1, 2);
+	assertEquals(list.getSelectionIndices(), new int[] {2});
+
+	list.deselectAll();
+	list.setSelection(10, 1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(3, 1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(-1, -1);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] {3});
+
+	list.setSelection(-1, 3);
+	assertEquals(list.getSelectionIndices(), new int[] {3});
+
+	list.setSelection(-1, 30);
+	assertEquals(list.getSelectionIndices(), new int[] {3});
+
+	list.setSelection(1, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 2 });
+
+	list.setSelection(3, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(3, 2);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(0, 3);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.deselectAll();
+	list.setSelection(4, 4);
+	assertEquals(list.getSelectionIndices(), new int[] {});
+
+	list.setSelection(2, 5);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+
+	list.setSelection(-2, 500);
+	assertEquals(list.getSelectionIndices(), new int[] { 3 });
+}
+
+public void test_setTopIndexI() {
+	list.setTopIndex(3);
+	assertEquals(list.getTopIndex(), 0);
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+	for (int i = 0; i < items.length; i++) {
+		list.setTopIndex(i);
+		assertEquals(list.getTopIndex(), i);
+	}
+
+	
+	setSingleList();
+	list.setTopIndex(3);
+	assertEquals(0, list.getTopIndex());
+
+	list.setItems(items);
+	for (int i = 0; i < items.length; i++) {
+		list.setTopIndex(i);
+		assertEquals(i, list.getTopIndex());
+	}
+
+}
+
+public void test_showSelection() {
+	String[] items = { "item0", "item1", "item2", "item3" };
+	list.setItems(items);
+	list.setSelection(items);
+	list.showSelection();
+
+	
+	setSingleList();
+
+	list.setItems(items);
+	list.setSelection(items);
+	list.showSelection();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_List((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addLjava_lang_String");
+	methodNames.addElement("test_addLjava_lang_StringI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_deselect$I");
+	methodNames.addElement("test_deselectI");
+	methodNames.addElement("test_deselectII");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getFocusIndex");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_getSelectionIndices");
+	methodNames.addElement("test_getTopIndex");
+	methodNames.addElement("test_indexOfLjava_lang_String");
+	methodNames.addElement("test_indexOfLjava_lang_StringI");
+	methodNames.addElement("test_isSelectedI");
+	methodNames.addElement("test_remove$I");
+	methodNames.addElement("test_removeI");
+	methodNames.addElement("test_removeII");
+	methodNames.addElement("test_removeLjava_lang_String");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_select$I");
+	methodNames.addElement("test_selectI");
+	methodNames.addElement("test_selectII");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setItemILjava_lang_String");
+	methodNames.addElement("test_setItems$Ljava_lang_String");
+	methodNames.addElement("test_setSelection$I");
+	methodNames.addElement("test_setSelection$Ljava_lang_String");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionII");
+	methodNames.addElement("test_setTopIndexI");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Scrollable.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addLjava_lang_String")) test_addLjava_lang_String();
+	else if (getName().equals("test_addLjava_lang_StringI")) test_addLjava_lang_StringI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_deselect$I")) test_deselect$I();
+	else if (getName().equals("test_deselectI")) test_deselectI();
+	else if (getName().equals("test_deselectII")) test_deselectII();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getFocusIndex")) test_getFocusIndex();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_getSelectionIndices")) test_getSelectionIndices();
+	else if (getName().equals("test_getTopIndex")) test_getTopIndex();
+	else if (getName().equals("test_indexOfLjava_lang_String")) test_indexOfLjava_lang_String();
+	else if (getName().equals("test_indexOfLjava_lang_StringI")) test_indexOfLjava_lang_StringI();
+	else if (getName().equals("test_isSelectedI")) test_isSelectedI();
+	else if (getName().equals("test_remove$I")) test_remove$I();
+	else if (getName().equals("test_removeI")) test_removeI();
+	else if (getName().equals("test_removeII")) test_removeII();
+	else if (getName().equals("test_removeLjava_lang_String")) test_removeLjava_lang_String();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_select$I")) test_select$I();
+	else if (getName().equals("test_selectI")) test_selectI();
+	else if (getName().equals("test_selectII")) test_selectII();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setItemILjava_lang_String")) test_setItemILjava_lang_String();
+	else if (getName().equals("test_setItems$Ljava_lang_String")) test_setItems$Ljava_lang_String();
+	else if (getName().equals("test_setSelection$I")) test_setSelection$I();
+	else if (getName().equals("test_setSelection$Ljava_lang_String")) test_setSelection$Ljava_lang_String();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionII")) test_setSelectionII();
+	else if (getName().equals("test_setTopIndexI")) test_setTopIndexI();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Listener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Listener.java
new file mode 100644
index 0000000000..d4b1e49b1e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Listener.java
@@ -0,0 +1,42 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Listener
+ *
+ * @see org.eclipse.swt.widgets.Listener
+ */
+public class Test_org_eclipse_swt_widgets_Listener extends SwtTestCase {
+
+public Test_org_eclipse_swt_widgets_Listener(String name) {
+	super(name);
+}
+
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_handleEventLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_handleEventLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_handleEventLorg_eclipse_swt_widgets_Event");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_handleEventLorg_eclipse_swt_widgets_Event")) test_handleEventLorg_eclipse_swt_widgets_Event();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Menu.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Menu.java
new file mode 100644
index 0000000000..4b3c439558
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Menu.java
@@ -0,0 +1,364 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Menu
+ *
+ * @see org.eclipse.swt.widgets.Menu
+ */
+public class Test_org_eclipse_swt_widgets_Menu extends Test_org_eclipse_swt_widgets_Widget {
+
+Menu menu;
+
+public Test_org_eclipse_swt_widgets_Menu(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	menu = new Menu(shell);
+	setWidget(menu);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/* tests Menu(Window) */
+public void test_ConstructorLorg_eclipse_swt_widgets_Control(){
+	Composite comp = new Composite(shell, SWT.NULL);
+	Menu testMenu = new Menu(comp);
+	comp.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_DecorationsI(){
+	Menu newMenu;
+	MenuItem mItem = new MenuItem(menu, SWT.NULL);
+	newMenu = new Menu(mItem);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Menu(){
+	Menu newMenu;
+	newMenu = new Menu(menu);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_MenuItem() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_MenuItem not written");
+}
+
+public void test_addHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	warnUnimpl("Test test_addHelpListenerLorg_eclipse_swt_events_HelpListener not written");
+}
+
+public void test_addMenuListenerLorg_eclipse_swt_events_MenuListener() {
+	warnUnimpl("Test test_addMenuListenerLorg_eclipse_swt_events_MenuListener not written");
+}
+
+public void test_getDefaultItem() {
+	warnUnimpl("Test test_getDefaultItem not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getEnabled() {
+	warnUnimpl("Test test_getEnabled not written");
+}
+
+/**
+ * Returns the item at the given, zero-relative index in the
+ * receiver. Throws an exception if the index is out of range.
+ *
+ * @param index the index of the item to return
+ * @return the item at the given index
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
+ * </ul>
+ */
+public void test_getItemI(){
+	MenuItem mItem0 = new MenuItem(menu, SWT.NULL);
+	MenuItem mItem1 = new MenuItem(menu, SWT.NULL);
+	assertEquals(menu.getItem(0), mItem0);
+	assertEquals(menu.getItem(1), mItem1);
+}
+
+/**
+ * Returns the number of items contained in the receiver.
+ */
+public void test_getItemCount(){
+	int number = 10;
+	MenuItem ti;
+	for (int i = 0; i<number ; i++){
+		assertEquals(menu.getItemCount(), i);
+	  	ti = new MenuItem(menu, 0);
+	}
+}
+
+/**
+ * Returns an array of <code>MenuItem</code>s which are the items
+ * in the receiver. 
+ * <p>
+ * Note: This is not the actual structure used by the receiver
+ * to maintain its list of items, so modifying the array will
+ * not affect the receiver. 
+ * </p>
+ */
+public void test_getItems(){
+	int number = 5;
+	MenuItem[] items = new MenuItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new MenuItem(menu, 0);
+	}
+	assertEquals(":a:", items, menu.getItems());
+	
+	menu.getItems()[0].dispose();
+	assertEquals(":b:", new MenuItem[]{items[1], items[2], items[3], items[4]}, menu.getItems());
+
+	menu.getItems()[3].dispose();
+	assertEquals(":c:", new MenuItem[]{items[1], items[2], items[3]}, menu.getItems());
+
+	menu.getItems()[1].dispose();
+	assertEquals(":d:", new MenuItem[]{items[1], items[3]}, menu.getItems());
+}
+
+/**
+ * Returns the receiver's parent, which must be a <code>Decorations</code>.
+ */
+public void test_getParent(){
+	assertEquals(menu.getParent(), shell);
+}
+
+/**
+ * Returns the receiver's parent item, which must be a
+ * <code>MenuItem</code> or null when the receiver is a
+ * root.
+ */
+public void test_getParentItem(){
+	MenuItem mItem = new MenuItem(menu, SWT.CASCADE);
+	Menu newMenu = new Menu(shell, SWT.DROP_DOWN);
+	assertNull(newMenu.getParentItem());
+	mItem.setMenu(newMenu);
+	assertEquals(newMenu.getParentItem(), mItem);
+}
+
+/**
+ * Returns the receiver's parent item, which must be a
+ * <code>Menu</code> or null when the receiver is a
+ * root.
+ */
+public void test_getParentMenu(){
+	MenuItem mItem = new MenuItem(menu, SWT.CASCADE);
+	Menu newMenu = new Menu(shell, SWT.DROP_DOWN);
+	assertNull(newMenu.getParentMenu());
+	mItem.setMenu(newMenu);
+	assertEquals(newMenu.getParentMenu(), menu);
+}
+
+/**
+ * Returns the receiver's shell. For all controls other than
+ * shells, this simply returns the control's nearest ancestor
+ * shell. Shells return themselves, even if they are children
+ * of other shells.
+ */
+public void test_getShell(){
+	assertEquals(menu.getShell(), shell);
+}
+
+public void test_getVisible() {
+	warnUnimpl("Test test_getVisible not written");
+}
+
+/**
+ * Searches the receiver's list starting at the first item
+ * (index 0) until an item is found that is equal to the 
+ * argument, and returns the index of that item. If no item
+ * is found, returns -1.
+ *
+ * @param item the search item
+ * @return the index of the item
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
+ * </ul>
+ */
+public void test_indexOfLorg_eclipse_swt_widgets_MenuItem(){
+	int number = 10;
+	MenuItem[] mis = new MenuItem[number];
+	for (int i = 0; i<number ; i++){
+	  	mis[i] = new MenuItem(menu, SWT.NULL);
+	}
+	for (int i = 0; i<number ; i++){
+		assertEquals(menu.indexOf(mis[i]), i);
+		if (i>1)
+			assertTrue(menu.indexOf(mis[i-1]) != i);
+	}
+}
+
+public void test_isEnabled() {
+	warnUnimpl("Test test_isEnabled not written");
+}
+
+/**
+ * Returns <code>true</code> if the receiver is visible, and
+ * <code>false</code> otherwise.
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, this method
+ * may still indicate that it is considered visible even though
+ * it may not actually be showing.
+ * </p>
+ */
+public void test_isVisible(){
+	menu.setVisible(true);
+	assertTrue(menu.isVisible());
+
+	// api not implemented yet
+	if (fCheckVisibility) {
+		menu.setVisible(false);
+		assertEquals(menu.isVisible(), false);
+	}
+}
+
+public void test_removeHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	warnUnimpl("Test test_removeHelpListenerLorg_eclipse_swt_events_HelpListener not written");
+}
+
+public void test_removeMenuListenerLorg_eclipse_swt_events_MenuListener() {
+	warnUnimpl("Test test_removeMenuListenerLorg_eclipse_swt_events_MenuListener not written");
+}
+
+/**
+ * Sets the default menu item to the argument or removes
+ * the default emphasis when the argument is <code>null</code>.
+ * 
+ * @param item the default menu item or null
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu item has been disposed</li> 
+ * </ul>
+ */
+public void test_setDefaultItemLorg_eclipse_swt_widgets_MenuItem(){
+	MenuItem mItem0 = new MenuItem(menu, SWT.NULL);
+	MenuItem mItem1 = new MenuItem(menu, SWT.NULL);
+	menu.setDefaultItem(mItem0);
+	assertEquals(menu.getDefaultItem(), mItem0);
+	assertTrue("After setDefaultItem(mItem0):", menu.getDefaultItem() != mItem1);
+	menu.setDefaultItem(mItem1);
+	assertEquals(menu.getDefaultItem(), mItem1);
+	assertTrue("After setDefaultItem(mItem1):", menu.getDefaultItem() != mItem0);
+}
+
+public void test_setEnabledZ() {
+	warnUnimpl("Test test_setEnabledZ not written");
+}
+
+public void test_setLocationII() {
+	warnUnimpl("Test test_setLocationII not written");
+}
+
+/**
+ * Marks the receiver as visible if the argument is <code>true</code>,
+ * and marks it invisible otherwise. 
+ * <p>
+ * If one of the receiver's ancestors is not visible or some
+ * other condition makes the receiver not visible, marking
+ * it visible may not actually cause it to be displayed.
+ * </p>
+ */
+/* tests both getVisible and setVisble */
+public void test_setVisibleZ(){
+	menu.setVisible(true);
+	assertTrue(menu.getVisible());
+	// API not implemented yet 
+	if (fCheckVisibility) {
+		menu.setVisible(false);
+		assertEquals(menu.getVisible(), false);
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Menu((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_DecorationsI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_MenuItem");
+	methodNames.addElement("test_addHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_addMenuListenerLorg_eclipse_swt_events_MenuListener");
+	methodNames.addElement("test_getDefaultItem");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getParentItem");
+	methodNames.addElement("test_getParentMenu");
+	methodNames.addElement("test_getShell");
+	methodNames.addElement("test_getVisible");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_MenuItem");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_isVisible");
+	methodNames.addElement("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_removeMenuListenerLorg_eclipse_swt_events_MenuListener");
+	methodNames.addElement("test_setDefaultItemLorg_eclipse_swt_widgets_MenuItem");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setLocationII");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Control")) test_ConstructorLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_DecorationsI")) test_ConstructorLorg_eclipse_swt_widgets_DecorationsI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Menu")) test_ConstructorLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_MenuItem")) test_ConstructorLorg_eclipse_swt_widgets_MenuItem();
+	else if (getName().equals("test_addHelpListenerLorg_eclipse_swt_events_HelpListener")) test_addHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_addMenuListenerLorg_eclipse_swt_events_MenuListener")) test_addMenuListenerLorg_eclipse_swt_events_MenuListener();
+	else if (getName().equals("test_getDefaultItem")) test_getDefaultItem();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getParentItem")) test_getParentItem();
+	else if (getName().equals("test_getParentMenu")) test_getParentMenu();
+	else if (getName().equals("test_getShell")) test_getShell();
+	else if (getName().equals("test_getVisible")) test_getVisible();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_MenuItem")) test_indexOfLorg_eclipse_swt_widgets_MenuItem();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_isVisible")) test_isVisible();
+	else if (getName().equals("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener")) test_removeHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_removeMenuListenerLorg_eclipse_swt_events_MenuListener")) test_removeMenuListenerLorg_eclipse_swt_events_MenuListener();
+	else if (getName().equals("test_setDefaultItemLorg_eclipse_swt_widgets_MenuItem")) test_setDefaultItemLorg_eclipse_swt_widgets_MenuItem();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setLocationII")) test_setLocationII();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java
new file mode 100644
index 0000000000..9bf8431fca
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MenuItem.java
@@ -0,0 +1,279 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.MenuItem
+ *
+ * @see org.eclipse.swt.widgets.MenuItem
+ */
+public class Test_org_eclipse_swt_widgets_MenuItem extends Test_org_eclipse_swt_widgets_Item {
+
+Menu menu;
+MenuItem menuItem;
+
+public Test_org_eclipse_swt_widgets_MenuItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	menu = new Menu(shell);
+	menuItem = new MenuItem(menu, 0);
+	setWidget(menuItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_MenuI(){
+	MenuItem mItem = new MenuItem(menu, SWT.NULL);
+	assertNotNull(mItem);
+	
+	if (fCheckSwtNullExceptions) {
+		try {
+			mItem = new MenuItem(null, SWT.NULL);
+			fail("No exception thrown");
+		} 
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_MenuII(){
+	MenuItem mItem = new MenuItem(menu, SWT.NULL, 0); //create a menu item at index 0
+	assertNotNull(mItem);
+}
+
+public void test_addArmListenerLorg_eclipse_swt_events_ArmListener() {
+	warnUnimpl("Test test_addArmListenerLorg_eclipse_swt_events_ArmListener not written");
+}
+
+public void test_addHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	warnUnimpl("Test test_addHelpListenerLorg_eclipse_swt_events_HelpListener not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getAccelerator() {
+	warnUnimpl("Test test_getAccelerator not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getEnabled() {
+	warnUnimpl("Test test_getEnabled not written");
+}
+
+public void test_getMenu() {
+	warnUnimpl("Test test_getMenu not written");
+}
+
+/**
+ * Returns the receiver's parent, which must be a <code>Menu</code>.
+ */
+ public void test_getParent(){
+	assertEquals(menuItem.getParent(), menu);
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+/**
+ * Returns <code>true</code> if the receiver is enabled, and
+ * <code>false</code> otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ */
+public void test_isEnabled(){
+	menuItem.setEnabled(true);
+	assertTrue(menuItem.isEnabled());
+	menuItem.setEnabled(false);
+	assertEquals(menuItem.isEnabled(), false);
+}
+
+public void test_removeArmListenerLorg_eclipse_swt_events_ArmListener() {
+	warnUnimpl("Test test_removeArmListenerLorg_eclipse_swt_events_ArmListener not written");
+}
+
+public void test_removeHelpListenerLorg_eclipse_swt_events_HelpListener() {
+	warnUnimpl("Test test_removeHelpListenerLorg_eclipse_swt_events_HelpListener not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+/**
+ * Sets the widget accelerator.  An accelerator is the bit-wise
+ * OR of zero or more modifier masks and a key. Examples:
+ * <code>SWT.CONTROL | SWT.SHIFT | 'T', SWT.ALT | SWT.F2</code>.
+ */
+public void test_setAcceleratorI(){
+	menuItem.setAccelerator(SWT.CTRL + 'Z');
+	assertEquals(menuItem.getAccelerator(), SWT.CTRL + 'Z');
+	
+}
+
+/**
+ * Enables the receiver if the argument is <code>true</code>,
+ * and disables it otherwise. A disabled control is typically
+ * not selectable from the user interface and draws with an
+ * inactive or "grayed" look.
+ */
+public void test_setEnabledZ(){
+	menuItem.setEnabled(true);
+	assertTrue(menuItem.getEnabled());
+	menuItem.setEnabled(false);
+	assertEquals(menuItem.getEnabled(), false);
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+/**
+ * Sets the receiver's pull down menu to the argument.
+ * Only <code>CASCADE</code> menu items can have a
+ * pull down menu. The sequence of key strokes, button presses
+ * and/or button releases that are used to request a pull down
+ * menu is platform specific.
+ *
+ * @param menu the new pull down menu
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_MENU_NOT_DROP_DOWN - if the menu is not a drop down menu</li>
+ *    <li>ERROR_MENUITEM_NOT_CASCADE - if the menu item is not a <code>CASCADE</code></li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the menu has been disposed</li>
+ *    <li>ERROR_INVALID_PARENT - if the menu is not in the same widget tree</li>
+ * </ul>
+ */
+public void test_setMenuLorg_eclipse_swt_widgets_Menu(){
+	assertNull(menuItem.getMenu());
+	MenuItem mItem = new MenuItem(menu, SWT.CASCADE);
+	Menu newMenu = new Menu(shell, SWT.DROP_DOWN);
+	mItem.setMenu(newMenu);
+	assertEquals(mItem.getMenu(), newMenu);
+}
+
+/**
+ * Sets the selection state of the receiver.
+ * <p>
+ * When the receiver is of type <code>CHECK</code> or <code>RADIO</code>,
+ * it is selected when it is checked.
+ */
+public void test_setSelectionZ(){
+
+	int[] itemStyles = {SWT.CHECK, SWT.RADIO};
+	for (int i=0; i<itemStyles.length; i++)
+	{
+		MenuItem mItem = new MenuItem(menu, itemStyles[i]);
+		mItem.setSelection(false);
+		assertEquals(mItem.getSelection(), false);
+		mItem.setSelection(true);
+		assertTrue(mItem.getSelection());
+		mItem.dispose();
+	} 
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_MenuItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_MenuI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_MenuII");
+	methodNames.addElement("test_addArmListenerLorg_eclipse_swt_events_ArmListener");
+	methodNames.addElement("test_addHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getAccelerator");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getMenu");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_removeArmListenerLorg_eclipse_swt_events_ArmListener");
+	methodNames.addElement("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setAcceleratorI");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setMenuLorg_eclipse_swt_widgets_Menu");
+	methodNames.addElement("test_setSelectionZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_MenuI")) test_ConstructorLorg_eclipse_swt_widgets_MenuI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_MenuII")) test_ConstructorLorg_eclipse_swt_widgets_MenuII();
+	else if (getName().equals("test_addArmListenerLorg_eclipse_swt_events_ArmListener")) test_addArmListenerLorg_eclipse_swt_events_ArmListener();
+	else if (getName().equals("test_addHelpListenerLorg_eclipse_swt_events_HelpListener")) test_addHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getAccelerator")) test_getAccelerator();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getMenu")) test_getMenu();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_removeArmListenerLorg_eclipse_swt_events_ArmListener")) test_removeArmListenerLorg_eclipse_swt_events_ArmListener();
+	else if (getName().equals("test_removeHelpListenerLorg_eclipse_swt_events_HelpListener")) test_removeHelpListenerLorg_eclipse_swt_events_HelpListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setAcceleratorI")) test_setAcceleratorI();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setMenuLorg_eclipse_swt_widgets_Menu")) test_setMenuLorg_eclipse_swt_widgets_Menu();
+	else if (getName().equals("test_setSelectionZ")) test_setSelectionZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MessageBox.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MessageBox.java
new file mode 100644
index 0000000000..d43109be40
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_MessageBox.java
@@ -0,0 +1,133 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.MessageBox
+ *
+ * @see org.eclipse.swt.widgets.MessageBox
+ */
+public class Test_org_eclipse_swt_widgets_MessageBox extends Test_org_eclipse_swt_widgets_Dialog {
+
+MessageBox messageBox;
+
+public Test_org_eclipse_swt_widgets_MessageBox(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	messageBox = new MessageBox(shell, SWT.NULL);
+	setDialog(messageBox);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell(){
+	if (fCheckSwtNullExceptions) {
+		MessageBox mb = new MessageBox(shell);
+		try {
+			mb = new MessageBox(null);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ShellI not written");
+}
+
+public void test_getMessage() {
+	warnUnimpl("Test test_getMessage not written");
+}
+
+/**
+ * Makes the dialog visible and brings it to the front
+ * of the display.
+ *
+ * @return the ID of the button that was selected to dismiss the
+ *         message box (e.g. SWT.OK, SWT.CANCEL, etc...)
+ */
+public void test_open(){
+	if (fTestDialogOpen)
+		messageBox.open();
+}
+
+/**
+ * Sets the dialog's message, which is a description of
+ * the purpose for which it was opened. This message will be
+ * visible on the dialog while it is open.
+ */
+public void test_setMessageLjava_lang_String(){
+	assertEquals(messageBox.getMessage(), "");
+	String testStr = "test string";
+	messageBox.setMessage(testStr);
+	assertEquals(messageBox.getMessage(), testStr);
+	messageBox.setMessage("");
+	assertEquals(messageBox.getMessage(), "");
+	if (fCheckSwtNullExceptions) {
+		try {
+			messageBox.setMessage(null);
+			fail("No exception thrown");
+		} 
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_MessageBox((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_getMessage");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_setMessageLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Dialog.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_getMessage")) test_getMessage();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_setMessageLjava_lang_String")) test_setMessageLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ProgressBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ProgressBar.java
new file mode 100644
index 0000000000..a662f5ff62
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ProgressBar.java
@@ -0,0 +1,627 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ProgressBar
+ *
+ * @see org.eclipse.swt.widgets.ProgressBar
+ */
+public class Test_org_eclipse_swt_widgets_ProgressBar extends Test_org_eclipse_swt_widgets_Control {
+
+ProgressBar progressBar;
+
+public Test_org_eclipse_swt_widgets_ProgressBar(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	progressBar = new ProgressBar(shell, 0);
+	setWidget(progressBar);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void report(String call, int set, int minExpected, int maxExpected, int selectionExpected) {
+	// Uncomment these lines and comment out call to check() if you want the test to report all errors without
+	// stopping.
+	
+	//if (progressBar.getMinimum() != minExpected)
+		//System.out.println(call + "(" + set + "): Minimum Expected: " + minExpected + "  Actual: " + progressBar.getMinimum());
+	//if (progressBar.getMaximum() != maxExpected)
+		//System.out.println(call + "(" + set + "): Maximum Expected: " + maxExpected + "  Actual: " + progressBar.getMaximum());
+	//if (progressBar.getSelection() != selectionExpected)
+		//System.out.println(call + "(" + set + "): Selection Expected: " + selectionExpected + "  Actual: " + progressBar.getSelection());
+
+	check(minExpected, maxExpected, selectionExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void check(int minExpected, int maxExpected, int selectionExpected) {
+	assertEquals(progressBar.getMaximum(), maxExpected);
+	assertEquals(progressBar.getMinimum(), minExpected);
+	assertEquals(progressBar.getSelection(), selectionExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMinimumValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 0, 100, 50, },
+{1, 1, 100, 50, },
+{2, 2, 100, 50, },
+{3, 3, 100, 50, },
+{4, 4, 100, 50, },
+{5, 5, 100, 50, },
+{6, 6, 100, 50, },
+{7, 7, 100, 50, },
+{8, 8, 100, 50, },
+{9, 9, 100, 50, },
+{10, 10, 100, 50, },
+{11, 11, 100, 50, },
+{12, 12, 100, 50, },
+{13, 13, 100, 50, },
+{14, 14, 100, 50, },
+{15, 15, 100, 50, },
+{16, 16, 100, 50, },
+{17, 17, 100, 50, },
+{18, 18, 100, 50, },
+{19, 19, 100, 50, },
+{20, 20, 100, 50, },
+{21, 21, 100, 50, },
+{22, 22, 100, 50, },
+{23, 23, 100, 50, },
+{24, 24, 100, 50, },
+{25, 25, 100, 50, },
+{26, 26, 100, 50, },
+{27, 27, 100, 50, },
+{28, 28, 100, 50, },
+{29, 29, 100, 50, },
+{30, 30, 100, 50, },
+{31, 31, 100, 50, },
+{32, 32, 100, 50, },
+{33, 33, 100, 50, },
+{34, 34, 100, 50, },
+{35, 35, 100, 50, },
+{36, 36, 100, 50, },
+{37, 37, 100, 50, },
+{38, 38, 100, 50, },
+{39, 39, 100, 50, },
+{40, 40, 100, 50, },
+{41, 41, 100, 50, },
+{42, 42, 100, 50, },
+{43, 43, 100, 50, },
+{44, 44, 100, 50, },
+{45, 45, 100, 50, },
+{46, 46, 100, 50, },
+{47, 47, 100, 50, },
+{48, 48, 100, 50, },
+{49, 49, 100, 50, },
+{50, 50, 100, 50, },
+{51, 51, 100, 51, },
+{52, 52, 100, 52, },
+{53, 53, 100, 53, },
+{54, 54, 100, 54, },
+{55, 55, 100, 55, },
+{56, 56, 100, 56, },
+{57, 57, 100, 57, },
+{58, 58, 100, 58, },
+{59, 59, 100, 59, },
+{60, 60, 100, 60, },
+{61, 61, 100, 61, },
+{62, 62, 100, 62, },
+{63, 63, 100, 63, },
+{64, 64, 100, 64, },
+{65, 65, 100, 65, },
+{66, 66, 100, 66, },
+{67, 67, 100, 67, },
+{68, 68, 100, 68, },
+{69, 69, 100, 69, },
+{70, 70, 100, 70, },
+{71, 71, 100, 71, },
+{72, 72, 100, 72, },
+{73, 73, 100, 73, },
+{74, 74, 100, 74, },
+{75, 75, 100, 75, },
+{76, 76, 100, 76, },
+{77, 77, 100, 77, },
+{78, 78, 100, 78, },
+{79, 79, 100, 79, },
+{80, 80, 100, 80, },
+{81, 81, 100, 81, },
+{82, 82, 100, 82, },
+{83, 83, 100, 83, },
+{84, 84, 100, 84, },
+{85, 85, 100, 85, },
+{86, 86, 100, 86, },
+{87, 87, 100, 87, },
+{88, 88, 100, 88, },
+{89, 89, 100, 89, },
+{90, 90, 100, 90, },
+{91, 91, 100, 91, },
+{92, 92, 100, 92, },
+{93, 93, 100, 93, },
+{94, 94, 100, 94, },
+{95, 95, 100, 95, },
+{96, 96, 100, 96, },
+{97, 97, 100, 97, },
+{98, 98, 100, 98, },
+{99, 99, 100, 99, },
+{100, 10, 100, 50, },
+{101, 10, 100, 50, },
+{102, 10, 100, 50, },
+{103, 10, 100, 50, },
+{104, 10, 100, 50, },
+{105, 10, 100, 50, },
+{106, 10, 100, 50, },
+{107, 10, 100, 50, },
+{108, 10, 100, 50, },
+{109, 10, 100, 50, },
+{110, 10, 100, 50, },
+{111, 10, 100, 50, },
+{112, 10, 100, 50, },
+{113, 10, 100, 50, },
+{114, 10, 100, 50, },
+{115, 10, 100, 50, },
+{116, 10, 100, 50, },
+{117, 10, 100, 50, },
+{118, 10, 100, 50, },
+{119, 10, 100, 50, },
+{120, 10, 100, 50, },
+{121, 10, 100, 50, },
+{122, 10, 100, 50, },
+{123, 10, 100, 50, },
+{124, 10, 100, 50, },
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMaximumValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 10, 100, 50, },
+{1, 10, 100, 50, },
+{2, 10, 100, 50, },
+{3, 10, 100, 50, },
+{4, 10, 100, 50, },
+{5, 10, 100, 50, },
+{6, 10, 100, 50, },
+{7, 10, 100, 50, },
+{8, 10, 100, 50, },
+{9, 10, 100, 50, },
+{10, 10, 100, 50, },
+{11, 10, 11, 11, },
+{12, 10, 12, 12, },
+{13, 10, 13, 13, },
+{14, 10, 14, 14, },
+{15, 10, 15, 15, },
+{16, 10, 16, 16, },
+{17, 10, 17, 17, },
+{18, 10, 18, 18, },
+{19, 10, 19, 19, },
+{20, 10, 20, 20, },
+{21, 10, 21, 21, },
+{22, 10, 22, 22, },
+{23, 10, 23, 23, },
+{24, 10, 24, 24, },
+{25, 10, 25, 25, },
+{26, 10, 26, 26, },
+{27, 10, 27, 27, },
+{28, 10, 28, 28, },
+{29, 10, 29, 29, },
+{30, 10, 30, 30, },
+{31, 10, 31, 31, },
+{32, 10, 32, 32, },
+{33, 10, 33, 33, },
+{34, 10, 34, 34, },
+{35, 10, 35, 35, },
+{36, 10, 36, 36, },
+{37, 10, 37, 37, },
+{38, 10, 38, 38, },
+{39, 10, 39, 39, },
+{40, 10, 40, 40, },
+{41, 10, 41, 41, },
+{42, 10, 42, 42, },
+{43, 10, 43, 43, },
+{44, 10, 44, 44, },
+{45, 10, 45, 45, },
+{46, 10, 46, 46, },
+{47, 10, 47, 47, },
+{48, 10, 48, 48, },
+{49, 10, 49, 49, },
+{50, 10, 50, 50, },
+{51, 10, 51, 50, },
+{52, 10, 52, 50, },
+{53, 10, 53, 50, },
+{54, 10, 54, 50, },
+{55, 10, 55, 50, },
+{56, 10, 56, 50, },
+{57, 10, 57, 50, },
+{58, 10, 58, 50, },
+{59, 10, 59, 50, },
+{60, 10, 60, 50, },
+{61, 10, 61, 50, },
+{62, 10, 62, 50, },
+{63, 10, 63, 50, },
+{64, 10, 64, 50, },
+{65, 10, 65, 50, },
+{66, 10, 66, 50, },
+{67, 10, 67, 50, },
+{68, 10, 68, 50, },
+{69, 10, 69, 50, },
+{70, 10, 70, 50, },
+{71, 10, 71, 50, },
+{72, 10, 72, 50, },
+{73, 10, 73, 50, },
+{74, 10, 74, 50, },
+{75, 10, 75, 50, },
+{76, 10, 76, 50, },
+{77, 10, 77, 50, },
+{78, 10, 78, 50, },
+{79, 10, 79, 50, },
+{80, 10, 80, 50, },
+{81, 10, 81, 50, },
+{82, 10, 82, 50, },
+{83, 10, 83, 50, },
+{84, 10, 84, 50, },
+{85, 10, 85, 50, },
+{86, 10, 86, 50, },
+{87, 10, 87, 50, },
+{88, 10, 88, 50, },
+{89, 10, 89, 50, },
+{90, 10, 90, 50, },
+{91, 10, 91, 50, },
+{92, 10, 92, 50, },
+{93, 10, 93, 50, },
+{94, 10, 94, 50, },
+{95, 10, 95, 50, },
+{96, 10, 96, 50, },
+{97, 10, 97, 50, },
+{98, 10, 98, 50, },
+{99, 10, 99, 50, },
+{100, 10, 100, 50, },
+{101, 10, 101, 50, },
+{102, 10, 102, 50, },
+{103, 10, 103, 50, },
+{104, 10, 104, 50, },
+{105, 10, 105, 50, },
+{106, 10, 106, 50, },
+{107, 10, 107, 50, },
+{108, 10, 108, 50, },
+{109, 10, 109, 50, },
+{110, 10, 110, 50, },
+{111, 10, 111, 50, },
+{112, 10, 112, 50, },
+{113, 10, 113, 50, },
+{114, 10, 114, 50, },
+{115, 10, 115, 50, },
+{116, 10, 116, 50, },
+{117, 10, 117, 50, },
+{118, 10, 118, 50, },
+{119, 10, 119, 50, },
+{120, 10, 120, 50, },
+{121, 10, 121, 50, },
+{122, 10, 122, 50, },
+{123, 10, 123, 50, },
+{124, 10, 124, 50, },
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void setDefaults() {
+	progressBar.setMaximum(100);
+	progressBar.setMinimum(10);
+	progressBar.setSelection(50);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetSelectionValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 10, 100, 10, },
+{1, 10, 100, 10, },
+{2, 10, 100, 10, },
+{3, 10, 100, 10, },
+{4, 10, 100, 10, },
+{5, 10, 100, 10, },
+{6, 10, 100, 10, },
+{7, 10, 100, 10, },
+{8, 10, 100, 10, },
+{9, 10, 100, 10, },
+{10, 10, 100, 10, },
+{11, 10, 100, 11, },
+{12, 10, 100, 12, },
+{13, 10, 100, 13, },
+{14, 10, 100, 14, },
+{15, 10, 100, 15, },
+{16, 10, 100, 16, },
+{17, 10, 100, 17, },
+{18, 10, 100, 18, },
+{19, 10, 100, 19, },
+{20, 10, 100, 20, },
+{21, 10, 100, 21, },
+{22, 10, 100, 22, },
+{23, 10, 100, 23, },
+{24, 10, 100, 24, },
+{25, 10, 100, 25, },
+{26, 10, 100, 26, },
+{27, 10, 100, 27, },
+{28, 10, 100, 28, },
+{29, 10, 100, 29, },
+{30, 10, 100, 30, },
+{31, 10, 100, 31, },
+{32, 10, 100, 32, },
+{33, 10, 100, 33, },
+{34, 10, 100, 34, },
+{35, 10, 100, 35, },
+{36, 10, 100, 36, },
+{37, 10, 100, 37, },
+{38, 10, 100, 38, },
+{39, 10, 100, 39, },
+{40, 10, 100, 40, },
+{41, 10, 100, 41, },
+{42, 10, 100, 42, },
+{43, 10, 100, 43, },
+{44, 10, 100, 44, },
+{45, 10, 100, 45, },
+{46, 10, 100, 46, },
+{47, 10, 100, 47, },
+{48, 10, 100, 48, },
+{49, 10, 100, 49, },
+{50, 10, 100, 50, },
+{51, 10, 100, 51, },
+{52, 10, 100, 52, },
+{53, 10, 100, 53, },
+{54, 10, 100, 54, },
+{55, 10, 100, 55, },
+{56, 10, 100, 56, },
+{57, 10, 100, 57, },
+{58, 10, 100, 58, },
+{59, 10, 100, 59, },
+{60, 10, 100, 60, },
+{61, 10, 100, 61, },
+{62, 10, 100, 62, },
+{63, 10, 100, 63, },
+{64, 10, 100, 64, },
+{65, 10, 100, 65, },
+{66, 10, 100, 66, },
+{67, 10, 100, 67, },
+{68, 10, 100, 68, },
+{69, 10, 100, 69, },
+{70, 10, 100, 70, },
+{71, 10, 100, 71, },
+{72, 10, 100, 72, },
+{73, 10, 100, 73, },
+{74, 10, 100, 74, },
+{75, 10, 100, 75, },
+{76, 10, 100, 76, },
+{77, 10, 100, 77, },
+{78, 10, 100, 78, },
+{79, 10, 100, 79, },
+{80, 10, 100, 80, },
+{81, 10, 100, 81, },
+{82, 10, 100, 82, },
+{83, 10, 100, 83, },
+{84, 10, 100, 84, },
+{85, 10, 100, 85, },
+{86, 10, 100, 86, },
+{87, 10, 100, 87, },
+{88, 10, 100, 88, },
+{89, 10, 100, 89, },
+{90, 10, 100, 90, },
+{91, 10, 100, 91, },
+{92, 10, 100, 92, },
+{93, 10, 100, 93, },
+{94, 10, 100, 94, },
+{95, 10, 100, 95, },
+{96, 10, 100, 96, },
+{97, 10, 100, 97, },
+{98, 10, 100, 98, },
+{99, 10, 100, 99, },
+{100, 10, 100, 100, },
+{101, 10, 100, 100, },
+{102, 10, 100, 100, },
+{103, 10, 100, 100, },
+{104, 10, 100, 100, },
+{105, 10, 100, 100, },
+{106, 10, 100, 100, },
+{107, 10, 100, 100, },
+{108, 10, 100, 100, },
+{109, 10, 100, 100, },
+{110, 10, 100, 100, },
+{111, 10, 100, 100, },
+{112, 10, 100, 100, },
+{113, 10, 100, 100, },
+{114, 10, 100, 100, },
+{115, 10, 100, 100, },
+{116, 10, 100, 100, },
+{117, 10, 100, 100, },
+{118, 10, 100, 100, },
+{119, 10, 100, 100, },
+{120, 10, 100, 100, },
+{121, 10, 100, 100, },
+{122, 10, 100, 100, },
+{123, 10, 100, 100, },
+{124, 10, 100, 100, },
+};
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		progressBar = new ProgressBar(null, 0);
+		fail("No exception thrown"); //should never get here
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.HORIZONTAL, SWT.VERTICAL};
+	for (int i = 0; i < cases.length; i++)
+		progressBar = new ProgressBar(shell, cases[i]);
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getMaximum() {
+	warnUnimpl("Test test_getMaximum not written");
+}
+
+public void test_getMinimum() {
+	warnUnimpl("Test test_getMinimum not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+/**
+ * Sets the maximum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMaximumI(){
+
+	int [][] testValues = getSetMaximumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		progressBar.setMaximum(intArray[0]);
+		report("setMaximum", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+/**
+ * Sets the minimum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMinimumI(){
+
+	int [][] testValues = getSetMinimumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		progressBar.setMinimum(intArray[0]);
+		report("setMinimum", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+/**
+ * Sets the single <em>selection</em> that is the receiver's
+ * position to the argument which must be greater than or equal
+ * to zero.
+ */
+public void test_setSelectionI(){
+
+	int [][] testValues = getSetSelectionValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		progressBar.setSelection(intArray[0]);
+		report("setSelection", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_ProgressBar((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getMaximum");
+	methodNames.addElement("test_getMinimum");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_setMaximumI");
+	methodNames.addElement("test_setMinimumI");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getMaximum")) test_getMaximum();
+	else if (getName().equals("test_getMinimum")) test_getMinimum();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_setMaximumI")) test_setMaximumI();
+	else if (getName().equals("test_setMinimumI")) test_setMinimumI();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Sash.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Sash.java
new file mode 100644
index 0000000000..689ebc23ff
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Sash.java
@@ -0,0 +1,106 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Sash
+ *
+ * @see org.eclipse.swt.widgets.Sash
+ */
+public class Test_org_eclipse_swt_widgets_Sash extends Test_org_eclipse_swt_widgets_Control {
+
+Sash sash;
+
+public Test_org_eclipse_swt_widgets_Sash(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	sash = new Sash(shell, 0);
+	setWidget(sash);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
+ * </ul>
+ * @exception SWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		sash = new Sash(null, 0);
+		fail("No exception thrown"); //should never get here
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.HORIZONTAL, SWT.VERTICAL};
+	for (int i = 0; i < cases.length; i++)
+		sash = new Sash(shell, cases[i]);
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	// overridden from Control because it does not make sense
+	// to set the font of a Sash.
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Sash((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scale.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scale.java
new file mode 100644
index 0000000000..cbfa170b06
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scale.java
@@ -0,0 +1,669 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Scale
+ *
+ * @see org.eclipse.swt.widgets.Scale
+ */
+public class Test_org_eclipse_swt_widgets_Scale extends Test_org_eclipse_swt_widgets_Control {
+
+Scale scale;
+
+public Test_org_eclipse_swt_widgets_Scale(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	scale = new Scale(shell, 0);
+	setWidget(scale);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void report(String call, int set, int minExpected, int maxExpected, int selectionExpected) {
+	 //Uncomment these lines and comment out call to check() if you want the test to report all errors without
+	 //stopping.
+	
+	//if (trackBar.getMinimum() != minExpected)
+		//System.out.println(call + "(" + set + "): Minimum Expected: " + minExpected + "  Actual: " + trackBar.getMinimum());
+	//if (trackBar.getMaximum() != maxExpected)
+		//System.out.println(call + "(" + set + "): Maximum Expected: " + maxExpected + "  Actual: " + trackBar.getMaximum());
+	//if (trackBar.getSelection() != selectionExpected)
+		//System.out.println(call + "(" + set + "): Selection Expected: " + selectionExpected + "  Actual: " + trackBar.getSelection());
+	check(minExpected, maxExpected, selectionExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void check(int minExpected, int maxExpected, int selectionExpected) {
+	assertEquals(scale.getMaximum(), maxExpected);
+	assertEquals(scale.getMinimum(), minExpected);
+	assertEquals(scale.getSelection(), selectionExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMinimumValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 0, 100, 50, },
+{1, 1, 100, 50, },
+{2, 2, 100, 50, },
+{3, 3, 100, 50, },
+{4, 4, 100, 50, },
+{5, 5, 100, 50, },
+{6, 6, 100, 50, },
+{7, 7, 100, 50, },
+{8, 8, 100, 50, },
+{9, 9, 100, 50, },
+{10, 10, 100, 50, },
+{11, 11, 100, 50, },
+{12, 12, 100, 50, },
+{13, 13, 100, 50, },
+{14, 14, 100, 50, },
+{15, 15, 100, 50, },
+{16, 16, 100, 50, },
+{17, 17, 100, 50, },
+{18, 18, 100, 50, },
+{19, 19, 100, 50, },
+{20, 20, 100, 50, },
+{21, 21, 100, 50, },
+{22, 22, 100, 50, },
+{23, 23, 100, 50, },
+{24, 24, 100, 50, },
+{25, 25, 100, 50, },
+{26, 26, 100, 50, },
+{27, 27, 100, 50, },
+{28, 28, 100, 50, },
+{29, 29, 100, 50, },
+{30, 30, 100, 50, },
+{31, 31, 100, 50, },
+{32, 32, 100, 50, },
+{33, 33, 100, 50, },
+{34, 34, 100, 50, },
+{35, 35, 100, 50, },
+{36, 36, 100, 50, },
+{37, 37, 100, 50, },
+{38, 38, 100, 50, },
+{39, 39, 100, 50, },
+{40, 40, 100, 50, },
+{41, 41, 100, 50, },
+{42, 42, 100, 50, },
+{43, 43, 100, 50, },
+{44, 44, 100, 50, },
+{45, 45, 100, 50, },
+{46, 46, 100, 50, },
+{47, 47, 100, 50, },
+{48, 48, 100, 50, },
+{49, 49, 100, 50, },
+{50, 50, 100, 50, },
+{51, 51, 100, 51, },
+{52, 52, 100, 52, },
+{53, 53, 100, 53, },
+{54, 54, 100, 54, },
+{55, 55, 100, 55, },
+{56, 56, 100, 56, },
+{57, 57, 100, 57, },
+{58, 58, 100, 58, },
+{59, 59, 100, 59, },
+{60, 60, 100, 60, },
+{61, 61, 100, 61, },
+{62, 62, 100, 62, },
+{63, 63, 100, 63, },
+{64, 64, 100, 64, },
+{65, 65, 100, 65, },
+{66, 66, 100, 66, },
+{67, 67, 100, 67, },
+{68, 68, 100, 68, },
+{69, 69, 100, 69, },
+{70, 70, 100, 70, },
+{71, 71, 100, 71, },
+{72, 72, 100, 72, },
+{73, 73, 100, 73, },
+{74, 74, 100, 74, },
+{75, 75, 100, 75, },
+{76, 76, 100, 76, },
+{77, 77, 100, 77, },
+{78, 78, 100, 78, },
+{79, 79, 100, 79, },
+{80, 80, 100, 80, },
+{81, 81, 100, 81, },
+{82, 82, 100, 82, },
+{83, 83, 100, 83, },
+{84, 84, 100, 84, },
+{85, 85, 100, 85, },
+{86, 86, 100, 86, },
+{87, 87, 100, 87, },
+{88, 88, 100, 88, },
+{89, 89, 100, 89, },
+{90, 90, 100, 90, },
+{91, 91, 100, 91, },
+{92, 92, 100, 92, },
+{93, 93, 100, 93, },
+{94, 94, 100, 94, },
+{95, 95, 100, 95, },
+{96, 96, 100, 96, },
+{97, 97, 100, 97, },
+{98, 98, 100, 98, },
+{99, 99, 100, 99, },
+{100, 10, 100, 50, },
+{101, 10, 100, 50, },
+{102, 10, 100, 50, },
+{103, 10, 100, 50, },
+{104, 10, 100, 50, },
+{105, 10, 100, 50, },
+{106, 10, 100, 50, },
+{107, 10, 100, 50, },
+{108, 10, 100, 50, },
+{109, 10, 100, 50, },
+{110, 10, 100, 50, },
+{111, 10, 100, 50, },
+{112, 10, 100, 50, },
+{113, 10, 100, 50, },
+{114, 10, 100, 50, },
+{115, 10, 100, 50, },
+{116, 10, 100, 50, },
+{117, 10, 100, 50, },
+{118, 10, 100, 50, },
+{119, 10, 100, 50, },
+{120, 10, 100, 50, },
+{121, 10, 100, 50, },
+{122, 10, 100, 50, },
+{123, 10, 100, 50, },
+{124, 10, 100, 50, },
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMaximumValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 10, 100, 50, },
+{1, 10, 100, 50, },
+{2, 10, 100, 50, },
+{3, 10, 100, 50, },
+{4, 10, 100, 50, },
+{5, 10, 100, 50, },
+{6, 10, 100, 50, },
+{7, 10, 100, 50, },
+{8, 10, 100, 50, },
+{9, 10, 100, 50, },
+{10, 10, 100, 50, },
+{11, 10, 11, 11, },
+{12, 10, 12, 12, },
+{13, 10, 13, 13, },
+{14, 10, 14, 14, },
+{15, 10, 15, 15, },
+{16, 10, 16, 16, },
+{17, 10, 17, 17, },
+{18, 10, 18, 18, },
+{19, 10, 19, 19, },
+{20, 10, 20, 20, },
+{21, 10, 21, 21, },
+{22, 10, 22, 22, },
+{23, 10, 23, 23, },
+{24, 10, 24, 24, },
+{25, 10, 25, 25, },
+{26, 10, 26, 26, },
+{27, 10, 27, 27, },
+{28, 10, 28, 28, },
+{29, 10, 29, 29, },
+{30, 10, 30, 30, },
+{31, 10, 31, 31, },
+{32, 10, 32, 32, },
+{33, 10, 33, 33, },
+{34, 10, 34, 34, },
+{35, 10, 35, 35, },
+{36, 10, 36, 36, },
+{37, 10, 37, 37, },
+{38, 10, 38, 38, },
+{39, 10, 39, 39, },
+{40, 10, 40, 40, },
+{41, 10, 41, 41, },
+{42, 10, 42, 42, },
+{43, 10, 43, 43, },
+{44, 10, 44, 44, },
+{45, 10, 45, 45, },
+{46, 10, 46, 46, },
+{47, 10, 47, 47, },
+{48, 10, 48, 48, },
+{49, 10, 49, 49, },
+{50, 10, 50, 50, },
+{51, 10, 51, 50, },
+{52, 10, 52, 50, },
+{53, 10, 53, 50, },
+{54, 10, 54, 50, },
+{55, 10, 55, 50, },
+{56, 10, 56, 50, },
+{57, 10, 57, 50, },
+{58, 10, 58, 50, },
+{59, 10, 59, 50, },
+{60, 10, 60, 50, },
+{61, 10, 61, 50, },
+{62, 10, 62, 50, },
+{63, 10, 63, 50, },
+{64, 10, 64, 50, },
+{65, 10, 65, 50, },
+{66, 10, 66, 50, },
+{67, 10, 67, 50, },
+{68, 10, 68, 50, },
+{69, 10, 69, 50, },
+{70, 10, 70, 50, },
+{71, 10, 71, 50, },
+{72, 10, 72, 50, },
+{73, 10, 73, 50, },
+{74, 10, 74, 50, },
+{75, 10, 75, 50, },
+{76, 10, 76, 50, },
+{77, 10, 77, 50, },
+{78, 10, 78, 50, },
+{79, 10, 79, 50, },
+{80, 10, 80, 50, },
+{81, 10, 81, 50, },
+{82, 10, 82, 50, },
+{83, 10, 83, 50, },
+{84, 10, 84, 50, },
+{85, 10, 85, 50, },
+{86, 10, 86, 50, },
+{87, 10, 87, 50, },
+{88, 10, 88, 50, },
+{89, 10, 89, 50, },
+{90, 10, 90, 50, },
+{91, 10, 91, 50, },
+{92, 10, 92, 50, },
+{93, 10, 93, 50, },
+{94, 10, 94, 50, },
+{95, 10, 95, 50, },
+{96, 10, 96, 50, },
+{97, 10, 97, 50, },
+{98, 10, 98, 50, },
+{99, 10, 99, 50, },
+{100, 10, 100, 50, },
+{101, 10, 101, 50, },
+{102, 10, 102, 50, },
+{103, 10, 103, 50, },
+{104, 10, 104, 50, },
+{105, 10, 105, 50, },
+{106, 10, 106, 50, },
+{107, 10, 107, 50, },
+{108, 10, 108, 50, },
+{109, 10, 109, 50, },
+{110, 10, 110, 50, },
+{111, 10, 111, 50, },
+{112, 10, 112, 50, },
+{113, 10, 113, 50, },
+{114, 10, 114, 50, },
+{115, 10, 115, 50, },
+{116, 10, 116, 50, },
+{117, 10, 117, 50, },
+{118, 10, 118, 50, },
+{119, 10, 119, 50, },
+{120, 10, 120, 50, },
+{121, 10, 121, 50, },
+{122, 10, 122, 50, },
+{123, 10, 123, 50, },
+{124, 10, 124, 50, },
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void setDefaults() {
+	scale.setMaximum(100);
+	scale.setMinimum(10);
+	scale.setSelection(50);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetSelectionValues() {
+return new int[][] {
+{-15, 10, 100, 50, },
+{-14, 10, 100, 50, },
+{-13, 10, 100, 50, },
+{-12, 10, 100, 50, },
+{-11, 10, 100, 50, },
+{-10, 10, 100, 50, },
+{-9, 10, 100, 50, },
+{-8, 10, 100, 50, },
+{-7, 10, 100, 50, },
+{-6, 10, 100, 50, },
+{-5, 10, 100, 50, },
+{-4, 10, 100, 50, },
+{-3, 10, 100, 50, },
+{-2, 10, 100, 50, },
+{-1, 10, 100, 50, },
+{0, 10, 100, 10, },
+{1, 10, 100, 10, },
+{2, 10, 100, 10, },
+{3, 10, 100, 10, },
+{4, 10, 100, 10, },
+{5, 10, 100, 10, },
+{6, 10, 100, 10, },
+{7, 10, 100, 10, },
+{8, 10, 100, 10, },
+{9, 10, 100, 10, },
+{10, 10, 100, 10, },
+{11, 10, 100, 11, },
+{12, 10, 100, 12, },
+{13, 10, 100, 13, },
+{14, 10, 100, 14, },
+{15, 10, 100, 15, },
+{16, 10, 100, 16, },
+{17, 10, 100, 17, },
+{18, 10, 100, 18, },
+{19, 10, 100, 19, },
+{20, 10, 100, 20, },
+{21, 10, 100, 21, },
+{22, 10, 100, 22, },
+{23, 10, 100, 23, },
+{24, 10, 100, 24, },
+{25, 10, 100, 25, },
+{26, 10, 100, 26, },
+{27, 10, 100, 27, },
+{28, 10, 100, 28, },
+{29, 10, 100, 29, },
+{30, 10, 100, 30, },
+{31, 10, 100, 31, },
+{32, 10, 100, 32, },
+{33, 10, 100, 33, },
+{34, 10, 100, 34, },
+{35, 10, 100, 35, },
+{36, 10, 100, 36, },
+{37, 10, 100, 37, },
+{38, 10, 100, 38, },
+{39, 10, 100, 39, },
+{40, 10, 100, 40, },
+{41, 10, 100, 41, },
+{42, 10, 100, 42, },
+{43, 10, 100, 43, },
+{44, 10, 100, 44, },
+{45, 10, 100, 45, },
+{46, 10, 100, 46, },
+{47, 10, 100, 47, },
+{48, 10, 100, 48, },
+{49, 10, 100, 49, },
+{50, 10, 100, 50, },
+{51, 10, 100, 51, },
+{52, 10, 100, 52, },
+{53, 10, 100, 53, },
+{54, 10, 100, 54, },
+{55, 10, 100, 55, },
+{56, 10, 100, 56, },
+{57, 10, 100, 57, },
+{58, 10, 100, 58, },
+{59, 10, 100, 59, },
+{60, 10, 100, 60, },
+{61, 10, 100, 61, },
+{62, 10, 100, 62, },
+{63, 10, 100, 63, },
+{64, 10, 100, 64, },
+{65, 10, 100, 65, },
+{66, 10, 100, 66, },
+{67, 10, 100, 67, },
+{68, 10, 100, 68, },
+{69, 10, 100, 69, },
+{70, 10, 100, 70, },
+{71, 10, 100, 71, },
+{72, 10, 100, 72, },
+{73, 10, 100, 73, },
+{74, 10, 100, 74, },
+{75, 10, 100, 75, },
+{76, 10, 100, 76, },
+{77, 10, 100, 77, },
+{78, 10, 100, 78, },
+{79, 10, 100, 79, },
+{80, 10, 100, 80, },
+{81, 10, 100, 81, },
+{82, 10, 100, 82, },
+{83, 10, 100, 83, },
+{84, 10, 100, 84, },
+{85, 10, 100, 85, },
+{86, 10, 100, 86, },
+{87, 10, 100, 87, },
+{88, 10, 100, 88, },
+{89, 10, 100, 89, },
+{90, 10, 100, 90, },
+{91, 10, 100, 91, },
+{92, 10, 100, 92, },
+{93, 10, 100, 93, },
+{94, 10, 100, 94, },
+{95, 10, 100, 95, },
+{96, 10, 100, 96, },
+{97, 10, 100, 97, },
+{98, 10, 100, 98, },
+{99, 10, 100, 99, },
+{100, 10, 100, 100, },
+{101, 10, 100, 100, },
+{102, 10, 100, 100, },
+{103, 10, 100, 100, },
+{104, 10, 100, 100, },
+{105, 10, 100, 100, },
+{106, 10, 100, 100, },
+{107, 10, 100, 100, },
+{108, 10, 100, 100, },
+{109, 10, 100, 100, },
+{110, 10, 100, 100, },
+{111, 10, 100, 100, },
+{112, 10, 100, 100, },
+{113, 10, 100, 100, },
+{114, 10, 100, 100, },
+{115, 10, 100, 100, },
+{116, 10, 100, 100, },
+{117, 10, 100, 100, },
+{118, 10, 100, 100, },
+{119, 10, 100, 100, },
+{120, 10, 100, 100, },
+{121, 10, 100, 100, },
+{122, 10, 100, 100, },
+{123, 10, 100, 100, },
+{124, 10, 100, 100, },
+};
+}
+
+/**
+ * Possible exceptions:
+ * 
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
+ * </ul>
+ * 
+ * @exception SWTException <ul>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
+ *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
+ * </ul>
+ */
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		scale = new Scale(null, 0);
+		fail("No exception occurred"); //should never get here
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.HORIZONTAL, SWT.VERTICAL};
+	for (int i = 0; i < cases.length; i++)
+		scale = new Scale(shell, cases[i]);
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getIncrement() {
+	warnUnimpl("Test test_getIncrement not written");
+}
+
+public void test_getMaximum() {
+	warnUnimpl("Test test_getMaximum not written");
+}
+
+public void test_getMinimum() {
+	warnUnimpl("Test test_getMinimum not written");
+}
+
+public void test_getPageIncrement() {
+	warnUnimpl("Test test_getPageIncrement not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	// overridden from Control because it does not make sense
+	// to set the font of a Scale.
+}
+
+public void test_setIncrementI() {
+	warnUnimpl("Test test_setIncrementI not written");
+}
+
+/**
+ * Sets the maximum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMaximumI(){
+
+	int [][] testValues = getSetMaximumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scale.setMaximum(intArray[0]);
+		report("setMaximum", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+/**
+ * Sets the minimum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMinimumI(){
+
+
+	int [][] testValues = getSetMinimumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scale.setMinimum(intArray[0]);
+		report("setMinimum", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+public void test_setPageIncrementI() {
+	warnUnimpl("Test test_setPageIncrementI not written");
+}
+
+/**
+ * Sets the single <em>selection</em> that is the receiver's
+ * value to the argument which must be greater than or equal
+ * to zero.
+ */
+public void test_setSelectionI() {
+
+	int [][] testValues = getSetSelectionValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scale.setSelection(intArray[0]);
+		report("setSelection", intArray[0], intArray[1], intArray[2], intArray[3]);
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Scale((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getIncrement");
+	methodNames.addElement("test_getMaximum");
+	methodNames.addElement("test_getMinimum");
+	methodNames.addElement("test_getPageIncrement");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setIncrementI");
+	methodNames.addElement("test_setMaximumI");
+	methodNames.addElement("test_setMinimumI");
+	methodNames.addElement("test_setPageIncrementI");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getIncrement")) test_getIncrement();
+	else if (getName().equals("test_getMaximum")) test_getMaximum();
+	else if (getName().equals("test_getMinimum")) test_getMinimum();
+	else if (getName().equals("test_getPageIncrement")) test_getPageIncrement();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setIncrementI")) test_setIncrementI();
+	else if (getName().equals("test_setMaximumI")) test_setMaximumI();
+	else if (getName().equals("test_setMinimumI")) test_setMinimumI();
+	else if (getName().equals("test_setPageIncrementI")) test_setPageIncrementI();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java
new file mode 100644
index 0000000000..07501527a4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ScrollBar.java
@@ -0,0 +1,890 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ScrollBar
+ *
+ * @see org.eclipse.swt.widgets.ScrollBar
+ */
+public class Test_org_eclipse_swt_widgets_ScrollBar extends Test_org_eclipse_swt_widgets_Widget {
+
+ScrollBar scrollBar;
+Canvas canvas;
+
+public Test_org_eclipse_swt_widgets_ScrollBar(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	canvas = new Canvas(shell, SWT.H_SCROLL | SWT.V_SCROLL);
+	scrollBar = canvas.getHorizontalBar();
+	setWidget(scrollBar);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void report(String call, int set, int minExpected, int maxExpected, int selectionExpected, int thumbExpected) {
+	// Uncomment these lines and comment out call to check() if you want the test to report all errors without
+	// stopping.
+
+	//if (scrollBar.getMinimum() != minExpected)
+		//System.out.println(call + "(" + set + "): Minimum Expected: " + minExpected + "  Actual: " + scrollBar.getMinimum());
+	//if (scrollBar.getMaximum() != maxExpected)
+		//System.out.println(call + "(" + set + "): Maximum Expected: " + maxExpected + "  Actual: " + scrollBar.getMaximum());
+	//if (scrollBar.getSelection() != selectionExpected)
+		//System.out.println(call + "(" + set + "): Selection Expected: " + selectionExpected + "  Actual: " + scrollBar.getSelection());
+	//if (scrollBar.getThumb() != thumbExpected)
+		//System.out.println(call + "(" + set + "): Thumb Expected: " + thumbExpected + "  Actual: " + scrollBar.getThumb());
+	check(minExpected, maxExpected, selectionExpected, thumbExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void check(int minExpected, int maxExpected, int selectionExpected, int thumbExpected) {
+	assertEquals(scrollBar.getMaximum(), maxExpected);
+	assertEquals(scrollBar.getMinimum(), minExpected);
+	assertEquals(scrollBar.getSelection(), selectionExpected);
+	assertEquals(scrollBar.getThumb(), thumbExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetThumbValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 50, 10},
+{1, 10, 100, 50, 1},
+{2, 10, 100, 50, 2},
+{3, 10, 100, 50, 3},
+{4, 10, 100, 50, 4},
+{5, 10, 100, 50, 5},
+{6, 10, 100, 50, 6},
+{7, 10, 100, 50, 7},
+{8, 10, 100, 50, 8},
+{9, 10, 100, 50, 9},
+{10, 10, 100, 50, 10},
+{11, 10, 100, 50, 11},
+{12, 10, 100, 50, 12},
+{13, 10, 100, 50, 13},
+{14, 10, 100, 50, 14},
+{15, 10, 100, 50, 15},
+{16, 10, 100, 50, 16},
+{17, 10, 100, 50, 17},
+{18, 10, 100, 50, 18},
+{19, 10, 100, 50, 19},
+{20, 10, 100, 50, 20},
+{21, 10, 100, 50, 21},
+{22, 10, 100, 50, 22},
+{23, 10, 100, 50, 23},
+{24, 10, 100, 50, 24},
+{25, 10, 100, 50, 25},
+{26, 10, 100, 50, 26},
+{27, 10, 100, 50, 27},
+{28, 10, 100, 50, 28},
+{29, 10, 100, 50, 29},
+{30, 10, 100, 50, 30},
+{31, 10, 100, 50, 31},
+{32, 10, 100, 50, 32},
+{33, 10, 100, 50, 33},
+{34, 10, 100, 50, 34},
+{35, 10, 100, 50, 35},
+{36, 10, 100, 50, 36},
+{37, 10, 100, 50, 37},
+{38, 10, 100, 50, 38},
+{39, 10, 100, 50, 39},
+{40, 10, 100, 50, 40},
+{41, 10, 100, 50, 41},
+{42, 10, 100, 50, 42},
+{43, 10, 100, 50, 43},
+{44, 10, 100, 50, 44},
+{45, 10, 100, 50, 45},
+{46, 10, 100, 50, 46},
+{47, 10, 100, 50, 47},
+{48, 10, 100, 50, 48},
+{49, 10, 100, 50, 49},
+{50, 10, 100, 50, 50},
+{51, 10, 100, 49, 51},
+{52, 10, 100, 48, 52},
+{53, 10, 100, 47, 53},
+{54, 10, 100, 46, 54},
+{55, 10, 100, 45, 55},
+{56, 10, 100, 44, 56},
+{57, 10, 100, 43, 57},
+{58, 10, 100, 42, 58},
+{59, 10, 100, 41, 59},
+{60, 10, 100, 40, 60},
+{61, 10, 100, 39, 61},
+{62, 10, 100, 38, 62},
+{63, 10, 100, 37, 63},
+{64, 10, 100, 36, 64},
+{65, 10, 100, 35, 65},
+{66, 10, 100, 34, 66},
+{67, 10, 100, 33, 67},
+{68, 10, 100, 32, 68},
+{69, 10, 100, 31, 69},
+{70, 10, 100, 30, 70},
+{71, 10, 100, 29, 71},
+{72, 10, 100, 28, 72},
+{73, 10, 100, 27, 73},
+{74, 10, 100, 26, 74},
+{75, 10, 100, 25, 75},
+{76, 10, 100, 24, 76},
+{77, 10, 100, 23, 77},
+{78, 10, 100, 22, 78},
+{79, 10, 100, 21, 79},
+{80, 10, 100, 20, 80},
+{81, 10, 100, 19, 81},
+{82, 10, 100, 18, 82},
+{83, 10, 100, 17, 83},
+{84, 10, 100, 16, 84},
+{85, 10, 100, 15, 85},
+{86, 10, 100, 14, 86},
+{87, 10, 100, 13, 87},
+{88, 10, 100, 12, 88},
+{89, 10, 100, 11, 89},
+{90, 10, 100, 10, 90},
+{91, 10, 100, 50, 10},
+{92, 10, 100, 50, 10},
+{93, 10, 100, 50, 10},
+{94, 10, 100, 50, 10},
+{95, 10, 100, 50, 10},
+{96, 10, 100, 50, 10},
+{97, 10, 100, 50, 10},
+{98, 10, 100, 50, 10},
+{99, 10, 100, 50, 10},
+{100, 10, 100, 50, 10},
+{101, 10, 100, 50, 10},
+{102, 10, 100, 50, 10},
+{103, 10, 100, 50, 10},
+{104, 10, 100, 50, 10},
+{105, 10, 100, 50, 10},
+{106, 10, 100, 50, 10},
+{107, 10, 100, 50, 10},
+{108, 10, 100, 50, 10},
+{109, 10, 100, 50, 10},
+{110, 10, 100, 50, 10},
+{111, 10, 100, 50, 10},
+{112, 10, 100, 50, 10},
+{113, 10, 100, 50, 10},
+{114, 10, 100, 50, 10},
+{115, 10, 100, 50, 10},
+{116, 10, 100, 50, 10},
+{117, 10, 100, 50, 10},
+{118, 10, 100, 50, 10},
+{119, 10, 100, 50, 10},
+{120, 10, 100, 50, 10},
+{121, 10, 100, 50, 10},
+{122, 10, 100, 50, 10},
+{123, 10, 100, 50, 10},
+{124, 10, 100, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMinimumValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 0, 100, 50, 10},
+{1, 1, 100, 50, 10},
+{2, 2, 100, 50, 10},
+{3, 3, 100, 50, 10},
+{4, 4, 100, 50, 10},
+{5, 5, 100, 50, 10},
+{6, 6, 100, 50, 10},
+{7, 7, 100, 50, 10},
+{8, 8, 100, 50, 10},
+{9, 9, 100, 50, 10},
+{10, 10, 100, 50, 10},
+{11, 11, 100, 50, 10},
+{12, 12, 100, 50, 10},
+{13, 13, 100, 50, 10},
+{14, 14, 100, 50, 10},
+{15, 15, 100, 50, 10},
+{16, 16, 100, 50, 10},
+{17, 17, 100, 50, 10},
+{18, 18, 100, 50, 10},
+{19, 19, 100, 50, 10},
+{20, 20, 100, 50, 10},
+{21, 21, 100, 50, 10},
+{22, 22, 100, 50, 10},
+{23, 23, 100, 50, 10},
+{24, 24, 100, 50, 10},
+{25, 25, 100, 50, 10},
+{26, 26, 100, 50, 10},
+{27, 27, 100, 50, 10},
+{28, 28, 100, 50, 10},
+{29, 29, 100, 50, 10},
+{30, 30, 100, 50, 10},
+{31, 31, 100, 50, 10},
+{32, 32, 100, 50, 10},
+{33, 33, 100, 50, 10},
+{34, 34, 100, 50, 10},
+{35, 35, 100, 50, 10},
+{36, 36, 100, 50, 10},
+{37, 37, 100, 50, 10},
+{38, 38, 100, 50, 10},
+{39, 39, 100, 50, 10},
+{40, 40, 100, 50, 10},
+{41, 41, 100, 50, 10},
+{42, 42, 100, 50, 10},
+{43, 43, 100, 50, 10},
+{44, 44, 100, 50, 10},
+{45, 45, 100, 50, 10},
+{46, 46, 100, 50, 10},
+{47, 47, 100, 50, 10},
+{48, 48, 100, 50, 10},
+{49, 49, 100, 50, 10},
+{50, 50, 100, 50, 10},
+{51, 51, 100, 51, 10},
+{52, 52, 100, 52, 10},
+{53, 53, 100, 53, 10},
+{54, 54, 100, 54, 10},
+{55, 55, 100, 55, 10},
+{56, 56, 100, 56, 10},
+{57, 57, 100, 57, 10},
+{58, 58, 100, 58, 10},
+{59, 59, 100, 59, 10},
+{60, 60, 100, 60, 10},
+{61, 61, 100, 61, 10},
+{62, 62, 100, 62, 10},
+{63, 63, 100, 63, 10},
+{64, 64, 100, 64, 10},
+{65, 65, 100, 65, 10},
+{66, 66, 100, 66, 10},
+{67, 67, 100, 67, 10},
+{68, 68, 100, 68, 10},
+{69, 69, 100, 69, 10},
+{70, 70, 100, 70, 10},
+{71, 71, 100, 71, 10},
+{72, 72, 100, 72, 10},
+{73, 73, 100, 73, 10},
+{74, 74, 100, 74, 10},
+{75, 75, 100, 75, 10},
+{76, 76, 100, 76, 10},
+{77, 77, 100, 77, 10},
+{78, 78, 100, 78, 10},
+{79, 79, 100, 79, 10},
+{80, 80, 100, 80, 10},
+{81, 81, 100, 81, 10},
+{82, 82, 100, 82, 10},
+{83, 83, 100, 83, 10},
+{84, 84, 100, 84, 10},
+{85, 85, 100, 85, 10},
+{86, 86, 100, 86, 10},
+{87, 87, 100, 87, 10},
+{88, 88, 100, 88, 10},
+{89, 89, 100, 89, 10},
+{90, 90, 100, 90, 10},
+{91, 91, 100, 91, 9},
+{92, 92, 100, 92, 8},
+{93, 93, 100, 93, 7},
+{94, 94, 100, 94, 6},
+{95, 95, 100, 95, 5},
+{96, 96, 100, 96, 4},
+{97, 97, 100, 97, 3},
+{98, 98, 100, 98, 2},
+{99, 99, 100, 99, 1},
+{100, 10, 100, 50, 10},
+{101, 10, 100, 50, 10},
+{102, 10, 100, 50, 10},
+{103, 10, 100, 50, 10},
+{104, 10, 100, 50, 10},
+{105, 10, 100, 50, 10},
+{106, 10, 100, 50, 10},
+{107, 10, 100, 50, 10},
+{108, 10, 100, 50, 10},
+{109, 10, 100, 50, 10},
+{110, 10, 100, 50, 10},
+{111, 10, 100, 50, 10},
+{112, 10, 100, 50, 10},
+{113, 10, 100, 50, 10},
+{114, 10, 100, 50, 10},
+{115, 10, 100, 50, 10},
+{116, 10, 100, 50, 10},
+{117, 10, 100, 50, 10},
+{118, 10, 100, 50, 10},
+{119, 10, 100, 50, 10},
+{120, 10, 100, 50, 10},
+{121, 10, 100, 50, 10},
+{122, 10, 100, 50, 10},
+{123, 10, 100, 50, 10},
+{124, 10, 100, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMaximumValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 50, 10},
+{1, 10, 100, 50, 10},
+{2, 10, 100, 50, 10},
+{3, 10, 100, 50, 10},
+{4, 10, 100, 50, 10},
+{5, 10, 100, 50, 10},
+{6, 10, 100, 50, 10},
+{7, 10, 100, 50, 10},
+{8, 10, 100, 50, 10},
+{9, 10, 100, 50, 10},
+{10, 10, 100, 50, 10},
+{11, 10, 11, 10, 1},
+{12, 10, 12, 10, 2},
+{13, 10, 13, 10, 3},
+{14, 10, 14, 10, 4},
+{15, 10, 15, 10, 5},
+{16, 10, 16, 10, 6},
+{17, 10, 17, 10, 7},
+{18, 10, 18, 10, 8},
+{19, 10, 19, 10, 9},
+{20, 10, 20, 10, 10},
+{21, 10, 21, 11, 10},
+{22, 10, 22, 12, 10},
+{23, 10, 23, 13, 10},
+{24, 10, 24, 14, 10},
+{25, 10, 25, 15, 10},
+{26, 10, 26, 16, 10},
+{27, 10, 27, 17, 10},
+{28, 10, 28, 18, 10},
+{29, 10, 29, 19, 10},
+{30, 10, 30, 20, 10},
+{31, 10, 31, 21, 10},
+{32, 10, 32, 22, 10},
+{33, 10, 33, 23, 10},
+{34, 10, 34, 24, 10},
+{35, 10, 35, 25, 10},
+{36, 10, 36, 26, 10},
+{37, 10, 37, 27, 10},
+{38, 10, 38, 28, 10},
+{39, 10, 39, 29, 10},
+{40, 10, 40, 30, 10},
+{41, 10, 41, 31, 10},
+{42, 10, 42, 32, 10},
+{43, 10, 43, 33, 10},
+{44, 10, 44, 34, 10},
+{45, 10, 45, 35, 10},
+{46, 10, 46, 36, 10},
+{47, 10, 47, 37, 10},
+{48, 10, 48, 38, 10},
+{49, 10, 49, 39, 10},
+{50, 10, 50, 40, 10},
+{51, 10, 51, 41, 10},
+{52, 10, 52, 42, 10},
+{53, 10, 53, 43, 10},
+{54, 10, 54, 44, 10},
+{55, 10, 55, 45, 10},
+{56, 10, 56, 46, 10},
+{57, 10, 57, 47, 10},
+{58, 10, 58, 48, 10},
+{59, 10, 59, 49, 10},
+{60, 10, 60, 50, 10},
+{61, 10, 61, 50, 10},
+{62, 10, 62, 50, 10},
+{63, 10, 63, 50, 10},
+{64, 10, 64, 50, 10},
+{65, 10, 65, 50, 10},
+{66, 10, 66, 50, 10},
+{67, 10, 67, 50, 10},
+{68, 10, 68, 50, 10},
+{69, 10, 69, 50, 10},
+{70, 10, 70, 50, 10},
+{71, 10, 71, 50, 10},
+{72, 10, 72, 50, 10},
+{73, 10, 73, 50, 10},
+{74, 10, 74, 50, 10},
+{75, 10, 75, 50, 10},
+{76, 10, 76, 50, 10},
+{77, 10, 77, 50, 10},
+{78, 10, 78, 50, 10},
+{79, 10, 79, 50, 10},
+{80, 10, 80, 50, 10},
+{81, 10, 81, 50, 10},
+{82, 10, 82, 50, 10},
+{83, 10, 83, 50, 10},
+{84, 10, 84, 50, 10},
+{85, 10, 85, 50, 10},
+{86, 10, 86, 50, 10},
+{87, 10, 87, 50, 10},
+{88, 10, 88, 50, 10},
+{89, 10, 89, 50, 10},
+{90, 10, 90, 50, 10},
+{91, 10, 91, 50, 10},
+{92, 10, 92, 50, 10},
+{93, 10, 93, 50, 10},
+{94, 10, 94, 50, 10},
+{95, 10, 95, 50, 10},
+{96, 10, 96, 50, 10},
+{97, 10, 97, 50, 10},
+{98, 10, 98, 50, 10},
+{99, 10, 99, 50, 10},
+{100, 10, 100, 50, 10},
+{101, 10, 101, 50, 10},
+{102, 10, 102, 50, 10},
+{103, 10, 103, 50, 10},
+{104, 10, 104, 50, 10},
+{105, 10, 105, 50, 10},
+{106, 10, 106, 50, 10},
+{107, 10, 107, 50, 10},
+{108, 10, 108, 50, 10},
+{109, 10, 109, 50, 10},
+{110, 10, 110, 50, 10},
+{111, 10, 111, 50, 10},
+{112, 10, 112, 50, 10},
+{113, 10, 113, 50, 10},
+{114, 10, 114, 50, 10},
+{115, 10, 115, 50, 10},
+{116, 10, 116, 50, 10},
+{117, 10, 117, 50, 10},
+{118, 10, 118, 50, 10},
+{119, 10, 119, 50, 10},
+{120, 10, 120, 50, 10},
+{121, 10, 121, 50, 10},
+{122, 10, 122, 50, 10},
+{123, 10, 123, 50, 10},
+{124, 10, 124, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void setDefaults() {
+	scrollBar.setMaximum(100);
+	scrollBar.setMinimum(10);
+	scrollBar.setThumb(10);
+	scrollBar.setSelection(50);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetSelectionValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 10, 10},
+{1, 10, 100, 10, 10},
+{2, 10, 100, 10, 10},
+{3, 10, 100, 10, 10},
+{4, 10, 100, 10, 10},
+{5, 10, 100, 10, 10},
+{6, 10, 100, 10, 10},
+{7, 10, 100, 10, 10},
+{8, 10, 100, 10, 10},
+{9, 10, 100, 10, 10},
+{10, 10, 100, 10, 10},
+{11, 10, 100, 11, 10},
+{12, 10, 100, 12, 10},
+{13, 10, 100, 13, 10},
+{14, 10, 100, 14, 10},
+{15, 10, 100, 15, 10},
+{16, 10, 100, 16, 10},
+{17, 10, 100, 17, 10},
+{18, 10, 100, 18, 10},
+{19, 10, 100, 19, 10},
+{20, 10, 100, 20, 10},
+{21, 10, 100, 21, 10},
+{22, 10, 100, 22, 10},
+{23, 10, 100, 23, 10},
+{24, 10, 100, 24, 10},
+{25, 10, 100, 25, 10},
+{26, 10, 100, 26, 10},
+{27, 10, 100, 27, 10},
+{28, 10, 100, 28, 10},
+{29, 10, 100, 29, 10},
+{30, 10, 100, 30, 10},
+{31, 10, 100, 31, 10},
+{32, 10, 100, 32, 10},
+{33, 10, 100, 33, 10},
+{34, 10, 100, 34, 10},
+{35, 10, 100, 35, 10},
+{36, 10, 100, 36, 10},
+{37, 10, 100, 37, 10},
+{38, 10, 100, 38, 10},
+{39, 10, 100, 39, 10},
+{40, 10, 100, 40, 10},
+{41, 10, 100, 41, 10},
+{42, 10, 100, 42, 10},
+{43, 10, 100, 43, 10},
+{44, 10, 100, 44, 10},
+{45, 10, 100, 45, 10},
+{46, 10, 100, 46, 10},
+{47, 10, 100, 47, 10},
+{48, 10, 100, 48, 10},
+{49, 10, 100, 49, 10},
+{50, 10, 100, 50, 10},
+{51, 10, 100, 51, 10},
+{52, 10, 100, 52, 10},
+{53, 10, 100, 53, 10},
+{54, 10, 100, 54, 10},
+{55, 10, 100, 55, 10},
+{56, 10, 100, 56, 10},
+{57, 10, 100, 57, 10},
+{58, 10, 100, 58, 10},
+{59, 10, 100, 59, 10},
+{60, 10, 100, 60, 10},
+{61, 10, 100, 61, 10},
+{62, 10, 100, 62, 10},
+{63, 10, 100, 63, 10},
+{64, 10, 100, 64, 10},
+{65, 10, 100, 65, 10},
+{66, 10, 100, 66, 10},
+{67, 10, 100, 67, 10},
+{68, 10, 100, 68, 10},
+{69, 10, 100, 69, 10},
+{70, 10, 100, 70, 10},
+{71, 10, 100, 71, 10},
+{72, 10, 100, 72, 10},
+{73, 10, 100, 73, 10},
+{74, 10, 100, 74, 10},
+{75, 10, 100, 75, 10},
+{76, 10, 100, 76, 10},
+{77, 10, 100, 77, 10},
+{78, 10, 100, 78, 10},
+{79, 10, 100, 79, 10},
+{80, 10, 100, 80, 10},
+{81, 10, 100, 81, 10},
+{82, 10, 100, 82, 10},
+{83, 10, 100, 83, 10},
+{84, 10, 100, 84, 10},
+{85, 10, 100, 85, 10},
+{86, 10, 100, 86, 10},
+{87, 10, 100, 87, 10},
+{88, 10, 100, 88, 10},
+{89, 10, 100, 89, 10},
+{90, 10, 100, 90, 10},
+{91, 10, 100, 90, 10},
+{92, 10, 100, 90, 10},
+{93, 10, 100, 90, 10},
+{94, 10, 100, 90, 10},
+{95, 10, 100, 90, 10},
+{96, 10, 100, 90, 10},
+{97, 10, 100, 90, 10},
+{98, 10, 100, 90, 10},
+{99, 10, 100, 90, 10},
+{100, 10, 100, 90, 10},
+{101, 10, 100, 90, 10},
+{102, 10, 100, 90, 10},
+{103, 10, 100, 90, 10},
+{104, 10, 100, 90, 10},
+{105, 10, 100, 90, 10},
+{106, 10, 100, 90, 10},
+{107, 10, 100, 90, 10},
+{108, 10, 100, 90, 10},
+{109, 10, 100, 90, 10},
+{110, 10, 100, 90, 10},
+{111, 10, 100, 90, 10},
+{112, 10, 100, 90, 10},
+{113, 10, 100, 90, 10},
+{114, 10, 100, 90, 10},
+{115, 10, 100, 90, 10},
+{116, 10, 100, 90, 10},
+{117, 10, 100, 90, 10},
+{118, 10, 100, 90, 10},
+{119, 10, 100, 90, 10},
+{120, 10, 100, 90, 10},
+{121, 10, 100, 90, 10},
+{122, 10, 100, 90, 10},
+{123, 10, 100, 90, 10},
+{124, 10, 100, 90, 10},
+};
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getEnabled() {
+	warnUnimpl("Test test_getEnabled not written");
+}
+
+public void test_getIncrement() {
+	warnUnimpl("Test test_getIncrement not written");
+}
+
+public void test_getMaximum() {
+	warnUnimpl("Test test_getMaximum not written");
+}
+
+public void test_getMinimum() {
+	warnUnimpl("Test test_getMinimum not written");
+}
+
+public void test_getPageIncrement() {
+	warnUnimpl("Test test_getPageIncrement not written");
+}
+
+public void test_getParent() {
+	warnUnimpl("Test test_getParent not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSize() {
+	warnUnimpl("Test test_getSize not written");
+}
+
+public void test_getThumb() {
+	warnUnimpl("Test test_getThumb not written");
+}
+
+public void test_getVisible() {
+	warnUnimpl("Test test_getVisible not written");
+}
+
+public void test_isEnabled() {
+	warnUnimpl("Test test_isEnabled not written");
+}
+
+public void test_isVisible() {
+	warnUnimpl("Test test_isVisible not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setEnabledZ() {
+	warnUnimpl("Test test_setEnabledZ not written");
+}
+
+/**
+ * Sets the amount that the receiver's value will be
+ * modified by when the up/down (or right/left) arrows
+ * are pressed to the argument, which must be at least 
+ * one.
+ */
+public void test_setIncrementI() {
+	int[] cases = {1, 10, 10000};
+	for (int i=0; i < cases.length; i++)
+	{
+		scrollBar.setIncrement(cases[i]);
+		assertEquals(cases[i], scrollBar.getIncrement());
+	} 
+
+	scrollBar.setIncrement(25);
+	scrollBar.setIncrement(0); // setting to 0 fails silently
+	assertEquals(25, scrollBar.getIncrement());
+}
+
+/**
+ * Sets the maximum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMaximumI(){
+	int [][] testValues = getSetMaximumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scrollBar.setMaximum(intArray[0]);
+		report("setMaximum", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+/**
+ * Sets the minimum value which the receiver will allow
+ * to be the argument which must be greater than or
+ * equal to zero.
+ */
+public void test_setMinimumI(){
+	int [][] testValues = getSetMinimumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scrollBar.setMinimum(intArray[0]);
+		report("setMinimum", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+/**
+ * Sets the amount that the receiver's value will be
+ * modified by when the page increment/decrement areas
+ * are selected to the argument, which must be at least
+ * one.
+ */
+public void test_setPageIncrementI(){
+	int[] cases = {1, 10, 10000};
+	for (int i=0; i<cases.length; i++)
+	{
+		scrollBar.setPageIncrement(cases[i]);
+		assertEquals(scrollBar.getPageIncrement(), cases[i]);
+	} 
+
+	scrollBar.setPageIncrement(25);
+	scrollBar.setPageIncrement(0); // setting to 0 fails silently
+	assertEquals(25, scrollBar.getPageIncrement());
+}
+
+/**
+ * Sets the single <em>selection</em> that is the receiver's
+ * value to the argument which must be greater than or equal
+ * to zero.
+ */
+public void test_setSelectionI(){
+	int [][] testValues = getSetSelectionValues();
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scrollBar.setSelection(intArray[0]);
+		report("setSelection", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+/**
+ * Sets the size of the receiver's thumb relative to the
+ * difference between its maximum and minimum values to the
+ * argument which must be at least one.
+ */
+public void test_setThumbI(){
+	int [][] testValues = getSetThumbValues();
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		scrollBar.setThumb(intArray[0]);
+		report("setThumb", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+public void test_setValuesIIIIII() {
+	warnUnimpl("Test test_setValuesIIIIII not written");
+}
+
+public void test_setVisibleZ() {
+	warnUnimpl("Test test_setVisibleZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_ScrollBar((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getIncrement");
+	methodNames.addElement("test_getMaximum");
+	methodNames.addElement("test_getMinimum");
+	methodNames.addElement("test_getPageIncrement");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSize");
+	methodNames.addElement("test_getThumb");
+	methodNames.addElement("test_getVisible");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_isVisible");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setIncrementI");
+	methodNames.addElement("test_setMaximumI");
+	methodNames.addElement("test_setMinimumI");
+	methodNames.addElement("test_setPageIncrementI");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setThumbI");
+	methodNames.addElement("test_setValuesIIIIII");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getIncrement")) test_getIncrement();
+	else if (getName().equals("test_getMaximum")) test_getMaximum();
+	else if (getName().equals("test_getMinimum")) test_getMinimum();
+	else if (getName().equals("test_getPageIncrement")) test_getPageIncrement();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSize")) test_getSize();
+	else if (getName().equals("test_getThumb")) test_getThumb();
+	else if (getName().equals("test_getVisible")) test_getVisible();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_isVisible")) test_isVisible();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setIncrementI")) test_setIncrementI();
+	else if (getName().equals("test_setMaximumI")) test_setMaximumI();
+	else if (getName().equals("test_setMinimumI")) test_setMinimumI();
+	else if (getName().equals("test_setPageIncrementI")) test_setPageIncrementI();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setThumbI")) test_setThumbI();
+	else if (getName().equals("test_setValuesIIIIII")) test_setValuesIIIIII();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scrollable.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scrollable.java
new file mode 100644
index 0000000000..f161aa3ab9
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Scrollable.java
@@ -0,0 +1,70 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Scrollable
+ *
+ * @see org.eclipse.swt.widgets.Scrollable
+ */
+public class Test_org_eclipse_swt_widgets_Scrollable extends Test_org_eclipse_swt_widgets_Control {
+
+	Scrollable scrollable;
+	
+public Test_org_eclipse_swt_widgets_Scrollable(String name) {
+	super(name);
+}
+
+protected void setUp() {
+	super.setUp();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+protected void setWidget(Widget w) {
+	scrollable = (Scrollable)w;
+	super.setWidget(w);
+}
+
+public void test_computeTrimIIII() {
+	scrollable.computeTrim(0, 0, 0, 0);
+}
+
+public void test_getClientArea() {
+	scrollable.getClientArea();
+}
+
+public void test_getHorizontalBar() {
+	ScrollBar hbar = scrollable.getHorizontalBar();
+}
+
+public void test_getVerticalBar() {
+	ScrollBar vbar = scrollable.getVerticalBar();
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getHorizontalBar");
+	methodNames.addElement("test_getVerticalBar");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getHorizontalBar")) test_getHorizontalBar();
+	else if (getName().equals("test_getVerticalBar")) test_getVerticalBar();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
new file mode 100644
index 0000000000..6162ae133e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java
@@ -0,0 +1,424 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Shell
+ *
+ * @see org.eclipse.swt.widgets.Shell
+ */
+public class Test_org_eclipse_swt_widgets_Shell extends Test_org_eclipse_swt_widgets_Decorations {
+
+Shell testShell;
+
+public Test_org_eclipse_swt_widgets_Shell(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	testShell = new Shell(shell, SWT.NULL);
+	setWidget(shell);
+	assertTrue(testShell.getParent() == shell);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_Constructor() {
+	warnUnimpl("Test test_Constructor not written");
+}
+
+public void test_ConstructorI(){
+	/* this should test various combinations of STYLE bits, for now just test individual bits */
+	int[] cases = {SWT.NO_TRIM, SWT.RESIZE, SWT.TITLE, SWT.CLOSE, SWT.MENU, SWT.MIN, SWT.BORDER, 
+				   SWT.CLIP_CHILDREN, SWT.CLIP_SIBLINGS, SWT.ON_TOP, SWT.FLAT, SWT.SMOOTH};
+	Shell newShell;
+	for (int i = 0; i < cases.length; i++) {
+		newShell = new Shell(cases[i]);
+		assertTrue("a " +i, newShell.getDisplay() == shell.getDisplay());
+		newShell.dispose();
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Display(){
+	Display display = shell.getDisplay();
+	Shell newShell = new Shell(display);
+	assertTrue("a: ", newShell.getDisplay() == display);
+	newShell.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_DisplayI(){
+	int[] cases = {SWT.NO_TRIM, SWT.RESIZE, SWT.TITLE, SWT.CLOSE, SWT.MENU, SWT.MIN, SWT.BORDER, 
+				   SWT.CLIP_CHILDREN, SWT.CLIP_SIBLINGS, SWT.ON_TOP, SWT.FLAT, SWT.SMOOTH};
+	Shell newShell;
+	Display display = shell.getDisplay();
+	for (int i = 0; i < cases.length; i++) {
+		newShell = new Shell(display, cases[i]);
+		assertTrue("a " +i, newShell.getDisplay() == shell.getDisplay());
+		newShell.dispose();
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Shell(){
+	Shell newShell = new Shell(shell);
+	assertTrue("a: ", newShell.getParent() == shell);
+	newShell.dispose();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ShellI(){
+	/* this should test various combinations of STYLE bits, for now just test individual bits */
+	int[] cases = {SWT.NO_TRIM, SWT.RESIZE, SWT.TITLE, SWT.CLOSE, SWT.MENU, SWT.MIN, SWT.BORDER, 
+				   SWT.CLIP_CHILDREN, SWT.CLIP_SIBLINGS, SWT.ON_TOP, SWT.FLAT, SWT.SMOOTH};
+	Shell newShell;
+	for (int i = 0; i < cases.length; i++) {
+		newShell = new Shell(shell, cases[i]);
+		assertTrue("a " +i, newShell.getParent() == shell);
+		newShell.dispose();
+	}
+}
+
+public void test_win32_newLorg_eclipse_swt_widgets_DisplayI() {
+	// do not test - Windows only
+}
+
+public void test_addShellListenerLorg_eclipse_swt_events_ShellListener() {
+	warnUnimpl("Test test_addShellListenerLorg_eclipse_swt_events_ShellListener not written");
+}
+
+public void test_close(){
+
+	// bogus line that 'enabled' gpfs
+	//	Shell newShell = new Shell();
+	testShell.setBounds(20,30,200, 200);
+	testShell.open();
+	testShell.close();
+	shell.setBounds(20,30,200, 200);
+	shell.open();
+}
+
+public void test_dispose(){
+	Shell newShell = new Shell();
+	newShell.dispose();
+}
+
+public void test_getBounds() {
+	// tested in test_setBoundsIIII and test_setBoundsLorg_eclipse_swt_graphics_Rectangle
+}
+
+public void test_getDisplay(){
+	assertTrue( shell.getDisplay() == testShell.getDisplay());
+}
+
+public void test_getEnabled(){
+	assertTrue(":a0:", shell.getEnabled());
+	shell.setEnabled(false);
+	assertTrue(":a:", !shell.getEnabled());
+	shell.setEnabled(true);
+	assertTrue(":b:", shell.getEnabled());
+}
+
+public void test_getImeInputMode() {
+	warnUnimpl("Test test_getImeInputMode not written");
+}
+
+public void test_getLocation() {
+	warnUnimpl("Test test_getLocation not written");
+}
+
+public void test_getParent () {
+	// overriding Control.test_getParent
+	assertTrue(shell.getParent()==null);
+	assertTrue(testShell.getParent() == shell);
+}
+
+public void test_getShell () {
+	assertTrue(":a:", shell.getShell()==shell);
+	Shell shell_1 = new Shell(shell);
+	assertTrue(":b:", shell_1.getShell()== shell_1);
+	shell_1.dispose();
+}
+
+public void test_getShells() {
+	warnUnimpl("Test test_getShells not written");
+}
+
+public void test_getStyle() {
+	// overriding Widget.test_getStyle
+	assertTrue("testShell not modeless", (testShell.getStyle () & SWT.MODELESS) == SWT.MODELESS);
+	int[] cases = {SWT.MODELESS, SWT.PRIMARY_MODAL, SWT.APPLICATION_MODAL, SWT.SYSTEM_MODAL};
+	for (int i = 0; i < cases.length; i++) {
+		Shell testShell2 = new Shell(shell, cases[i]);
+		assertTrue("shell " + i, (testShell2.getStyle () & cases[i]) == cases[i]);
+		testShell2.dispose();
+	}
+}
+
+public void test_isEnabled(){
+	assertTrue(":a:", shell.isEnabled());
+	shell.setEnabled(false);
+	assertTrue(":b:", !shell.isEnabled());
+	if (fCheckBogusTestCases)
+		assertTrue(":b1:", !testShell.isEnabled());
+	shell.setEnabled(true);
+	assertTrue(":c:", shell.isEnabled());
+	assertTrue(":a:", testShell.isEnabled());
+	testShell.setEnabled(false);
+	assertTrue(":b:", !testShell.isEnabled());
+	testShell.setEnabled(true);
+	assertTrue(":c:", testShell.isEnabled());
+}
+
+public void test_isVisible() {
+	// overriding Control.test_isVisible
+	testShell.setVisible(true);
+	assertTrue(testShell.isVisible());
+	shell.setVisible(true);
+	assertTrue(shell.isVisible());
+
+	testShell.setVisible(true);
+	shell.setVisible(true);
+	assertTrue("shell.isVisible() a:", shell.isVisible());
+	shell.setVisible(false);
+	assertTrue("shell.isVisible() b:", !shell.isVisible());
+	if (fCheckBogusTestCases)
+		assertTrue("testShell.isVisible() c:", !testShell.isVisible());
+}
+
+public void test_open(){
+	shell.open();
+}
+
+public void test_removeShellListenerLorg_eclipse_swt_events_ShellListener() {
+	warnUnimpl("Test test_removeShellListenerLorg_eclipse_swt_events_ShellListener not written");
+}
+
+public void test_setBoundsIIII() {
+	// overridden from Control because Shells have a minimum size
+}
+
+public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
+	// overridden from Control because Shells have a minimum size
+//	/* windows */
+//	/* note that there is a minimum size for a shell, this test will fail if p1.x < 112 or p1.y < 27 */
+//	/* note that there is a maximum size for a shell, this test will fail if p1.x > 1292 or p1.y > 1036 */
+//	if (SwtJunit.isWindows) {
+//		Point p1 = new Point(112, 27);
+//		Rectangle r1 = new Rectangle(20, 30, p1.x, p1.y);
+//		Rectangle r2;
+//		for (int i = 0; i < 11; i++) {
+//			testShell.setBounds(r1);
+//			r2 = testShell.getBounds();
+//			assert("child shell iteration " + i + " set=" + r1 + " get=" + r2, r1.equals(r2));
+//			r1.width += 100;
+//			r1.height += 100;
+//		}
+//		r1 = new Rectangle(20, 30, p1.x, p1.y);
+//		for (int i = 0; i < 11; i++) {
+//			shell.setBounds(r1);
+//			r2 = shell.getBounds();
+//			assert("parent shell iteration " + i + " set=" + r1 + " get=" + r2, r1.equals(r2));
+//			r1.width += 100;
+//			r1.height += 100;
+//		}
+//	}
+//	/* motif */
+//	/* note that there is a minimum size for a shell, this test will fail if p1.x < 112 or p1.y < 27 */
+//	/* note that there is a maximum size for a shell, this test will fail if p1.x > 1292 or p1.y > 1036 */
+//	if (SwtJunit.isMotif) {
+//		Point p1 = new Point(15,35);
+//		Rectangle r1 = new Rectangle(20, 30, p1.x, p1.y);
+//		Rectangle r2;
+//		
+//		for (int i = 0; i < 15; i++) {
+//			testShell.setBounds(r1);
+//			r2 = testShell.getBounds();
+//			assert("child shell iteration " + i + " set=" + r1 + " get=" + r2, r1.equals(r2));
+//			r1.width += 100;
+//			r1.height += 100;
+//		}
+//		r1 = new Rectangle(50, 50, p1.x, p1.y);
+//		for (int i = 0; i < 11; i++) {
+//			shell.setBounds(r1);
+//			r2 = shell.getBounds();
+//			assert("parent shell iteration " + i + " set=" + r1 + " get=" + r2, r1.equals(r2));
+//			r1.width += 100;
+//			r1.height += 100;
+//		}
+//	}
+}
+
+public void test_setEnabledZ() {
+	warnUnimpl("Test test_setEnabledZ not written");
+}
+
+public void test_setImeInputModeI() {
+	warnUnimpl("Test test_setImeInputModeI not written");
+}
+
+public void test_setSizeII() {
+	/* windows */
+	/* note that there is a minimum size for a shell, this test will fail if p1.x < 112 or p1.y < 27 */
+	/* note that there is a maximum size for a shell, this test will fail if p1.x > 1292 or p1.y > 1036 */
+	if (SwtJunit.isWindows) {
+		Point newSize = new Point(112, 27);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize.x, newSize.y);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x += 100;
+			newSize.y += 100;
+		}
+		newSize = new Point(1292, 1036);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize.x, newSize.y);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x -= 100;
+			newSize.y -= 100;
+		}
+	}
+	
+	/* motif */
+	/* note that there is a minimum size for a shell, this test will fail if p1.x < ?? or p1.y < ?? */
+	/* note that there is a maximum size for a shell, this test will fail if p1.x > ?? or p1.y > ?? */
+	if (SwtJunit.isMotif) {
+		Point newSize = new Point(2, 2);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize.x, newSize.y);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x += 100;
+			newSize.y += 100;
+		}
+		newSize = new Point(1600, 1600);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize.x, newSize.y);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x -= 100;
+			newSize.y -= 100;
+		}
+	}
+}
+
+public void test_setSizeLorg_eclipse_swt_graphics_Point() {
+	/* windows */
+	/* note that there is a minimum size for a shell, this test will fail if p1.x < 112 or p1.y < 27 */
+	/* note that there is a maximum size for a shell, this test will fail if p1.x > 1292 or p1.y > 1036 */
+	if (SwtJunit.isWindows) {
+		Point newSize = new Point(112, 27);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x += 100;
+			newSize.y += 100;
+		}
+		newSize = new Point(1292, 1036);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x -= 100;
+			newSize.y -= 100;
+		}
+	}
+	
+	/* motif */
+	/* note that there is a minimum size for a shell, this test will fail if p1.x < ?? or p1.y < ?? */
+	/* note that there is a maximum size for a shell, this test will fail if p1.x > ?? or p1.y > ?? */
+	if (SwtJunit.isMotif) {
+		Point newSize = new Point(2, 2);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x += 100;
+			newSize.y += 100;
+		}
+		newSize = new Point(1600, 1600);
+		for (int i = 0; i < 10; i++) {
+			testShell.setSize(newSize);
+			assertEquals(newSize, testShell.getSize());
+			newSize.x -= 100;
+			newSize.y -= 100;
+		}
+	}
+}
+
+public void test_setVisibleZ() {
+	warnUnimpl("Test test_setVisibleZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Shell((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_Constructor");
+	methodNames.addElement("test_ConstructorI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Display");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_DisplayI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Shell");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ShellI");
+	methodNames.addElement("test_win32_newLorg_eclipse_swt_widgets_DisplayI");
+	methodNames.addElement("test_addShellListenerLorg_eclipse_swt_events_ShellListener");
+	methodNames.addElement("test_close");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getImeInputMode");
+	methodNames.addElement("test_getLocation");
+	methodNames.addElement("test_getShell");
+	methodNames.addElement("test_getShells");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_removeShellListenerLorg_eclipse_swt_events_ShellListener");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setImeInputModeI");
+	methodNames.addElement("test_setVisibleZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Decorations.methodNames()); // add superclass method names
+	return methodNames;
+}
+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_ConstructorLorg_eclipse_swt_widgets_Display")) test_ConstructorLorg_eclipse_swt_widgets_Display();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_DisplayI")) test_ConstructorLorg_eclipse_swt_widgets_DisplayI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Shell")) test_ConstructorLorg_eclipse_swt_widgets_Shell();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ShellI")) test_ConstructorLorg_eclipse_swt_widgets_ShellI();
+	else if (getName().equals("test_win32_newLorg_eclipse_swt_widgets_DisplayI")) test_win32_newLorg_eclipse_swt_widgets_DisplayI();
+	else if (getName().equals("test_addShellListenerLorg_eclipse_swt_events_ShellListener")) test_addShellListenerLorg_eclipse_swt_events_ShellListener();
+	else if (getName().equals("test_close")) test_close();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getImeInputMode")) test_getImeInputMode();
+	else if (getName().equals("test_getLocation")) test_getLocation();
+	else if (getName().equals("test_getShell")) test_getShell();
+	else if (getName().equals("test_getShells")) test_getShells();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_removeShellListenerLorg_eclipse_swt_events_ShellListener")) test_removeShellListenerLorg_eclipse_swt_events_ShellListener();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setImeInputModeI")) test_setImeInputModeI();
+	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Slider.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Slider.java
new file mode 100644
index 0000000000..85c5fc5e38
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Slider.java
@@ -0,0 +1,841 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Slider
+ *
+ * @see org.eclipse.swt.widgets.Slider
+ */
+public class Test_org_eclipse_swt_widgets_Slider extends Test_org_eclipse_swt_widgets_Control {
+
+Slider slider;
+
+public Test_org_eclipse_swt_widgets_Slider(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	slider = new Slider(shell, 0);
+	setWidget(slider);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void report(String call, int set, int minExpected, int maxExpected, int selectionExpected, int thumbExpected) {
+	// Uncomment these lines and comment out call to check() if you want the test to report all errors without
+	// stopping.
+	
+	//if (slider.getMinimum() != minExpected)
+		//System.out.println(call + "(" + set + "): Minimum Expected: " + minExpected + "  Actual: " + slider.getMinimum());
+	//if (slider.getMaximum() != maxExpected)
+		//System.out.println(call + "(" + set + "): Maximum Expected: " + maxExpected + "  Actual: " + slider.getMaximum());
+	//if (slider.getSelection() != selectionExpected)
+		//System.out.println(call + "(" + set + "): Selection Expected: " + selectionExpected + "  Actual: " + slider.getSelection());
+	//if (slider.getThumb() != thumbExpected)
+		//System.out.println(call + "(" + set + "): Thumb Expected: " + thumbExpected + "  Actual: " + slider.getThumb());
+
+	check(call, set, minExpected, maxExpected, selectionExpected, thumbExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void check(String call, int set, int minExpected, int maxExpected, int selectionExpected, int thumbExpected) {
+	assertTrue(call + "(" + set + "): Maximum Expected: " + maxExpected + "  Actual: " + slider.getMaximum(), slider.getMaximum() == maxExpected);
+	assertTrue(call + "(" + set + "): Minimum Expected: " + minExpected + "  Actual: " + slider.getMinimum(), slider.getMinimum() == minExpected);
+	assertTrue(call + "(" + set + "): Selection Expected: " + selectionExpected + "  Actual: " + slider.getSelection(), slider.getSelection() == selectionExpected);
+	assertTrue(call + "(" + set + "): Thumb Expected: " + thumbExpected + "  Actual: " + slider.getThumb(), slider.getThumb() == thumbExpected);
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetThumbValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 50, 10},
+{1, 10, 100, 50, 1},
+{2, 10, 100, 50, 2},
+{3, 10, 100, 50, 3},
+{4, 10, 100, 50, 4},
+{5, 10, 100, 50, 5},
+{6, 10, 100, 50, 6},
+{7, 10, 100, 50, 7},
+{8, 10, 100, 50, 8},
+{9, 10, 100, 50, 9},
+{10, 10, 100, 50, 10},
+{11, 10, 100, 50, 11},
+{12, 10, 100, 50, 12},
+{13, 10, 100, 50, 13},
+{14, 10, 100, 50, 14},
+{15, 10, 100, 50, 15},
+{16, 10, 100, 50, 16},
+{17, 10, 100, 50, 17},
+{18, 10, 100, 50, 18},
+{19, 10, 100, 50, 19},
+{20, 10, 100, 50, 20},
+{21, 10, 100, 50, 21},
+{22, 10, 100, 50, 22},
+{23, 10, 100, 50, 23},
+{24, 10, 100, 50, 24},
+{25, 10, 100, 50, 25},
+{26, 10, 100, 50, 26},
+{27, 10, 100, 50, 27},
+{28, 10, 100, 50, 28},
+{29, 10, 100, 50, 29},
+{30, 10, 100, 50, 30},
+{31, 10, 100, 50, 31},
+{32, 10, 100, 50, 32},
+{33, 10, 100, 50, 33},
+{34, 10, 100, 50, 34},
+{35, 10, 100, 50, 35},
+{36, 10, 100, 50, 36},
+{37, 10, 100, 50, 37},
+{38, 10, 100, 50, 38},
+{39, 10, 100, 50, 39},
+{40, 10, 100, 50, 40},
+{41, 10, 100, 50, 41},
+{42, 10, 100, 50, 42},
+{43, 10, 100, 50, 43},
+{44, 10, 100, 50, 44},
+{45, 10, 100, 50, 45},
+{46, 10, 100, 50, 46},
+{47, 10, 100, 50, 47},
+{48, 10, 100, 50, 48},
+{49, 10, 100, 50, 49},
+{50, 10, 100, 50, 50},
+{51, 10, 100, 49, 51},
+{52, 10, 100, 48, 52},
+{53, 10, 100, 47, 53},
+{54, 10, 100, 46, 54},
+{55, 10, 100, 45, 55},
+{56, 10, 100, 44, 56},
+{57, 10, 100, 43, 57},
+{58, 10, 100, 42, 58},
+{59, 10, 100, 41, 59},
+{60, 10, 100, 40, 60},
+{61, 10, 100, 39, 61},
+{62, 10, 100, 38, 62},
+{63, 10, 100, 37, 63},
+{64, 10, 100, 36, 64},
+{65, 10, 100, 35, 65},
+{66, 10, 100, 34, 66},
+{67, 10, 100, 33, 67},
+{68, 10, 100, 32, 68},
+{69, 10, 100, 31, 69},
+{70, 10, 100, 30, 70},
+{71, 10, 100, 29, 71},
+{72, 10, 100, 28, 72},
+{73, 10, 100, 27, 73},
+{74, 10, 100, 26, 74},
+{75, 10, 100, 25, 75},
+{76, 10, 100, 24, 76},
+{77, 10, 100, 23, 77},
+{78, 10, 100, 22, 78},
+{79, 10, 100, 21, 79},
+{80, 10, 100, 20, 80},
+{81, 10, 100, 19, 81},
+{82, 10, 100, 18, 82},
+{83, 10, 100, 17, 83},
+{84, 10, 100, 16, 84},
+{85, 10, 100, 15, 85},
+{86, 10, 100, 14, 86},
+{87, 10, 100, 13, 87},
+{88, 10, 100, 12, 88},
+{89, 10, 100, 11, 89},
+{90, 10, 100, 10, 90},
+{91, 10, 100, 50, 10},
+{92, 10, 100, 50, 10},
+{93, 10, 100, 50, 10},
+{94, 10, 100, 50, 10},
+{95, 10, 100, 50, 10},
+{96, 10, 100, 50, 10},
+{97, 10, 100, 50, 10},
+{98, 10, 100, 50, 10},
+{99, 10, 100, 50, 10},
+{100, 10, 100, 50, 10},
+{101, 10, 100, 50, 10},
+{102, 10, 100, 50, 10},
+{103, 10, 100, 50, 10},
+{104, 10, 100, 50, 10},
+{105, 10, 100, 50, 10},
+{106, 10, 100, 50, 10},
+{107, 10, 100, 50, 10},
+{108, 10, 100, 50, 10},
+{109, 10, 100, 50, 10},
+{110, 10, 100, 50, 10},
+{111, 10, 100, 50, 10},
+{112, 10, 100, 50, 10},
+{113, 10, 100, 50, 10},
+{114, 10, 100, 50, 10},
+{115, 10, 100, 50, 10},
+{116, 10, 100, 50, 10},
+{117, 10, 100, 50, 10},
+{118, 10, 100, 50, 10},
+{119, 10, 100, 50, 10},
+{120, 10, 100, 50, 10},
+{121, 10, 100, 50, 10},
+{122, 10, 100, 50, 10},
+{123, 10, 100, 50, 10},
+{124, 10, 100, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMinimumValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 0, 100, 50, 10},
+{1, 1, 100, 50, 10},
+{2, 2, 100, 50, 10},
+{3, 3, 100, 50, 10},
+{4, 4, 100, 50, 10},
+{5, 5, 100, 50, 10},
+{6, 6, 100, 50, 10},
+{7, 7, 100, 50, 10},
+{8, 8, 100, 50, 10},
+{9, 9, 100, 50, 10},
+{10, 10, 100, 50, 10},
+{11, 11, 100, 50, 10},
+{12, 12, 100, 50, 10},
+{13, 13, 100, 50, 10},
+{14, 14, 100, 50, 10},
+{15, 15, 100, 50, 10},
+{16, 16, 100, 50, 10},
+{17, 17, 100, 50, 10},
+{18, 18, 100, 50, 10},
+{19, 19, 100, 50, 10},
+{20, 20, 100, 50, 10},
+{21, 21, 100, 50, 10},
+{22, 22, 100, 50, 10},
+{23, 23, 100, 50, 10},
+{24, 24, 100, 50, 10},
+{25, 25, 100, 50, 10},
+{26, 26, 100, 50, 10},
+{27, 27, 100, 50, 10},
+{28, 28, 100, 50, 10},
+{29, 29, 100, 50, 10},
+{30, 30, 100, 50, 10},
+{31, 31, 100, 50, 10},
+{32, 32, 100, 50, 10},
+{33, 33, 100, 50, 10},
+{34, 34, 100, 50, 10},
+{35, 35, 100, 50, 10},
+{36, 36, 100, 50, 10},
+{37, 37, 100, 50, 10},
+{38, 38, 100, 50, 10},
+{39, 39, 100, 50, 10},
+{40, 40, 100, 50, 10},
+{41, 41, 100, 50, 10},
+{42, 42, 100, 50, 10},
+{43, 43, 100, 50, 10},
+{44, 44, 100, 50, 10},
+{45, 45, 100, 50, 10},
+{46, 46, 100, 50, 10},
+{47, 47, 100, 50, 10},
+{48, 48, 100, 50, 10},
+{49, 49, 100, 50, 10},
+{50, 50, 100, 50, 10},
+{51, 51, 100, 51, 10},
+{52, 52, 100, 52, 10},
+{53, 53, 100, 53, 10},
+{54, 54, 100, 54, 10},
+{55, 55, 100, 55, 10},
+{56, 56, 100, 56, 10},
+{57, 57, 100, 57, 10},
+{58, 58, 100, 58, 10},
+{59, 59, 100, 59, 10},
+{60, 60, 100, 60, 10},
+{61, 61, 100, 61, 10},
+{62, 62, 100, 62, 10},
+{63, 63, 100, 63, 10},
+{64, 64, 100, 64, 10},
+{65, 65, 100, 65, 10},
+{66, 66, 100, 66, 10},
+{67, 67, 100, 67, 10},
+{68, 68, 100, 68, 10},
+{69, 69, 100, 69, 10},
+{70, 70, 100, 70, 10},
+{71, 71, 100, 71, 10},
+{72, 72, 100, 72, 10},
+{73, 73, 100, 73, 10},
+{74, 74, 100, 74, 10},
+{75, 75, 100, 75, 10},
+{76, 76, 100, 76, 10},
+{77, 77, 100, 77, 10},
+{78, 78, 100, 78, 10},
+{79, 79, 100, 79, 10},
+{80, 80, 100, 80, 10},
+{81, 81, 100, 81, 10},
+{82, 82, 100, 82, 10},
+{83, 83, 100, 83, 10},
+{84, 84, 100, 84, 10},
+{85, 85, 100, 85, 10},
+{86, 86, 100, 86, 10},
+{87, 87, 100, 87, 10},
+{88, 88, 100, 88, 10},
+{89, 89, 100, 89, 10},
+{90, 90, 100, 90, 10},
+{91, 91, 100, 91, 9},
+{92, 92, 100, 92, 8},
+{93, 93, 100, 93, 7},
+{94, 94, 100, 94, 6},
+{95, 95, 100, 95, 5},
+{96, 96, 100, 96, 4},
+{97, 97, 100, 97, 3},
+{98, 98, 100, 98, 2},
+{99, 99, 100, 99, 1},
+{100, 10, 100, 50, 10}, 
+{101, 10, 100, 50, 10},
+{102, 10, 100, 50, 10},
+{103, 10, 100, 50, 10},
+{104, 10, 100, 50, 10},
+{105, 10, 100, 50, 10},
+{106, 10, 100, 50, 10},
+{107, 10, 100, 50, 10},
+{108, 10, 100, 50, 10},
+{109, 10, 100, 50, 10},
+{110, 10, 100, 50, 10},
+{111, 10, 100, 50, 10},
+{112, 10, 100, 50, 10},
+{113, 10, 100, 50, 10},
+{114, 10, 100, 50, 10},
+{115, 10, 100, 50, 10},
+{116, 10, 100, 50, 10},
+{117, 10, 100, 50, 10},
+{118, 10, 100, 50, 10},
+{119, 10, 100, 50, 10},
+{120, 10, 100, 50, 10},
+{121, 10, 100, 50, 10},
+{122, 10, 100, 50, 10},
+{123, 10, 100, 50, 10},
+{124, 10, 100, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetMaximumValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 50, 10},
+{1, 10, 100, 50, 10},
+{2, 10, 100, 50, 10},
+{3, 10, 100, 50, 10},
+{4, 10, 100, 50, 10},
+{5, 10, 100, 50, 10},
+{6, 10, 100, 50, 10},
+{7, 10, 100, 50, 10},
+{8, 10, 100, 50, 10},
+{9, 10, 100, 50, 10},
+{10, 10, 100, 50, 10},
+{11, 10, 11, 10, 1},
+{12, 10, 12, 10, 2},
+{13, 10, 13, 10, 3},
+{14, 10, 14, 10, 4},
+{15, 10, 15, 10, 5},
+{16, 10, 16, 10, 6},
+{17, 10, 17, 10, 7},
+{18, 10, 18, 10, 8},
+{19, 10, 19, 10, 9},
+{20, 10, 20, 10, 10},
+{21, 10, 21, 11, 10},
+{22, 10, 22, 12, 10},
+{23, 10, 23, 13, 10},
+{24, 10, 24, 14, 10},
+{25, 10, 25, 15, 10},
+{26, 10, 26, 16, 10},
+{27, 10, 27, 17, 10},
+{28, 10, 28, 18, 10},
+{29, 10, 29, 19, 10},
+{30, 10, 30, 20, 10},
+{31, 10, 31, 21, 10},
+{32, 10, 32, 22, 10},
+{33, 10, 33, 23, 10},
+{34, 10, 34, 24, 10},
+{35, 10, 35, 25, 10},
+{36, 10, 36, 26, 10},
+{37, 10, 37, 27, 10},
+{38, 10, 38, 28, 10},
+{39, 10, 39, 29, 10},
+{40, 10, 40, 30, 10},
+{41, 10, 41, 31, 10},
+{42, 10, 42, 32, 10},
+{43, 10, 43, 33, 10},
+{44, 10, 44, 34, 10},
+{45, 10, 45, 35, 10},
+{46, 10, 46, 36, 10},
+{47, 10, 47, 37, 10},
+{48, 10, 48, 38, 10},
+{49, 10, 49, 39, 10},
+{50, 10, 50, 40, 10},
+{51, 10, 51, 41, 10},
+{52, 10, 52, 42, 10},
+{53, 10, 53, 43, 10},
+{54, 10, 54, 44, 10},
+{55, 10, 55, 45, 10},
+{56, 10, 56, 46, 10},
+{57, 10, 57, 47, 10},
+{58, 10, 58, 48, 10},
+{59, 10, 59, 49, 10},
+{60, 10, 60, 50, 10},
+{61, 10, 61, 50, 10},
+{62, 10, 62, 50, 10},
+{63, 10, 63, 50, 10},
+{64, 10, 64, 50, 10},
+{65, 10, 65, 50, 10},
+{66, 10, 66, 50, 10},
+{67, 10, 67, 50, 10},
+{68, 10, 68, 50, 10},
+{69, 10, 69, 50, 10},
+{70, 10, 70, 50, 10},
+{71, 10, 71, 50, 10},
+{72, 10, 72, 50, 10},
+{73, 10, 73, 50, 10},
+{74, 10, 74, 50, 10},
+{75, 10, 75, 50, 10},
+{76, 10, 76, 50, 10},
+{77, 10, 77, 50, 10},
+{78, 10, 78, 50, 10},
+{79, 10, 79, 50, 10},
+{80, 10, 80, 50, 10},
+{81, 10, 81, 50, 10},
+{82, 10, 82, 50, 10},
+{83, 10, 83, 50, 10},
+{84, 10, 84, 50, 10},
+{85, 10, 85, 50, 10},
+{86, 10, 86, 50, 10},
+{87, 10, 87, 50, 10},
+{88, 10, 88, 50, 10},
+{89, 10, 89, 50, 10},
+{90, 10, 90, 50, 10},
+{91, 10, 91, 50, 10},
+{92, 10, 92, 50, 10},
+{93, 10, 93, 50, 10},
+{94, 10, 94, 50, 10},
+{95, 10, 95, 50, 10},
+{96, 10, 96, 50, 10},
+{97, 10, 97, 50, 10},
+{98, 10, 98, 50, 10},
+{99, 10, 99, 50, 10},
+{100, 10, 100, 50, 10},
+{101, 10, 101, 50, 10},
+{102, 10, 102, 50, 10},
+{103, 10, 103, 50, 10},
+{104, 10, 104, 50, 10},
+{105, 10, 105, 50, 10},
+{106, 10, 106, 50, 10},
+{107, 10, 107, 50, 10},
+{108, 10, 108, 50, 10},
+{109, 10, 109, 50, 10},
+{110, 10, 110, 50, 10},
+{111, 10, 111, 50, 10},
+{112, 10, 112, 50, 10},
+{113, 10, 113, 50, 10},
+{114, 10, 114, 50, 10},
+{115, 10, 115, 50, 10},
+{116, 10, 116, 50, 10},
+{117, 10, 117, 50, 10},
+{118, 10, 118, 50, 10},
+{119, 10, 119, 50, 10},
+{120, 10, 120, 50, 10},
+{121, 10, 121, 50, 10},
+{122, 10, 122, 50, 10},
+{123, 10, 123, 50, 10},
+{124, 10, 124, 50, 10},
+};
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private void setDefaults() {
+
+	slider.setMaximum(100);
+	slider.setMinimum(10);
+	slider.setThumb(10);
+	slider.setSelection(50);
+
+}
+// this method must be private or protected so the auto-gen tool keeps it
+private int[][] getSetSelectionValues() {
+return new int[][] {
+{-15, 10, 100, 50, 10},
+{-14, 10, 100, 50, 10},
+{-13, 10, 100, 50, 10},
+{-12, 10, 100, 50, 10},
+{-11, 10, 100, 50, 10},
+{-10, 10, 100, 50, 10},
+{-9, 10, 100, 50, 10},
+{-8, 10, 100, 50, 10},
+{-7, 10, 100, 50, 10},
+{-6, 10, 100, 50, 10},
+{-5, 10, 100, 50, 10},
+{-4, 10, 100, 50, 10},
+{-3, 10, 100, 50, 10},
+{-2, 10, 100, 50, 10},
+{-1, 10, 100, 50, 10},
+{0, 10, 100, 10, 10},
+{1, 10, 100, 10, 10},
+{2, 10, 100, 10, 10},
+{3, 10, 100, 10, 10},
+{4, 10, 100, 10, 10},
+{5, 10, 100, 10, 10},
+{6, 10, 100, 10, 10},
+{7, 10, 100, 10, 10},
+{8, 10, 100, 10, 10},
+{9, 10, 100, 10, 10},
+{10, 10, 100, 10, 10},
+{11, 10, 100, 11, 10},
+{12, 10, 100, 12, 10},
+{13, 10, 100, 13, 10},
+{14, 10, 100, 14, 10},
+{15, 10, 100, 15, 10},
+{16, 10, 100, 16, 10},
+{17, 10, 100, 17, 10},
+{18, 10, 100, 18, 10},
+{19, 10, 100, 19, 10},
+{20, 10, 100, 20, 10},
+{21, 10, 100, 21, 10},
+{22, 10, 100, 22, 10},
+{23, 10, 100, 23, 10},
+{24, 10, 100, 24, 10},
+{25, 10, 100, 25, 10},
+{26, 10, 100, 26, 10},
+{27, 10, 100, 27, 10},
+{28, 10, 100, 28, 10},
+{29, 10, 100, 29, 10},
+{30, 10, 100, 30, 10},
+{31, 10, 100, 31, 10},
+{32, 10, 100, 32, 10},
+{33, 10, 100, 33, 10},
+{34, 10, 100, 34, 10},
+{35, 10, 100, 35, 10},
+{36, 10, 100, 36, 10},
+{37, 10, 100, 37, 10},
+{38, 10, 100, 38, 10},
+{39, 10, 100, 39, 10},
+{40, 10, 100, 40, 10},
+{41, 10, 100, 41, 10},
+{42, 10, 100, 42, 10},
+{43, 10, 100, 43, 10},
+{44, 10, 100, 44, 10},
+{45, 10, 100, 45, 10},
+{46, 10, 100, 46, 10},
+{47, 10, 100, 47, 10},
+{48, 10, 100, 48, 10},
+{49, 10, 100, 49, 10},
+{50, 10, 100, 50, 10},
+{51, 10, 100, 51, 10},
+{52, 10, 100, 52, 10},
+{53, 10, 100, 53, 10},
+{54, 10, 100, 54, 10},
+{55, 10, 100, 55, 10},
+{56, 10, 100, 56, 10},
+{57, 10, 100, 57, 10},
+{58, 10, 100, 58, 10},
+{59, 10, 100, 59, 10},
+{60, 10, 100, 60, 10},
+{61, 10, 100, 61, 10},
+{62, 10, 100, 62, 10},
+{63, 10, 100, 63, 10},
+{64, 10, 100, 64, 10},
+{65, 10, 100, 65, 10},
+{66, 10, 100, 66, 10},
+{67, 10, 100, 67, 10},
+{68, 10, 100, 68, 10},
+{69, 10, 100, 69, 10},
+{70, 10, 100, 70, 10},
+{71, 10, 100, 71, 10},
+{72, 10, 100, 72, 10},
+{73, 10, 100, 73, 10},
+{74, 10, 100, 74, 10},
+{75, 10, 100, 75, 10},
+{76, 10, 100, 76, 10},
+{77, 10, 100, 77, 10},
+{78, 10, 100, 78, 10},
+{79, 10, 100, 79, 10},
+{80, 10, 100, 80, 10},
+{81, 10, 100, 81, 10},
+{82, 10, 100, 82, 10},
+{83, 10, 100, 83, 10},
+{84, 10, 100, 84, 10},
+{85, 10, 100, 85, 10},
+{86, 10, 100, 86, 10},
+{87, 10, 100, 87, 10},
+{88, 10, 100, 88, 10},
+{89, 10, 100, 89, 10},
+{90, 10, 100, 90, 10},
+{91, 10, 100, 90, 10},
+{92, 10, 100, 90, 10},
+{93, 10, 100, 90, 10},
+{94, 10, 100, 90, 10},
+{95, 10, 100, 90, 10},
+{96, 10, 100, 90, 10},
+{97, 10, 100, 90, 10},
+{98, 10, 100, 90, 10},
+{99, 10, 100, 90, 10},
+{100, 10, 100, 90, 10},
+{101, 10, 100, 90, 10},
+{102, 10, 100, 90, 10},
+{103, 10, 100, 90, 10},
+{104, 10, 100, 90, 10},
+{105, 10, 100, 90, 10},
+{106, 10, 100, 90, 10},
+{107, 10, 100, 90, 10},
+{108, 10, 100, 90, 10},
+{109, 10, 100, 90, 10},
+{110, 10, 100, 90, 10},
+{111, 10, 100, 90, 10},
+{112, 10, 100, 90, 10},
+{113, 10, 100, 90, 10},
+{114, 10, 100, 90, 10},
+{115, 10, 100, 90, 10},
+{116, 10, 100, 90, 10},
+{117, 10, 100, 90, 10},
+{118, 10, 100, 90, 10},
+{119, 10, 100, 90, 10},
+{120, 10, 100, 90, 10},
+{121, 10, 100, 90, 10},
+{122, 10, 100, 90, 10},
+{123, 10, 100, 90, 10},
+{124, 10, 100, 90, 10},
+};
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		slider = new Slider(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.HORIZONTAL, SWT.VERTICAL};
+	for (int i = 0; i < cases.length; i++)
+		slider = new Slider(shell, cases[i]);
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_getEnabled() {
+	warnUnimpl("Test test_getEnabled not written");
+}
+
+public void test_getIncrement(){
+	int[] cases = {1, 10, 10000};
+	for (int i=0; i<cases.length; i++)
+	{
+	  slider.setIncrement(cases[i]);
+	  assertTrue("case: " + String.valueOf(i), slider.getIncrement()==cases[i]);
+	} 
+}
+
+public void test_getMaximum() {
+	warnUnimpl("Test test_getMaximum not written");
+}
+
+public void test_getMinimum() {
+	warnUnimpl("Test test_getMinimum not written");
+}
+
+public void test_getPageIncrement(){
+	int[] cases = {1, 10, 10000};
+	for (int i=0; i<cases.length; i++)
+	{
+	  slider.setPageIncrement(cases[i]);
+	  assertTrue("case: " + String.valueOf(i), slider.getPageIncrement()==cases[i]);
+	} 
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getThumb() {
+	warnUnimpl("Test test_getThumb not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setEnabledZ() {
+	warnUnimpl("Test test_setEnabledZ not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	// overridden from Control because it does not make sense
+	// to set the font of a Slider.
+}
+
+public void test_setIncrementI() {
+	warnUnimpl("Test test_setIncrementI not written");
+}
+
+public void test_setMaximumI(){
+
+	int [][] testValues = getSetMaximumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		slider.setMaximum(intArray[0]);
+		report("setMaximum", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+public void test_setMinimumI(){
+
+	int [][] testValues = getSetMinimumValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		slider.setMinimum(intArray[0]);
+		report("setMinimum", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+public void test_setPageIncrementI() {
+	warnUnimpl("Test test_setPageIncrementI not written");
+}
+
+public void test_setSelectionI(){
+
+	int [][] testValues = getSetSelectionValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		slider.setSelection(intArray[0]);
+		report("setSelection", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+public void test_setThumbI(){
+
+	int [][] testValues = getSetThumbValues();
+
+	for (int i = 0; i < testValues.length; i++) {
+		int[] intArray = testValues[i];
+		setDefaults();
+		slider.setThumb(intArray[0]);
+		report("setThumb", intArray[0], intArray[1], intArray[2], intArray[3], intArray[4]);
+	}
+}
+
+public void test_setValuesIIIIII() {
+	warnUnimpl("Test test_setValuesIIIIII not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Slider((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getIncrement");
+	methodNames.addElement("test_getMaximum");
+	methodNames.addElement("test_getMinimum");
+	methodNames.addElement("test_getPageIncrement");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getThumb");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setIncrementI");
+	methodNames.addElement("test_setMaximumI");
+	methodNames.addElement("test_setMinimumI");
+	methodNames.addElement("test_setPageIncrementI");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setThumbI");
+	methodNames.addElement("test_setValuesIIIIII");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getIncrement")) test_getIncrement();
+	else if (getName().equals("test_getMaximum")) test_getMaximum();
+	else if (getName().equals("test_getMinimum")) test_getMinimum();
+	else if (getName().equals("test_getPageIncrement")) test_getPageIncrement();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getThumb")) test_getThumb();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setIncrementI")) test_setIncrementI();
+	else if (getName().equals("test_setMaximumI")) test_setMaximumI();
+	else if (getName().equals("test_setMinimumI")) test_setMinimumI();
+	else if (getName().equals("test_setPageIncrementI")) test_setPageIncrementI();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setThumbI")) test_setThumbI();
+	else if (getName().equals("test_setValuesIIIIII")) test_setValuesIIIIII();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Synchronizer.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Synchronizer.java
new file mode 100644
index 0000000000..bd65cd4dbd
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Synchronizer.java
@@ -0,0 +1,66 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Synchronizer
+ *
+ * @see org.eclipse.swt.widgets.Synchronizer
+ */
+public class Test_org_eclipse_swt_widgets_Synchronizer extends SwtTestCase {
+
+public Test_org_eclipse_swt_widgets_Synchronizer(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_Display() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Display not written");
+}
+
+public void test_asyncExecLjava_lang_Runnable() {
+	warnUnimpl("Test test_asyncExecLjava_lang_Runnable not written");
+}
+
+public void test_syncExecLjava_lang_Runnable() {
+	warnUnimpl("Test test_syncExecLjava_lang_Runnable not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Synchronizer((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Display");
+	methodNames.addElement("test_asyncExecLjava_lang_Runnable");
+	methodNames.addElement("test_syncExecLjava_lang_Runnable");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Display")) test_ConstructorLorg_eclipse_swt_widgets_Display();
+	else if (getName().equals("test_asyncExecLjava_lang_Runnable")) test_asyncExecLjava_lang_Runnable();
+	else if (getName().equals("test_syncExecLjava_lang_Runnable")) test_syncExecLjava_lang_Runnable();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabFolder.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabFolder.java
new file mode 100644
index 0000000000..3b0d15ca77
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabFolder.java
@@ -0,0 +1,404 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TabFolder
+ *
+ * @see org.eclipse.swt.widgets.TabFolder
+ */
+public class Test_org_eclipse_swt_widgets_TabFolder extends Test_org_eclipse_swt_widgets_Composite {
+
+protected TabFolder tabFolder;
+
+public Test_org_eclipse_swt_widgets_TabFolder(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	makeCleanEnvironment();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * (Re)initializes tabFolder. This is called from setUp before each test
+ * method is invoked, but also inside the test methods themselves to 
+ * re-initialize the environment for a fresh test.
+ * 
+ * Basically a shim for coalescing the old test methods (several test
+ * methods testing the same target method) into a single test method for
+ * every target method. This way the original tests should work with little
+ * modification, as long as this method is called before each test.
+ * 
+ * Caveat: the Widget TestCase defines the tearDown method, which asserts that
+ * the main widget (defined by the last call to setWidget) has been disposed.
+ * So using this inside test methods means that only the widget created by
+ * the last call to this method will be tested for this. 
+ */
+private void makeCleanEnvironment() {
+// this method must be private or protected so the auto-gen tool keeps it
+	tabFolder = new TabFolder(shell, 0);
+	setWidget(tabFolder);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	TabFolder newTabFolder;
+	try {
+		newTabFolder = new TabFolder(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_getClientArea() {
+	warnUnimpl("Test test_getClientArea not written");
+}
+
+public void test_getItemI(){
+	int number = 15;
+	TabItem[] items = new TabItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TabItem(tabFolder, 0);
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertTrue(":a:" +String.valueOf(i), tabFolder.getItem(i).equals(items[i]));
+	}
+	try {
+		tabFolder.getItem(number);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		tabFolder.getItem(number+1);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		tabFolder.getItem(-1);
+		fail("No exception thrown for index == -1");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getItemCount() {
+	int number = 10;
+	TabItem ti;
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:" + i, tabFolder.getItemCount()==i);
+	  	ti = new TabItem(tabFolder, 0);
+	}
+}
+
+public void test_getItems() {	
+	int number = 5;
+	TabItem[] items = new TabItem[number];
+
+	assertEquals(0, tabFolder.getItems().length);
+	
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new TabItem(tabFolder, 0);
+	}
+	assertEquals(items, tabFolder.getItems());
+	
+	tabFolder.getItems()[0].dispose();
+	assertEquals(new TabItem[]{items[1], items[2], items[3], items[4]}, tabFolder.getItems());
+
+	tabFolder.getItems()[3].dispose();
+	assertEquals(new TabItem[]{items[1], items[2], items[3]}, tabFolder.getItems());
+
+	tabFolder.getItems()[1].dispose();
+	assertEquals(new TabItem[]{items[1], items[3]}, tabFolder.getItems());
+}
+
+public void test_getSelection() {
+	int number = 10;
+	TabItem[] tis = new TabItem[number];
+	for (int i = 0; i<number ; i++){
+	  	tis[i] = new TabItem(tabFolder, 0);
+	}
+	assertTrue(":a:", tabFolder.getSelection()[0] == tis[0]);	
+	for (int i = 0; i<number ; i++){
+		tabFolder.setSelection(i);
+		assertTrue(":b:" + i, tabFolder.getSelection()[0]==tis[i]);
+	}
+}
+
+public void test_getSelectionIndex() {
+	int number = 15;
+	TabItem[] items = new TabItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TabItem(tabFolder, 0);
+		
+	assertTrue(":a:", tabFolder.getSelectionIndex()==0);
+
+	tabFolder.setSelection(new TabItem[]{items[2], items[number-1], items[10]});
+	assertTrue(":b:", tabFolder.getSelectionIndex()==2);
+	
+	tabFolder.setSelection(items);
+	assertTrue(":c:", tabFolder.getSelectionIndex()==0);
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_TabItem(){
+	int number = 10;
+	TabItem[] tis = new TabItem[number];
+	for (int i = 0; i<number ; i++){
+	  	tis[i] = new TabItem(tabFolder, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:" + i, tabFolder.indexOf(tis[i])==i);
+	}
+
+	//
+	makeCleanEnvironment();
+	
+	for (int i = 0; i<number ; i++){
+	  	tis[i] = new TabItem(tabFolder, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		try {
+			tabFolder.indexOf(null);
+			fail("No exception thrown for tabItem == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+
+	//
+	makeCleanEnvironment();	
+	number = 20;
+	TabItem[] items = new TabItem[number];
+
+	for (int i = 0; i < number; i++) {
+		items[i] = new TabItem(tabFolder, 0);
+		items[i].setText(String.valueOf(i));
+	}
+
+	//another tabFolder
+	TabFolder tabFolder_2 = new TabFolder(shell, 0);
+	TabItem[] items_2 = new TabItem[number];
+	for (int i = 0; i < number; i++) {
+		items_2[i] = new TabItem(tabFolder_2, 0);
+		items_2[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertTrue(":a:" + String.valueOf(i), tabFolder.indexOf(items_2[i])==-1);
+	}
+
+	//
+	TabFolder tabFolder2 = new TabFolder(shell, SWT.NULL);
+	TabItem tabItem = new TabItem(tabFolder2, SWT.NULL);
+	
+	assertTrue(":a:", tabFolder.indexOf(tabItem) == -1);
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setSelection$Lorg_eclipse_swt_widgets_TabItem() {
+	warnUnimpl("Test test_setSelection$Lorg_eclipse_swt_widgets_TabItem not written");
+}
+
+public void test_setSelectionI(){
+	int number = 10;
+	TabItem ti;
+	for (int i = 0; i<number ; i++){
+	  	ti = new TabItem(tabFolder, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		tabFolder.setSelection(i);
+		assertEquals(i, tabFolder.getSelectionIndex());
+	}
+
+	//
+	makeCleanEnvironment();
+	
+	for (int i = 0; i<number ; i++){
+	  	ti = new TabItem(tabFolder, 0);
+	  	assertEquals("i=" + i, 0, tabFolder.getSelectionIndex());
+	}
+
+	//
+	makeCleanEnvironment();
+	
+	number = 5;
+	TabItem[] items = new TabItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TabItem(tabFolder, 0);
+	try {
+		tabFolder.setSelection((TabItem[]) null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	finally {
+		assertEquals(new TabItem[]{items[0]}, tabFolder.getSelection());
+	}
+
+	//
+	makeCleanEnvironment();
+	
+	items = new TabItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TabItem(tabFolder, 0);
+
+	tabFolder.setSelection(0);
+	assertEquals(new TabItem[]{items[0]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(4);
+	assertEquals(new TabItem[]{items[4]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(2);
+	assertEquals(new TabItem[]{items[2]}, tabFolder.getSelection());	
+
+	tabFolder.setSelection(1);
+	assertEquals(new TabItem[]{items[1]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(number + 1);
+	assertEquals(new TabItem[]{items[1]}, tabFolder.getSelection());	
+
+	tabFolder.setSelection(-1);
+	assertEquals(0, tabFolder.getSelection().length);	
+	
+	tabFolder.setSelection(3);
+	assertEquals(new TabItem[]{items[3]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(-2);
+	assertEquals(0, tabFolder.getSelection().length);	
+
+	//
+	makeCleanEnvironment();
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TabItem(tabFolder, 0);
+
+	tabFolder.setSelection(new TabItem[]{});
+	assertEquals(new TabItem[]{}, tabFolder.getSelection());
+		
+	tabFolder.setSelection(new TabItem[] {items[0]});
+	assertEquals(new TabItem[] {items[0]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(new TabItem[] {items[3]});
+	assertEquals(new TabItem[] {items[3]}, tabFolder.getSelection());	
+
+	tabFolder.setSelection(new TabItem[] {items[4]});
+	assertEquals(new TabItem[] {items[4]}, tabFolder.getSelection());
+
+	tabFolder.setSelection(new TabItem[] {items[2]});
+	assertEquals(new TabItem[] {items[2]}, tabFolder.getSelection());	
+
+	tabFolder.setSelection(new TabItem[] {items[1]});
+	assertEquals(new TabItem[] {items[1]}, tabFolder.getSelection());	
+
+	//
+	makeCleanEnvironment();
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TabItem(tabFolder, 0);
+	try {
+		tabFolder.setSelection( new TabItem[]{items[0], null});
+		tabFolder.setSelection( new TabItem[]{null});		
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	finally {
+		assertEquals(new TabItem[]{items[0]}, tabFolder.getSelection());
+	}
+}
+
+public void test_setSelectionIZ() {
+	warnUnimpl("Test test_setSelectionIZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TabFolder((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getClientArea");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_TabItem");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setSelection$Lorg_eclipse_swt_widgets_TabItem");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionIZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getClientArea")) test_getClientArea();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_TabItem")) test_indexOfLorg_eclipse_swt_widgets_TabItem();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setSelection$Lorg_eclipse_swt_widgets_TabItem")) test_setSelection$Lorg_eclipse_swt_widgets_TabItem();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionIZ")) test_setSelectionIZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabItem.java
new file mode 100644
index 0000000000..75f27ae5e3
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TabItem.java
@@ -0,0 +1,185 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TabItem
+ *
+ * @see org.eclipse.swt.widgets.TabItem
+ */
+public class Test_org_eclipse_swt_widgets_TabItem extends Test_org_eclipse_swt_widgets_Item {
+
+TabFolder tabFolder;
+TabItem tabItem;
+
+public Test_org_eclipse_swt_widgets_TabItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	tabFolder = new TabFolder(shell, 0);
+	tabItem = new TabItem(tabFolder, 0);
+	setWidget(tabItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TabFolderI(){
+	if (fCheckSwtNullExceptions) {
+		try {
+			TabItem tItem = new TabItem(null, SWT.NULL);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TabFolderII(){
+	TabItem tItem = new TabItem(tabFolder, SWT.NULL, 0);
+	
+	assertTrue(":a:", tabFolder.getItems()[0] == tItem);
+	
+	tItem = new TabItem(tabFolder, SWT.NULL, 1);	
+	assertTrue(":b:", tabFolder.getItems()[1] == tItem);
+				
+	tItem = new TabItem(tabFolder, SWT.NULL, 1);	
+	assertTrue(":c:", tabFolder.getItems()[1] == tItem);
+
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			new TabItem(tabFolder, SWT.NULL, -1);	
+			fail("No exception thrown");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		finally {
+			assertTrue(":d:", tabFolder.getItems()[1] == tItem);			
+		}
+	}
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			new TabItem(tabFolder, SWT.NULL, tabFolder.getItemCount() + 1);
+			fail("No exception thrown");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		finally {
+			assertTrue(":e:", tabFolder.getItems()[1] == tItem);
+		}
+	}
+	if (fCheckSwtNullExceptions) {
+		try {
+			new TabItem(null, SWT.NULL, 0);
+			fail("No exception thrown");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getControl() {
+	warnUnimpl("Test test_getControl not written");
+}
+
+public void test_getDisplay() {
+	assertTrue(tabItem.getDisplay() == tabFolder.getDisplay());
+}
+
+public void test_getParent() {
+	assertTrue(":a: ", tabItem.getParent() == tabFolder);
+}
+
+public void test_getToolTipText() {
+	warnUnimpl("Test test_getToolTipText not written");
+}
+
+public void test_setControlLorg_eclipse_swt_widgets_Control(){
+	Control control = new Table(tabFolder, SWT.NULL);
+
+	assertTrue(":a: ", tabItem.getControl() == null);	
+
+	tabItem.setControl(control);
+	assertTrue(":b: ", tabItem.getControl() == control);
+
+	tabItem.setControl(null);
+	assertTrue(":c: ", tabItem.getControl() == null);
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public void test_setToolTipTextLjava_lang_String(){
+	tabItem.setToolTipText("fred");
+	assertTrue(":a: ", tabItem.getToolTipText().equals("fred"));
+	tabItem.setToolTipText("fredttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt");
+	assertTrue(":b: ", tabItem.getToolTipText().equals("fredttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt"));
+	tabItem.setToolTipText(null);
+	assertTrue(":c: ", tabItem.getToolTipText() == null);
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TabItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TabFolderI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TabFolderII");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_setControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TabFolderI")) test_ConstructorLorg_eclipse_swt_widgets_TabFolderI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TabFolderII")) test_ConstructorLorg_eclipse_swt_widgets_TabFolderII();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_setControlLorg_eclipse_swt_widgets_Control")) test_setControlLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java
new file mode 100644
index 0000000000..37c5f6a71c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Table.java
@@ -0,0 +1,1635 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Table
+ *
+ * @see org.eclipse.swt.widgets.Table
+ */
+public class Test_org_eclipse_swt_widgets_Table extends Test_org_eclipse_swt_widgets_Composite {
+
+protected Table table;
+
+public Test_org_eclipse_swt_widgets_Table(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	makeCleanEnvironment(false); // by default, use multi-select table.	
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * (Re)initializes table. This is called from setUp before each test
+ * method is invoked, but also inside the test methods themselves to 
+ * re-initialize the environment for a fresh test.
+ * 
+ * Basically a shim for coalescing the old test methods (several test
+ * methods testing the same target method) into a single test method for
+ * every target method. This way the original tests should work with little
+ * modification, as long as this method is called before each test.
+ * 
+ * Caveat: the Widget TestCase defines the tearDown method, will assert that
+ * the main widget (defined by the last call to setWidget) has been disposed.
+ * So using this inside test methods means that only the widget created by
+ * the last call to this method will be tested for this. 
+ * 
+ * @param int Value to pass as the second parameter to the Table constructor
+ */
+private void makeCleanEnvironment(boolean singleMode) {
+// this method must be private or protected so the auto-gen tool keeps it
+	if ( singleMode == false )
+		table = new Table(shell, SWT.MULTI);
+	else
+		table = new Table(shell, SWT.SINGLE);
+	setWidget(table);	
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	if (fCheckSwtNullExceptions) {
+		Table newTable;
+		try {
+			newTable = new Table(null, 0);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_deselect$I(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+	items[i] = new TableItem(table, 0);
+		
+	table.select(new int[] {0, 3});
+	assertEquals(2, table.getSelectionCount());
+
+	table.deselect(new int[] {1, 2});
+	assertEquals(2, table.getSelectionCount());
+
+	table.deselect(new int[] {1, 3, 5});
+	assertEquals(1, table.getSelectionCount());
+
+	table.deselect(new int[] {9, 3, 0});
+	assertEquals(0, table.getSelectionCount());
+
+	makeCleanEnvironment(false);
+	
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	
+	table.selectAll();
+	assertEquals(number, table.getSelectionCount());
+
+	try{
+		table.deselect(null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(new int[] {});
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(new int[] {-1, 100, -1000});
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(new int[] {2, -1, 1, 100, 2});
+	assertEquals(number-2, table.getSelectionCount());
+	
+	table.deselect(new int[] {2, -1, 1, 100, 2});
+	assertEquals(number-2, table.getSelectionCount());
+	
+	table.deselect(new int[] {2, -1, 3, 100, 2});
+	assertEquals(number-3, table.getSelectionCount());
+}
+
+public void test_deselectI(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TableItem(table, 0);
+	}
+	assertEquals(0, table.getSelectionCount());
+	
+	table.deselect(0);	
+	assertEquals(0, table.getSelectionCount());
+
+	table.select(new int[] {0, 3, 6});
+	assertEquals(3, table.getSelectionCount());
+
+	table.deselect(0);
+	assertEquals(2, table.getSelectionCount());
+	
+	table.deselect(0);
+	assertEquals(2, table.getSelectionCount());
+
+	table.deselect(5);
+	assertEquals(2, table.getSelectionCount());
+
+	table.deselect(3);
+	assertEquals(1, table.getSelectionCount());
+	
+	table.deselect(100);
+	assertEquals(1, table.getSelectionCount());
+}
+
+public void test_deselectII(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+		
+	table.select(new int[] {0, 3, 6});
+	assertEquals(3, table.getSelectionCount());
+
+	table.deselect(7, 10);
+	assertEquals(3, table.getSelectionCount());
+
+	table.deselect(6, 10);
+	assertEquals(2, table.getSelectionCount());
+
+	table.deselect(1, 10);
+	assertEquals(1, table.getSelectionCount());
+
+	table.deselect(0, 10);
+	assertEquals(0, table.getSelectionCount());
+
+	table.deselect(0, 100);
+	assertEquals(0, table.getSelectionCount());
+
+	makeCleanEnvironment(false);
+	
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	
+	table.selectAll();
+	assertEquals(number, table.getSelectionCount());
+
+	table.deselect(-10, 2);
+	assertEquals(number-3, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(-10, 2000);
+	assertEquals(0, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(2000, -10);
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+	
+	table.deselect(0, number-1);
+	assertEquals(0, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(0, 0);
+	assertEquals(number-1, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(number-1, number-1);
+	assertEquals(number-1, table.getSelectionCount());
+	table.selectAll();
+	table.deselect(-1, -1);
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+
+	table.deselect(number, number);
+	assertEquals(number, table.getSelectionCount());
+	table.selectAll();
+}
+
+public void test_deselectAll() {
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	
+	assertEquals(0, table.getSelectionCount());
+	table.select(new int[] {2, 4, 5, 10});
+	
+	assertEquals(4, table.getSelectionCount());
+	
+	table.deselectAll();
+	assertEquals(0, table.getSelectionCount());
+
+	table.selectAll();
+	assertEquals(number, table.getSelectionCount());
+
+	table.deselectAll();
+	assertEquals(0, table.getSelectionCount());
+}
+
+public void test_getColumnI() {
+	warnUnimpl("Test test_getColumnI not written");
+}
+
+public void test_getColumnCount() {
+	warnUnimpl("Test test_getColumnCount not written");
+}
+
+public void test_getColumns() {
+	warnUnimpl("Test test_getColumns not written");
+}
+
+public void test_getGridLineWidth() {
+	table.getGridLineWidth();
+}
+
+public void test_getHeaderVisible() {
+	warnUnimpl("Test test_getHeaderVisible not written");
+}
+
+public void test_getItemI(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	for (int i = 0; i < number; i++)
+		assertEquals("i=" + i, items[i], table.getItem(i));
+	try {
+		table.getItem(number);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		table.getItem(number+1);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	// note: SWT.SINGLE	
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	for (int i = 0; i < number; i++) {
+		assertEquals("i=" + i, items[i], table.getItem(i));
+	}
+	try {
+		table.getItem(number);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		table.getItem(number+1);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getItemLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_getItemLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_getItemCount(){
+	int[] cases = {0, 10, 100};
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+		}
+		assertEquals("j="+ j, cases[j], table.getItemCount());
+		table.removeAll();
+	}
+
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);	
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+		}
+		assertEquals("j="+ j, cases[j], table.getItemCount());
+		table.removeAll();
+	}
+}
+
+public void test_getItemHeight() {
+	assertTrue(":a: Item height <= 0", table.getItemHeight() > 0);
+	new TableItem(table, 0);
+	assertTrue(":b: Item height <= 0", table.getItemHeight() > 0);
+}
+
+public void test_getItems(){
+	int[] cases = {0, 10, 100};
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+		}
+		assertEquals("j=" + j, cases[j], table.getItems().length);
+		table.removeAll();
+	}
+
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+			ti.setText(String.valueOf(i));
+		}
+		TableItem[] items = table.getItems();
+		for (int i = 0; i < items.length; i++) {
+			assertEquals("j=" + j + ", i=" + i, String.valueOf(i), items[i].getText());
+		}
+		table.removeAll();
+	}
+	
+	// note SWT.SINGLE
+	makeCleanEnvironment(true);
+	
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+		}
+		assertEquals("j=" + j, cases[j], table.getItems().length);
+		table.removeAll();
+	}
+
+	makeCleanEnvironment(true);
+		
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TableItem ti = new TableItem(table, 0);
+			ti.setText(String.valueOf(i));
+		}
+		TableItem[] items = table.getItems();
+		for (int i = 0; i < items.length; i++) {
+			assertEquals("j=" + j + ", i=" + i, String.valueOf(i), items[i].getText());
+		}
+		table.removeAll();
+	}
+}
+
+public void test_getLinesVisible() {
+	warnUnimpl("Test test_getLinesVisible not written");
+}
+
+public void test_getSelection(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new TableItem[] {}, table.getSelection());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(new TableItem[] {items[2], items[10], items[number-1]}, table.getSelection());
+	
+	table.setSelection(items);
+	assertEquals(items, table.getSelection());
+	
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new TableItem[] {}, table.getSelection());
+
+	table.setSelection(new TableItem[]{items[10], items[number-1], items[2]});
+	assertEquals(new TableItem[] {items[10]}, table.getSelection());
+	
+	table.setSelection(items);
+	assertEquals(new TableItem[] {items[0]}, table.getSelection());
+}
+
+public void test_getSelectionCount(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(0, table.getSelectionCount());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(3, table.getSelectionCount());
+	
+	table.setSelection(items);
+	assertEquals(number, table.getSelectionCount());
+
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(0, table.getSelectionCount());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(1, table.getSelectionCount());
+	
+	table.setSelection(items);
+	assertEquals(1, table.getSelectionCount());
+}
+
+public void test_getSelectionIndex(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(-1, table.getSelectionIndex());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(2, table.getSelectionIndex());
+	
+	table.setSelection(items);
+	assertEquals(0, table.getSelectionIndex());
+	
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(-1, table.getSelectionIndex());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(2, table.getSelectionIndex());
+	
+	table.setSelection(items);
+	assertEquals(0, table.getSelectionIndex());
+}
+
+public void test_getSelectionIndices(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new int[]{}, table.getSelectionIndices());
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(new int[]{2, 10, number-1}, table.getSelectionIndices()); // 10 < number
+
+	int[] all = new int[number];
+	for (int i = 0; i<number; i++)
+		all[i]=i;
+	table.setSelection(items);
+	assertEquals(all, table.getSelectionIndices());
+
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new int[]{}, table.getSelectionIndices());
+
+	table.setSelection(new TableItem[]{items[2], items[number-1], items[10]});
+	assertEquals(new int[]{2}, table.getSelectionIndices());
+
+	table.setSelection(items);
+	assertEquals(new int[]{0}, table.getSelectionIndices());
+}
+
+public void test_getTopIndex() {
+	warnUnimpl("Test test_getTopIndex not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_TableColumn() {
+	warnUnimpl("Test test_indexOfLorg_eclipse_swt_widgets_TableColumn not written");
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_TableItem(){
+	int number = 20;
+	TableItem[] items = new TableItem[number];
+
+	for (int i = 0; i < number; i++) {
+		items[i] = new TableItem(table, 0);
+		items[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertEquals(i, table.indexOf(items[i]));
+	}
+
+	for (int i = 0; i < number; i++) {
+		try {
+			table.indexOf((TableItem)null);
+			fail("No exception thrown for tableItem == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+
+	// another table
+	Table table_2 = new Table(shell, 0);
+	TableItem[] items_2 = new TableItem[number];
+	for (int i = 0; i < number; i++) {
+		items_2[i] = new TableItem(table_2, 0);
+		items_2[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertEquals("i=" + i, -1, table.indexOf(items_2[i]));
+	}
+	
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+	
+	number = 20;
+	items = new TableItem[number];
+
+	for (int i = 0; i < number; i++) {
+		items[i] = new TableItem(table, 0);
+		items[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertEquals(i, table.indexOf(items[i]));
+	}
+
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++) {
+		items[i] = new TableItem(table, 0);
+		items[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		try {
+			table.indexOf((TableItem)null);
+			fail("No exception thrown for tableItem == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+	
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++) {
+		items[i] = new TableItem(table, 0);
+		items[i].setText(String.valueOf(i));
+	}
+
+	// another table
+	table_2 = new Table(shell, 0);
+	items_2 = new TableItem[number];
+	for (int i = 0; i < number; i++) {
+		items_2[i] = new TableItem(table_2, 0);
+		items_2[i].setText(String.valueOf(i));
+	}
+
+	for (int i = 0; i < number; i++) {
+		assertEquals("i=" + i, -1, table.indexOf(items_2[i]));
+	}
+}
+
+public void test_isSelectedI(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	for (int i = 0; i < number; i++)
+		assertTrue(":a:" + i, !table.isSelected(i));
+	table.setSelection(new TableItem[] {items[2], items[number-1], items[10]});
+	for (int i = 0; i < number; i++) {
+		if (i == 2 || i == number-1 || i == 10)
+			assertTrue(":b:" + i, table.isSelected(i));
+		else
+			assertTrue(":b:" + i, !table.isSelected(i));
+	}
+	
+	table.setSelection(items);
+	for (int i = 0; i < number; i++)
+		assertTrue(":c:" + i, table.isSelected(i));
+
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+			
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	for (int i = 0; i < number; i++)
+		assertTrue(":d:" + i, !table.isSelected(i));
+	table.setSelection(new TableItem[] {items[10], items[number-1], items[2]});
+	for (int i = 0; i < number; i++) {
+		if (i == 10)
+			assertTrue(":e:" + i, table.isSelected(i));
+		else
+			assertTrue(":e:" + i, !table.isSelected(i));
+	}
+	
+	table.setSelection(items);
+	for (int i = 0; i < number; i++){
+			if (i == 0)
+			assertTrue(":f:" + i, table.isSelected(i));
+		else
+			assertTrue(":f:" + i, !table.isSelected(i));
+	}
+}
+
+public void test_remove$I(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	try {
+		table.remove(null);
+		fail("No exception thrown for tableItems == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	try {
+		table.remove(new int[] {2, 1, 0, -100, 5, 5, 2, 1, 0, 0, 0});
+		fail("No exception thrown for illegal index arguments");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		table.remove(new int[] {2, 1, 0, number, 5, 5, 2, 1, 0, 0, 0});
+		fail("No exception thrown for illegal index arguments");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	table.remove(new int[] {});
+
+	makeCleanEnvironment(false);
+		
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertTrue(":a:", !items[2].isDisposed());
+	table.remove(new int[] {2});
+	assertTrue(":b:", items[2].isDisposed());
+	assertEquals(number-1, table.getItemCount());
+
+	assertTrue(":c:", !items[number-1].isDisposed());
+	table.remove(new int[] {number-2});
+	assertTrue(":d:", items[number-1].isDisposed());
+	assertEquals(number-2, table.getItemCount());
+
+	assertTrue(":e:", !items[3].isDisposed());
+	table.remove(new int[] {2});
+	assertTrue(":f:", items[3].isDisposed());
+	assertEquals(number-3, table.getItemCount());
+
+	assertTrue(":g:", !items[0].isDisposed());
+	table.remove(new int[] {0});
+	assertTrue(":h:", items[0].isDisposed());
+	assertEquals(number-4, table.getItemCount());
+}
+
+public void test_removeI() {
+	warnUnimpl("Test test_removeI not written");
+}
+
+public void test_removeII(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(-number, number + 100);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+	
+	makeCleanEnvironment(false);
+
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(2, 3);
+	assertEquals(new TableItem[]{items[0], items[1], items[4]}, table.getItems());
+	
+	makeCleanEnvironment(false);
+
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	//should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(2, 100);
+			fail("No exception thrown for illegal index range");
+		} 
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(new TableItem[] {items[0], items[1]}, table.getItems());
+	}
+	
+	makeCleanEnvironment(false);
+
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(2, number);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(new TableItem[] {items[0], items[1]}, table.getItems());
+	}
+	
+	makeCleanEnvironment(false);
+	
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(2, number-1);
+	assertEquals(new TableItem[] {items[0], items[1]}, table.getItems());
+
+	makeCleanEnvironment(false);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(0, 3);
+	assertEquals(new TableItem[] {items[4]}, table.getItems());
+
+	makeCleanEnvironment(false);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(0, number-1);
+	assertEquals(new TableItem[] {}, table.getItems());
+	
+	makeCleanEnvironment(false);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.remove(new int[] {});
+	assertEquals(number, table.getItemCount());
+
+	makeCleanEnvironment(false);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(-20, -10);
+			fail("No exception thrown for illegal index range");
+		} 
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(items, table.getItems());
+	}
+	
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(20, 40);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(items, table.getItems());
+	}
+	
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		table.remove(200, 40);
+		assertEquals(items, table.getItems());
+	}
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(2, 2);
+	assertEquals(new TableItem[]{items[0], items[1], items[3], items[4]}, table.getItems());
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(0, 0);
+	assertEquals(new TableItem[]{items[1], items[2], items[3], items[4]}, table.getItems());
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.remove(4, 4);
+	assertEquals(new TableItem[]{items[0], items[1], items[2], items[3]}, table.getItems());
+	
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	assertEquals(number, table.getItemCount());
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(-10, 2);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+	assertEquals(number, table.getItemCount());
+	if (fCheckSWTPolicy) {
+		table.remove(10, 2);
+		assertEquals(number, table.getItemCount());
+	}
+	table.remove(0, 2);
+	assertEquals(number - 3, table.getItemCount());
+	assertEquals(new TableItem[] {items[3], items[4]}, table.getItems());
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(1, 200);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(1, table.getItemCount());
+		assertEquals(new TableItem[] {items[3]}, table.getItems());
+	}
+	
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.remove(0, number-1);
+	assertEquals(0, table.getItemCount());
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(number, number);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	// should not cause a null pointer exception, bounds checks for table not implemented yet
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			table.remove(number, number + 100);
+			fail("No exception thrown for illegal index range");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+	
+	makeCleanEnvironment(false);
+	
+	number = 15;
+	items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+
+	table.remove(new int[] {2, 1, 0, 5, 5});
+	assertEquals(number-4, table.getItemCount());
+}
+
+public void test_removeAll(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.removeAll();
+
+	makeCleanEnvironment(false);
+		
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.removeAll();
+	table.removeAll();
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_select$I(){
+	try {
+		table.select(null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.select(new int[] {10, 2, 14});
+	assertEquals(new int[] {2, 10, 14}, table.getSelectionIndices());
+	
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true); 
+	
+	try {
+		table.select(null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_selectI(){	
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	
+	table.select(new int[] {10, 2, 14});
+	assertEquals(new int[] {2, 10, 14}, table.getSelectionIndices());
+	
+	table.select(7);
+	assertEquals(new int[]{2, 7, 10, 14}, table.getSelectionIndices());
+
+	table.select(0);
+	assertEquals(new int[]{0, 2, 7, 10, 14}, table.getSelectionIndices());
+
+	// note: SWT.SINGLE	
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.select(new int[] {number - 1, 10, 2 });
+	assertEquals(number - 1, table.getSelectionIndex());
+	table.setSelection(new int[] {number - 1,10, 2});
+	assertEquals(number - 1, table.getSelectionIndex()); // for SINGLE setSelection and select are the same
+
+	table.select(7);
+	assertEquals(new int[] {7}, table.getSelectionIndices());
+	table.setSelection(7);
+	assertEquals(new int[] {7}, table.getSelectionIndices()); // for SINGLE setSelection and select are the same
+
+	table.select(0);
+	assertEquals(new int[] {0}, table.getSelectionIndices());
+	table.setSelection(0);
+	assertEquals(new int[] {0}, table.getSelectionIndices()); // for SINGLE setSelection and select are the same
+}
+
+public void test_selectII(){
+	int number = 15;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	
+	table.select(new int[] {10, 2, 14});
+	assertEquals(new int[] {2, 10, 14}, table.getSelectionIndices());
+	
+	table.select(7);
+	assertEquals(new int[]{2, 7, 10, 14}, table.getSelectionIndices());
+
+	table.select(0);
+	assertEquals(new int[]{0, 2, 7, 10, 14}, table.getSelectionIndices());
+
+	table.select(4, 10);
+	assertEquals(new int[]{0, 2, 4, 5, 6, 7, 8, 9, 10, 14}, table.getSelectionIndices());
+
+	table.select(4, 14);
+	assertEquals(new int[]{0, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, table.getSelectionIndices());
+
+	table.select(0, 7);
+	assertEquals(new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, table.getSelectionIndices());
+
+	table.select(9, 5);
+	assertEquals(new int[]{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, table.getSelectionIndices());
+
+	makeCleanEnvironment(false);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.select(-100, 1000);
+	assertEquals(number, table.getSelectionCount());
+	table.deselectAll();
+	assertEquals(0, table.getSelectionCount());
+	table.select(0, 1000);
+	assertEquals(number, table.getSelectionCount());
+	table.deselectAll();
+
+	table.select(0, number-1);
+	assertEquals(number, table.getSelectionCount());
+	table.deselectAll();
+
+	table.select(0, 0);
+	assertEquals(1, table.getSelectionCount());
+	table.deselectAll();
+
+	table.select(number-1, number);
+	assertEquals(1, table.getSelectionCount());
+	table.deselectAll();
+
+	table.select(number, number);
+	assertEquals(0, table.getSelectionCount());
+	table.deselectAll();
+
+	// note: SWT.SINGLE
+	makeCleanEnvironment(true);
+
+	table.setSelection(0);
+		
+	if (fCheckSWTPolicy) {
+		table.select(4, 10);
+		assertEquals(new int[] {4}, table.getSelectionIndices());
+		table.setSelection(4, 10);
+		assertEquals(new int[] {4}, table.getSelectionIndices()); //for SINGLE setSelection and select are the same
+
+		table.select(5, number - 1);
+		assertEquals(new int[] {5}, table.getSelectionIndices());
+		table.setSelection(5, number - 1);
+		assertEquals(new int[] {5}, table.getSelectionIndices()); //for SINGLE setSelection and select are the same
+
+		table.select(0, 7);
+		assertEquals(new int[] {0}, table.getSelectionIndices());
+		table.setSelection(0, 7);
+		assertEquals(new int[] {0}, table.getSelectionIndices()); //for SINGLE setSelection and select are the same
+
+		table.select(9, 5);
+		assertEquals(new int[] {7}, table.getSelectionIndices());
+		table.setSelection(9, 5);
+		assertEquals(new int[] {}, table.getSelectionIndices()); //for SINGLE setSelection and select are the same
+	} // ?? in this case maybe the sel. should be cleared
+	
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	if (fCheckSWTPolicy) {
+		table.select(-100, 1000);
+		assertEquals(1, table.getSelectionCount());
+		assertEquals(new int[] {number - 1}, table.getSelectionIndices());
+	}
+	table.deselectAll();
+	assertEquals(0, table.getSelectionCount());
+	table.select(0, 1000);
+	assertEquals(1, table.getSelectionCount());
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {number - 1}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(0, number - 1);
+	assertEquals(1, table.getSelectionCount());
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {number - 1}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(0, 0);
+	assertEquals(1, table.getSelectionCount());
+	assertEquals(new int[] {0}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(number - 1, number);
+	assertEquals(1, table.getSelectionCount());
+	assertEquals(new int[] {number - 1}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(number, number);
+	assertEquals(0, table.getSelectionCount());
+	assertEquals(new int[] {}, table.getSelectionIndices());
+	table.deselectAll();
+	
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.select(-100, 1000);
+	if (fCheckSWTPolicy) {
+		assertEquals(1, table.getSelectionCount());
+		assertEquals(new int[] {number - 1}, table.getSelectionIndices());
+	}
+	table.deselectAll();
+	assertEquals(0, table.getSelectionCount());
+	table.select(1000, 0);
+	assertEquals(0, table.getSelectionCount());
+	assertEquals(new int[] {}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(number - 1, 0);
+	if (fCheckSWTPolicy)
+		assertEquals(0, table.getSelectionCount());
+	table.deselectAll();
+	table.select(0, 0);
+	assertEquals(1, table.getSelectionCount());
+	assertEquals(new int[] {0}, table.getSelectionIndices());
+	table.deselectAll();
+	table.select(-1, -1);
+	if (fCheckSWTPolicy) {
+		assertEquals(0, table.getSelectionCount());
+		assertEquals(new int[] {}, table.getSelectionIndices());
+	}
+	table.deselectAll();
+	table.select(number, number);
+	if (fCheckSWTPolicy) {
+		assertEquals(0, table.getSelectionCount());
+		assertEquals(new int[] {}, table.getSelectionIndices());
+	}
+	table.deselectAll();
+}
+
+public void test_selectAll(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new int[]{}, table.getSelectionIndices());
+	table.selectAll();
+	assertEquals(new int[]{0, 1, 2, 3, 4}, table.getSelectionIndices());
+	
+	// test single-selection table
+	makeCleanEnvironment(true);
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	assertEquals(new int[]{}, table.getSelectionIndices());
+	table.selectAll();
+	assertEquals(new int[]{}, table.getSelectionIndices());
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setHeaderVisibleZ(){
+	table.setHeaderVisible(true);
+	assertTrue(table.getHeaderVisible());
+
+	table.setHeaderVisible(false);
+	assertTrue(!table.getHeaderVisible());
+}
+
+public void test_setLinesVisibleZ(){
+	table.setLinesVisible(true);
+	assertTrue(table.getLinesVisible());
+
+	table.setLinesVisible(false);
+	assertTrue(!table.getLinesVisible());
+}
+
+public void test_setRedrawZ() {
+	warnUnimpl("Test test_setRedrawZ not written");
+}
+
+public void test_setSelection$I(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	try {
+		table.setSelection((int[]) null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	table.setSelection(new int[]{});
+	assertEquals(new int[]{}, table.getSelectionIndices());
+
+	table.setSelection(new int[]{0, 3, 2});
+	assertEquals(new int[]{0, 2, 3}, table.getSelectionIndices());	
+
+	table.setSelection(new int[]{3, 2, 1});
+	assertEquals(new int[]{1, 2, 3}, table.getSelectionIndices());
+
+	table.setSelection(new int[]{1, 4, 0});
+	assertEquals(new int[]{0, 1, 4}, table.getSelectionIndices());	
+	table.setSelection(new int[]{0, 4, 0});
+	assertEquals(new int[]{0, 4}, table.getSelectionIndices());	
+
+	table.setSelection(new int[]{2, 3, 4});
+	assertEquals(new int[]{2, 3, 4}, table.getSelectionIndices());
+
+	table.setSelection(new int[]{4, 4, 4, 4, 4, 4, 4});
+	assertEquals(new int[]{4}, table.getSelectionIndices());
+
+	table.setSelection(new int[]{4});
+	assertEquals(new int[]{4}, table.getSelectionIndices());
+	
+	// test single-selection table
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	try {
+		table.setSelection((int[]) null);
+		fail("No exception thrown for selection range == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.setSelection(new int[] {});
+	assertEquals(new int[] {}, table.getSelectionIndices());
+	table.setSelection(new int[] {0, 3, 2});
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {2}, table.getSelectionIndices());
+	table.setSelection(new int[] {3, 2, 1});
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {1}, table.getSelectionIndices());
+	table.setSelection(new int[] {1, 4, 0});
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {0}, table.getSelectionIndices());
+	table.setSelection(new int[] {0, 4, 1});
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {0}, table.getSelectionIndices());
+	table.setSelection(new int[] {2, 3, 4});
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {4}, table.getSelectionIndices());
+	table.setSelection(new int[] {4, 4, 4, 4, 4, 4, 4});
+	assertEquals(new int[] {4}, table.getSelectionIndices());
+	table.setSelection(new int[] {4});
+	assertEquals(new int[] {4}, table.getSelectionIndices());
+	
+	makeCleanEnvironment(true);
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	try {
+		table.setSelection((TableItem[]) null);
+		fail("No exception thrown for selection range == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	finally {
+		assertEquals(0, table.getSelectionCount());
+	}
+}
+
+public void test_setSelection$Lorg_eclipse_swt_widgets_TableItem(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	try {
+		table.setSelection((TableItem[]) null);
+		fail("No exception thrown for selection range == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	finally {
+		assertEquals(0, table.getSelectionCount());
+	}
+
+	table.setSelection(new TableItem[]{});
+	assertEquals(0, table.getSelectionCount());
+
+	table.setSelection(new TableItem[]{items[0], items[3], items[2]});
+	assertEquals(new TableItem[]{items[0], items[2], items[3]}, table.getSelection());	
+	table.setSelection(new TableItem[]{items[3], items[2], items[1]});
+	assertEquals(new TableItem[]{items[1], items[2], items[3]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[1], items[4], items[0]});
+	assertEquals(new TableItem[]{items[0], items[1], items[4]}, table.getSelection());	
+	table.setSelection(new TableItem[]{items[0], items[4], items[0]});
+	assertEquals(new TableItem[]{items[0], items[4]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[2], items[3], items[4]});
+	assertEquals(new TableItem[]{items[2], items[3], items[4]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[4], items[4], items[4], items[4], items[4], items[4]});
+	assertEquals(new TableItem[]{items[4]}, table.getSelection());	
+	table.setSelection(new TableItem[]{items[4]});
+	assertEquals(new TableItem[]{items[4]}, table.getSelection());	
+
+	makeCleanEnvironment(false);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(new TableItem[] {items[0]});
+	assertEquals(new TableItem[] {items[0]}, table.getSelection());
+
+	table.setSelection(new TableItem[] {items[3]});
+	assertEquals(new TableItem[] {items[3]}, table.getSelection());	
+
+	table.setSelection(new TableItem[] {items[4]});
+	assertEquals(new TableItem[] {items[4]}, table.getSelection());
+	table.setSelection(new TableItem[] {items[2]});
+	assertEquals(new TableItem[] {items[2]}, table.getSelection());	
+	table.setSelection(new TableItem[] {items[1]});
+	assertEquals(new TableItem[] {items[1]}, table.getSelection());
+
+	// test single-selection table
+	makeCleanEnvironment(true);
+
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(new TableItem[]{});
+	assertEquals(0, table.getSelectionCount());
+
+	table.setSelection(new TableItem[]{items[0], items[3], items[2]});
+	assertEquals(new TableItem[]{items[0]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[3], items[2], items[1]});
+	assertEquals(new TableItem[]{items[3]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[1], items[4], items[0]});
+	assertEquals(new TableItem[]{items[1]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[0], items[4], items[0]});
+	assertEquals(new TableItem[]{items[0]}, table.getSelection());
+
+	table.setSelection(new TableItem[]{items[2], items[3], items[4]});
+	assertEquals(new TableItem[]{items[2]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[4], items[4], items[4], items[4], items[4], items[4]});
+	assertEquals(new TableItem[]{items[4]}, table.getSelection());	
+
+	table.setSelection(new TableItem[]{items[4]});
+	assertEquals(new TableItem[]{items[4]}, table.getSelection());
+	
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(new TableItem[] {items[0]});
+	assertEquals(new TableItem[] {items[0]}, table.getSelection());
+
+	table.setSelection(new TableItem[] {items[3]});
+	assertEquals(new TableItem[] {items[3]}, table.getSelection());	
+
+	table.setSelection(new TableItem[] {items[4]});
+	assertEquals(new TableItem[] {items[4]}, table.getSelection());
+
+	table.setSelection(new TableItem[] {items[2]});
+	assertEquals(new TableItem[] {items[2]}, table.getSelection());	
+
+	table.setSelection(new TableItem[] {items[1]});
+	assertEquals(new TableItem[] {items[1]}, table.getSelection());			
+}
+
+public void test_setSelectionI(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(0);
+	assertEquals(new int[]{0}, table.getSelectionIndices());
+	table.setSelection(3);
+	assertEquals(new int[]{3}, table.getSelectionIndices());	
+	table.setSelection(4);
+	assertEquals(new int[]{4}, table.getSelectionIndices());
+
+	table.setSelection(2);
+	assertEquals(new int[]{2}, table.getSelectionIndices());	
+
+	table.setSelection(1);
+	assertEquals(new int[]{1}, table.getSelectionIndices());
+
+	// test single-selection table
+	makeCleanEnvironment(true);
+		
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(0);
+	assertEquals(new int[]{0}, table.getSelectionIndices());
+
+	table.setSelection(3);
+	assertEquals(new int[]{3}, table.getSelectionIndices());	
+
+	table.setSelection(4);
+	assertEquals(new int[]{4}, table.getSelectionIndices());
+
+	table.setSelection(2);
+	assertEquals(new int[]{2}, table.getSelectionIndices());	
+
+	table.setSelection(1);
+	assertEquals(new int[]{1}, table.getSelectionIndices());	
+	
+}
+
+public void test_setSelectionII(){
+	int number = 5;
+	TableItem[] items = new TableItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+
+	table.setSelection(0, 1);
+	assertEquals(new int[]{0, 1}, table.getSelectionIndices());
+
+	table.setSelection(2, 4);
+	assertEquals(new int[]{2, 3, 4}, table.getSelectionIndices());	
+
+	table.setSelection(3, 4);
+	assertEquals(new int[]{3, 4}, table.getSelectionIndices());	
+
+	table.setSelection(5, 4);
+	assertEquals(new int[]{}, table.getSelectionIndices());
+
+	table.setSelection(2, 2);
+	assertEquals(new int[]{2}, table.getSelectionIndices());	
+
+	table.setSelection(1, 4);
+	assertEquals(new int[]{1, 2, 3, 4}, table.getSelectionIndices());
+
+	table.setSelection(0, 4);
+	assertEquals(new int[]{0, 1, 2, 3, 4}, table.getSelectionIndices());
+
+	// test single-selection table
+	makeCleanEnvironment(true);
+		
+	for (int i = 0; i < number; i++)
+		items[i] = new TableItem(table, 0);
+	table.setSelection(0, 1);
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {1}, table.getSelectionIndices());
+	table.setSelection(2, 4);
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {4}, table.getSelectionIndices());
+	table.setSelection(5, 4);
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {}, table.getSelectionIndices());
+	table.setSelection(2, 2);
+	assertEquals(new int[] {2}, table.getSelectionIndices());
+	table.setSelection(1, 4);
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {4}, table.getSelectionIndices());
+	table.setSelection(0, 4);
+	if (fCheckSWTPolicy)
+		assertEquals(new int[] {4}, table.getSelectionIndices());
+}
+
+public void test_setTopIndexI() {
+	warnUnimpl("Test test_setTopIndexI not written");
+}
+
+public void test_showItemLorg_eclipse_swt_widgets_TableItem() {
+	warnUnimpl("Test test_showItemLorg_eclipse_swt_widgets_TableItem not written");
+}
+
+public void test_showSelection() {
+	table.showSelection();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Table((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_deselect$I");
+	methodNames.addElement("test_deselectI");
+	methodNames.addElement("test_deselectII");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getColumnI");
+	methodNames.addElement("test_getColumnCount");
+	methodNames.addElement("test_getColumns");
+	methodNames.addElement("test_getGridLineWidth");
+	methodNames.addElement("test_getHeaderVisible");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getLinesVisible");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_getSelectionIndex");
+	methodNames.addElement("test_getSelectionIndices");
+	methodNames.addElement("test_getTopIndex");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_TableColumn");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_TableItem");
+	methodNames.addElement("test_isSelectedI");
+	methodNames.addElement("test_remove$I");
+	methodNames.addElement("test_removeI");
+	methodNames.addElement("test_removeII");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_select$I");
+	methodNames.addElement("test_selectI");
+	methodNames.addElement("test_selectII");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setHeaderVisibleZ");
+	methodNames.addElement("test_setLinesVisibleZ");
+	methodNames.addElement("test_setRedrawZ");
+	methodNames.addElement("test_setSelection$I");
+	methodNames.addElement("test_setSelection$Lorg_eclipse_swt_widgets_TableItem");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionII");
+	methodNames.addElement("test_setTopIndexI");
+	methodNames.addElement("test_showItemLorg_eclipse_swt_widgets_TableItem");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_deselect$I")) test_deselect$I();
+	else if (getName().equals("test_deselectI")) test_deselectI();
+	else if (getName().equals("test_deselectII")) test_deselectII();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getColumnI")) test_getColumnI();
+	else if (getName().equals("test_getColumnCount")) test_getColumnCount();
+	else if (getName().equals("test_getColumns")) test_getColumns();
+	else if (getName().equals("test_getGridLineWidth")) test_getGridLineWidth();
+	else if (getName().equals("test_getHeaderVisible")) test_getHeaderVisible();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemLorg_eclipse_swt_graphics_Point")) test_getItemLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getLinesVisible")) test_getLinesVisible();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_getSelectionIndex")) test_getSelectionIndex();
+	else if (getName().equals("test_getSelectionIndices")) test_getSelectionIndices();
+	else if (getName().equals("test_getTopIndex")) test_getTopIndex();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_TableColumn")) test_indexOfLorg_eclipse_swt_widgets_TableColumn();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_TableItem")) test_indexOfLorg_eclipse_swt_widgets_TableItem();
+	else if (getName().equals("test_isSelectedI")) test_isSelectedI();
+	else if (getName().equals("test_remove$I")) test_remove$I();
+	else if (getName().equals("test_removeI")) test_removeI();
+	else if (getName().equals("test_removeII")) test_removeII();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_select$I")) test_select$I();
+	else if (getName().equals("test_selectI")) test_selectI();
+	else if (getName().equals("test_selectII")) test_selectII();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setHeaderVisibleZ")) test_setHeaderVisibleZ();
+	else if (getName().equals("test_setLinesVisibleZ")) test_setLinesVisibleZ();
+	else if (getName().equals("test_setRedrawZ")) test_setRedrawZ();
+	else if (getName().equals("test_setSelection$I")) test_setSelection$I();
+	else if (getName().equals("test_setSelection$Lorg_eclipse_swt_widgets_TableItem")) test_setSelection$Lorg_eclipse_swt_widgets_TableItem();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionII")) test_setSelectionII();
+	else if (getName().equals("test_setTopIndexI")) test_setTopIndexI();
+	else if (getName().equals("test_showItemLorg_eclipse_swt_widgets_TableItem")) test_showItemLorg_eclipse_swt_widgets_TableItem();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableColumn.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableColumn.java
new file mode 100644
index 0000000000..588dc89855
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableColumn.java
@@ -0,0 +1,268 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TableColumn
+ *
+ * @see org.eclipse.swt.widgets.TableColumn
+ */
+public class Test_org_eclipse_swt_widgets_TableColumn extends Test_org_eclipse_swt_widgets_Item {
+
+protected TableColumn tableColumn;
+protected Table table;
+
+public Test_org_eclipse_swt_widgets_TableColumn(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	table = new Table(shell, SWT.SINGLE);		
+	tableColumn = new TableColumn(table, SWT.NULL);	
+	setWidget(tableColumn);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TableI(){
+	if (fCheckSwtNullExceptions) {
+		try {
+			new TableColumn(null, SWT.NULL);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TableII(){
+	if (fCheckSwtNullExceptions) {
+		try {
+			new TableColumn(null, SWT.NULL, 0);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+
+		try {
+			new TableColumn(table, SWT.NULL, -1);
+			fail("No exception thrown for index == -1");
+		}
+		catch (IllegalArgumentException e) {
+		}
+
+		try {
+			new TableColumn(table, SWT.NULL, 2);
+			fail("No exception thrown for illegal index argument");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
+	warnUnimpl("Test test_addControlListenerLorg_eclipse_swt_events_ControlListener not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener(){
+	try {
+		tableColumn.addSelectionListener(null);		
+		fail("No exception thrown for selectionListener == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getAlignment() {
+	warnUnimpl("Test test_getAlignment not written");
+}
+
+public void test_getDisplay() {
+	assertTrue(":a:", tableColumn.getDisplay() == table.getDisplay());
+}
+
+public void test_getParent() {
+	warnUnimpl("Test test_getParent not written");
+}
+
+public void test_getResizable() {
+	warnUnimpl("Test test_getResizable not written");
+}
+
+public void test_getWidth(){
+	final int DEFAULT_WIDTH = 10;
+	int testWidth = 42;
+	
+	assertTrue(":a: width=" + tableColumn.getWidth() + " should be=" + DEFAULT_WIDTH, tableColumn.getWidth() == DEFAULT_WIDTH);
+
+//	try {
+//		tableColumn.setWidth(-1);
+//		assertTrue("No exception thrown", false);
+//	}
+//	catch (IllegalArgumentException e) {
+//		assertTrue("Wrong error thrown: " + e, e.getMessage().equals("Argument not valid"));
+//	}
+//	catch (SWTException e) {
+//		assertTrue("Wrong error thrown: " + e, e.getMessage().equals("Argument not valid"));
+//	}
+
+	tableColumn.setWidth(0);
+	assertTrue(":c: width=" + tableColumn.getWidth() + " should be=" + 0, tableColumn.getWidth() == 0);
+
+	tableColumn.setWidth(testWidth);
+	assertTrue(":d: width=" + tableColumn.getWidth() + " should be=" + testWidth, tableColumn.getWidth() == testWidth);
+
+	tableColumn.setWidth(testWidth);
+	assertTrue(":e: width=" + tableColumn.getWidth() + " should be=" + testWidth, tableColumn.getWidth() == testWidth);
+}
+
+public void test_pack() {
+	warnUnimpl("Test test_pack not written");
+}
+
+public void test_removeControlListenerLorg_eclipse_swt_events_ControlListener() {
+	warnUnimpl("Test test_removeControlListenerLorg_eclipse_swt_events_ControlListener not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener(){
+	SelectionListener listener = new SelectionAdapter() {
+		public void widgetSelected(SelectionEvent e) {}};
+
+	tableColumn.removeSelectionListener(listener);	
+	tableColumn.addSelectionListener(listener);		
+	tableColumn.removeSelectionListener(listener);	
+	try {
+		tableColumn.removeSelectionListener(null);		
+		fail("No exception thrown for selectionListener == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setAlignmentI(){
+	TableColumn column2;
+	
+	assertTrue(":a:", tableColumn.getAlignment() == SWT.LEFT);
+
+	tableColumn.setAlignment(-1);
+	assertTrue(":b:", tableColumn.getAlignment() == SWT.LEFT);
+
+	tableColumn.setAlignment(SWT.RIGHT);
+	assertTrue(
+		":c: Should not be allowed to set alignment of the first column", 
+		tableColumn.getAlignment() == SWT.LEFT);
+
+	column2 = new TableColumn(table, SWT.NULL);
+	column2.setAlignment(SWT.RIGHT);
+	assertTrue(":d:", column2.getAlignment() == SWT.RIGHT);
+	
+	column2.setAlignment(SWT.CENTER);
+	assertTrue(":e:", column2.getAlignment() == SWT.CENTER);	
+
+	column2.setAlignment(SWT.LEFT);
+	assertTrue(":f:", column2.getAlignment() == SWT.LEFT);	
+}
+
+public void test_setResizableZ(){
+	assertTrue(":a:", tableColumn.getResizable() == true);
+
+	tableColumn.setResizable(false);
+	assertTrue(":b:", tableColumn.getResizable() == false);
+
+	tableColumn.setResizable(false);
+	assertTrue(":c:", tableColumn.getResizable() == false);
+
+	tableColumn.setResizable(true);
+	assertTrue(":d:", tableColumn.getResizable() == true);
+}
+
+public void test_setTextLjava_lang_String(){
+	assertTrue(":a:", tableColumn.getText() == "");
+
+	tableColumn.setText("text");
+	assertTrue(":b:", tableColumn.getText() == "text");
+
+	try {
+		tableColumn.setText(null);
+		fail("No exception thrown for column header == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setWidthI() {
+	warnUnimpl("Test test_setWidthI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TableColumn((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TableI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TableII");
+	methodNames.addElement("test_addControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getAlignment");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getResizable");
+	methodNames.addElement("test_getWidth");
+	methodNames.addElement("test_pack");
+	methodNames.addElement("test_removeControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setAlignmentI");
+	methodNames.addElement("test_setResizableZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setWidthI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TableI")) test_ConstructorLorg_eclipse_swt_widgets_TableI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TableII")) test_ConstructorLorg_eclipse_swt_widgets_TableII();
+	else if (getName().equals("test_addControlListenerLorg_eclipse_swt_events_ControlListener")) test_addControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getAlignment")) test_getAlignment();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getResizable")) test_getResizable();
+	else if (getName().equals("test_getWidth")) test_getWidth();
+	else if (getName().equals("test_pack")) test_pack();
+	else if (getName().equals("test_removeControlListenerLorg_eclipse_swt_events_ControlListener")) test_removeControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setAlignmentI")) test_setAlignmentI();
+	else if (getName().equals("test_setResizableZ")) test_setResizableZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setWidthI")) test_setWidthI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
new file mode 100644
index 0000000000..2d16d31c01
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TableItem.java
@@ -0,0 +1,505 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TableItem
+ *
+ * @see org.eclipse.swt.widgets.TableItem
+ */
+public class Test_org_eclipse_swt_widgets_TableItem extends Test_org_eclipse_swt_widgets_Item {
+
+Table table;
+TableItem tableItem;
+
+public Test_org_eclipse_swt_widgets_TableItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	makeCleanEnvironment();
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+// this method must be private or protected so the auto-gen tool keeps it
+private void makeCleanEnvironment() {
+	if ( tableItem != null ) tableItem.dispose();
+	if ( table != null ) table.dispose();
+	table = new Table(shell, 0);
+	tableItem = new TableItem(table, 0);
+	setWidget(tableItem);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TableI(){
+
+	if (fCheckSwtNullExceptions) {
+		try {
+			TableItem tItem = new TableItem(null, SWT.NULL);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TableII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_TableII not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getBoundsI(){
+	int boundsX;
+	Rectangle bounds;
+	Table table2 = new Table(shell, SWT.CHECK);
+	TableItem tableItem2 = new TableItem(table2, SWT.NULL);
+
+	bounds = tableItem.getBounds(0);
+	assertTrue(":a:", bounds.x > 0 && bounds.width > 0);
+	boundsX = bounds.x;
+
+	bounds = tableItem.getBounds(-1);
+	assertTrue(":b:", bounds.equals(new Rectangle(0, 0, 0, 0)));	
+
+	bounds = tableItem.getBounds(1);
+	assertTrue(":c:", bounds.equals(new Rectangle(0, 0, 0, 0)));
+
+	//table2.setWidths(new int[] {30});
+	TableColumn column = new TableColumn(table2, SWT.NONE, 0);
+	column.setWidth(30);
+	bounds = tableItem2.getBounds(0);
+	assertTrue(":d:", bounds.x > boundsX && bounds.width > 0);
+
+	bounds = tableItem2.getBounds(-1);
+	assertEquals(new Rectangle(0, 0, 0, 0), bounds);	
+
+	bounds = tableItem2.getBounds(1);
+	assertEquals(new Rectangle(0, 0, 0, 0), bounds);			
+
+	
+	//
+	makeCleanEnvironment();
+
+	Image image = images[0];
+	table2.dispose();
+	table2 = new Table(shell, SWT.CHECK);
+	tableItem2.dispose();
+	tableItem2 = new TableItem(table2, SWT.NULL);
+	column.dispose();
+
+	new TableColumn(table, SWT.NULL);
+	new TableColumn(table, SWT.NULL);
+	tableItem.setImage(1, image);
+	bounds = tableItem.getBounds(0);
+	assertTrue(":a:", bounds.x > 0 && bounds.width > 0);
+	boundsX = bounds.x;
+
+	bounds = tableItem.getBounds(-1);
+	assertEquals(new Rectangle(0, 0, 0, 0), bounds);	
+
+	bounds = tableItem.getBounds(1);
+	//assert(":c:", bounds.x > 0 && bounds.width > 0);  // ?? setting the image in one column does not affect width of other columns
+	assertTrue(":c:", bounds.x > 0 && bounds.height > 0);
+
+
+	column = new TableColumn(table2, SWT.NULL);
+	column.setWidth(30);
+	new TableColumn(table2, SWT.NULL);	
+	tableItem2.setImage(1, image);
+	bounds = tableItem2.getBounds(0);
+	assertTrue(":d:", bounds.x > boundsX && bounds.width > 0);
+
+	bounds = tableItem2.getBounds(-1);
+	assertEquals(new Rectangle(0, 0, 0, 0), bounds);	
+
+	bounds = tableItem2.getBounds(1);
+	//assert(":f:", bounds.x > 0 && bounds.width > 0); // ?? setting the image in one column does not affect width of other columns
+	assertTrue(":f:", bounds.x > 0 && bounds.height > 0);
+}
+
+public void test_getChecked() {
+	warnUnimpl("Test test_getChecked not written");
+}
+
+public void test_getDisplay() {
+	assertEquals(table.getDisplay(), tableItem.getDisplay());
+}
+
+public void test_getGrayed() {
+	warnUnimpl("Test test_getGrayed not written");
+}
+
+public void test_getImageI() {
+	warnUnimpl("Test test_getImageI not written");
+}
+
+/**
+ * Test without item image
+ */
+public void test_getImageBoundsI(){
+	Rectangle bounds;
+	Table table2 = new Table(shell, SWT.CHECK);
+	TableItem tableItem2 = new TableItem(table2, SWT.NULL);
+	int imageX;
+	
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem.getImageBounds(-1));
+	
+	bounds = tableItem.getImageBounds(0);
+	assertTrue(":b:", bounds.x > 0 && bounds.width == 0);
+	imageX = bounds.x;
+	
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem.getImageBounds(1));
+	
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(-1));
+	
+	bounds = tableItem2.getImageBounds(0);
+	assertTrue(":e:", bounds.x > imageX && bounds.width == 0);
+	
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(1));
+
+	//
+	makeCleanEnvironment();
+	
+	Image image = images[0];	
+	int imageWidth = image.getBounds().width;
+	int imageHeight;
+	
+	tableItem.setImage(0, image);
+	imageHeight = table.getItemHeight() - table.getGridLineWidth();
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem.getImageBounds(-1));
+	
+	bounds = tableItem.getImageBounds(0);
+	assertTrue(":b:", bounds.x > 0 && bounds.width == imageWidth && bounds.height == imageHeight);	
+
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem.getImageBounds(1));	
+
+
+	//
+	makeCleanEnvironment();	
+	
+	table2.dispose();
+	table2 = new Table(shell, SWT.CHECK);
+	tableItem2.dispose();
+	tableItem2 = new TableItem(table2, SWT.NULL);
+	Rectangle imageBounds = image.getBounds();
+	imageWidth = imageBounds.width;
+	tableItem2.setImage(0, image);
+	imageHeight = table2.getItemHeight() - table2.getGridLineWidth();
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(-1));
+	
+	bounds = tableItem2.getImageBounds(0);	// bounds.width should be check box width if they are wider than image
+	assertTrue(":b:", bounds.x > 0 && bounds.width > 0 && bounds.height == imageHeight);
+
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(1));	
+
+
+	//
+	makeCleanEnvironment();
+
+	table2.dispose();
+	table2 = new Table(shell, SWT.CHECK);
+	tableItem2.dispose();
+	tableItem2 = new TableItem(table2, SWT.NULL);
+	image = images[1];
+	imageBounds = image.getBounds();
+	imageWidth = imageBounds.width;
+
+	tableItem2.setImage(0, image);
+	imageHeight = table2.getItemHeight() - table2.getGridLineWidth();
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(-1));
+
+	bounds = tableItem2.getImageBounds(0);	// bounds.width should be check box width if check box is wider than image
+	assertTrue(":b:", bounds.x > 0 && bounds.width > 0 && bounds.height == imageHeight);
+
+	assertEquals(new Rectangle(0, 0, 0, 0), tableItem2.getImageBounds(1));
+}
+
+public void test_getImageIndent() {
+	warnUnimpl("Test test_getImageIndent not written");
+}
+
+public void test_getParent() {
+	assertEquals(table, tableItem.getParent());
+}
+
+public void test_getTextI() {
+	warnUnimpl("Test test_getTextI not written");
+}
+
+public void test_setCheckedZ(){
+	assertEquals(false, tableItem.getChecked());
+	
+	tableItem.setChecked(true);
+	assertEquals(false, tableItem.getChecked());
+
+	Table t = new Table(shell, SWT.CHECK);
+	TableItem ti = new TableItem(t, SWT.NULL);
+	ti.setChecked(true);
+	assertTrue(ti.getChecked());
+	
+	ti.setChecked(false);
+	assertEquals(false, ti.getChecked());
+	t.dispose();
+}
+
+public void test_setGrayedZ() {
+	warnUnimpl("Test test_setGrayedZ not written");
+}
+
+public void test_setImage$Lorg_eclipse_swt_graphics_Image(){
+	assertNull(tableItem.getImage(1));	
+
+	tableItem.setImage(-1, null);		
+	assertNull(tableItem.getImage(-1));	
+		
+	tableItem.setImage(0, images[0]);
+	assertEquals(images[0], tableItem.getImage(0));	
+
+	String texts[] = new String[images.length];
+	for (int i = 0; i < texts.length; i++) {
+		texts[i] = String.valueOf(i);
+	}
+	
+	//table.setText(texts);				// create enough columns for TableItem.setImage(Image[]) to work
+	int columnCount = table.getColumnCount();
+	if (columnCount < texts.length) {
+		for (int i = columnCount; i < texts.length; i++){
+			TableColumn column = new TableColumn(table, SWT.NONE);
+		}
+	}
+	TableColumn[] columns = table.getColumns();
+	for (int i = 0; i < texts.length; i++) {
+		columns[i].setText(texts[i]);
+	}
+	tableItem.setImage(1, images[1]);
+	assertEquals(images[1], tableItem.getImage(1));	
+
+	tableItem.setImage(images);
+	for (int i = 0; i < images.length; i++) {
+		assertEquals(images[i], tableItem.getImage(i));
+	}
+	try {
+		tableItem.setImage((Image []) null);
+		fail("No exception thrown for images == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setImageILorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageILorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setImageIndentI(){
+	assertEquals(0, tableItem.getImageIndent());
+
+	tableItem.setImageIndent(1);
+	assertEquals(1, tableItem.getImageIndent());
+
+	tableItem.setImageIndent(-1);
+	assertEquals(1, tableItem.getImageIndent());
+}
+
+public void test_setText$Ljava_lang_String(){
+	final String TestString = "test";
+	final String TestStrings[] = new String[] {TestString, TestString + "1", TestString + "2"};
+	
+	try {
+		tableItem.setText((String []) null);
+		fail("No exception thrown for strings == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+   /*
+ 	* Test the getText/setText API with a Table that has only 
+ 	* the default column.
+ 	*/
+	
+	assertEquals(0, tableItem.getText(1).length());
+	
+	tableItem.setText(TestStrings);
+	assertEquals(TestStrings[0], tableItem.getText(0));
+	for (int i = 1; i < TestStrings.length; i++) {
+		assertEquals(0, tableItem.getText(i).length());
+	}
+	
+	
+   /*
+ 	* Test the getText/setText API with a Table that enough 
+ 	* columns to fit all test item texts.
+ 	*/
+ 		
+	int columnCount = table.getColumnCount();
+	if (columnCount < images.length) {
+		for (int i = columnCount; i < images.length; i++){
+			TableColumn column = new TableColumn(table, SWT.NONE);
+		}
+	}
+	TableColumn[] columns = table.getColumns();
+	for (int i = 0; i < TestStrings.length; i++) {
+		columns[i].setText(TestStrings[i]);
+	}
+	assertEquals(0, tableItem.getText(1).length());
+
+}
+
+public void test_setTextILjava_lang_String(){
+	final String TestString = "test";
+	final String TestStrings[] = new String[] {TestString, TestString + "1", TestString + "2"};
+
+   /*
+ 	* Test the getText/setText API with a Table that has only 
+ 	* the default column.
+ 	*/
+	
+	assertEquals(0, tableItem.getText(1).length());	
+
+	tableItem.setText(1, TestString);
+	assertEquals(0, tableItem.getText(1).length());	
+	assertEquals(0, tableItem.getText(0).length());
+	
+	tableItem.setText(0, TestString);
+	assertEquals(TestString, tableItem.getText(0));
+
+	tableItem.setText(-1, TestStrings[1]);
+	assertEquals(0, tableItem.getText(-1).length());	
+
+   /*
+ 	* Test the getText/setText API with a Table that enough 
+ 	* columns to fit all test item texts.
+ 	*/
+
+	makeCleanEnvironment();
+	
+	//table.setText(TestStrings);				// create anough columns for TableItem.setText(String[]) to work
+	int columnCount = table.getColumnCount();
+	if (columnCount < images.length) {
+		for (int i = columnCount; i < images.length; i++){
+			TableColumn column = new TableColumn(table, SWT.NONE);
+		}
+	}
+	TableColumn[] columns = table.getColumns();
+	for (int i = 0; i < TestStrings.length; i++) {
+		columns[i].setText(TestStrings[i]);
+	}
+	assertEquals(0, tableItem.getText(1).length());	
+
+
+	tableItem.setText(1, TestString);
+	assertEquals(TestString, tableItem.getText(1));	
+	assertEquals(0, tableItem.getText(0).length());
+	
+	tableItem.setText(0, TestString);
+	assertEquals(TestString, tableItem.getText(0));
+
+
+	tableItem.setText(-1, TestStrings[1]);
+	assertEquals(0, tableItem.getText(-1).length());	
+
+
+	try {
+		tableItem.setText(-1, null);		
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	try {
+		tableItem.setText(0, null);		
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+
+
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TableItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TableI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TableII");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getBoundsI");
+	methodNames.addElement("test_getChecked");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getGrayed");
+	methodNames.addElement("test_getImageI");
+	methodNames.addElement("test_getImageBoundsI");
+	methodNames.addElement("test_getImageIndent");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getTextI");
+	methodNames.addElement("test_setCheckedZ");
+	methodNames.addElement("test_setGrayedZ");
+	methodNames.addElement("test_setImage$Lorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImageILorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImageIndentI");
+	methodNames.addElement("test_setText$Ljava_lang_String");
+	methodNames.addElement("test_setTextILjava_lang_String");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TableI")) test_ConstructorLorg_eclipse_swt_widgets_TableI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TableII")) test_ConstructorLorg_eclipse_swt_widgets_TableII();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getBoundsI")) test_getBoundsI();
+	else if (getName().equals("test_getChecked")) test_getChecked();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getGrayed")) test_getGrayed();
+	else if (getName().equals("test_getImageI")) test_getImageI();
+	else if (getName().equals("test_getImageBoundsI")) test_getImageBoundsI();
+	else if (getName().equals("test_getImageIndent")) test_getImageIndent();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getTextI")) test_getTextI();
+	else if (getName().equals("test_setCheckedZ")) test_setCheckedZ();
+	else if (getName().equals("test_setGrayedZ")) test_setGrayedZ();
+	else if (getName().equals("test_setImage$Lorg_eclipse_swt_graphics_Image")) test_setImage$Lorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImageILorg_eclipse_swt_graphics_Image")) test_setImageILorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImageIndentI")) test_setImageIndentI();
+	else if (getName().equals("test_setText$Ljava_lang_String")) test_setText$Ljava_lang_String();
+	else if (getName().equals("test_setTextILjava_lang_String")) test_setTextILjava_lang_String();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java
new file mode 100644
index 0000000000..e4b8128d31
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Text.java
@@ -0,0 +1,976 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Text
+ *
+ * @see org.eclipse.swt.widgets.Text
+ */
+public class Test_org_eclipse_swt_widgets_Text extends Test_org_eclipse_swt_widgets_Scrollable {
+
+Text text;
+String delimiterString;
+
+public Test_org_eclipse_swt_widgets_Text(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	makeCleanEnvironment(false); // use multi-line by default	
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Clean up the environment for a new test.
+ * 
+ * @param single true if the new text widget should be single-line.
+ */
+private void makeCleanEnvironment(boolean single) {
+// this method must be private or protected so the auto-gen tool keeps it
+	if ( text != null ) text.dispose();
+
+	if ( single == true )
+		text = new Text(shell, SWT.SINGLE);	
+	else
+		text = new Text(shell, SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL);
+	setWidget(text);
+	delimiterString = Text.DELIMITER;
+}
+protected void setWidget(Widget w) {
+	text = (Text)w;
+	super.setWidget(w);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		text = new Text(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.SINGLE, SWT.MULTI, SWT.MULTI | SWT.V_SCROLL, SWT.MULTI | SWT.H_SCROLL, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL, 
+					SWT.WRAP};
+	for (int i = 0; i < cases.length; i++)
+		text = new Text(shell, cases[i]);
+}
+
+public void test_addModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_addModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener() {
+	warnUnimpl("Test test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener not written");
+}
+
+public void test_appendLjava_lang_String(){
+	try {
+		text.append(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	text.setText("01");
+	text.append("23");
+	assertEquals("0123", text.getText());
+	text.append("45");
+	assertEquals("012345", text.getText());
+	text.setSelection(0);
+	text.append("67");
+	assertEquals("01234567", text.getText());
+
+	text.setText("01");
+	text.append("23");
+	assertEquals("0123", text.getText());
+	text.append("4" + delimiterString+ "5");
+	assertEquals("01234" + delimiterString +"5", text.getText());
+	text.setSelection(0);
+	text.append("67");
+	assertEquals("01234" + delimiterString+"567", text.getText());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	try {
+		text.append(null);
+		fail("No exception thrown on string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+
+	text.setText("01");
+	text.append("23");
+	assertEquals("0123", text.getText());
+	text.append("45");
+	assertEquals("012345", text.getText());
+	text.setSelection(0);
+	text.append("67");
+	assertEquals("01234567", text.getText());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+
+	text.setText("01");
+	text.append("23");
+	assertEquals("0123", text.getText());
+	text.append("4" + delimiterString+"5");
+	assertEquals("01234" + delimiterString+"5", text.getText());
+	text.setSelection(0);
+	text.append("67");
+	assertEquals("01234" + delimiterString+"567", text.getText());
+}
+
+public void test_clearSelection(){
+	text.setText("01234567890");
+	assertEquals("", text.getSelectionText());
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+	text.clearSelection();
+	assertEquals("", text.getSelectionText());
+
+	text.setText("01234567890");
+	assertEquals("", text.getSelectionText());
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+	text.clearSelection();
+	assertEquals("", text.getSelectionText());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+	assertEquals("", text.getSelectionText());
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+	text.clearSelection();
+	assertEquals("", text.getSelectionText());
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_copy(){
+	text.copy();
+
+	text.selectAll();
+	text.copy();
+	assertEquals("", text.getSelectionText());
+
+	text.setText("00000");
+	text.selectAll();
+	text.copy();
+	text.setSelection(2);
+	assertEquals("", text.getSelectionText());
+
+	text.setText("");
+	text.paste();
+	assertEquals("00000", text.getText());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.copy();
+
+	text.selectAll();
+	text.copy();
+	assertEquals("", text.getSelectionText());
+
+	text.setText("00000");
+	text.selectAll();
+	text.copy();
+	text.setSelection(2);
+	assertEquals("", text.getSelectionText());
+
+	text.setText("");
+	text.paste();
+	assertEquals("00000", text.getText());
+}
+
+public void test_cut(){
+	text.cut();
+	text.setText("01234567890");
+	text.setSelection(2, 5);
+	text.cut();
+	assertEquals("01567890", text.getText());
+
+	text.selectAll();
+	text.cut();
+	assertEquals("", text.getText());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.cut();
+
+	text.setText("01234567890");
+	text.setSelection(2, 5);
+	text.cut();
+	assertEquals("01567890", text.getText());
+
+	text.selectAll();
+	text.cut();
+	assertEquals("", text.getText());
+}
+
+public void test_getCaretLineNumber() {
+	warnUnimpl("Test test_getCaretLineNumber not written");
+}
+
+public void test_getCaretLocation() {
+	warnUnimpl("Test test_getCaretLocation not written");
+}
+
+public void test_getCaretPosition() {
+	warnUnimpl("Test test_getCaretPosition not written");
+}
+
+public void test_getCharCount(){
+	assertEquals(0, text.getCharCount());
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	text.setText("01234567890");
+	assertEquals(11, text.getCharCount());
+
+	text.setText("012345" + delimiterString+"67890");
+	assertEquals(11  + delimiterString.length(), text.getCharCount()); //might be bogus on UNIX
+
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	
+	text.setText("01234\t567890");
+	assertEquals(12, text.getCharCount());
+
+	//
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	text.setText("01234567890");
+	assertEquals(11, text.getCharCount());
+
+	text.setText("012345" + delimiterString+"67890");
+	assertEquals(11  + delimiterString.length(), text.getCharCount()); //might be bogus on UNIX
+
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	
+	text.setText("01234\t567890");
+	assertEquals(12, text.getCharCount());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals(0, text.getCharCount());
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	text.setText("01234567890");
+	assertEquals(11, text.getCharCount());
+	if (fCheckBogusTestCases) {
+		text.setText("012345"+ delimiterString + "67890");
+		assertEquals(11  + delimiterString.length(), text.getCharCount()); //might be bogus on UNIX
+	}
+	text.setText("");
+	assertEquals(0, text.getCharCount());
+	if (!SwtJunit.isAIX) {	
+		text.setText("01234\t567890");
+		assertEquals(12, text.getCharCount());
+	}
+}
+
+public void test_getDoubleClickEnabled(){
+	text.setDoubleClickEnabled(true);
+	assertTrue(text.getDoubleClickEnabled());
+	
+	text.setDoubleClickEnabled(false);
+	assertEquals(false, text.getDoubleClickEnabled());
+	
+	// this method tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setDoubleClickEnabled(true);
+	assertTrue(text.getDoubleClickEnabled());
+	
+	text.setDoubleClickEnabled(false);
+	assertEquals(false, text.getDoubleClickEnabled());
+}
+
+public void test_getEchoChar(){
+	text.setEchoChar('a');
+	assertEquals('a', text.getEchoChar());
+}
+
+public void test_getEditable() {
+	warnUnimpl("Test test_getEditable not written");
+}
+
+public void test_getLineCount(){
+	assertEquals(1, text.getLineCount());
+	text.append("dddasd" + delimiterString);
+	assertEquals(2, text.getLineCount());
+	text.append("ddasdasdasdasd" + delimiterString);
+	assertEquals(3, text.getLineCount());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals(1, text.getLineCount());
+	text.append("dddasd" + delimiterString);
+	assertEquals(1, text.getLineCount());
+	text.append("ddasdasdasdasd" + delimiterString);
+	assertEquals(1, text.getLineCount());
+}
+
+public void test_getLineDelimiter() {
+	warnUnimpl("Test test_getLineDelimiter not written");
+}
+
+public void test_getLineHeight() {
+	warnUnimpl("Test test_getLineHeight not written");
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionCount() {
+	warnUnimpl("Test test_getSelectionCount not written");
+}
+
+public void test_getSelectionText(){
+	text.setText("01234567890");
+	assertEquals("", text.getSelectionText());
+	text.setSelection(3, 7);
+	assertEquals("3456", text.getSelectionText());
+
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+}
+
+public void test_getTabs() {
+	warnUnimpl("Test test_getTabs not written");
+}
+
+public void test_getText(){
+	assertEquals("", text.getText());
+	text.setText("01234567890");
+	assertEquals("01234567890", text.getText());
+	text.setText("");
+	assertEquals("", text.getText());
+	String string = "012345" + delimiterString + "67890";
+	text.setText(string);
+	assertEquals(string, text.getText());
+}
+
+public void test_getTextII(){
+	assertEquals("", text.getText());
+	text.setText("01234567890");
+	assertEquals("345", text.getText(3, 5));
+	// these tests should not cause a null pointer exception, checks not implemented yet	
+	if (fCheckOutOfRangeBehaviour) {
+		text.setText("");
+		assertEquals("", text.getText(3, 5));
+		text.setText("01234567890");
+		assertEquals(":d:", text.getText(3, 100));
+		text.setText("01234567890");
+		assertEquals("34", text.getText(5, 3));
+	}
+}
+
+public void test_getTextLimit() {
+	warnUnimpl("Test test_getTextLimit not written");
+}
+
+public void test_getTopIndex(){
+	assertEquals(0, text.getTopIndex());
+	text.setText("01234567890");
+	assertEquals(0, text.getTopIndex());
+	text.append(delimiterString +"01234567890");
+	assertEquals(0, text.getTopIndex());
+	text.setTopIndex(1);
+	assertEquals(1, text.getTopIndex());
+	text.setTopIndex(17);
+	assertEquals(1, text.getTopIndex());
+}
+
+public void test_getTopPixel() {
+	warnUnimpl("Test test_getTopPixel not written");
+}
+
+public void test_insertLjava_lang_String(){
+	try {
+		text.insert(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	assertEquals("", text.getText());
+	text.insert("");
+	assertEquals("", text.getText());
+	text.insert("fred");
+	assertEquals("fred", text.getText());
+	text.setSelection(2);
+	text.insert("helmut");
+	assertEquals("frhelmuted", text.getText());
+
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertEquals(1, text.getLineCount());
+	text.insert(delimiterString);
+	assertEquals(2, text.getLineCount());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	try {
+		text.insert(null);
+		fail("No exception thrown on string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals("", text.getText());
+	text.insert("");
+	assertEquals("", text.getText());
+	text.insert("fred");
+	assertEquals("fred", text.getText());
+	text.setSelection(2);
+	text.insert("helmut");
+	assertEquals("frhelmuted", text.getText());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertEquals(1, text.getLineCount());
+	text.insert(Text.DELIMITER);
+	assertEquals(1, text.getLineCount());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	try {
+		text.insert(null);
+		fail("No exception thrown on string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_paste(){
+	text.setText("01234567890");
+	text.setSelection(2, 4);
+	assertEquals("01234567890", text.getText());
+	text.copy();
+	text.setSelection(0);
+	text.paste();
+	assertEquals("2301234567890", text.getText());
+	text.copy();
+	text.setSelection(3);
+	text.paste();
+	assertEquals("230231234567890", text.getText());
+
+	text.setText("0" + delimiterString + "1");
+	text.selectAll();
+	text.copy();
+	text.setSelection(0);
+	text.paste();
+	assertEquals("0" + delimiterString + "1" + "0" + delimiterString + "1", text.getText());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+	text.setSelection(2, 4);
+	assertEquals("01234567890", text.getText());
+	text.copy();
+	text.setSelection(0);
+	text.paste();
+	assertEquals("2301234567890", text.getText());
+	text.copy();
+	text.setSelection(3);
+	text.paste();
+	assertEquals("230231234567890", text.getText());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("0" + delimiterString + "1");
+	text.selectAll();
+	text.copy();
+	text.setSelection(0);
+	text.paste();
+
+	if (fCheckSWTPolicy)
+		assertEquals("0" + delimiterString + "1" + "0" + delimiterString + "1", text.getText());
+}
+
+public void test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener() {
+	warnUnimpl("Test test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener() {
+	warnUnimpl("Test test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener not written");
+}
+
+public void test_selectAll(){
+	text.setText("01234567890");
+	assertEquals("01234567890", text.getText());
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+	text.cut();
+	assertEquals("", text.getText());
+
+	text.setText("01234" + delimiterString+"567890");
+	assertEquals("01234" + delimiterString+"567890", text.getText());
+	text.selectAll();
+	assertEquals("01234" + delimiterString+"567890", text.getSelectionText());
+	text.cut();
+	assertEquals("", text.getText());
+		
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+
+	text.setText("01234567890");
+	assertEquals("01234567890", text.getText());
+	text.selectAll();
+	assertEquals("01234567890", text.getSelectionText());
+	text.cut();
+	assertEquals("", text.getText());
+
+	// tests a SINGLE line text editor
+	if (fCheckBogusTestCases) {
+		text.setText("01234" + delimiterString+"567890");
+		assertEquals("01234" + delimiterString+"567890", text.getText());
+		text.selectAll();
+		assertEquals("01234" + delimiterString+"567890", text.getSelectionText());
+		text.cut();
+		assertEquals("", text.getText());
+	}
+}
+
+public void test_setDoubleClickEnabledZ(){
+	text.setDoubleClickEnabled(true);
+	assertTrue(text.getDoubleClickEnabled());
+	
+	text.setDoubleClickEnabled(false);
+	assertEquals(false, text.getDoubleClickEnabled());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setDoubleClickEnabled(true);
+	assertTrue(text.getDoubleClickEnabled());
+	
+	text.setDoubleClickEnabled(false);
+	assertEquals(false, text.getDoubleClickEnabled());
+}
+
+public void test_setEchoCharC(){
+	for (int i=0; i<128; i++){
+		text.setEchoChar((char) i);
+		assertEquals((char)i, text.getEchoChar());
+	}
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setEchoChar('a');
+	assertEquals('a', text.getEchoChar());
+
+	text.setEchoChar((char) 0);
+	assertEquals((char)0, text.getEchoChar());
+
+	text.setEchoChar('\n');
+	assertEquals('\n', text.getEchoChar());
+
+	for (int i=0; i<128; i++){
+		text.setEchoChar((char) i);
+		assertEquals((char)i, text.getEchoChar());
+	}
+}
+
+public void test_setEditableZ() {
+	warnUnimpl("Test test_setEditableZ not written");
+}
+
+public void test_setFontLorg_eclipse_swt_graphics_Font() {
+	warnUnimpl("Test test_setFontLorg_eclipse_swt_graphics_Font not written");
+}
+
+public void test_setSelectionI() {
+	warnUnimpl("Test test_setSelectionI not written");
+}
+
+public void test_setSelectionII(){
+	text.setText("01234567890");
+	assertEquals(0, text.getSelectionCount());
+	text.setSelection(2, 4);
+	assertEquals(2, text.getSelectionCount());
+	text.setSelection(2, 100);
+	assertEquals(9, text.getSelectionCount());
+
+	text.setText("0123" + delimiterString +"4567890");
+	assertEquals(0, text.getSelectionCount());
+	text.setSelection(2, 4);
+	assertEquals(2, text.getSelectionCount());
+	text.setSelection(2, 100);
+	assertEquals(9 + delimiterString.length(), text.getSelectionCount());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+	assertEquals(0, text.getSelectionCount());
+	text.setSelection(2, 4);
+	assertEquals(2, text.getSelectionCount());
+	text.setSelection(2, 100);
+	assertEquals(9, text.getSelectionCount());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("0123"+ delimiterString+"4567890");
+	assertEquals(0, text.getSelectionCount());
+	text.setSelection(2, 4);
+	assertEquals(2, text.getSelectionCount());
+	if (fCheckBogusTestCases) {
+		text.setSelection(2, 100);
+		assertEquals(9 +delimiterString.length(), text.getSelectionCount());
+	}
+}
+
+public void test_setRedrawZ(){
+	text.setRedraw(false);
+	text.setRedraw(true);
+}
+
+public void test_setSelectionLorg_eclipse_swt_graphics_Point(){
+	text.setText("dsdsdasdslaasdas");
+	try {
+		text.setSelection((Point) null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	text.setText("01234567890");
+	text.setSelection(new Point(2, 2));
+	assertEquals(new Point(2, 2), text.getSelection());
+
+	text.setSelection(new Point(3, 2));
+	assertEquals(new Point(2, 3), text.getSelection());
+
+	text.setSelection(new Point(3, 100));
+	assertEquals(new Point(3, 11), text.getSelection());
+
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertEquals(new Point(4, 4), text.getSelection());
+
+	text.setSelection(100);
+	assertEquals(new Point(11, 11), text.getSelection());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("dsdsdasdslaasdas");
+	try {
+		text.setSelection((Point) null);
+		fail("No exception thrown for selection == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+
+	text.setSelection(new Point(2, 2));
+	assertEquals(new Point(2, 2), text.getSelection());
+
+	text.setSelection(new Point(3, 2));
+	assertEquals(new Point(2, 3), text.getSelection());
+
+	text.setSelection(new Point(3, 100));
+	assertEquals(new Point(3, 11), text.getSelection());
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.setText("01234567890");
+	text.setSelection(4);
+	assertEquals(new Point(4, 4), text.getSelection());
+
+	text.setSelection(100);
+	assertEquals(new Point(11, 11), text.getSelection());
+}
+
+public void test_setTabsI(){
+	if (SwtJunit.isMotif) {
+		for (int i = 0; i < 200; i++) {
+			text.setTabs(i);
+			assertEquals(8, text.getTabs());
+		}
+	} else {
+		for (int i = 0; i < 200; i++) {
+			text.setTabs(i);
+			assertEquals(i, text.getTabs());
+		}
+	}
+}
+
+public void test_setTextLjava_lang_String(){
+	try {
+		text.setText(null);
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	text.setText("");
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals("", text.getText());
+	text.setText("01234567890");
+	assertEquals("01234567890", text.getText());
+	text.setText("");
+	assertEquals("", text.getText());
+	if (fCheckBogusTestCases) {
+		text.setText("012345" + delimiterString+ "67890");
+		assertEquals("012345" + delimiterString +"67890", text.getText());
+	}
+
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals("", text.getText());
+	text.setText("01234567890");
+	assertEquals("345", text.getText(3, 5));
+	// these tests should not cause a null pointer exception, checks not implemented yet	
+	if (fCheckOutOfRangeBehaviour) {
+		text.setText("");
+		assertEquals("", text.getText(3, 5));
+		text.setText("01234567890");
+		assertEquals("34567890", text.getText(3, 100));
+		text.setText("01234567890");
+		assertEquals("34", text.getText(5, 3));
+	}
+}
+
+public void test_setTextLimitI() {
+	warnUnimpl("Test test_setTextLimitI not written");
+}
+
+public void test_setTopIndexI(){
+	int number = 100;
+	for (int i = 0; i < number; i++) {
+		text.append("01234\n");
+	}
+	for (int i = 1; i <= number; i++) {
+		text.setTopIndex(i);
+		assertEquals(i, text.getTopIndex());
+	}
+	
+	text.setTopIndex(number+5);
+	assertEquals(number, text.getTopIndex());
+	
+	// tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	assertEquals(0, text.getTopIndex());
+	text.setText("01234567890");
+	assertEquals(0, text.getTopIndex());
+	text.append(Text.DELIMITER +"01234567890");
+	assertEquals(0, text.getTopIndex());
+	text.setTopIndex(1);
+	assertEquals(0, text.getTopIndex());
+	text.setTopIndex(17);
+	assertEquals(0, text.getTopIndex());
+
+	text.setText("");	
+	for (int i = 0; i < number; i++) {
+		text.append("01234" + Text.DELIMITER);
+	}
+	for (int i = 0; i < number; i++) {
+		text.setTopIndex(i);
+		assertEquals(0, text.getTopIndex());
+	}
+}
+
+public void test_showSelection(){
+	text.showSelection();
+
+	text.selectAll();
+	text.showSelection();
+
+	text.setText("00000");
+	text.selectAll();
+	text.showSelection();
+	text.clearSelection();
+	text.showSelection();
+	
+	// this method tests a SINGLE line text editor
+	makeCleanEnvironment(true);
+	
+	text.showSelection();
+
+	text.selectAll();
+	text.showSelection();
+
+
+	text.setText("00000");
+	text.selectAll();
+	text.showSelection();
+
+	text.clearSelection();
+	text.showSelection();
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Text((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener");
+	methodNames.addElement("test_appendLjava_lang_String");
+	methodNames.addElement("test_clearSelection");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_copy");
+	methodNames.addElement("test_cut");
+	methodNames.addElement("test_getCaretLineNumber");
+	methodNames.addElement("test_getCaretLocation");
+	methodNames.addElement("test_getCaretPosition");
+	methodNames.addElement("test_getCharCount");
+	methodNames.addElement("test_getDoubleClickEnabled");
+	methodNames.addElement("test_getEchoChar");
+	methodNames.addElement("test_getEditable");
+	methodNames.addElement("test_getLineCount");
+	methodNames.addElement("test_getLineDelimiter");
+	methodNames.addElement("test_getLineHeight");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_getSelectionText");
+	methodNames.addElement("test_getTabs");
+	methodNames.addElement("test_getText");
+	methodNames.addElement("test_getTextII");
+	methodNames.addElement("test_getTextLimit");
+	methodNames.addElement("test_getTopIndex");
+	methodNames.addElement("test_getTopPixel");
+	methodNames.addElement("test_insertLjava_lang_String");
+	methodNames.addElement("test_paste");
+	methodNames.addElement("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setDoubleClickEnabledZ");
+	methodNames.addElement("test_setEchoCharC");
+	methodNames.addElement("test_setEditableZ");
+	methodNames.addElement("test_setFontLorg_eclipse_swt_graphics_Font");
+	methodNames.addElement("test_setSelectionI");
+	methodNames.addElement("test_setSelectionII");
+	methodNames.addElement("test_setRedrawZ");
+	methodNames.addElement("test_setSelectionLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_setTabsI");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setTextLimitI");
+	methodNames.addElement("test_setTopIndexI");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Scrollable.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_addModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener")) test_addVerifyListenerLorg_eclipse_swt_events_VerifyListener();
+	else if (getName().equals("test_appendLjava_lang_String")) test_appendLjava_lang_String();
+	else if (getName().equals("test_clearSelection")) test_clearSelection();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_copy")) test_copy();
+	else if (getName().equals("test_cut")) test_cut();
+	else if (getName().equals("test_getCaretLineNumber")) test_getCaretLineNumber();
+	else if (getName().equals("test_getCaretLocation")) test_getCaretLocation();
+	else if (getName().equals("test_getCaretPosition")) test_getCaretPosition();
+	else if (getName().equals("test_getCharCount")) test_getCharCount();
+	else if (getName().equals("test_getDoubleClickEnabled")) test_getDoubleClickEnabled();
+	else if (getName().equals("test_getEchoChar")) test_getEchoChar();
+	else if (getName().equals("test_getEditable")) test_getEditable();
+	else if (getName().equals("test_getLineCount")) test_getLineCount();
+	else if (getName().equals("test_getLineDelimiter")) test_getLineDelimiter();
+	else if (getName().equals("test_getLineHeight")) test_getLineHeight();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_getSelectionText")) test_getSelectionText();
+	else if (getName().equals("test_getTabs")) test_getTabs();
+	else if (getName().equals("test_getText")) test_getText();
+	else if (getName().equals("test_getTextII")) test_getTextII();
+	else if (getName().equals("test_getTextLimit")) test_getTextLimit();
+	else if (getName().equals("test_getTopIndex")) test_getTopIndex();
+	else if (getName().equals("test_getTopPixel")) test_getTopPixel();
+	else if (getName().equals("test_insertLjava_lang_String")) test_insertLjava_lang_String();
+	else if (getName().equals("test_paste")) test_paste();
+	else if (getName().equals("test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener")) test_removeModifyListenerLorg_eclipse_swt_events_ModifyListener();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener")) test_removeVerifyListenerLorg_eclipse_swt_events_VerifyListener();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setDoubleClickEnabledZ")) test_setDoubleClickEnabledZ();
+	else if (getName().equals("test_setEchoCharC")) test_setEchoCharC();
+	else if (getName().equals("test_setEditableZ")) test_setEditableZ();
+	else if (getName().equals("test_setFontLorg_eclipse_swt_graphics_Font")) test_setFontLorg_eclipse_swt_graphics_Font();
+	else if (getName().equals("test_setSelectionI")) test_setSelectionI();
+	else if (getName().equals("test_setSelectionII")) test_setSelectionII();
+	else if (getName().equals("test_setRedrawZ")) test_setRedrawZ();
+	else if (getName().equals("test_setSelectionLorg_eclipse_swt_graphics_Point")) test_setSelectionLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_setTabsI")) test_setTabsI();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setTextLimitI")) test_setTextLimitI();
+	else if (getName().equals("test_setTopIndexI")) test_setTopIndexI();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java
new file mode 100644
index 0000000000..59d513273f
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolBar.java
@@ -0,0 +1,206 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ToolBar
+ *
+ * @see org.eclipse.swt.widgets.ToolBar
+ */
+public class Test_org_eclipse_swt_widgets_ToolBar extends Test_org_eclipse_swt_widgets_Composite {
+
+protected ToolBar toolBar;
+
+public Test_org_eclipse_swt_widgets_ToolBar(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	toolBar = new ToolBar(shell, 0);
+	setWidget(toolBar);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	if (fCheckSwtNullExceptions) {	
+		ToolBar newToolBar;
+		try {
+			newToolBar = new ToolBar(null, 0);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_computeTrimIIII() {
+	warnUnimpl("Test test_computeTrimIIII not written");
+}
+
+public void test_getItemI(){
+	int number = 5;
+	ToolItem[] items = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ToolItem(toolBar, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:", toolBar.getItem(i)==items[i]);
+	}
+
+	toolBar = new ToolBar(shell, 0);
+	number = 5;
+	items = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ToolItem(toolBar, 0);
+	}
+	try {
+		toolBar.getItem(number);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getItemLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_getItemLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_getItemCount(){
+	int number = 10;
+	ToolItem ti;
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:" + i, toolBar.getItemCount()==i);
+	  	ti = new ToolItem(toolBar, 0);
+	}
+}
+
+public void test_getItems(){
+	int number = 5;
+	ToolItem[] items = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ToolItem(toolBar, 0);
+	}
+	assertEquals(items, toolBar.getItems());
+	
+	toolBar.getItems()[0].dispose();
+	assertEquals(new ToolItem[]{items[1], items[2], items[3], items[4]}, toolBar.getItems());
+
+	toolBar.getItems()[3].dispose();
+	assertEquals(new ToolItem[]{items[1], items[2], items[3]}, toolBar.getItems());
+
+	toolBar.getItems()[1].dispose();
+	assertEquals(new ToolItem[]{items[1], items[3]}, toolBar.getItems());
+}
+
+public void test_getRowCount(){
+	toolBar = new ToolBar(shell, SWT.WRAP);
+	int number = 5;
+	ToolItem[] items = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ToolItem(toolBar, 0);
+	}
+	assertTrue(":a:" + toolBar.getRowCount(), toolBar.getRowCount()==number);  //????  because of Size(0, 0)
+
+	toolBar = new ToolBar(shell, 0);
+	number = 5;
+	items = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ToolItem(toolBar, 0);
+	}
+	assertTrue(":a:", toolBar.getRowCount()==1);
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_ToolItem(){
+	int number = 10;
+	ToolItem[] tis = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	tis[i] = new ToolItem(toolBar, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:" + i, toolBar.indexOf(tis[i])==i);
+	}
+
+	number = 10;
+	tis = new ToolItem[number];
+	for (int i = 0; i<number ; i++){
+	  	tis[i] = new ToolItem(toolBar, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		try {
+			toolBar.indexOf(null);		
+			fail("No exception thrown for toolItem == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_setFocus() {
+	warnUnimpl("Test test_setFocus not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_ToolBar((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_computeTrimIIII");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getRowCount");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_ToolItem");
+	methodNames.addElement("test_setFocus");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_computeTrimIIII")) test_computeTrimIIII();
+	else if (getName().equals("test_getItemI")) test_getItemI();
+	else if (getName().equals("test_getItemLorg_eclipse_swt_graphics_Point")) test_getItemLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getRowCount")) test_getRowCount();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_ToolItem")) test_indexOfLorg_eclipse_swt_widgets_ToolItem();
+	else if (getName().equals("test_setFocus")) test_setFocus();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java
new file mode 100644
index 0000000000..9dd0cd1c84
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java
@@ -0,0 +1,223 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ToolItem
+ *
+ * @see org.eclipse.swt.widgets.ToolItem
+ */
+public class Test_org_eclipse_swt_widgets_ToolItem extends Test_org_eclipse_swt_widgets_Item {
+
+ToolBar toolBar;
+ToolItem toolItem;
+
+public Test_org_eclipse_swt_widgets_ToolItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	toolBar = new ToolBar(shell, 0);
+	toolItem = new ToolItem(toolBar, 0); 
+	setWidget(toolItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ToolBarI(){
+	if (fCheckSwtNullExceptions) {
+		try {
+			ToolItem tItem = new ToolItem(null, SWT.NULL);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ToolBarII() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ToolBarII not written");
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getControl() {
+	warnUnimpl("Test test_getControl not written");
+}
+
+public void test_getDisabledImage() {
+	warnUnimpl("Test test_getDisabledImage not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getEnabled() {
+	warnUnimpl("Test test_getEnabled not written");
+}
+
+public void test_getHotImage() {
+	warnUnimpl("Test test_getHotImage not written");
+}
+
+public void test_getParent() {
+	warnUnimpl("Test test_getParent not written");
+}
+
+public void test_getSelection(){
+	// Test for method boolean org.eclipse.swt.widgets.ToolItem.getSelection()
+	warnUnimpl( "Test Test_org_eclipse_swt_widgets_ToolItem.test_5_getSelection not written");
+}
+
+public void test_getToolTipText(){
+	toolItem.setToolTipText("fred");
+	assertTrue(":a: ", toolItem.getToolTipText().equals("fred"));
+	toolItem.setToolTipText("fredttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt");
+	assertTrue(":a: ", toolItem.getToolTipText().equals("fredttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttttt"));
+}
+
+public void test_getWidth() {
+	warnUnimpl("Test test_getWidth not written");
+}
+
+public void test_isEnabled(){
+	// Test for method boolean org.eclipse.swt.widgets.ToolItem.isEnabled()
+	warnUnimpl( "Test Test_org_eclipse_swt_widgets_ToolItem.test_7_isEnabled not written");
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_setControlLorg_eclipse_swt_widgets_Control() {
+	warnUnimpl("Test test_setControlLorg_eclipse_swt_widgets_Control not written");
+}
+
+public void test_setEnabledZ(){
+	// Test for method void org.eclipse.swt.widgets.ToolItem.setEnabled(boolean)
+	warnUnimpl( "Test Test_org_eclipse_swt_widgets_ToolItem.test_8_setEnabled not written");
+}
+
+public void test_setDisabledImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setDisabledImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setHotImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setHotImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setSelectionZ() {
+	warnUnimpl("Test test_setSelectionZ not written");
+}
+
+public void test_setTextLjava_lang_String() {
+	warnUnimpl("Test test_setTextLjava_lang_String not written");
+}
+
+public void test_setToolTipTextLjava_lang_String() {
+	warnUnimpl("Test test_setToolTipTextLjava_lang_String not written");
+}
+
+public void test_setWidthI() {
+	warnUnimpl("Test test_setWidthI not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_ToolItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ToolBarI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ToolBarII");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getDisabledImage");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getEnabled");
+	methodNames.addElement("test_getHotImage");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getToolTipText");
+	methodNames.addElement("test_getWidth");
+	methodNames.addElement("test_isEnabled");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_setControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setEnabledZ");
+	methodNames.addElement("test_setDisabledImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setHotImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setSelectionZ");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addElement("test_setToolTipTextLjava_lang_String");
+	methodNames.addElement("test_setWidthI");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ToolBarI")) test_ConstructorLorg_eclipse_swt_widgets_ToolBarI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ToolBarII")) test_ConstructorLorg_eclipse_swt_widgets_ToolBarII();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getDisabledImage")) test_getDisabledImage();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getEnabled")) test_getEnabled();
+	else if (getName().equals("test_getHotImage")) test_getHotImage();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getToolTipText")) test_getToolTipText();
+	else if (getName().equals("test_getWidth")) test_getWidth();
+	else if (getName().equals("test_isEnabled")) test_isEnabled();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_setControlLorg_eclipse_swt_widgets_Control")) test_setControlLorg_eclipse_swt_widgets_Control();
+	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
+	else if (getName().equals("test_setDisabledImageLorg_eclipse_swt_graphics_Image")) test_setDisabledImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setHotImageLorg_eclipse_swt_graphics_Image")) test_setHotImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setSelectionZ")) test_setSelectionZ();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else if (getName().equals("test_setToolTipTextLjava_lang_String")) test_setToolTipTextLjava_lang_String();
+	else if (getName().equals("test_setWidthI")) test_setWidthI();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tracker.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tracker.java
new file mode 100644
index 0000000000..140fad7b1c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tracker.java
@@ -0,0 +1,122 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Tracker
+ *
+ * @see org.eclipse.swt.widgets.Tracker
+ */
+public class Test_org_eclipse_swt_widgets_Tracker extends Test_org_eclipse_swt_widgets_Widget {
+
+	Tracker tracker;
+	
+public Test_org_eclipse_swt_widgets_Tracker(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	tracker = new Tracker(shell, 0);
+	setWidget(tracker);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_CompositeI not written");
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_DisplayI() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_DisplayI not written");
+}
+
+public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
+	warnUnimpl("Test test_addControlListenerLorg_eclipse_swt_events_ControlListener not written");
+}
+
+public void test_close() {
+	warnUnimpl("Test test_close not written");
+}
+
+public void test_getDisplay() {
+	warnUnimpl("Test test_getDisplay not written");
+}
+
+public void test_getRectangles() {
+	warnUnimpl("Test test_getRectangles not written");
+}
+
+public void test_getStippled() {
+	warnUnimpl("Test test_getStippled not written");
+}
+
+public void test_open() {
+	warnUnimpl("Test test_open not written");
+}
+
+public void test_removeControlListenerLorg_eclipse_swt_events_ControlListener() {
+	warnUnimpl("Test test_removeControlListenerLorg_eclipse_swt_events_ControlListener not written");
+}
+
+public void test_setRectangles$Lorg_eclipse_swt_graphics_Rectangle() {
+	warnUnimpl("Test test_setRectangles$Lorg_eclipse_swt_graphics_Rectangle not written");
+}
+
+public void test_setStippledZ() {
+	warnUnimpl("Test test_setStippledZ not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Tracker((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_DisplayI");
+	methodNames.addElement("test_addControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_close");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getRectangles");
+	methodNames.addElement("test_getStippled");
+	methodNames.addElement("test_open");
+	methodNames.addElement("test_removeControlListenerLorg_eclipse_swt_events_ControlListener");
+	methodNames.addElement("test_setRectangles$Lorg_eclipse_swt_graphics_Rectangle");
+	methodNames.addElement("test_setStippledZ");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_DisplayI")) test_ConstructorLorg_eclipse_swt_widgets_DisplayI();
+	else if (getName().equals("test_addControlListenerLorg_eclipse_swt_events_ControlListener")) test_addControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_close")) test_close();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getRectangles")) test_getRectangles();
+	else if (getName().equals("test_getStippled")) test_getStippled();
+	else if (getName().equals("test_open")) test_open();
+	else if (getName().equals("test_removeControlListenerLorg_eclipse_swt_events_ControlListener")) test_removeControlListenerLorg_eclipse_swt_events_ControlListener();
+	else if (getName().equals("test_setRectangles$Lorg_eclipse_swt_graphics_Rectangle")) test_setRectangles$Lorg_eclipse_swt_graphics_Rectangle();
+	else if (getName().equals("test_setStippledZ")) test_setStippledZ();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java
new file mode 100644
index 0000000000..a39087315e
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Tree.java
@@ -0,0 +1,507 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Tree
+ *
+ * @see org.eclipse.swt.widgets.Tree
+ */
+public class Test_org_eclipse_swt_widgets_Tree extends Test_org_eclipse_swt_widgets_Composite {
+
+public Tree tree;
+
+public Test_org_eclipse_swt_widgets_Tree(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	tree = new Tree(shell, SWT.MULTI);
+	setWidget(tree);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+/**
+ * Clean up the environment for a new test.
+ * 
+ * @param single true if the new tree should be a single-selection one,
+ * otherwise use multi-selection.
+ */
+private void makeCleanEnvironment(boolean single) {
+// this method must be private or protected so the auto-gen tool keeps it
+	tree.dispose();
+	tree = new Tree(shell, single?SWT.SINGLE:SWT.MULTI);
+	setWidget(tree);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI(){
+	try {
+		tree = new Tree(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	int[] cases = {0, SWT.BORDER};
+	for (int i = 0; i < cases.length; i++)
+		tree = new Tree(shell, cases[i]);
+
+	cases = new int[]{0, 10, 100};
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TreeItem ti = new TreeItem(tree, 0);
+		}
+		assertEquals(cases[j], tree.getItemCount());
+		tree.removeAll();
+	}
+}
+
+public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_addTreeListenerLorg_eclipse_swt_events_TreeListener() {
+	warnUnimpl("Test test_addTreeListenerLorg_eclipse_swt_events_TreeListener not written");
+}
+
+public void test_computeSizeIIZ() {
+	warnUnimpl("Test test_computeSizeIIZ not written");
+}
+
+public void test_deselectAll() {
+	int number = 15;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+	
+	assertEquals(0, tree.getSelectionCount());
+	tree.setSelection(new TreeItem[] {items[2], items[4], items[5], items[10]});
+	
+	assertEquals(4, tree.getSelectionCount());
+	
+	tree.deselectAll();
+	assertEquals(0, tree.getSelectionCount());
+
+	tree.selectAll();
+	assertEquals(number, tree.getSelectionCount());
+
+	tree.deselectAll();
+	assertEquals(0, tree.getSelectionCount());
+}
+
+public void test_getItemLorg_eclipse_swt_graphics_Point() {
+	warnUnimpl("Test test_getItemLorg_eclipse_swt_graphics_Point not written");
+}
+
+public void test_getItemCount() {
+	warnUnimpl("Test test_getItemCount not written");
+}
+
+public void test_getItemHeight() {
+	assertTrue(":a: Item height is 0", tree.getItemHeight() > 0);
+	new TreeItem(tree, 0);
+	assertTrue(":b: Item height is 0", tree.getItemHeight() > 0);	
+}
+
+public void test_getItems(){
+	int[] cases = {0, 10, 100};
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TreeItem ti = new TreeItem(tree, 0);
+		}
+		assertEquals(cases[j], tree.getItems().length);
+		tree.removeAll();
+		assertEquals(0, tree.getItemCount());
+	}
+
+	makeCleanEnvironment(false);
+	
+	for (int j = 0; j < cases.length; j++) {
+		for (int i = 0; i < cases[j]; i++) {
+			TreeItem ti = new TreeItem(tree, 0);
+			ti.setText(String.valueOf(i));
+		}
+		TreeItem[] items = tree.getItems();
+		for (int i = 0; i < items.length; i++) {
+			assertEquals(String.valueOf(i), items[i].getText());
+		}
+		tree.removeAll();
+		assertEquals(0, tree.getItemCount());
+	}
+}
+
+public void test_getParentItem() {
+	assertNull(tree.getParentItem());
+}
+
+public void test_getSelection() {
+	warnUnimpl("Test test_getSelection not written");
+}
+
+public void test_getSelectionCount(){
+	makeCleanEnvironment(true); // use single-selection tree.
+
+	int number = 15;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	assertEquals(0, tree.getSelectionCount());
+
+	tree.setSelection(new TreeItem[]{items[2], items[number-1], items[10]});
+	assertEquals(1, tree.getSelectionCount());
+	
+	tree.setSelection(items);
+	assertEquals(1, tree.getSelectionCount());
+}
+
+public void test_removeAll() {
+	tree.removeAll();
+
+	int number = 20;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TreeItem(tree, 0);
+	}
+	tree.removeAll();
+	assertEquals(0, tree.getItemCount());
+}
+
+public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
+	warnUnimpl("Test test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener not written");
+}
+
+public void test_removeTreeListenerLorg_eclipse_swt_events_TreeListener() {
+	warnUnimpl("Test test_removeTreeListenerLorg_eclipse_swt_events_TreeListener not written");
+}
+
+public void test_setInsertMarkLorg_eclipse_swt_widgets_TreeItemZ() {
+	warnUnimpl("Test test_setInsertMarkLorg_eclipse_swt_widgets_TreeItemZ not written");
+}
+
+public void test_selectAll(){
+	int number = 5;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	assertEquals(0, tree.getSelectionCount());
+	tree.selectAll();
+	assertEquals(number, tree.getSelectionCount());
+
+	makeCleanEnvironment(true); // single-selection tree
+		
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	assertEquals(0, tree.getSelectionCount());
+	tree.selectAll();
+	assertEquals(0, tree.getSelectionCount());
+}
+
+public void test_setRedrawZ() {
+	warnUnimpl("Test test_setRedrawZ not written");
+}
+
+public void test_setSelection$Lorg_eclipse_swt_widgets_TreeItem(){
+	int number = 20;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TreeItem(tree, 0);
+	}
+	TreeItem[] itemsToBeSelected = {items[5], items[16], items[19]};
+	tree.setSelection(itemsToBeSelected);
+	TreeItem[] selItems = tree.getSelection();
+	int selLength = selItems.length;
+	if (fCheckMultiSelectTree) {
+		assertTrue(":len:" + String.valueOf(selLength), selLength != itemsToBeSelected.length);
+		for (int i = 0; i < selLength; i++)
+			if (selItems[i] == itemsToBeSelected[i])
+				fail();
+	}
+	tree.setSelection(tree.getItems());
+	assertEquals(":b:", items, tree.getItems());
+	tree.setSelection(new TreeItem[] {});
+	if (fCheckMultiSelectTree)
+		assertEquals(":c:", new TreeItem[] {}, tree.getItems());
+	try {
+		tree.setSelection((TreeItem[]) null);
+		fail("No exception thrown for items == null");
+	} 
+	catch (IllegalArgumentException e) {
+	}
+	tree.removeAll();
+	
+	makeCleanEnvironment(false);
+	
+	number = 5;
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+	try {
+		tree.setSelection((TreeItem[]) null);
+		fail("No exception thrown for items == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	assertEquals(0, tree.getSelectionCount());
+	
+	makeCleanEnvironment(false);
+	
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	tree.setSelection(new TreeItem[]{});
+	assertEquals(0, tree.getSelectionCount());
+
+	tree.setSelection(new TreeItem[]{items[0], items[3], items[2]});
+	assertEquals(":b:", new TreeItem[]{items[0], items[2], items[3]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[3], items[2], items[1]});
+	assertEquals(":c:", new TreeItem[]{items[1], items[2], items[3]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[1], items[4], items[0]});
+	assertEquals(":d:", new TreeItem[]{items[0], items[1], items[4]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[0], items[4], items[0]});
+	assertEquals(":e:", new TreeItem[]{items[0], items[4]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[2], items[3], items[4]});
+	assertEquals(":f:", new TreeItem[]{items[2], items[3], items[4]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[4], items[4], items[4], items[4], items[4], items[4]});
+	assertEquals(":g:", new TreeItem[]{items[4]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[4]});
+	assertEquals(":h:", new TreeItem[]{items[4]}, tree.getSelection());	
+
+	makeCleanEnvironment(false);
+	
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	tree.setSelection(new TreeItem[] {items[0]});
+	assertEquals(":a:", new TreeItem[] {items[0]}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[] {items[3]});
+	assertEquals(":b:", new TreeItem[] {items[3]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[] {items[4]});
+	assertEquals(":c:", new TreeItem[] {items[4]}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[] {items[2]});
+	assertEquals(":d:", new TreeItem[] {items[2]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[] {items[1]});
+	assertEquals(":e:", new TreeItem[] {items[1]}, tree.getSelection());
+	
+	makeCleanEnvironment(true); // single-selection tree
+	
+	number = 15;
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	assertEquals(":a:", new TreeItem[] {}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[]{items[10], items[number-1], items[2]});
+	assertEquals(":b:", new TreeItem[] {items[10]}, tree.getSelection());
+	
+	tree.setSelection(items);
+	assertEquals(":c:", new TreeItem[] {items[0]}, tree.getSelection());
+
+	makeCleanEnvironment(true); //single-selection tree
+		
+	number = 5;
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+	try {
+		tree.setSelection((TreeItem[]) null);
+		fail("No exception thrown for items == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	assertEquals(0, tree.getSelectionCount());
+
+	makeCleanEnvironment(true); // single-selection tree
+	
+	number = 5;
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	tree.setSelection(new TreeItem[]{});
+	assertEquals(0, tree.getSelectionCount());
+
+	tree.setSelection(new TreeItem[]{items[0], items[3], items[2]});
+	assertEquals(":b:", new TreeItem[]{items[0]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[3], items[2], items[1]});
+	assertEquals(":c:", new TreeItem[]{items[3]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[1], items[4], items[0]});
+	assertEquals(":d:", new TreeItem[]{items[1]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[0], items[4], items[0]});
+	assertEquals(":e:", new TreeItem[]{items[0]}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[]{items[2], items[3], items[4]});
+	assertEquals(":f:", new TreeItem[]{items[2]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[4], items[4], items[4], items[4], items[4], items[4]});
+	assertEquals(":g:", new TreeItem[]{items[4]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[]{items[4]});
+	assertEquals(":h:", new TreeItem[]{items[4]}, tree.getSelection());	
+
+	makeCleanEnvironment(true); //single-selection tree
+	
+	number = 5;
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++)
+		items[i] = new TreeItem(tree, 0);
+
+	tree.setSelection(new TreeItem[] {items[0]});
+	assertEquals(":a:", new TreeItem[] {items[0]}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[] {items[3]});
+	assertEquals(":b:", new TreeItem[] {items[3]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[] {items[4]});
+	assertEquals(":c:", new TreeItem[] {items[4]}, tree.getSelection());
+
+	tree.setSelection(new TreeItem[] {items[2]});
+	assertEquals(":d:", new TreeItem[] {items[2]}, tree.getSelection());	
+
+	tree.setSelection(new TreeItem[] {items[1]});
+	assertEquals(":e:", new TreeItem[] {items[1]}, tree.getSelection());	
+}
+
+public void test_showItemLorg_eclipse_swt_widgets_TreeItem(){
+	try {
+		tree.showItem(null);
+		fail("No exception thrown for item == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	int number = 20;
+	TreeItem[] items = new TreeItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TreeItem(tree, 0);
+	}
+	for(int i=0; i<number; i++)
+		tree.showItem(items[i]);
+
+	tree.removeAll();
+
+	makeCleanEnvironment(false);
+	//showing somebody else's items
+	
+	items = new TreeItem[number];
+	for (int i = 0; i < number; i++) {
+		items[i] = new TreeItem(tree, 0);
+	}
+
+	Tree tree2 = new Tree(shell, 0);
+	TreeItem[] items2 = new TreeItem[number];
+	for (int i = 0; i < number; i++) {
+		items2[i] = new TreeItem(tree2, 0);
+	};
+
+	for(int i=0; i<number; i++)
+		tree.showItem(items2[i]);
+
+	tree.removeAll();
+}
+
+public void test_showSelection() {
+	TreeItem item;
+	
+	tree.showSelection();
+	item = new TreeItem(tree, 0);
+	tree.setSelection(new TreeItem[]{item});
+	tree.showSelection();	
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_Tree((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_addTreeListenerLorg_eclipse_swt_events_TreeListener");
+	methodNames.addElement("test_computeSizeIIZ");
+	methodNames.addElement("test_deselectAll");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemHeight");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getParentItem");
+	methodNames.addElement("test_getSelection");
+	methodNames.addElement("test_getSelectionCount");
+	methodNames.addElement("test_removeAll");
+	methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
+	methodNames.addElement("test_removeTreeListenerLorg_eclipse_swt_events_TreeListener");
+	methodNames.addElement("test_setInsertMarkLorg_eclipse_swt_widgets_TreeItemZ");
+	methodNames.addElement("test_selectAll");
+	methodNames.addElement("test_setRedrawZ");
+	methodNames.addElement("test_setSelection$Lorg_eclipse_swt_widgets_TreeItem");
+	methodNames.addElement("test_showItemLorg_eclipse_swt_widgets_TreeItem");
+	methodNames.addElement("test_showSelection");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_addTreeListenerLorg_eclipse_swt_events_TreeListener")) test_addTreeListenerLorg_eclipse_swt_events_TreeListener();
+	else if (getName().equals("test_computeSizeIIZ")) test_computeSizeIIZ();
+	else if (getName().equals("test_deselectAll")) test_deselectAll();
+	else if (getName().equals("test_getItemLorg_eclipse_swt_graphics_Point")) test_getItemLorg_eclipse_swt_graphics_Point();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItemHeight")) test_getItemHeight();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getParentItem")) test_getParentItem();
+	else if (getName().equals("test_getSelection")) test_getSelection();
+	else if (getName().equals("test_getSelectionCount")) test_getSelectionCount();
+	else if (getName().equals("test_removeAll")) test_removeAll();
+	else if (getName().equals("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
+	else if (getName().equals("test_removeTreeListenerLorg_eclipse_swt_events_TreeListener")) test_removeTreeListenerLorg_eclipse_swt_events_TreeListener();
+	else if (getName().equals("test_setInsertMarkLorg_eclipse_swt_widgets_TreeItemZ")) test_setInsertMarkLorg_eclipse_swt_widgets_TreeItemZ();
+	else if (getName().equals("test_selectAll")) test_selectAll();
+	else if (getName().equals("test_setRedrawZ")) test_setRedrawZ();
+	else if (getName().equals("test_setSelection$Lorg_eclipse_swt_widgets_TreeItem")) test_setSelection$Lorg_eclipse_swt_widgets_TreeItem();
+	else if (getName().equals("test_showItemLorg_eclipse_swt_widgets_TreeItem")) test_showItemLorg_eclipse_swt_widgets_TreeItem();
+	else if (getName().equals("test_showSelection")) test_showSelection();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
new file mode 100644
index 0000000000..f40ff45a9a
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TreeItem.java
@@ -0,0 +1,266 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TreeItem
+ *
+ * @see org.eclipse.swt.widgets.TreeItem
+ */
+public class Test_org_eclipse_swt_widgets_TreeItem extends Test_org_eclipse_swt_widgets_Item {
+
+TreeItem treeItem;
+Tree tree;
+
+public Test_org_eclipse_swt_widgets_TreeItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	tree = new Tree(shell, 0);
+	treeItem = new TreeItem(tree, 0);
+	setWidget(treeItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TreeI(){
+	if (fCheckSwtNullExceptions) {
+		try {
+			TreeItem tItem = new TreeItem((TreeItem)null, SWT.NULL);
+			fail("No exception thrown for parent == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+
+	for (int i=0; i<10; i++) {
+		new TreeItem(tree, 0);	
+	}
+	assertEquals(11, tree.getItemCount());
+	new TreeItem(tree, 0, 5);	
+	assertEquals(12, tree.getItemCount());
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TreeII(){
+	try {
+		new TreeItem(tree, 0, 5);
+		fail("No exception thrown for illegal index argument");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TreeItemI(){
+	for (int i = 0; i < 10; i++) {
+		new TreeItem(treeItem, 0);
+	}
+	assertEquals(10, treeItem.getItemCount());
+	new TreeItem(treeItem, 0, 5);
+	assertEquals(1, tree.getItemCount());
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_TreeItemII(){
+	if (fCheckOutOfRangeBehaviour) {
+		try {
+			new TreeItem(treeItem, 0, 5);
+			fail("No exception thrown for illegal index argument");
+		}
+		catch (IllegalArgumentException e) {
+		}
+		assertEquals(1, tree.getItemCount());
+	}
+}
+
+public void test_checkSubclass() {
+	warnUnimpl("Test test_checkSubclass not written");
+}
+
+public void test_getBounds() {
+	warnUnimpl("Test test_getBounds not written");
+}
+
+public void test_getChecked(){
+	Tree newTree = new Tree(shell, SWT.CHECK);
+	TreeItem tItem = new TreeItem(newTree,0);
+	assertEquals(false, tItem.getChecked());
+	tItem.setChecked(true);
+	assertTrue(tItem.getChecked());
+	tItem.setChecked(false);
+	assertEquals(false, tItem.getChecked());
+}
+
+public void test_getDisplay() {
+	assertEquals(tree.getDisplay(), treeItem.getDisplay());
+}
+
+public void test_getExpanded(){
+	assertEquals(false, treeItem.getExpanded());
+	// there must be at least one subitem before you can set the treeitem expanded
+	new TreeItem(treeItem, 0);
+	treeItem.setExpanded(true);
+	assertTrue(treeItem.getExpanded());
+	treeItem.setExpanded(false);
+	assertEquals(false, treeItem.getExpanded());
+}
+
+public void test_getGrayed() {
+	warnUnimpl("Test test_getGrayed not written");
+}
+
+public void test_getItemCount(){
+	for (int i = 0; i < 10; i++) {
+		assertEquals(i, treeItem.getItemCount());
+		new TreeItem(treeItem, 0);
+	}
+	assertTrue("b: ", treeItem.getItemCount() == 10);
+}
+
+public void test_getItems(){
+	if (fCheckBogusTestCases) {
+		int[] cases = {2, 10, 100};
+		for (int j = 0; j < cases.length; j++) {
+			for (int i = 0; i < cases[j]; i++) {
+				TreeItem ti = new TreeItem(tree, 0);
+			}
+			assertEquals(cases[j], tree.getItems().length);
+			tree.removeAll();
+			assertEquals(0, tree.getItemCount());
+		}
+	}
+}
+
+public void test_getParent(){
+	assertEquals(tree, treeItem.getParent());
+}
+
+public void test_getParentItem(){
+	TreeItem tItem = new TreeItem(treeItem, SWT.NULL);
+	assertEquals(treeItem, tItem.getParentItem());
+}
+
+public void test_setCheckedZ(){
+	assertEquals(false, treeItem.getChecked());
+	
+	treeItem.setChecked(true);
+	assertEquals(false, treeItem.getChecked());
+
+	Tree t = new Tree(shell, SWT.CHECK);
+	TreeItem ti = new TreeItem(t, SWT.NULL);
+	ti.setChecked(true);
+	assertTrue(ti.getChecked());
+	
+	ti.setChecked(false);
+	assertEquals(false, ti.getChecked());
+	t.dispose();
+}
+
+public void test_setExpandedZ(){
+	assertEquals(false, treeItem.getExpanded());
+	
+	// there must be at least one subitem before you can set the treeitem expanded
+	treeItem.setExpanded(true);
+	assertEquals(false, treeItem.getExpanded());
+
+
+	new TreeItem(treeItem, SWT.NULL);
+	treeItem.setExpanded(true);
+	assertTrue(treeItem.getExpanded());
+	treeItem.setExpanded(false);
+	assertEquals(false, treeItem.getExpanded());
+		
+	TreeItem ti = new TreeItem(treeItem, SWT.NULL);
+	ti.setExpanded(true);
+	treeItem.setExpanded(false);
+	assertEquals(false, ti.getExpanded());
+}
+
+public void test_setGrayedZ() {
+	warnUnimpl("Test test_setGrayedZ not written");
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImageLorg_eclipse_swt_graphics_Image not written");
+}
+
+public void test_setTextLjava_lang_String(){
+	try {
+		treeItem.setText(null);		
+		fail("No exception thrown for string == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TreeItem((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TreeI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TreeII");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TreeItemI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_TreeItemII");
+	methodNames.addElement("test_checkSubclass");
+	methodNames.addElement("test_getBounds");
+	methodNames.addElement("test_getChecked");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getExpanded");
+	methodNames.addElement("test_getGrayed");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_getParentItem");
+	methodNames.addElement("test_setCheckedZ");
+	methodNames.addElement("test_setExpandedZ");
+	methodNames.addElement("test_setGrayedZ");
+	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setTextLjava_lang_String");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Item.methodNames()); // add superclass method names
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TreeI")) test_ConstructorLorg_eclipse_swt_widgets_TreeI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TreeII")) test_ConstructorLorg_eclipse_swt_widgets_TreeII();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TreeItemI")) test_ConstructorLorg_eclipse_swt_widgets_TreeItemI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_TreeItemII")) test_ConstructorLorg_eclipse_swt_widgets_TreeItemII();
+	else if (getName().equals("test_checkSubclass")) test_checkSubclass();
+	else if (getName().equals("test_getBounds")) test_getBounds();
+	else if (getName().equals("test_getChecked")) test_getChecked();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getExpanded")) test_getExpanded();
+	else if (getName().equals("test_getGrayed")) test_getGrayed();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	else if (getName().equals("test_getItems")) test_getItems();
+	else if (getName().equals("test_getParent")) test_getParent();
+	else if (getName().equals("test_getParentItem")) test_getParentItem();
+	else if (getName().equals("test_setCheckedZ")) test_setCheckedZ();
+	else if (getName().equals("test_setExpandedZ")) test_setExpandedZ();
+	else if (getName().equals("test_setGrayedZ")) test_setGrayedZ();
+	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setTextLjava_lang_String")) test_setTextLjava_lang_String();
+	else super.runTest();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TypedListener.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TypedListener.java
new file mode 100644
index 0000000000..68b6643853
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_TypedListener.java
@@ -0,0 +1,66 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.widgets.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.TypedListener
+ *
+ * @see org.eclipse.swt.widgets.TypedListener
+ */
+public class Test_org_eclipse_swt_widgets_TypedListener extends SwtTestCase {
+
+public Test_org_eclipse_swt_widgets_TypedListener(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+}
+
+protected void tearDown() {
+}
+
+public void test_ConstructorLorg_eclipse_swt_internal_SWTEventListener() {
+	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_internal_SWTEventListener not written");
+}
+
+public void test_getEventListener() {
+	warnUnimpl("Test test_getEventListener not written");
+}
+
+public void test_handleEventLorg_eclipse_swt_widgets_Event() {
+	warnUnimpl("Test test_handleEventLorg_eclipse_swt_widgets_Event not written");
+}
+
+public static Test suite() {
+	TestSuite suite = new TestSuite();
+	java.util.Vector methodNames = methodNames();
+	java.util.Enumeration e = methodNames.elements();
+	while (e.hasMoreElements()) {
+		suite.addTest(new Test_org_eclipse_swt_widgets_TypedListener((String)e.nextElement()));
+	}
+	return suite;
+}
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_internal_SWTEventListener");
+	methodNames.addElement("test_getEventListener");
+	methodNames.addElement("test_handleEventLorg_eclipse_swt_widgets_Event");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_ConstructorLorg_eclipse_swt_internal_SWTEventListener")) test_ConstructorLorg_eclipse_swt_internal_SWTEventListener();
+	else if (getName().equals("test_getEventListener")) test_getEventListener();
+	else if (getName().equals("test_handleEventLorg_eclipse_swt_widgets_Event")) test_handleEventLorg_eclipse_swt_widgets_Event();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java
new file mode 100644
index 0000000000..2e16082614
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Widget.java
@@ -0,0 +1,191 @@
+package org.eclipse.swt.tests.junit;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2001.
+ * All Rights Reserved
+ */
+
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.graphics.*;
+import junit.framework.*;
+import junit.textui.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.Widget
+ *
+ * @see org.eclipse.swt.widgets.Widget
+ */
+public class Test_org_eclipse_swt_widgets_Widget extends SwtTestCase {
+
+public Shell shell;
+private Widget widget;
+
+public Test_org_eclipse_swt_widgets_Widget(String name) {
+	super(name);
+}
+
+protected void setUp() {
+	shell = new Shell();
+}
+
+protected void tearDown() {
+	if (widget != null) {
+		assertEquals(false, widget.isDisposed());
+	}
+	assertEquals(false, shell.isDisposed());
+	shell.dispose();
+	if (widget != null) {
+		assertTrue(widget.isDisposed());
+	}
+	assertTrue(shell.isDisposed());
+}
+
+protected void setWidget(Widget w) {
+	widget = w;
+}
+
+public void test_addListenerILorg_eclipse_swt_widgets_Listener() {
+	try {
+		widget.addListener(SWT.Dispose, null);
+		fail("No exception thrown for listener == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	Listener listener = new Listener() {
+		public void handleEvent(Event e) {
+		}
+	};
+	widget.addListener(SWT.Dispose, listener);
+	widget.removeListener(SWT.Dispose, listener);
+}
+
+public void test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener() {
+	DisposeListener listener = new DisposeListener() {
+		public void widgetDisposed(DisposeEvent e) {
+		}
+	};
+	widget.addDisposeListener(listener);
+	widget.removeDisposeListener(listener);
+}
+
+public void test_dispose() {
+	// tested in tearDown
+}
+
+public void test_getData() {
+	// tested in test_setDataLjava_lang_Object
+}
+
+public void test_getDataLjava_lang_String() {
+	// tested in test_setDataLjava_lang_StringLjava_lang_Object
+}
+
+public void test_getDisplay() {
+	assertEquals(widget.getDisplay(), widget.getDisplay());
+}
+
+public void test_getStyle() {
+	// this test should be overridden by leaf subclasses
+}
+
+public void test_isDisposed() {
+	assertEquals(false, widget.isDisposed());
+}
+
+public void test_notifyListenersILorg_eclipse_swt_widgets_Event() {
+	// this method is further tested in many of the addTypedListener tests
+	try {
+		widget.notifyListeners(0, null);
+		fail("No exception thrown for event == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	widget.notifyListeners(SWT.Paint, new Event());
+}
+
+public void test_removeListenerILorg_eclipse_swt_widgets_Listener() {
+	// this method is further tested by all of the removeTypedListener tests
+	try {
+		widget.removeListener(SWT.Paint, null);
+		fail("No exception thrown for listener == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+
+	widget.removeListener(SWT.Paint, new Listener() {
+		public void handleEvent(Event e) {
+		}
+	});
+	
+	Listener listener = new Listener() {
+		public void handleEvent(Event e) {
+		}
+	};
+	widget.addListener(SWT.Paint, listener);
+	widget.removeListener(SWT.Paint, listener);
+}
+
+public void test_removeDisposeListenerLorg_eclipse_swt_events_DisposeListener() {
+	// tested in test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener
+}
+
+public void test_setDataLjava_lang_Object(){
+	widget.setData(widget);
+	assertEquals(widget, widget.getData());
+
+	widget.setData(null);
+	assertNull(widget.getData());
+}
+
+public void test_setDataLjava_lang_StringLjava_lang_Object() {
+	widget.setData("the widget", widget);
+	assertEquals(widget, widget.getData("the widget"));
+
+	widget.setData("the widget", null);
+	assertNull(widget.getData("the widget"));
+}
+
+public void test_toString() {
+	assertNotNull(widget.toString());
+	assertEquals(false, widget.toString().equals(""));
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_addListenerILorg_eclipse_swt_widgets_Listener");
+	methodNames.addElement("test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener");
+	methodNames.addElement("test_dispose");
+	methodNames.addElement("test_getData");
+	methodNames.addElement("test_getDataLjava_lang_String");
+	methodNames.addElement("test_getDisplay");
+	methodNames.addElement("test_getStyle");
+	methodNames.addElement("test_isDisposed");
+	methodNames.addElement("test_notifyListenersILorg_eclipse_swt_widgets_Event");
+	methodNames.addElement("test_removeListenerILorg_eclipse_swt_widgets_Listener");
+	methodNames.addElement("test_removeDisposeListenerLorg_eclipse_swt_events_DisposeListener");
+	methodNames.addElement("test_setDataLjava_lang_Object");
+	methodNames.addElement("test_setDataLjava_lang_StringLjava_lang_Object");
+	methodNames.addElement("test_toString");
+	return methodNames;
+}
+protected void runTest() throws Throwable {
+	if (getName().equals("test_addListenerILorg_eclipse_swt_widgets_Listener")) test_addListenerILorg_eclipse_swt_widgets_Listener();
+	else if (getName().equals("test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener")) test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener();
+	else if (getName().equals("test_dispose")) test_dispose();
+	else if (getName().equals("test_getData")) test_getData();
+	else if (getName().equals("test_getDataLjava_lang_String")) test_getDataLjava_lang_String();
+	else if (getName().equals("test_getDisplay")) test_getDisplay();
+	else if (getName().equals("test_getStyle")) test_getStyle();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
+	else if (getName().equals("test_notifyListenersILorg_eclipse_swt_widgets_Event")) test_notifyListenersILorg_eclipse_swt_widgets_Event();
+	else if (getName().equals("test_removeListenerILorg_eclipse_swt_widgets_Listener")) test_removeListenerILorg_eclipse_swt_widgets_Listener();
+	else if (getName().equals("test_removeDisposeListenerLorg_eclipse_swt_events_DisposeListener")) test_removeDisposeListenerLorg_eclipse_swt_events_DisposeListener();
+	else if (getName().equals("test_setDataLjava_lang_Object")) test_setDataLjava_lang_Object();
+	else if (getName().equals("test_setDataLjava_lang_StringLjava_lang_Object")) test_setDataLjava_lang_StringLjava_lang_Object();
+	else if (getName().equals("test_toString")) test_toString();
+}
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/check.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/check.bmp
new file mode 100644
index 0000000000..72f236079c
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/check.bmp
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/dot.gif b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/dot.gif
new file mode 100644
index 0000000000..b9ad0367f8
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/dot.gif
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folder.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folder.bmp
new file mode 100644
index 0000000000..574351fbd4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folder.bmp
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folderOpen.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folderOpen.bmp
new file mode 100644
index 0000000000..6ba1214663
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/folderOpen.bmp
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/push.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/push.bmp
new file mode 100644
index 0000000000..d61c9f4ce1
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/push.bmp
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/radio.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/radio.bmp
new file mode 100644
index 0000000000..89e0cc31c4
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/radio.bmp
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/target.bmp b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/target.bmp
new file mode 100644
index 0000000000..ec7d509e74
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/target.bmp
author	Carolyn MacLeod	2001-11-06 19:23:07 +0000
committer	Carolyn MacLeod	2001-11-06 19:23:07 +0000
commit	635faf7df8b255a47fb036ddd76d34febc52406a (patch)
tree	22cd097cf293603d0f1225713d47c59a076d2063 /tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit
parent	f27a1273fe7c6ffb504004e2c6f8ef2e756f0ef3 (diff)
download	eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.tar.gz eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.tar.xz eclipse.platform.swt-635faf7df8b255a47fb036ddd76d34febc52406a.zip