Bug 427653 - Remove custom runTest method override.
Control, Widget and DateTime done. These are the last ones. For DateTime
JUnit 4.x Parametrized test was used to actually run the tests with
SWT.DATE, SWT.TIME and SWT.CALENDAR.
Change-Id: Id0517f15ecaf9c3addddab643b0981f358384b59
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
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 9d07dcc..4ee6112 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
@@ -107,7 +107,7 @@
addTestSuite(Test_org_eclipse_swt_widgets_ProgressBar.class);
addTestSuite(Test_org_eclipse_swt_widgets_Composite.class);
addTestSuite(Test_org_eclipse_swt_widgets_Link.class);
- addTest(Test_org_eclipse_swt_widgets_DateTime.suite());
+ addTest(new JUnit4TestAdapter(Test_org_eclipse_swt_widgets_DateTime.class));
//addTestSuite(Test_org_eclipse_swt_widgets_CoolBar.class);
addTestSuite(Test_org_eclipse_swt_widgets_ColorDialog.class);
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 b2bec65..f55773e 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
@@ -58,7 +58,7 @@
suite.addTestSuite(Test_org_eclipse_swt_widgets_ProgressBar.class);
suite.addTestSuite(Test_org_eclipse_swt_widgets_Composite.class);
suite.addTestSuite(Test_org_eclipse_swt_widgets_Link.class);
- suite.addTest(Test_org_eclipse_swt_widgets_DateTime.suite());
+ suite.addTestSuite(Test_org_eclipse_swt_widgets_DateTime.class);
//suite.addTest(Test_org_eclipse_swt_widgets_CoolBar.suite());
suite.addTestSuite(Test_org_eclipse_swt_widgets_ColorDialog.class);
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
index 561fa5b..a685574 100644
--- 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
@@ -14,10 +14,6 @@
import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.Accessible;
import org.eclipse.swt.events.ControlEvent;
@@ -51,6 +47,7 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Widget;
import org.junit.Assert;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.widgets.Control
@@ -63,14 +60,12 @@
super(name);
}
-public static void main(String[] args) {
- TestRunner.run(suite());
-}
-
+@Test
public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
// abstract class
}
+@Test
public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
ControlListener listener = new ControlListener() {
public void controlMoved(ControlEvent e) {
@@ -90,6 +85,7 @@
control.removeControlListener(listener);
}
+@Test
public void test_addFocusListenerLorg_eclipse_swt_events_FocusListener() {
FocusListener listener = new FocusListener() {
public void focusGained(FocusEvent e) {
@@ -109,6 +105,7 @@
control.removeFocusListener(listener);
}
+@Test
public void test_addHelpListenerLorg_eclipse_swt_events_HelpListener() {
HelpListener listener = new HelpListener() {
public void helpRequested(HelpEvent e) {
@@ -122,6 +119,7 @@
control.removeHelpListener(listener);
}
+@Test
public void test_addKeyListenerLorg_eclipse_swt_events_KeyListener() {
KeyListener listener = new KeyListener() {
public void keyPressed(KeyEvent e) {
@@ -141,6 +139,7 @@
control.removeKeyListener(listener);
}
+@Test
public void test_addMouseListenerLorg_eclipse_swt_events_MouseListener() {
MouseListener listener = new MouseListener() {
public void mouseDown(MouseEvent e) {
@@ -166,6 +165,7 @@
control.removeMouseListener(listener);
}
+@Test
public void test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
MouseMoveListener listener = new MouseMoveListener() {
public void mouseMove(MouseEvent e) {
@@ -179,6 +179,7 @@
control.removeMouseMoveListener(listener);
}
+@Test
public void test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
MouseTrackListener listener = new MouseTrackListener() {
public void mouseEnter(MouseEvent e) {
@@ -203,7 +204,7 @@
assertTrue(eventOccurred);
control.removeMouseTrackListener(listener);
}
-
+@Test
public void test_addPaintListenerLorg_eclipse_swt_events_PaintListener() {
PaintListener listener = new PaintListener() {
public void paintControl(PaintEvent e) {
@@ -219,7 +220,7 @@
assertTrue(eventOccurred);
control.removePaintListener(listener);
}
-
+@Test
public void test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
TraverseListener listener = new TraverseListener() {
public void keyTraversed(TraverseEvent e) {
@@ -233,6 +234,7 @@
control.removeTraverseListener(listener);
}
+@Test
public void test_computeSizeII() {
control.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Point size = control.getSize();
@@ -240,7 +242,7 @@
assertEquals(size.x, control.getSize().x);
assertEquals(size.y, control.getSize().y);
}
-
+@Test
public void test_computeSizeIIZ() {
control.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
Point size = control.getSize();
@@ -248,22 +250,22 @@
assertEquals(size.x, control.getSize().x);
assertEquals(size.y, control.getSize().y);
}
-
+@Test
public void test_getAccessible() {
Accessible accessible = control.getAccessible();
assertTrue(":a:", accessible != null);
}
-
+@Test
public void test_getBorderWidth() {
control.getBorderWidth();
}
-
+@Test
public void test_getLocation() {
control.setBounds(32, 43, 30, 40);
assertTrue(control.getLocation().equals(new Point(32, 43)));
}
-
+@Test
public void test_getMonitor() {
Monitor monitor = control.getMonitor();
assertNotNull(monitor);
@@ -278,15 +280,15 @@
fail("Control.getMonitor does not return a monitor listed in Display.getMonitors");
}
}
-
+@Test
public void test_getParent() {
assertEquals(shell, control.getParent());
}
-
+@Test
public void test_getShell() {
assertEquals(shell, control.getShell());
}
-
+@Test
public void test_isEnabled() {
control.setEnabled(true);
assertTrue(control.isEnabled());
@@ -294,15 +296,15 @@
control.setEnabled(false);
assertTrue(!control.isEnabled());
}
-
+@Test
public void test_isFocusControl() {
assertTrue(!control.isFocusControl());
}
-
+@Test
public void test_isReparentable() {
assertEquals ("isReparentable", control.isReparentable(), SwtTestUtil.isReparentablePlatform());
}
-
+@Test
public void test_isVisible() {
control.setVisible(true);
assertTrue(!control.isVisible()); //because the shell is not visible
@@ -318,7 +320,7 @@
assertTrue("Window should not be visible", !control.isVisible());
}
}
-
+@Test
public void test_moveAboveLorg_eclipse_swt_widgets_Control() {
control.moveAbove(null);
@@ -328,7 +330,7 @@
control.moveAbove(b);
b.dispose();
}
-
+@Test
public void test_moveBelowLorg_eclipse_swt_widgets_Control() {
control.moveBelow(null);
@@ -338,20 +340,20 @@
control.moveBelow(b);
b.dispose();
}
-
+@Test
public void test_pack() {
control.pack();
}
-
+@Test
public void test_packZ() {
control.pack(true);
control.pack(false);
}
-
+@Test
public void test_redraw() {
control.redraw();
}
-
+@Test
public void test_redrawIIIIZ() {
control.redraw(0, 0, 0, 0, false);
@@ -365,7 +367,7 @@
control.redraw(10000, 10000, 10000, 10000, false);
}
-
+@Test
public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
Color color = new Color(control.getDisplay(), 255, 0, 0);
control.setBackground(color);
@@ -374,7 +376,7 @@
assertTrue("getBackground unchanged after setBackground(null)", !control.getBackground().equals(color));
color.dispose();
}
-
+@Test
public void test_setBoundsIIII() {
control.setBounds(10, 20, 30, 40);
assertEquals(new Rectangle(10, 20, 30, 40), control.getBounds());
@@ -384,7 +386,7 @@
control.setBounds(10, 20, 30, 40);
}
-
+@Test
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());
@@ -401,13 +403,13 @@
control.setBounds(new Rectangle(10, 20, 30, 40));
}
-
+@Test
public void test_setCaptureZ() {
control.setCapture(true);
control.setCapture(false);
}
-
+@Test
public void test_setCursorLorg_eclipse_swt_graphics_Cursor() {
control.setCursor(null);
@@ -415,7 +417,7 @@
control.setCursor(c);
c.dispose();
}
-
+@Test
public void test_setEnabledZ() {
control.setEnabled(true);
assertTrue(control.getEnabled());
@@ -423,11 +425,11 @@
control.setEnabled(false);
assertTrue(!control.getEnabled());
}
-
+@Test
public void test_setFocus() {
control.setFocus();
}
-
+@Test
public void test_setFontLorg_eclipse_swt_graphics_Font() {
Font font = control.getFont();
control.setFont(font);
@@ -446,7 +448,7 @@
} catch (IllegalArgumentException e) {
}
}
-
+@Test
public void test_setForegroundLorg_eclipse_swt_graphics_Color() {
Color color = new Color(control.getDisplay(), 255, 0, 0);
control.setForeground(color);
@@ -455,7 +457,7 @@
assertTrue(!control.getForeground().equals(color));
color.dispose();
}
-
+@Test
public void test_setLayoutDataLjava_lang_Object() {
control.setLayoutData(this);
assertEquals(this, control.getLayoutData());
@@ -469,7 +471,7 @@
control.setLayoutData(null);
assertNull(control.getLayoutData());
}
-
+@Test
public void test_setLocationII() {
control.setBounds(32, 43, 30, 40);
control.setLocation(11, 22);
@@ -479,7 +481,7 @@
control.setLocation(10, 10);
assertEquals(control.getLocation(), new Point(10, 10));
}
-
+@Test
public void test_setLocationLorg_eclipse_swt_graphics_Point() {
try {
control.setLocation(null);
@@ -504,7 +506,7 @@
control.setLocation(loc);
assertEquals(control.getLocation(), loc);
}
-
+@Test
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);
@@ -513,7 +515,7 @@
control.setMenu(m);
assertEquals(m, control.getMenu());
}
-
+@Test
public void test_setParentLorg_eclipse_swt_widgets_Composite() {
if (control.isReparentable()) {
Shell originalParent = new Shell();
@@ -525,13 +527,13 @@
newParent.dispose();
}
}
-
+@Test
public void test_setRedrawZ() {
control.setRedraw(false);
control.setRedraw(true);
}
-
+@Test
public void test_setSizeII() {
control.setBounds(32, 43, 30, 40);
assertEquals(new Point(30, 40), control.getSize());
@@ -549,7 +551,7 @@
control.setSize(-10, -10);
}
-
+@Test
public void test_setSizeLorg_eclipse_swt_graphics_Point() {
control.setSize(new Point(30, 40));
assertEquals(new Point(30, 40), control.getSize());
@@ -569,7 +571,7 @@
control.setSize(new Point(-10, -10));
}
-
+@Test
public void test_setToolTipTextLjava_lang_String() {
control.setToolTipText("This is a tip");
assertEquals("This is a tip", control.getToolTipText());
@@ -577,7 +579,7 @@
control.setToolTipText(null);
assertNull(control.getToolTipText());
}
-
+@Test
public void test_setVisibleZ() {
control.setVisible(true);
assertTrue(control.getVisible());
@@ -585,12 +587,12 @@
control.setVisible(false);
assertTrue(!control.getVisible());
}
-
+@Test
public void test_toControlII() {
Point controlCoords = control.toControl(0, 0);
assertEquals(new Point(0, 0), control.toDisplay(controlCoords.x, controlCoords.y));
}
-
+@Test
public void test_toControlLorg_eclipse_swt_graphics_Point() {
Point controlCoords = control.toControl(new Point(0, 0));
assertEquals(new Point(0, 0), control.toDisplay(controlCoords));
@@ -601,12 +603,12 @@
catch (IllegalArgumentException e) {
}
}
-
+@Test
public void test_toDisplayII() {
Point displayCoords = control.toDisplay(0, 0);
assertEquals(new Point(0, 0), control.toControl(displayCoords.x, displayCoords.y));
}
-
+@Test
public void test_toDisplayLorg_eclipse_swt_graphics_Point() {
Point displayCoords = control.toDisplay(new Point(0, 0));
assertEquals(new Point(0, 0), control.toControl(displayCoords));
@@ -617,7 +619,7 @@
catch (IllegalArgumentException e) {
}
}
-
+@Test
public void test_traverseI() {
control.traverse(SWT.TRAVERSE_ESCAPE);
control.traverse(SWT.TRAVERSE_RETURN);
@@ -626,137 +628,11 @@
control.traverse(SWT.TRAVERSE_ARROW_NEXT);
control.traverse(SWT.TRAVERSE_ARROW_PREVIOUS);
}
-
+@Test
public void test_update() {
control.update();
}
-public static Test suite() {
- TestSuite suite = new TestSuite();
- java.util.Vector<String> methodNames = methodNames();
- java.util.Enumeration<String> e = methodNames.elements();
- while (e.hasMoreElements()) {
- suite.addTest(new Test_org_eclipse_swt_widgets_Control(e.nextElement()));
- }
- return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
- java.util.Vector<String> methodNames = new java.util.Vector<String>();
- methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
- 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_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener");
- methodNames.addElement("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener");
- 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_getAccessible");
- methodNames.addElement("test_getBorderWidth");
- methodNames.addElement("test_getLocation");
- methodNames.addElement("test_getMonitor");
- methodNames.addElement("test_getParent");
- methodNames.addElement("test_getShell");
- 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_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_setParentLorg_eclipse_swt_widgets_Composite");
- 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_toControlII");
- methodNames.addElement("test_toControlLorg_eclipse_swt_graphics_Point");
- methodNames.addElement("test_toDisplayII");
- methodNames.addElement("test_toDisplayLorg_eclipse_swt_graphics_Point");
- methodNames.addElement("test_traverseI");
- methodNames.addElement("test_update");
- methodNames.addAll(Test_org_eclipse_swt_widgets_Widget.methodNames()); // add superclass method names
- return methodNames;
-}
-@Override
-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_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_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener")) test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener();
- else if (getName().equals("test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener")) test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener();
- 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_getAccessible")) test_getAccessible();
- else if (getName().equals("test_getBorderWidth")) test_getBorderWidth();
- else if (getName().equals("test_getLocation")) test_getLocation();
- else if (getName().equals("test_getMonitor")) test_getMonitor();
- else if (getName().equals("test_getParent")) test_getParent();
- else if (getName().equals("test_getShell")) test_getShell();
- 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_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_setParentLorg_eclipse_swt_widgets_Composite")) test_setParentLorg_eclipse_swt_widgets_Composite();
- 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_toControlII")) test_toControlII();
- else if (getName().equals("test_toControlLorg_eclipse_swt_graphics_Point")) test_toControlLorg_eclipse_swt_graphics_Point();
- else if (getName().equals("test_toDisplayII")) test_toDisplayII();
- 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 super.runTest();
-}
-
/* custom */
Control control;
boolean eventOccurred;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DateTime.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DateTime.java
index c26efe9..7ba09ab 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DateTime.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_DateTime.java
@@ -10,44 +10,52 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import org.eclipse.swt.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.widgets.*;
+import java.util.Arrays;
+import java.util.Collection;
-import junit.framework.*;
-import junit.textui.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.DateTime;
+import org.eclipse.swt.widgets.Event;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
/**
* Automated Test Suite for class org.eclipse.swt.widgets.DateTime
*
* @see org.eclipse.swt.widgets.DateTime
*/
+@RunWith(value = Parameterized.class)
public class Test_org_eclipse_swt_widgets_DateTime extends Test_org_eclipse_swt_widgets_Control {
static final int JAN = 0, FEB = 1, AUG = 7, NOV = 10;
DateTime datetime;
int style = SWT.DATE;
+
+ @Parameters
+ public static Collection<Object[]> data() {
+ Object[][] data = new Object[][] { { SWT.DATE }, { SWT.TIME}, { SWT.CALENDAR }};
+ return Arrays.asList(data);
+ }
-public Test_org_eclipse_swt_widgets_DateTime(String name) {
- super(name);
-}
-
-public Test_org_eclipse_swt_widgets_DateTime(String name, int style) {
- this(name);
+public Test_org_eclipse_swt_widgets_DateTime(int style) {
+ super("");
this.style = style;
}
-public static void main(String[] args) {
- TestRunner.run(suite());
-}
-
@Override
-protected void setUp() {
+@Before
+public void setUp() {
super.setUp();
datetime = new DateTime(shell, style);
setWidget(datetime);
}
@Override
+@Test
public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
new DateTime(shell, SWT.NULL);
@@ -83,6 +91,7 @@
}
}
+@Test
public void test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
listenerCalled = false;
SelectionListener listener = new SelectionListener() {
@@ -114,6 +123,7 @@
assertFalse(listenerCalled);
}
+@Test
public void test_setDateIII() {
datetime.setDate(2008, AUG, 31);
assertEquals(31, datetime.getDay());
@@ -215,6 +225,7 @@
assertEquals(2008, datetime.getYear());
}
+@Test
public void test_setDayI() {
datetime.setDate(2008, AUG, 1);
for (int day = 1; day <= 31; day++) {
@@ -238,6 +249,7 @@
assertEquals(5, datetime.getDay());
}
+@Test
public void test_setHoursI() {
datetime.setTime(2, 10, 30);
datetime.setHours(21);
@@ -256,6 +268,7 @@
assertEquals(30, datetime.getSeconds());
}
+@Test
public void test_setMinutesI() {
datetime.setTime(2, 10, 30);
datetime.setMinutes(22);
@@ -284,6 +297,7 @@
assertEquals(30, datetime.getSeconds());
}
+@Test
public void test_setMonthI() {
datetime.setDate(2008, NOV, 1);
datetime.setMonth(AUG);
@@ -311,6 +325,7 @@
assertEquals(NOV, datetime.getMonth());
}
+@Test
public void test_setSecondsI() {
datetime.setTime(2, 10, 30);
datetime.setSeconds(52);
@@ -339,6 +354,7 @@
assertEquals(59, datetime.getSeconds());
}
+@Test
public void test_setTimeIII() {
datetime.setTime(2, 10, 30);
assertEquals(2, datetime.getHours());
@@ -391,6 +407,7 @@
assertEquals(59, datetime.getSeconds());
}
+@Test
public void test_setYearI() {
datetime.setDate(2008, NOV, 1);
datetime.setYear(1947);
@@ -415,70 +432,18 @@
datetime.setYear(2007);
assertEquals(2008, datetime.getYear());
}
-
+@Test
public void test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener() {
// tested in test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener()
}
-public static Test suite() {
- TestSuite suite = new TestSuite();
- java.util.Vector<String> methodNames = methodNames();
- java.util.Enumeration<String> e = methodNames.elements();
- while (e.hasMoreElements()) {
- String methodName = e.nextElement();
- suite.addTest(new Test_org_eclipse_swt_widgets_DateTime(methodName, SWT.DATE));
- suite.addTest(new Test_org_eclipse_swt_widgets_DateTime(methodName, SWT.TIME));
- suite.addTest(new Test_org_eclipse_swt_widgets_DateTime(methodName, SWT.CALENDAR));
- }
- return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
- java.util.Vector<String> methodNames = new java.util.Vector<String>();
- methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
- methodNames.addElement("test_addSelectionListenerLorg_eclipse_swt_events_SelectionListener");
- methodNames.addElement("test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener");
- methodNames.addElement("test_setDateIII");
- methodNames.addElement("test_setTimeIII");
- methodNames.addElement("test_setDayI");
- methodNames.addElement("test_setHoursI");
- methodNames.addElement("test_setMinutesI");
- methodNames.addElement("test_setMonthI");
- methodNames.addElement("test_setSecondsI");
- methodNames.addElement("test_setYearI");
- methodNames.addElement("test_consistency_MenuDetect");
- methodNames.addElement("test_consistency_DragDetect");
- methodNames.addElement("test_consistency_MouseSelection");
- methodNames.addElement("test_consistency_EnterSelection");
- methodNames.addAll(Test_org_eclipse_swt_widgets_Control.methodNames()); // add superclass method names
- return methodNames;
-}
-@Override
-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_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener")) test_removeSelectionListenerLorg_eclipse_swt_events_SelectionListener();
- else if (getName().equals("test_setDateIII")) test_setDateIII();
- else if (getName().equals("test_setTimeIII")) test_setTimeIII();
- else if (getName().equals("test_setDayI")) test_setDayI();
- else if (getName().equals("test_setHoursI")) test_setHoursI();
- else if (getName().equals("test_setMinutesI")) test_setMinutesI();
- else if (getName().equals("test_setMonthI")) test_setMonthI();
- else if (getName().equals("test_setSecondsI")) test_setSecondsI();
- else if (getName().equals("test_setYearI")) test_setYearI();
- else if (getName().equals("test_consistency_MenuDetect")) test_consistency_MenuDetect();
- else if (getName().equals("test_consistency_DragDetect")) test_consistency_DragDetect();
- else if (getName().equals("test_consistency_MouseSelection")) test_consistency_MouseSelection();
- else if (getName().equals("test_consistency_EnterSelection")) test_consistency_EnterSelection();
- else super.runTest();
-}
-
protected void setUp(int style) {
super.setUp();
datetime = new DateTime(shell, style);
setWidget(datetime);
}
+@Test
public void test_consistency_MenuDetect () {
consistencyEvent(10, 10, 3, 0, ConsistencyUtility.MOUSE_CLICK);
tearDown();
@@ -493,6 +458,7 @@
}
+@Test
public void test_consistency_MouseSelection () {
consistencyEvent(10, 10, 1, 0, ConsistencyUtility.MOUSE_CLICK);
tearDown();
@@ -505,7 +471,7 @@
setUp(SWT.CALENDAR);
consistencyEvent(5, 5, 1, 0, ConsistencyUtility.MOUSE_CLICK);
}
-
+@Test
public void test_consistency_EnterSelection () {
tearDown();
setUp(SWT.DATE);
@@ -517,7 +483,7 @@
setUp(SWT.CALENDAR);
consistencyEvent(10, 13, 0, 0, ConsistencyUtility.KEY_PRESS);
}
-
+@Test
public void test_consistency_DragDetect () {
consistencyEvent(10, 10, 20, 20, ConsistencyUtility.MOUSE_DRAG);
tearDown();
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 d09664f..4ee87fb 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
@@ -10,13 +10,18 @@
*******************************************************************************/
package org.eclipse.swt.tests.junit;
-import junit.framework.*;
-import junit.textui.*;
+import junit.framework.TestCase;
-import org.eclipse.swt.*;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Widget;
+import org.junit.Test;
/**
* Automated Test Suite for class org.eclipse.swt.widgets.Widget
@@ -31,10 +36,6 @@
super(name);
}
-public static void main(String[] args) {
- TestRunner.run(suite());
-}
-
@Override
protected void setUp() {
shell = new Shell();
@@ -52,11 +53,11 @@
}
assertTrue(shell.isDisposed());
}
-
+@Test
public void test_ConstructorLorg_eclipse_swt_widgets_WidgetI() {
// abstract class
}
-
+@Test
public void test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener() {
DisposeListener listener = new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
@@ -65,7 +66,7 @@
widget.addDisposeListener(listener);
widget.removeDisposeListener(listener);
}
-
+@Test
public void test_addListenerILorg_eclipse_swt_widgets_Listener() {
try {
widget.addListener(SWT.Dispose, null);
@@ -81,15 +82,15 @@
widget.addListener(SWT.Dispose, listener);
widget.removeListener(SWT.Dispose, listener);
}
-
+@Test
public void test_getDisplay() {
assertEquals(widget.getDisplay(), widget.getDisplay());
}
-
+@Test
public void test_isDisposed() {
assertEquals(false, widget.isDisposed());
}
-
+@Test
public void test_notifyListenersILorg_eclipse_swt_widgets_Event() {
widget.notifyListeners(0, null);
Event event = new Event();
@@ -100,7 +101,7 @@
widget.notifyListeners(SWT.Paint, event);
if (gc != null) gc.dispose();
}
-
+@Test
public void test_removeListenerILorg_eclipse_swt_widgets_Listener() {
// this method is further tested by all of the removeTypedListener tests
try {
@@ -122,7 +123,7 @@
widget.addListener(SWT.Paint, listener);
widget.removeListener(SWT.Paint, listener);
}
-
+@Test
public void test_setDataLjava_lang_Object() {
widget.setData(widget);
assertEquals(widget, widget.getData());
@@ -130,7 +131,7 @@
widget.setData(null);
assertNull(widget.getData());
}
-
+@Test
public void test_setDataLjava_lang_StringLjava_lang_Object() {
widget.setData("the widget", widget);
assertEquals(widget, widget.getData("the widget"));
@@ -138,50 +139,12 @@
widget.setData("the widget", null);
assertNull(widget.getData("the widget"));
}
-
+@Test
public void test_toString() {
assertNotNull(widget.toString());
assertTrue(widget.toString().length() > 0);
}
-public static Test suite() {
- TestSuite suite = new TestSuite();
- java.util.Vector<String> methodNames = methodNames();
- java.util.Enumeration<String> e = methodNames.elements();
- while (e.hasMoreElements()) {
- suite.addTest(new Test_org_eclipse_swt_widgets_Widget(e.nextElement()));
- }
- return suite;
-}
-
-public static java.util.Vector<String> methodNames() {
- java.util.Vector<String> methodNames = new java.util.Vector<String>();
- methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_WidgetI");
- methodNames.addElement("test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener");
- methodNames.addElement("test_addListenerILorg_eclipse_swt_widgets_Listener");
- methodNames.addElement("test_getDisplay");
- methodNames.addElement("test_isDisposed");
- methodNames.addElement("test_notifyListenersILorg_eclipse_swt_widgets_Event");
- methodNames.addElement("test_removeListenerILorg_eclipse_swt_widgets_Listener");
- methodNames.addElement("test_setDataLjava_lang_Object");
- methodNames.addElement("test_setDataLjava_lang_StringLjava_lang_Object");
- methodNames.addElement("test_toString");
- return methodNames;
-}
-@Override
-protected void runTest() throws Throwable {
- if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_WidgetI")) test_ConstructorLorg_eclipse_swt_widgets_WidgetI();
- else if (getName().equals("test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener")) test_addDisposeListenerLorg_eclipse_swt_events_DisposeListener();
- else if (getName().equals("test_addListenerILorg_eclipse_swt_widgets_Listener")) test_addListenerILorg_eclipse_swt_widgets_Listener();
- else if (getName().equals("test_getDisplay")) test_getDisplay();
- 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_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();
-}
-
/* custom */
public Shell shell;
private Widget widget;
