Add JUnit tests for ExpandBar and ExpandItem

6 files changed, 486 insertions, 1 deletions

diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
index 5b3b459242..a6528de5d3 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllTests.java
@@ -77,6 +77,7 @@ public AllTests() {
 	addTest(Test_org_eclipse_swt_graphics_PaletteData.suite());
 	addTest(Test_org_eclipse_swt_graphics_ImageLoader.suite());
 
+	addTest(Test_org_eclipse_swt_widgets_ExpandItem.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());
@@ -95,6 +96,7 @@ public AllTests() {
 	//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_ExpandBar.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());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
index 4ad8b17617..42f089b0ce 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/AllWidgetTests.java
@@ -24,6 +24,7 @@ public static void main(String[] args) {
 public static Test suite() {
 	TestSuite suite = new TestSuite();
 
+	suite.addTest(Test_org_eclipse_swt_widgets_ExpandItem.suite());
 	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());
@@ -42,6 +43,7 @@ public static Test 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_ExpandBar.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());
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
index 93dd532151..ab31f2fb36 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/ConsistencyUtility.java
@@ -33,6 +33,7 @@ public class ConsistencyUtility {
         eventOrdering.put("ButtonMouseSelection", 	new String[] {"MouseDown", "MouseUp", "Selection:"});
         eventOrdering.put("ComboMouseSelection",	new String[] {"MouseDown", "MouseUp", "Verify", "Modify", "Selection:"});
         eventOrdering.put("CComboMouseSelection",	new String[] {"Modify", "Selection:"});
+        eventOrdering.put("ExpandBarMouseSelection",new String[] {"MouseDown", "MouseUp", "Selection:"});
         eventOrdering.put("ListMouseSelection", 	new String[] {"MouseDown", "MouseUp", "Selection:"});
         eventOrdering.put("SashMouseSelection", 	new String[] {"Selection:Drag", "MouseDown", "Selection:", "MouseUp"});
         eventOrdering.put("TabFolderMouseSelection",new String[] {"MouseDown", "Selection:", "MouseUp" });
@@ -44,6 +45,7 @@ public class ConsistencyUtility {
         
         eventOrdering.put("ListDoubleClick", 		new String[] {"MouseDown", "MouseUp", "Selection:", "MouseDown", "MouseDoubleClick", "DefaultSelection", "MouseUp"});
         eventOrdering.put("ButtonEnterSelection", 	new String[] {"Traverse:Return", "KeyDown", "KeyUp"});
+        eventOrdering.put("ExpandBarEnterSelection",new String[] {"Traverse:Return", "Selection:", "KeyDown", "KeyUp"});
         eventOrdering.put("CComboEnterSelection", 	new String[] {"Traverse:Return", "DefaultSelection", "KeyDown", "KeyUp"});
         eventOrdering.put("ToolBarEnterSelection", 	new String[] {"Traverse:Return", "Selection:", "KeyDown", "KeyUp"});
         eventOrdering.put("TreeDragDetect", 		new String[] {"MouseDown", "Selection:", "DragDetect", "MouseUp"});
@@ -52,6 +54,7 @@ public class ConsistencyUtility {
         eventOrdering.put("TableTreeMenuDetect",	new String[] {"MenuDetect", "MouseDown", "Selection:", "MouseUp"});
         
         eventOrdering.put("ButtonSpaceSelection", 	new String[] {"Traverse:Mnemonic", "KeyDown", "KeyUp", "Selection:"});
+        eventOrdering.put("ExpandBarSpaceSelection",new String[] {"MouseDown", "MouseUp", "Selection:", "Traverse:Mnemonic", "KeyDown", "KeyUp"});
         eventOrdering.put("ListSpaceSelection", 	new String[] {"Selection:", "KeyDown", "KeyUp"});
         eventOrdering.put("ToolBarSpaceSelection", 	new String[] {"MouseDown", "MouseUp", "Selection:", "Traverse:Mnemonic", "KeyDown", "KeyUp"});
         eventOrdering.put("TreeSpaceSelection", 	new String[] {"Selection:", "KeyDown", "KeyUp"});
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java
new file mode 100644
index 0000000000..749e780978
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandBar.java
@@ -0,0 +1,283 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.junit;
+
+import java.util.Vector;
+
+import junit.framework.*;
+import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.events.ExpandEvent;
+import org.eclipse.swt.events.ExpandListener;
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ExpandBar
+ *
+ * @see org.eclipse.swt.widgets.ExpandBar
+ */
+public class Test_org_eclipse_swt_widgets_ExpandBar extends Test_org_eclipse_swt_widgets_Composite {
+
+public Test_org_eclipse_swt_widgets_ExpandBar(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	expandBar = new ExpandBar(shell, 0);
+	setWidget(expandBar);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_addExpandListenerLorg_eclipse_swt_events_ExpandListener() {
+	final boolean[] listenerCalled = new boolean[] {false};
+	ExpandListener expandListener = new ExpandListener() {		
+		public void itemCollapsed(ExpandEvent e) {
+			listenerCalled[0] = true;			
+		}
+		public void itemExpanded(ExpandEvent e) {
+			listenerCalled[0] = true;			
+		};
+	};
+
+	try {
+		expandBar.addExpandListener(null);
+		fail("No exception thrown for addExpandListener with null argument");
+	} catch (IllegalArgumentException e) {
+	}
+	
+	expandBar.addExpandListener(expandListener);
+	expandBar.notifyListeners(SWT.Expand, new Event());
+	assertTrue(":a:", listenerCalled[0]);
+
+	listenerCalled[0] = false;
+	expandBar.notifyListeners(SWT.Collapse, new Event());
+	assertTrue(":b:", listenerCalled[0]);
+	
+	try {
+		expandBar.removeExpandListener(null);
+		fail("No exception thrown for removeExpandListener with null argument");
+	} catch (IllegalArgumentException e) {
+	}
+	
+	listenerCalled[0] = false;
+	expandBar.removeExpandListener(expandListener);
+	expandBar.notifyListeners(SWT.Expand, new Event());
+	assertFalse(listenerCalled[0]);
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+	try {
+		new ExpandBar(null, 0);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_getItemCount() {
+	int number = 10;
+	ExpandItem item;
+	for (int i = 0; i < number; i++) {
+		assertTrue(":a:" + i, expandBar.getItemCount() == i);
+	  	item = new ExpandItem(expandBar, 0);
+	}
+}
+
+public void test_getItemI() {
+	int number = 5;
+	ExpandItem[] items = new ExpandItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ExpandItem(expandBar, 0);
+	}
+	for (int i = 0; i<number ; i++){
+		assertTrue(":a:", expandBar.getItem(i)==items[i]);
+	}
+
+	expandBar = new ExpandBar(shell, 0);
+	number = 5;
+	items = new ExpandItem[number];
+	for (int i = 0; i<number ; i++){
+	  	items[i] = new ExpandItem(expandBar, 0);
+	}
+	try {
+		expandBar.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_getItems() {
+	int number = 5;
+	ExpandItem[] items = new ExpandItem[number];
+	for (int i = 0; i<number ; i++) {
+	  	items[i] = new ExpandItem(expandBar, 0);
+	}
+	assertEquals(items, expandBar.getItems());
+	
+	expandBar.getItems()[0].dispose();
+	assertEquals(new ExpandItem[] {items[1], items[2], items[3], items[4]}, expandBar.getItems());
+
+	expandBar.getItems()[3].dispose();
+	assertEquals(new ExpandItem[] {items[1], items[2], items[3]}, expandBar.getItems());
+
+	expandBar.getItems()[1].dispose();
+	assertEquals(new ExpandItem[] {items[1], items[3]}, expandBar.getItems());
+}
+
+public void test_getSpacing() {
+//tested in test_setSpacingI
+}
+
+public void test_indexOfLorg_eclipse_swt_widgets_ExpandItem() {
+	int number = 10;
+	ExpandItem[] items = new ExpandItem[number];
+	for (int i = 0; i < number; i++) {
+	  	items[i] = new ExpandItem(expandBar, 0);
+	}
+	for (int i = 0; i < number; i++) {
+		assertTrue(":a:" + i, expandBar.indexOf(items[i] ) == i);
+	}
+	
+	items = new ExpandItem[number];
+	for (int i = 0; i < number; i++) {
+	  	items[i] = new ExpandItem(expandBar, 0);
+	}
+	for (int i = 0; i < number; i++) {
+		try {
+			expandBar.indexOf(null);		
+			fail("No exception thrown for expandItem == null");
+		}
+		catch (IllegalArgumentException e) {
+		}
+	}
+}
+
+public void test_removeExpandListenerLorg_eclipse_swt_events_ExpandListener() {
+//tested in test_addExpandListenerLorg_eclipse_swt_events_ExpandListener 
+}
+
+public void test_setSpacingI() {
+	expandBar.setSpacing(0);
+	assertEquals(expandBar.getSpacing(), 0);
+	
+	expandBar.setSpacing(3);
+	assertEquals(expandBar.getSpacing(), 3);
+	
+	expandBar.setSpacing(-4);
+	assertEquals(expandBar.getSpacing(), 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_ExpandBar((String)e.nextElement()));
+	}
+	return suite;
+}
+
+public static java.util.Vector methodNames() {
+	java.util.Vector methodNames = new java.util.Vector();
+	methodNames.addElement("test_addExpandListenerLorg_eclipse_swt_events_ExpandListener");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
+	methodNames.addElement("test_getItemCount");
+	methodNames.addElement("test_getItemI");
+	methodNames.addElement("test_getItemLorg_eclipse_swt_graphics_Point");
+	methodNames.addElement("test_getItems");
+	methodNames.addElement("test_getSpacing");
+	methodNames.addElement("test_setSpacingI");
+	methodNames.addElement("test_indexOfLorg_eclipse_swt_widgets_ExpandItem");
+	methodNames.addElement("test_removeExpandListenerLorg_eclipse_swt_events_ExpandListener");
+	methodNames.addElement("test_consistency_MouseSelection");
+	methodNames.addElement("test_consistency_SpaceSelection");
+	methodNames.addElement("test_consistency_EnterSelection");
+	methodNames.addElement("test_consistency_MenuDetect");
+	methodNames.addElement("test_consistency_DragDetect");
+	methodNames.addAll(Test_org_eclipse_swt_widgets_Composite.methodNames()); // add superclass method names
+	return methodNames;
+}
+
+protected void runTest() throws Throwable {
+	if (getName().equals("test_addExpandListenerLorg_eclipse_swt_events_ExpandListener")) test_addExpandListenerLorg_eclipse_swt_events_ExpandListener();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
+	else if (getName().equals("test_getItemCount")) test_getItemCount();
+	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_getItems")) test_getItems();
+	else if (getName().equals("test_getSpacing")) test_getSpacing();
+	else if (getName().equals("test_setSpacingI")) test_setSpacingI();
+	else if (getName().equals("test_indexOfLorg_eclipse_swt_widgets_ExpandItem")) test_indexOfLorg_eclipse_swt_widgets_ExpandItem();
+	else if (getName().equals("test_removeExpandListenerLorg_eclipse_swt_events_ExpandListener")) test_removeExpandListenerLorg_eclipse_swt_events_ExpandListener();
+	else if (getName().equals("test_consistency_MouseSelection")) test_consistency_MouseSelection();
+	else if (getName().equals("test_consistency_EnterSelection")) test_consistency_EnterSelection();
+	else if (getName().equals("test_consistency_SpaceSelection")) test_consistency_SpaceSelection();
+	else if (getName().equals("test_consistency_MenuDetect")) test_consistency_MenuDetect();
+	else if (getName().equals("test_consistency_DragDetect")) test_consistency_DragDetect();
+	else super.runTest();
+}
+
+private void createExpandBar(Vector events) {
+	expandBar = new ExpandBar(shell, SWT.V_SCROLL);
+	for (int i = 0; i < 3; i++) {
+		ExpandItem item = new ExpandItem(expandBar, SWT.NONE);
+		item.setText("ExpandBar" + i);
+		hookExpectedEvents(item, getTestName(), events);
+	}
+	setWidget(expandBar);
+}
+
+public void test_consistency_MouseSelection() {
+    Vector events = new Vector();
+    createExpandBar(events);
+    consistencyEvent(30, 10, 1, 0, ConsistencyUtility.MOUSE_CLICK, events);
+}
+
+public void test_consistency_EnterSelection() {
+    Vector events = new Vector();
+    createExpandBar(events);
+    consistencyEvent(13, 10, 0, 0, ConsistencyUtility.KEY_PRESS, events);
+}
+
+public void test_consistency_SpaceSelection () {
+    Vector events = new Vector();
+    createExpandBar(events);
+    consistencyEvent(' ', 32, 0, 0, ConsistencyUtility.KEY_PRESS, events);
+}
+
+public void test_consistency_MenuDetect () {
+    Vector events = new Vector();
+    createExpandBar(events);
+    consistencyEvent(50, 15, 3, 0, ConsistencyUtility.MOUSE_CLICK, events);
+}
+
+public void test_consistency_DragDetect () {
+    Vector events = new Vector();
+    createExpandBar(events);
+    consistencyEvent(30, 20, 50, 20, ConsistencyUtility.MOUSE_DRAG, events);
+}
+
+/* custom */
+protected ExpandBar expandBar;
+}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java
new file mode 100644
index 0000000000..9784a7be32
--- /dev/null
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ExpandItem.java
@@ -0,0 +1,195 @@
+/* Copyright (c) 2000, 2006 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.swt.tests.junit;
+
+import junit.framework.*;
+import junit.textui.*;
+import org.eclipse.swt.*;
+import org.eclipse.swt.widgets.*;
+
+/**
+ * Automated Test Suite for class org.eclipse.swt.widgets.ToolItem
+ *
+ * @see org.eclipse.swt.widgets.ToolItem
+ */
+public class Test_org_eclipse_swt_widgets_ExpandItem extends Test_org_eclipse_swt_widgets_Item {
+
+public Test_org_eclipse_swt_widgets_ExpandItem(String name) {
+	super(name);
+}
+
+public static void main(String[] args) {
+	TestRunner.run(suite());
+}
+
+protected void setUp() {
+	super.setUp();
+	expandBar = new ExpandBar(shell, 0);
+	expandItem = new ExpandItem(expandBar, 0); 
+	setWidget(expandItem);
+}
+
+protected void tearDown() {
+	super.tearDown();
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ExpandItemI() {
+	try {
+		new ExpandItem(null, SWT.NULL);
+		fail("No exception thrown for parent == null");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_ConstructorLorg_eclipse_swt_widgets_ExpandItemII() {
+	ExpandItem item = new ExpandItem(expandBar, SWT.NULL, 0); //create an expand item at index 0
+	assertNotNull(item);
+	assertTrue(expandBar.getItem(0).equals(item));
+	item = new ExpandItem(expandBar, SWT.NULL, 1);
+	assertNotNull(item);
+	assertTrue(expandBar.getItem(1).equals(item));
+}
+
+public void test_getControl() {
+	assertNull(expandItem.getControl());
+
+	Button button = new Button(expandBar, SWT.PUSH);
+	expandItem.setControl(button);
+	Control control = expandItem.getControl();
+	assertEquals(button, control);
+
+	button = new Button(expandBar, SWT.PUSH);
+	expandItem.setControl(button);
+	control = expandItem.getControl();
+	assertEquals(button, control);
+}
+
+public void test_getExpanded() {
+//tested in test_setExpandedZ()
+}
+
+public void test_getHeaderHeight() {
+	warnUnimpl("Test test_getHeaderHeight not written");
+}
+
+public void test_getHeight() {
+//tested in test_setHeightI()	
+}
+
+public void test_getParent() {	
+	assertEquals(expandItem.getParent(), expandBar);
+}
+
+public void test_setControlLorg_eclipse_swt_widgets_Control() {
+	expandItem.setControl(null);	
+	Button button = new Button(expandBar, SWT.PUSH);
+	expandItem.setControl(button);
+	
+	button = new Button(expandBar, SWT.PUSH);
+	button.dispose();
+	try {
+		expandItem.setControl(button);
+		fail("No exception when control.isDisposed()");
+	}
+	catch (IllegalArgumentException e) {
+	}
+	
+	button = new Button(shell, SWT.PUSH);
+	try {
+		expandItem.setControl(button);
+		fail("No exception thrown when control has wrong parent");
+	}
+	catch (IllegalArgumentException e) {
+	}
+}
+
+public void test_setExpandedZ() {
+	expandItem.setExpanded(true);
+	assertTrue(expandItem.getExpanded());
+	expandItem.setExpanded(false);
+	assertEquals(expandItem.getExpanded(), false);
+}
+
+public void test_setHeightI() {
+	expandItem.setHeight(30);
+	assertEquals(expandItem.getHeight(), 30);
+	expandItem.setHeight(-8);
+	assertEquals(expandItem.getHeight(), 30);
+}
+
+public void test_setImageLorg_eclipse_swt_graphics_Image() {
+	assertNull(expandItem.getImage());
+	expandItem.setImage(images[0]);
+	assertEquals(images[0], expandItem.getImage());
+	assertTrue(expandItem.getImage() != images[1]);
+	expandItem.setImage(null);
+	assertNull(expandItem.getImage());
+}
+
+public void test_setTextLjava_lang_String() {
+	expandItem.setText("ABCDEFG");
+	assertTrue(expandItem.getText().equals("ABCDEFG"));
+	try {
+		expandItem.setText(null);
+		fail("No exception thrown for addArmListener with null argument");
+	} catch (IllegalArgumentException e) {
+	}
+	expandItem.setText("ABCDEFG");
+	assertTrue(expandItem.getText().startsWith("ABCDEFG"));
+}
+
+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_ExpandItem((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_ExpandItemI");
+	methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_ExpandItemII");
+	methodNames.addElement("test_getControl");
+	methodNames.addElement("test_getExpanded");
+	methodNames.addElement("test_getHeaderHeight");
+	methodNames.addElement("test_getHeight");
+	methodNames.addElement("test_getParent");
+	methodNames.addElement("test_setControlLorg_eclipse_swt_widgets_Control");
+	methodNames.addElement("test_setExpandedZ");
+	methodNames.addElement("test_setHeightI");
+	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_ExpandBarI")) test_ConstructorLorg_eclipse_swt_widgets_ExpandItemI();
+	else if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_ExpandBarII")) test_ConstructorLorg_eclipse_swt_widgets_ExpandItemII();
+	else if (getName().equals("test_getControl")) test_getControl();
+	else if (getName().equals("test_getExpanded")) test_getExpanded();
+	else if (getName().equals("test_getHeaderHeight")) test_getHeaderHeight();
+	else if (getName().equals("test_getHeight")) test_getHeight();
+	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_setExpandedZ")) test_setExpandedZ();
+	else if (getName().equals("test_setHeightI")) test_setHeightI();
+	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();
+	super.runTest();
+}
+
+/* custom */
+ExpandBar expandBar;
+ExpandItem expandItem;
+}
+
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 0a7820bc57..8004cd72ce 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
@@ -257,7 +257,7 @@ protected String getTestName() {
        (!test.equals("DragDetect") || clss.equals("Tree") || clss.equals("TableTree") || test.startsWith("Chevron")) &&
        (!test.equals("DoubleClick") || clss.equals("List")) &&
        (!test.equals("KeySelection") || clss.equals("Slider") || clss.equals("Combo") || clss.equals("CCombo") || clss.equals("CTabFolder")) &&
-       (!test.equals("EnterSelection") || clss.equals("Button") || clss.equals("ToolBar") || clss.equals("CCombo")))
+       (!test.equals("EnterSelection") || clss.equals("Button") || clss.equals("ToolBar") || clss.equals("CCombo") || clss.equals("ExpandBar")))
         test = clss + test;
     return test;
 }