*** empty log message ***
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
index 91d3cf8..d4c424d 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Font.java
@@ -305,10 +305,6 @@
disposeMeter(meter);
}
-public void test_win32_newLorg_eclipse_swt_graphics_DeviceI() {
- // do not test - Windows only
-}
-
public static Test suite() {
TestSuite suite = new TestSuite();
java.util.Vector methodNames = methodNames();
@@ -328,7 +324,6 @@
methodNames.addElement("test_getFontData");
methodNames.addElement("test_hashCode");
methodNames.addElement("test_isDisposed");
- methodNames.addElement("test_win32_newLorg_eclipse_swt_graphics_DeviceI");
return methodNames;
}
protected void runTest() throws Throwable {
@@ -340,6 +335,5 @@
else if (getName().equals("test_getFontData")) test_getFontData();
else if (getName().equals("test_hashCode")) test_hashCode();
else if (getName().equals("test_isDisposed")) test_isDisposed();
- else if (getName().equals("test_win32_newLorg_eclipse_swt_graphics_DeviceI")) test_win32_newLorg_eclipse_swt_graphics_DeviceI();
}
}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
index 0d7442a..554c1e7 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontData.java
@@ -239,11 +239,6 @@
disposeMeter(meter);
}
-
-public void test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI() {
- // do not test - Windows only
-}
-
public static Test suite() {
TestSuite suite = new TestSuite();
java.util.Vector methodNames = methodNames();
@@ -268,7 +263,6 @@
methodNames.addElement("test_setLocaleLjava_lang_String");
methodNames.addElement("test_setNameLjava_lang_String");
methodNames.addElement("test_setStyleI");
- methodNames.addElement("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI");
return methodNames;
}
protected void runTest() throws Throwable {
@@ -285,6 +279,5 @@
else if (getName().equals("test_setLocaleLjava_lang_String")) test_setLocaleLjava_lang_String();
else if (getName().equals("test_setNameLjava_lang_String")) test_setNameLjava_lang_String();
else if (getName().equals("test_setStyleI")) test_setStyleI();
- else if (getName().equals("test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI")) test_win32_newLorg_eclipse_swt_internal_win32_LOGFONTI();
}
}
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
index 17db84d..e5ff569 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_FontMetrics.java
@@ -169,10 +169,6 @@
disposeMeter(meter);
}
-public void test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC() {
- // do not test - Windows only
-}
-
public static Test suite() {
TestSuite suite = new TestSuite();
java.util.Vector methodNames = methodNames();
@@ -191,7 +187,6 @@
methodNames.addElement("test_getHeight");
methodNames.addElement("test_getLeading");
methodNames.addElement("test_hashCode");
- methodNames.addElement("test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC");
return methodNames;
}
protected void runTest() throws Throwable {
@@ -202,7 +197,6 @@
else if (getName().equals("test_getHeight")) test_getHeight();
else if (getName().equals("test_getLeading")) test_getLeading();
else if (getName().equals("test_hashCode")) test_hashCode();
- else if (getName().equals("test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC")) test_win32_newLorg_eclipse_swt_internal_win32_TEXTMETRIC();
}
/* custom */
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
index 684e10b..eaf0a49 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_GC.java
@@ -235,7 +235,7 @@
}
public void test_dispose() {
- final int COUNT = 2000; // 4000 causes No More Handles
+ final int COUNT = 3000; // 4000 causes No More Handles
Image[] images = new Image [COUNT];
GC[] gcs = new GC [COUNT];
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
index e6553d3..6dd2a76 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_Image.java
@@ -42,7 +42,7 @@
}
public void test_ConstructorLorg_eclipse_swt_graphics_DeviceII() {
- final int COUNT = 60000;
+ final int COUNT = 30000;
PerformanceMeter meter = createMeter("Image constr.(Device,II)");
meter.start();
@@ -121,7 +121,7 @@
}
public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_Rectangle() {
- final int COUNT = 60000;
+ final int COUNT = 30000;
Rectangle rectangle = new Rectangle(0, 0, 100, 100);
@@ -174,7 +174,6 @@
}
public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLorg_eclipse_swt_graphics_ImageDataLorg_eclipse_swt_graphics_ImageData() {
- if (true) return;
final int COUNT = 4000; // 5000 causes an error
Image[] images = new Image[COUNT];
@@ -212,7 +211,7 @@
}
public void test_ConstructorLorg_eclipse_swt_graphics_DeviceLjava_lang_String() {
- final int COUNT = 2000;
+ final int COUNT = 1000;
int numFileNames = imageFilenames.length;
int numFormats = imageFormats.length;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
index 98a4bad..e3b50bc 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_graphics_ImageLoader.java
@@ -35,7 +35,16 @@
}
public void test_Constructor() {
- ImageLoader loader = new ImageLoader();
+ final int COUNT = 5000000;
+
+ PerformanceMeter meter = createMeter("ImageLoader constr.");
+ meter.start();
+ for (int i = 0; i < COUNT; i++) {
+ new ImageLoader();
+ }
+ meter.stop();
+
+ disposeMeter(meter);
}
public void test_addImageLoaderListenerLorg_eclipse_swt_graphics_ImageLoaderListener() {
@@ -58,7 +67,7 @@
}
public void test_hasListeners() {
- final int COUNT = 400000000;
+ final int COUNT = 300000000;
ImageLoader loader = new ImageLoader();
@@ -91,7 +100,7 @@
}
public void test_loadLjava_lang_String() {
- final int COUNT = 2500;
+ final int COUNT = 4500;
// j2se and j2me(cdc) can load from a filename but, j2me(cldc) throws an exception
if (isJ2ME()) return;
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java
index 2c59685..880c099 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Button.java
@@ -45,33 +45,43 @@
}
public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
+ // TODO
}
public void test_getAlignment() {
+ // TODO
}
public void test_getImage() {
+ // TODO
}
public void test_getSelection() {
+ // TODO
}
public void test_getText() {
+ // TODO
}
public void test_setAlignmentI() {
+ // TODO
}
public void test_setFocus() {
+ // TODO
}
public void test_setImageLorg_eclipse_swt_graphics_Image() {
+ // TODO
}
public void test_setSelectionZ() {
+ // TODO
}
public void test_setTextLjava_lang_String() {
+ // TODO
}
public static Test suite() {
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java
index 3cbe466..1f2ec9d 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Control.java
@@ -42,10 +42,6 @@
super.tearDown();
}
-public void test_ConstructorLorg_eclipse_swt_widgets_CompositeI() {
- // abstract class
-}
-
public void test_addControlListenerLorg_eclipse_swt_events_ControlListener() {
final int COUNT = 7500;
@@ -682,39 +678,39 @@
}
public void test_removeControlListenerLorg_eclipse_swt_events_ControlListener() {
- // tested in test_addControlListenerLorg_eclipse_swt_events_ControlListener
+ // TODO
}
public void test_removeFocusListenerLorg_eclipse_swt_events_FocusListener() {
- // tested in test_addFocusListenerLorg_eclipse_swt_events_FocusListener
+ // TODO
}
public void test_removeHelpListenerLorg_eclipse_swt_events_HelpListener() {
- // tested in test_addHelpListenerLorg_eclipse_swt_events_HelpListener
+ // TODO
}
public void test_removeKeyListenerLorg_eclipse_swt_events_KeyListener() {
- // tested in test_addKeyListenerLorg_eclipse_swt_events_KeyListener
+ // TODO
}
public void test_removeMouseListenerLorg_eclipse_swt_events_MouseListener() {
- // tested in test_addMouseListenerLorg_eclipse_swt_events_MouseListener
+ // TODO
}
public void test_removeMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener() {
- // tested in test_addMouseMoveListenerLorg_eclipse_swt_events_MouseMoveListener
+ // TODO
}
public void test_removeMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener() {
- // tested in test_addMouseTrackListenerLorg_eclipse_swt_events_MouseTrackListener
+ // TODO
}
public void test_removePaintListenerLorg_eclipse_swt_events_PaintListener() {
- // tested in test_addPaintListenerLorg_eclipse_swt_events_PaintListener
+ // TODO
}
public void test_removeTraverseListenerLorg_eclipse_swt_events_TraverseListener() {
- // tested in test_addTraverseListenerLorg_eclipse_swt_events_TraverseListener
+ // TODO
}
public void test_setBackgroundLorg_eclipse_swt_graphics_Color() {
@@ -740,7 +736,7 @@
}
public void test_setBoundsIIII() {
- final int COUNT = 12000;
+ final int COUNT = 25000;
int[] xs = new int[COUNT];
int[] ys = new int[COUNT];
@@ -763,7 +759,7 @@
}
public void test_setBoundsLorg_eclipse_swt_graphics_Rectangle() {
- final int COUNT = 12000;
+ final int COUNT = 25000;
Rectangle[] rectangles = new Rectangle[COUNT];
Rectangle rectangle1 = new Rectangle(0,5,10,15);
@@ -783,7 +779,7 @@
}
public void test_setCaptureZ() {
- final int COUNT = 33000;
+ final int COUNT = 100000;
boolean[] capture = new boolean [COUNT];
for (int i = 0; i < COUNT; i += 2) {
@@ -825,22 +821,23 @@
public void test_setEnabledZ() {
final int COUNT = 200000;
- boolean[] capture = new boolean [COUNT];
+ boolean[] enabled = new boolean [COUNT];
for (int i = 0; i < COUNT; i += 2) {
- capture[i] = true;
- capture[i+1] = false;
+ enabled[i] = true;
+ enabled[i+1] = false;
}
PerformanceMeter meter = createMeter(getTypeString() + "setEnabled");
meter.start();
for (int i = 0; i < COUNT; i++) {
- control.setEnabled(capture[i]);
+ control.setEnabled(enabled[i]);
}
meter.stop();
disposeMeter(meter);
}
public void test_setFocus() {
+ // TODO
final int COUNT = 10000;
PerformanceMeter meter = createMeter(getTypeString() + "setFocus");
@@ -901,7 +898,7 @@
}
public void test_setLocationII() {
- final int COUNT = 13000;
+ final int COUNT = 25000;
int[] xs = new int[COUNT];
int[] ys = new int[COUNT];
@@ -920,7 +917,7 @@
}
public void test_setLocationLorg_eclipse_swt_graphics_Point() {
- final int COUNT = 13000;
+ final int COUNT = 25000;
Point[] points = new Point[COUNT];
Point point1 = new Point(0,5);
@@ -982,7 +979,7 @@
}
public void test_setSizeII() {
- final int COUNT = 13000;
+ final int COUNT = 25000;
int[] widths = new int[COUNT];
int[] heights = new int[COUNT];
@@ -1001,7 +998,7 @@
}
public void test_setSizeLorg_eclipse_swt_graphics_Point() {
- final int COUNT = 13000;
+ final int COUNT = 25000;
Point[] points = new Point[COUNT];
Point point1 = new Point(20,15);
@@ -1226,7 +1223,6 @@
public static java.util.Vector methodNames() {
java.util.Vector methodNames = new java.util.Vector();
- methodNames.addElement("test_ConstructorLorg_eclipse_swt_widgets_CompositeI");
methodNames.addElement("test_addControlListenerLorg_eclipse_swt_events_ControlListener");
methodNames.addElement("test_addFocusListenerLorg_eclipse_swt_events_FocusListener");
methodNames.addElement("test_addHelpListenerLorg_eclipse_swt_events_HelpListener");
@@ -1300,8 +1296,7 @@
return methodNames;
}
protected void runTest() throws Throwable {
- if (getName().equals("test_ConstructorLorg_eclipse_swt_widgets_CompositeI")) test_ConstructorLorg_eclipse_swt_widgets_CompositeI();
- else if (getName().equals("test_addControlListenerLorg_eclipse_swt_events_ControlListener")) test_addControlListenerLorg_eclipse_swt_events_ControlListener();
+ 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();
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java
index 6f9471b..8812c0f 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/performance/Test_org_eclipse_swt_widgets_Widget.java
@@ -46,18 +46,23 @@
}
public void test_dispose() {
+ // TODO
}
public void test_getDisplay() {
+ // TODO
}
public void test_getStyle() {
+ // TODO
}
public void test_isDisposed() {
+ // TODO
}
public void test_notifyListenersILorg_eclipse_swt_widgets_Event() {
+ // TODO
}
public static Test suite() {
