Added missing methods for 3.0.

21 files changed, 234 insertions, 41 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
index cd2cb07afe..aab129fb5b 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_Accessible.java
@@ -42,27 +42,55 @@ protected void tearDown() {
 }
 
 public void test_addAccessibleControlListenerLorg_eclipse_swt_accessibility_AccessibleControlListener() {
-	AccessibleControlListener listener = new AccessibleControlAdapter() {
+	AccessibleControlListener listener = new AccessibleControlListener() {
 		public void getValue(AccessibleControlEvent e) {
 		}
+		public void getChild(AccessibleControlEvent e) {
+		}
+		public void getChildAtPoint(AccessibleControlEvent e) {
+		}
+		public void getChildCount(AccessibleControlEvent e) {
+		}
+		public void getChildren(AccessibleControlEvent e) {
+		}
+		public void getDefaultAction(AccessibleControlEvent e) {
+		}
+		public void getFocus(AccessibleControlEvent e) {
+		}
+		public void getLocation(AccessibleControlEvent e) {
+		}
+		public void getRole(AccessibleControlEvent e) {
+		}
+		public void getSelection(AccessibleControlEvent e) {
+		}
+		public void getState(AccessibleControlEvent e) {
+		}
 	};
 	accessible.addAccessibleControlListener(listener);
 	accessible.removeAccessibleControlListener(listener);
 }
 
 public void test_addAccessibleListenerLorg_eclipse_swt_accessibility_AccessibleListener() {
-	AccessibleListener listener = new AccessibleAdapter() {
+	AccessibleListener listener = new AccessibleListener() {
 		public void getName(AccessibleEvent e) {
 		}
+		public void getDescription(AccessibleEvent e) {
+		}
+		public void getHelp(AccessibleEvent e) {
+		}
+		public void getKeyboardShortcut(AccessibleEvent e) {
+		}
 	};
 	accessible.addAccessibleListener(listener);
 	accessible.removeAccessibleListener(listener);
 }
 
 public void test_addAccessibleTextListenerLorg_eclipse_swt_accessibility_AccessibleTextListener() {
-	AccessibleTextListener listener = new AccessibleTextAdapter() {
+	AccessibleTextListener listener = new AccessibleTextListener() {
 		public void getSelectionRange(AccessibleTextEvent e) {
 		}
+		public void getCaretOffset(AccessibleTextEvent e) {
+		}
 	};
 	accessible.addAccessibleTextListener(listener);
 	accessible.removeAccessibleTextListener(listener);
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
index ca15258c34..616648371c 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleControlEvent.java
@@ -12,6 +12,8 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.accessibility.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleControlEvent
@@ -29,17 +31,27 @@ public static void main(String[] args) {
 }
 
 protected void setUp() {
+	shell = new Shell();
 }
 
 protected void tearDown() {
+	shell.dispose();
 }
 
 public void test_ConstructorLjava_lang_Object() {
-	warnUnimpl("Test test_ConstructorLjava_lang_Object not written");
+	// Object will typically be a widget.
+	AccessibleControlEvent event = new AccessibleControlEvent(shell);
+	assertNotNull(event);
+	
+	// Test with some other object also.
+	event = new AccessibleControlEvent(new Integer(5));
+	assertNotNull(event);
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	AccessibleControlEvent event = new AccessibleControlEvent(shell);
+	assertNotNull(event.toString());
+	assertTrue(event.toString().length() > 0);
 }
 
 
@@ -64,4 +76,7 @@ protected void runTest() throws Throwable {
 	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
 	else if (getName().equals("test_toString")) test_toString();
 }
+
+/* custom */
+public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
index fe778a9823..5da25bca84 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleEvent.java
@@ -12,6 +12,8 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.accessibility.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleEvent
@@ -29,17 +31,27 @@ public static void main(String[] args) {
 }
 
 protected void setUp() {
+	shell = new Shell();
 }
 
 protected void tearDown() {
+	shell.dispose();
 }
 
 public void test_ConstructorLjava_lang_Object() {
-	warnUnimpl("Test test_ConstructorLjava_lang_Object not written");
+	// Object will typically be a widget.
+	AccessibleEvent event = new AccessibleEvent(shell);
+	assertNotNull(event);
+	
+	// Test with some other object also.
+	event = new AccessibleEvent(new Integer(5));
+	assertNotNull(event);
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	AccessibleEvent event = new AccessibleEvent(shell);
+	assertNotNull(event.toString());
+	assertTrue(event.toString().length() > 0);
 }
 
 
@@ -64,4 +76,7 @@ protected void runTest() throws Throwable {
 	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
 	else if (getName().equals("test_toString")) test_toString();
 }
+
+/* custom */
+public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
index a1626ad5fb..d6b1d4de1a 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_accessibility_AccessibleTextEvent.java
@@ -12,6 +12,8 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.accessibility.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.accessibility.AccessibleTextEvent
@@ -29,17 +31,27 @@ public static void main(String[] args) {
 }
 
 protected void setUp() {
+	shell = new Shell();
 }
 
 protected void tearDown() {
+	shell.dispose();
 }
 
 public void test_ConstructorLjava_lang_Object() {
-	warnUnimpl("Test test_ConstructorLjava_lang_Object not written");
+	// Object will typically be a widget.
+	AccessibleTextEvent event = new AccessibleTextEvent(shell);
+	assertNotNull(event);
+	
+	// Test with some other object also.
+	event = new AccessibleTextEvent(new Integer(5));
+	assertNotNull(event);
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	AccessibleTextEvent event = new AccessibleTextEvent(shell);
+	assertNotNull(event.toString());
+	assertTrue(event.toString().length() > 0);
 }
 
 
@@ -64,4 +76,7 @@ protected void runTest() throws Throwable {
 	if (getName().equals("test_ConstructorLjava_lang_Object")) test_ConstructorLjava_lang_Object();
 	else if (getName().equals("test_toString")) test_toString();
 }
+
+/* custom */
+public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Clipboard.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_dnd_Clipboard.java
index 56d694016f..c8b6730719 100644
--- 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
@@ -55,6 +55,10 @@ public void test_getContentsLorg_eclipse_swt_dnd_Transfer() {
 	warnUnimpl("Test test_getContentsLorg_eclipse_swt_dnd_Transfer not written");
 }
 
+public void test_isDisposed() {
+	warnUnimpl("Test test_isDisposed 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");
 }
@@ -76,6 +80,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getAvailableTypeNames");
 	methodNames.addElement("test_getAvailableTypes");
 	methodNames.addElement("test_getContentsLorg_eclipse_swt_dnd_Transfer");
+	methodNames.addElement("test_isDisposed");
 	methodNames.addElement("test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer");
 	return methodNames;
 }
@@ -85,6 +90,7 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_getAvailableTypeNames")) test_getAvailableTypeNames();
 	else if (getName().equals("test_getAvailableTypes")) test_getAvailableTypes();
 	else if (getName().equals("test_getContentsLorg_eclipse_swt_dnd_Transfer")) test_getContentsLorg_eclipse_swt_dnd_Transfer();
+	else if (getName().equals("test_isDisposed")) test_isDisposed();
 	else if (getName().equals("test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer")) test_setContents$Ljava_lang_Object$Lorg_eclipse_swt_dnd_Transfer();
 }
 }
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
index 59a0c1cde6..99f646d975 100644
--- 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
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.swt.tests.junit;
 
+import junit.framework.*;
+import junit.textui.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.events.ShellAdapter
@@ -22,6 +24,9 @@ public Test_org_eclipse_swt_events_ShellAdapter(String name) {
 	super(name);
 }
 
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
 
 protected void setUp() {
 }
@@ -53,6 +58,17 @@ public void test_shellIconifiedLorg_eclipse_swt_events_ShellEvent() {
 	warnUnimpl("Test test_shellIconifiedLorg_eclipse_swt_events_ShellEvent 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_ShellAdapter((String)e.nextElement()));
+	}
+	return suite;
+}
+
 public static java.util.Vector methodNames() {
 	java.util.Vector methodNames = new java.util.Vector();
 	methodNames.addElement("test_Constructor");
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
index 079545dc44..bf503b4ef4 100644
--- 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
@@ -14,6 +14,9 @@ package org.eclipse.swt.tests.junit;
 import junit.framework.*;
 import junit.textui.*;
 
+import org.eclipse.swt.events.TypedEvent;
+import org.eclipse.swt.widgets.*;
+
 /**
  * Automated Test Suite for class org.eclipse.swt.events.TypedEvent
  *
@@ -30,9 +33,11 @@ public static void main(String[] args) {
 }
 
 protected void setUp() {
+	shell = new Shell();
 }
 
 protected void tearDown() {
+	shell.dispose();
 }
 
 public void test_ConstructorLjava_lang_Object() {
@@ -40,7 +45,18 @@ public void test_ConstructorLjava_lang_Object() {
 }
 
 public void test_ConstructorLorg_eclipse_swt_widgets_Event() {
-	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Event not written");
+	Event event = new Event();
+	event.widget = shell;
+	TypedEvent typedEvent = new TypedEvent(event);
+	assertNotNull(typedEvent);
+}
+
+public void test_toString() {
+	Event event = new Event();
+	event.widget = shell;
+	TypedEvent typedEvent = new TypedEvent(event);
+	assertNotNull(typedEvent.toString());
+	assertTrue(typedEvent.toString().length() > 0);
 }
 
 public static Test suite() {
@@ -56,10 +72,15 @@ 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");
+	methodNames.addElement("test_toString");
 	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();
+	else if (getName().equals("test_toString")) test_toString();
 }
+
+/* custom */
+public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
index 5a7191913c..c8ae9b5b79 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_Color.java
@@ -230,9 +230,13 @@ public void test_isDisposed() {
 
 public void test_toString() {
 	Color color = new Color(display, 0, 0, 255);
-	assertNotNull(color.toString());
-	assertTrue(color.toString().length() > 0);
-	assertEquals("Color {0, 0, 255}", color.toString());
+	try {
+		assertNotNull(color.toString());
+		assertTrue(color.toString().length() > 0);
+		assertEquals("Color {0, 0, 255}", color.toString());
+	} finally {
+		color.dispose();
+	}
 }
 
 public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
index b17c416c5a..450cd2b6e3 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_FontData.java
@@ -202,7 +202,9 @@ public void test_setStyleI() {
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	FontData data = new FontData();
+	assertNotNull(data.toString());
+	assertTrue(data.toString().length() > 0);
 }
 
 public void 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_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_graphics_GC.java
index cfb6455768..33c375827a 100644
--- 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
@@ -164,6 +164,10 @@ public void test_drawOvalIIII() {
 	gc.drawOval(10, 0, 20, 30);				
 }
 
+public void test_drawPointII() {
+	gc.drawPoint(10, 10);
+}
+
 public void test_drawPolygon$I() {
 	gc.drawPolygon(new int[] {0,0, 5,10, 0,20});				
 	gc.drawPolygon(new int[] {0,0});				
@@ -470,6 +474,7 @@ public void test_textExtentLjava_lang_StringI() {
 
 public void test_toString() {
 	String s = gc.toString();
+	assertNotNull(s);
 	assertTrue(s.length() > 0);
 }
 
@@ -503,6 +508,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_drawImageLorg_eclipse_swt_graphics_ImageIIIIIIII");
 	methodNames.addElement("test_drawLineIIII");
 	methodNames.addElement("test_drawOvalIIII");
+	methodNames.addElement("test_drawPointII");
 	methodNames.addElement("test_drawPolygon$I");
 	methodNames.addElement("test_drawPolyline$I");
 	methodNames.addElement("test_drawRectangleIIII");
@@ -565,6 +571,7 @@ protected void runTest() throws Throwable {
 	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_drawPointII")) test_drawPointII();
 	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();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
index 1cbe26beea..cae4d699e7 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_FormAttachment.java
@@ -12,6 +12,9 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.layout.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.layout.FormAttachment
@@ -29,33 +32,47 @@ public static void main(String[] args) {
 }
 
 protected void setUp() {
+	shell = new Shell();
 }
 
 protected void tearDown() {
+	shell.dispose();
+}
+
+public void test_ConstructorI() {
+	FormAttachment attachment = new FormAttachment(50);
+	assertNotNull(attachment);
 }
 
 public void test_ConstructorII() {
-	warnUnimpl("Test test_ConstructorII not written");
+	FormAttachment attachment = new FormAttachment(50, 10);
+	assertNotNull(attachment);
 }
 
 public void test_ConstructorIII() {
-	warnUnimpl("Test test_ConstructorIII not written");
+	FormAttachment attachment = new FormAttachment(50, 100, 10);
+	assertNotNull(attachment);
 }
 
 public void test_ConstructorLorg_eclipse_swt_widgets_Control() {
-	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_Control not written");
+	FormAttachment attachment = new FormAttachment(shell);
+	assertNotNull(attachment);
 }
 
 public void test_ConstructorLorg_eclipse_swt_widgets_ControlI() {
-	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ControlI not written");
+	FormAttachment attachment = new FormAttachment(shell, 10);
+	assertNotNull(attachment);
 }
 
 public void test_ConstructorLorg_eclipse_swt_widgets_ControlII() {
-	warnUnimpl("Test test_ConstructorLorg_eclipse_swt_widgets_ControlII not written");
+	FormAttachment attachment = new FormAttachment(shell, 10, SWT.LEFT);
+	assertNotNull(attachment);
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	FormAttachment attachment = new FormAttachment(50);
+	assertNotNull(attachment.toString());
+	assertTrue(attachment.toString().length() > 0);
 }
 
 
@@ -71,6 +88,7 @@ public static Test suite() {
 
 public static java.util.Vector methodNames() {
 	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_ConstructorI");
 	methodNames.addElement("test_ConstructorII");
 	methodNames.addElement("test_ConstructorIII");
 	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_Control");
@@ -81,11 +99,15 @@ public static java.util.Vector methodNames() {
 }
 
 protected void runTest() throws Throwable {
-	if (getName().equals("test_ConstructorII")) test_ConstructorII();
+	if (getName().equals("test_ConstructorI")) test_ConstructorI();
+	else if (getName().equals("test_ConstructorII")) test_ConstructorII();
 	else if (getName().equals("test_ConstructorIII")) test_ConstructorIII();
 	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_Control")) test_ConstructorLorg_eclipse_swt_widgets_Control();
 	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlI")) test_ConstructorLorg_eclipse_swt_widgets_ControlI();
 	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ControlII")) test_ConstructorLorg_eclipse_swt_widgets_ControlII();
 	else if (getName().equals("test_toString")) test_toString();
 }
+
+/* custom */
+public Shell shell;
 }
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
index 6d3a941f53..0d7e4430be 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_layout_GridData.java
@@ -13,6 +13,8 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.layout.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.layout.GridData
@@ -36,11 +38,33 @@ protected void tearDown() {
 }
 
 public void test_Constructor() {
-	warnUnimpl("Test test_Constructor not written");
+	GridData data = new GridData();
+	assertNotNull(data);
+	assertTrue(data.verticalAlignment == GridData.CENTER);
+	assertTrue(data.horizontalAlignment == GridData.BEGINNING);
+	assertTrue(data.widthHint == SWT.DEFAULT);
+	assertTrue(data.heightHint == SWT.DEFAULT);
+	assertTrue(data.horizontalIndent == 0);
+	assertTrue(data.horizontalSpan == 1);
+	assertTrue(data.verticalSpan == 1);
+	assertTrue(data.grabExcessHorizontalSpace == false);
+	assertTrue(data.grabExcessVerticalSpace == false);
 }
 
 public void test_ConstructorI() {
-	warnUnimpl("Test test_ConstructorI not written");
+	GridData data = new GridData(GridData.FILL_BOTH);
+	assertNotNull(data);
+	assertTrue(data.verticalAlignment == GridData.FILL);
+	assertTrue(data.horizontalAlignment == GridData.FILL);
+	assertTrue(data.grabExcessHorizontalSpace == true);
+	assertTrue(data.grabExcessVerticalSpace == true);
+}
+
+public void test_ConstructorII() {
+	GridData data = new GridData(100, 100);
+	assertNotNull(data);
+	assertTrue(data.widthHint == 100);
+	assertTrue(data.heightHint == 100);
 }
 
 public static Test suite() {
@@ -56,10 +80,12 @@ 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_ConstructorII");
 	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_ConstructorII")) test_ConstructorII();
 }
 }
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
index 5f215c86b5..e33d134ca3 100644
--- 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
@@ -86,6 +86,10 @@ public void test_getImage() {
 	}
 }
 
+public void test_getImages() {
+	warnUnimpl("Test test_getImages not written");
+}
+
 public void test_getLocation() {
 	decorations.setLocation(10,15);
 	assertTrue(":a:", decorations.getLocation().x == 10);
@@ -143,6 +147,10 @@ public void test_setImageLorg_eclipse_swt_graphics_Image() {
 	freeImages();
 }
 
+public void test_setImages$Lorg_eclipse_swt_graphics_Image() {
+	warnUnimpl("Test test_setImages$Lorg_eclipse_swt_graphics_Image not written");
+}
+
 public void test_setMaximizedZ() {
 	decorations.setMaximized(false);
 	assertTrue(":1:", decorations.getMaximized() == false);
@@ -211,6 +219,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getClientArea");
 	methodNames.addElement("test_getDefaultButton");
 	methodNames.addElement("test_getImage");
+	methodNames.addElement("test_getImages");
 	methodNames.addElement("test_getLocation");
 	methodNames.addElement("test_getMaximized");
 	methodNames.addElement("test_getMenuBar");
@@ -220,6 +229,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_isReparentable");
 	methodNames.addElement("test_setDefaultButtonLorg_eclipse_swt_widgets_Button");
 	methodNames.addElement("test_setImageLorg_eclipse_swt_graphics_Image");
+	methodNames.addElement("test_setImages$Lorg_eclipse_swt_graphics_Image");
 	methodNames.addElement("test_setMaximizedZ");
 	methodNames.addElement("test_setMenuBarLorg_eclipse_swt_widgets_Menu");
 	methodNames.addElement("test_setMinimizedZ");
@@ -236,6 +246,7 @@ protected void runTest() throws Throwable {
 	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_getImages")) test_getImages();
 	else if (getName().equals("test_getLocation")) test_getLocation();
 	else if (getName().equals("test_getMaximized")) test_getMaximized();
 	else if (getName().equals("test_getMenuBar")) test_getMenuBar();
@@ -245,6 +256,7 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_isReparentable")) test_isReparentable();
 	else if (getName().equals("test_setDefaultButtonLorg_eclipse_swt_widgets_Button")) test_setDefaultButtonLorg_eclipse_swt_widgets_Button();
 	else if (getName().equals("test_setImageLorg_eclipse_swt_graphics_Image")) test_setImageLorg_eclipse_swt_graphics_Image();
+	else if (getName().equals("test_setImages$Lorg_eclipse_swt_graphics_Image")) test_setImages$Lorg_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();
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
index 90a55dfca0..214e59dedd 100644
--- 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
@@ -172,6 +172,10 @@ public void test_getCursorLocation() {
 	}
 }
 
+public void test_getCursorSize() {
+	warnUnimpl("Test test_getCursorSize not written");
+}
+
 public void test_getData() {
 	// tested in setData(Object) method
 }
@@ -332,7 +336,7 @@ public void test_removeListenerILorg_eclipse_swt_widgets_Listener() {
 }
 
 public void test_release() {
-	warnUnimpl("Test test_release not written");
+	// Overriding test_release from Device.
 }
 
 public void test_setAppNameLjava_lang_String() {
@@ -451,6 +455,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_getCurrent");
 	methodNames.addElement("test_getCursorControl");
 	methodNames.addElement("test_getCursorLocation");
+	methodNames.addElement("test_getCursorSize");
 	methodNames.addElement("test_getData");
 	methodNames.addElement("test_getDataLjava_lang_String");
 	methodNames.addElement("test_getDefault");
@@ -485,6 +490,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_timerExecILjava_lang_Runnable");
 	methodNames.addElement("test_update");
 	methodNames.addElement("test_wake");
+	methodNames.addAll(Test_org_eclipse_swt_graphics_Device.methodNames()); // add superclass method names
 	return methodNames;
 }
 protected void runTest() throws Throwable {
@@ -504,6 +510,7 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_getCurrent")) test_getCurrent();
 	else if (getName().equals("test_getCursorControl")) test_getCursorControl();
 	else if (getName().equals("test_getCursorLocation")) test_getCursorLocation();
+	else if (getName().equals("test_getCursorSize")) test_getCursorSize();
 	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_getDefault")) test_getDefault();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
index e7677e78ce..2f9c7a212e 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Event.java
@@ -13,6 +13,7 @@ package org.eclipse.swt.tests.junit;
 
 import junit.framework.*;
 import junit.textui.*;
+import org.eclipse.swt.widgets.*;
 
 /**
  * Automated Test Suite for class org.eclipse.swt.widgets.Event
@@ -36,7 +37,8 @@ protected void tearDown() {
 }
 
 public void test_Constructor() {
-	warnUnimpl("Test test_Constructor not written");
+	Event event = new Event();
+	assertNotNull(event);
 }
 
 public void test_getBounds() {
@@ -48,7 +50,9 @@ public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
 }
 
 public void test_toString() {
-	warnUnimpl("Test test_toString not written");
+	Event event = new Event();
+	assertNotNull(event.toString());
+	assertTrue(event.toString().length() > 0);
 }
 
 public static Test suite() {
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
index a2afdf36c2..7a8fa5d24d 100644
--- 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
@@ -53,10 +53,6 @@ public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
 		group = new Group(shell, cases[i]);
 }
 
-public void test_computeSizeIIZ() {
-	warnUnimpl("Test test_computeSizeIIZ not written");
-}
-
 public void test_computeTrimIIII() {
 	warnUnimpl("Test test_computeTrimIIII not written");
 }
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
index 7d69076c90..dacc74d5ce 100644
--- 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
@@ -240,6 +240,10 @@ public void test_setImeInputModeI() {
 	assertTrue(":a:", shell.getImeInputMode() == SWT.NONE);
 }
 
+public void test_setRegionLorg_eclipse_swt_graphics_Region() {
+	warnUnimpl("Test test_setRegionLorg_eclipse_swt_graphics_Region not written");
+}
+
 public void test_setVisibleZ() {
 	shell.setVisible(false);
 	assertTrue(":a:", !shell.isVisible());
@@ -285,7 +289,7 @@ public static java.util.Vector methodNames() {
 	methodNames.addElement("test_setActive");
 	methodNames.addElement("test_setEnabledZ");
 	methodNames.addElement("test_setImeInputModeI");
-	methodNames.addElement("test_setRegion");
+	methodNames.addElement("test_setRegionLorg_eclipse_swt_graphics_Region");
 	methodNames.addElement("test_setVisibleZ");
 	methodNames.addElement("test_win32_newLorg_eclipse_swt_widgets_DisplayI");
 	methodNames.addAll(Test_org_eclipse_swt_widgets_Decorations.methodNames()); // add superclass method names
@@ -315,7 +319,7 @@ protected void runTest() throws Throwable {
 	else if (getName().equals("test_setActive")) test_setActive();
 	else if (getName().equals("test_setEnabledZ")) test_setEnabledZ();
 	else if (getName().equals("test_setImeInputModeI")) test_setImeInputModeI();
-	else if (getName().equals("test_setRegion")) test_setRegion();
+	else if (getName().equals("test_setRegionLorg_eclipse_swt_graphics_Region")) test_setRegionLorg_eclipse_swt_graphics_Region();
 	else if (getName().equals("test_setVisibleZ")) test_setVisibleZ();
 	else if (getName().equals("test_win32_newLorg_eclipse_swt_widgets_DisplayI")) test_win32_newLorg_eclipse_swt_widgets_DisplayI();
 	else super.runTest();
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
index c35c1f59c4..924d80051a 100644
--- 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
@@ -325,10 +325,6 @@ public void test_setSelectionI() {
 	}
 }
 
-public void test_setSelectionIZ() {
-	warnUnimpl("Test test_setSelectionIZ not written");
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
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
index 56ab5f7a34..96017d55e4 100644
--- 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
@@ -737,6 +737,7 @@ public void test_insertLjava_lang_String() {
 }
 
 public void test_isVisible() {
+	// overriding test_isVisible() from Control
 	control.setVisible(true);
 	assertTrue(control.isVisible());  
 
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
index 04a0da2ffa..8e74a6035c 100644
--- 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
@@ -155,10 +155,6 @@ public void test_indexOfLorg_eclipse_swt_widgets_ToolItem() {
 	}
 }
 
-public void test_setFocus() {
-	warnUnimpl("Test test_setFocus not written");
-}
-
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 	java.util.Vector methodNames = methodNames();
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
index f7c2d0b4d0..8f4cba8087 100644
--- 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
@@ -158,7 +158,7 @@ public void test_setDataLjava_lang_StringLjava_lang_Object() {
 
 public void test_toString() {
 	assertNotNull(widget.toString());
-	assertEquals(false, widget.toString().equals(""));
+	assertTrue(widget.toString().length() > 0);
 }
 
 public static Test suite() {