You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/05/26 11:31:15 UTC
svn commit: r948377 [12/21] - in /harmony/enhanced/java/branches/mrh:
classlib/make/ classlib/modules/accessibility/make/
classlib/modules/annotation/make/ classlib/modules/applet/make/
classlib/modules/archive/make/ classlib/modules/archive/src/test/j...
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SortingFocusTraversalPolicyTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing;
import java.awt.Component;
import java.util.Comparator;
+import tests.support.Support_Excludes;
@SuppressWarnings("unchecked")
public class SortingFocusTraversalPolicyTest extends BasicSwingTestCase {
@@ -64,18 +65,30 @@ public class SortingFocusTraversalPolicy
}
public void testSortingFocusTraversalPolicy() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Comparator cmp = new TestComparator();
policy = new SortingFocusTraversalPolicy(cmp);
assertEquals(cmp, policy.getComparator());
}
public void testSetComparator() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Comparator cmp = new TestComparator();
policy.setComparator(cmp);
assertEquals(cmp, policy.getComparator());
}
public void testAccept() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame.setVisible(true);
SwingWaitTestCase.isRealized(frame);
Component invisible = new JPanel();
@@ -98,6 +111,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeNoInnerCycleRoots() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -111,6 +128,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNotCycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -120,6 +141,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNullCycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -129,6 +154,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentBeforeForNullComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -144,6 +173,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterNoInnerCycleRoots() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JFrame f = new JFrame();
f.setVisible(true);
SwingWaitTestCase.isRealized(f);
@@ -158,6 +191,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNotCycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -167,6 +204,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNullCycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -176,6 +217,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetComponentAfterForNullComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JFrame f = new JFrame();
f.setVisible(true);
final JPanel cycleRoot = createPanelWithButtons();
@@ -191,6 +236,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetLastComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -201,6 +250,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetLastComponentForNotCycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new IllegalArgumentCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -210,6 +263,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetFirstComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -220,6 +277,10 @@ public class SortingFocusTraversalPolicy
}
public void testGetDefaultComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel cycleRoot = createPanelWithButtons();
frame.getContentPane().add(cycleRoot);
cycleRoot.setFocusCycleRoot(true);
@@ -230,6 +291,10 @@ public class SortingFocusTraversalPolicy
}
public void testComponentIsInACycleRoot() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final JPanel cycleRoot = createPanelWithButtons();
JPanel innerCycleRoot = new JPanel();
innerCycleRoot.setName("9 - the latest");
@@ -251,6 +316,10 @@ public class SortingFocusTraversalPolicy
}
public void testInnerCycleRootsProcessingWithImplicitTraversal() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel cycleRoot = createPanelWithButtons();
JPanel innerCycleRoot = new JPanel();
innerCycleRoot.setName("9 - the latest");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpinnerDateModelTest.java Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ package javax.swing;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import tests.support.Support_Excludes;
public class SpinnerDateModelTest extends BasicSwingTestCase {
private SpinnerDateModel model;
@@ -59,6 +60,10 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testSpinnerDateModel() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(model.getDate().getDay(), (now.getDay() + 1) % 7);
assertEquals(Calendar.DAY_OF_MONTH, model.getCalendarField());
assertNull(model.getStart());
@@ -90,6 +95,10 @@ public class SpinnerDateModelTest extend
}
public void testSetGetStart() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setStart(past);
assertTrue(chl.isChanged());
assertSame(past, model.getStart());
@@ -102,6 +111,10 @@ public class SpinnerDateModelTest extend
}
public void testSetGetEnd() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setEnd(future);
assertTrue(chl.isChanged());
assertSame(future, model.getEnd());
@@ -114,6 +127,10 @@ public class SpinnerDateModelTest extend
}
public void testSetGetValue() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setValue(now);
assertTrue(chl.isChanged());
assertNotSame(now, model.getValue());
@@ -140,12 +157,20 @@ public class SpinnerDateModelTest extend
}
public void testGetDate() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setValue(now);
assertNotSame(now, model.getDate());
assertEquals(model.getDate(), model.getValue());
}
public void testSetGetCalendarField() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setCalendarField(Calendar.ERA);
assertTrue(chl.isChanged());
assertEquals(Calendar.ERA, model.getCalendarField());
@@ -163,6 +188,10 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testGetNextValue() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setValue(now.clone());
model.setEnd(future);
now.setDate(now.getDate() + 1);
@@ -177,6 +206,10 @@ public class SpinnerDateModelTest extend
@SuppressWarnings("deprecation")
public void testGetPreviousValue() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
model.setValue(now.clone());
model.setStart(past);
now.setDate(now.getDate() - 1);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SpringLayoutTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import java.awt.Rectangle;
import java.awt.TextField;
import javax.swing.SpringLayout.Constraints;
+import tests.support.Support_Excludes;
public class SpringLayoutTest extends SwingTestCase {
private Component component;
@@ -67,6 +68,10 @@ public class SpringLayoutTest extends Sw
}
public void testSpringLayout() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SpringLayout.Constraints constrains = new SpringLayout.Constraints();
assertNull(constrains.getX());
assertNull(constrains.getY());
@@ -113,18 +118,30 @@ public class SpringLayoutTest extends Sw
}
public void testGetLayoutAlignmentX() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel container = new JPanel(layout);
assertEquals(0.5f, layout.getLayoutAlignmentX(null), 0.01);
assertEquals(0.5f, layout.getLayoutAlignmentX(container), 0.01);
}
public void testGetLayoutAlignmentY() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JPanel container = new JPanel(layout);
assertEquals(0.5f, layout.getLayoutAlignmentY(null), 0.01);
assertEquals(0.5f, layout.getLayoutAlignmentY(container), 0.01);
}
public void testGetConstraints() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Constraints constraints = layout.getConstraints(null);
assertNotNull(constraints);
layout.addLayoutComponent(component, "not_constraints");
@@ -162,6 +179,10 @@ public class SpringLayoutTest extends Sw
}
public void testGetConstraint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.putConstraint(SpringLayout.SOUTH, button, Spring.constant(5),
SpringLayout.NORTH, container);
layout.putConstraint(SpringLayout.EAST, button, Spring.constant(5),
@@ -179,6 +200,10 @@ public class SpringLayoutTest extends Sw
}
public void testPutConstraint_Cycles() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (isHarmony()) {
layout.putConstraint(SpringLayout.EAST, button, 5, SpringLayout.WEST, panel);
layout.putConstraint(SpringLayout.EAST, panel, 5, SpringLayout.WEST, textField);
@@ -198,6 +223,10 @@ public class SpringLayoutTest extends Sw
}
public void testPutConstraint() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JFrame frame = new JFrame("testPutConstraint");
container.setLayout(layout);
layout.putConstraint(SpringLayout.SOUTH, button, 5, SpringLayout.NORTH, container);
@@ -281,6 +310,10 @@ public class SpringLayoutTest extends Sw
}
public void testAddLayoutComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Constraints constraints = new Constraints(Spring.constant(1), Spring.constant(2),
Spring.constant(3), Spring.constant(4));
layout.addLayoutComponent(null, constraints);
@@ -302,6 +335,10 @@ public class SpringLayoutTest extends Sw
}
public void testRemoveLayoutComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.removeLayoutComponent(null);
layout.removeLayoutComponent(new JLabel());
@@ -338,6 +375,10 @@ public class SpringLayoutTest extends Sw
}
public void testInvalidateLayout() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JFrame frame = new JFrame("testMinimumLayoutSize");
frame.setContentPane(container);
layout = new SpringLayout();
@@ -371,6 +412,10 @@ public class SpringLayoutTest extends Sw
}
public void testLayoutContainer() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
button.setPreferredSize(new Dimension(11, 12));
Constraints buttonConstraints = layout.getConstraints(button);
@@ -441,6 +486,10 @@ public class SpringLayoutTest extends Sw
}
public void testMinimumLayoutSize() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
//container
setComponentSizes(button, Spring.constant(2, 5, 100), Spring.constant(3, 6, 101));
Constraints buttonConstraints = layout.getConstraints(button);
@@ -509,6 +558,10 @@ public class SpringLayoutTest extends Sw
}
public void testPreferredLayoutSize() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
//container
setComponentSizes(button,
Spring.constant(2, 5, 100),
@@ -610,6 +663,10 @@ public class SpringLayoutTest extends Sw
}
public void testMaximumLayoutSize() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
//container
setComponentSizes(button,
Spring.constant(2, 5, 100),
@@ -718,6 +775,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_Constraints() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Constraints constraints;
//SpringLayout.Constraints()
@@ -786,6 +847,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetConstraint() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Constraints constraints;
layout.getConstraints(container).setConstraint(SpringLayout.WEST,
Spring.constant(5));
@@ -842,6 +907,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetConstraint() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Constraints constraints;
layout.getConstraints(container).setConstraint(SpringLayout.WEST,
Spring.constant(5));
@@ -927,6 +996,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetHeight() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setHeight(Spring.constant(5));
layout.getConstraints(button).setHeight(Spring.constant(6));
layout.getConstraints(button).setHeight(Spring.constant(8));
@@ -953,6 +1026,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetHeight() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setHeight(Spring.constant(5));
layout.getConstraints(button).setHeight(Spring.constant(6));
layout.getConstraints(button).setHeight(Spring.constant(8));
@@ -990,6 +1067,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetWidth() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setWidth(Spring.constant(5));
layout.getConstraints(button).setWidth(Spring.constant(6));
layout.getConstraints(button).setWidth(Spring.constant(8));
@@ -1016,6 +1097,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetWidth() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setWidth(Spring.constant(5));
layout.getConstraints(button).setWidth(Spring.constant(6));
layout.getConstraints(button).setWidth(Spring.constant(8));
@@ -1052,6 +1137,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetX() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setX(Spring.constant(5));
layout.getConstraints(button).setX(Spring.constant(6));
layout.getConstraints(button).setX(Spring.constant(7));
@@ -1078,6 +1167,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetX() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setX(Spring.constant(5));
layout.getConstraints(button).setX(Spring.constant(6));
layout.getConstraints(button).setX(Spring.constant(7));
@@ -1114,6 +1207,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_SetY() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setY(Spring.constant(5));
layout.getConstraints(button).setY(Spring.constant(6));
layout.getConstraints(button).setY(Spring.constant(8));
@@ -1140,6 +1237,10 @@ public class SpringLayoutTest extends Sw
}
public void testConstraints_GetY() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
layout.getConstraints(container).setY(Spring.constant(5));
layout.getConstraints(button).setY(Spring.constant(6));
layout.getConstraints(button).setY(Spring.constant(8));
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesRTest.java Wed May 26 09:31:07 2010
@@ -28,9 +28,14 @@ import java.awt.Frame;
import java.awt.Rectangle;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
+import tests.support.Support_Excludes;
public class SwingUtilitiesRTest extends SwingTestCase {
public void testLayoutCompoundLabel() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent c = new JButton();
FontMetrics fm = c.getFontMetrics(c.getFont());
Rectangle viewRectangle = new Rectangle(1000, 1000);
@@ -45,6 +50,10 @@ public class SwingUtilitiesRTest extends
}
public void testIsLeftMiddleRightMouseButton() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent button1DownEvent = new MouseEvent(panel, 100, 0,
@@ -101,12 +110,20 @@ public class SwingUtilitiesRTest extends
}
public void testGetAncestorOfClass() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final Frame f = new Frame();
final JDialog dialog = new JDialog(f);
assertSame(f, SwingUtilities.getAncestorOfClass(Frame.class, dialog));
}
public void testDeadLoop_4820() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final int DEAD_LOOP_TIMEOUT = 1000;
final int VALID_NUMBER_OF_CALLS = 15;
final int counter[] = {0};
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/SwingUtilitiesTest.java Wed May 26 09:31:07 2010
@@ -48,6 +48,7 @@ import javax.accessibility.AccessibleSta
import javax.swing.border.EmptyBorder;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
+import tests.support.Support_Excludes;
public class SwingUtilitiesTest extends SwingTestCase implements SwingConstants {
class UIActionMap extends ActionMap implements UIResource {
@@ -62,6 +63,10 @@ public class SwingUtilitiesTest extends
* Class under test for String layoutCompoundLabel(JComponent, FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle, Rectangle, int)
*/
public void testLayoutCompoundLabelJComponentFontMetricsStringIconintintintintRectangleRectangleRectangleint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = new JPanel();
Font font = new Font("Fixed", Font.PLAIN, 12);
FontMetrics metrics = getFontMetrics(font);
@@ -130,6 +135,10 @@ public class SwingUtilitiesTest extends
* Class under test for String layoutCompoundLabel(FontMetrics, String, Icon, int, int, int, int, Rectangle, Rectangle, Rectangle, int)
*/
public void testLayoutCompoundLabelFontMetricsStringIconintintintintRectangleRectangleRectangleint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Font font = new Font("Fixed", Font.PLAIN, 12);
FontMetrics metrics = getFontMetrics(font);
Rectangle viewR = new Rectangle(0, 0, 10, 10);
@@ -261,6 +270,10 @@ public class SwingUtilitiesTest extends
}
public void testNotifyAction() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
class NATestAction implements Action {
public boolean enabled = true;
@@ -359,6 +372,10 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testConvertMouseEvent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
MouseEvent eventBefore, eventToPass, eventAfter;
JWindow window1 = new JWindow();
JWindow window2 = new JWindow();
@@ -453,6 +470,10 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testConvertRectangle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int width = 100;
int height = 200;
Rectangle rectBefore, rectToPass, rectAfter;
@@ -526,6 +547,10 @@ public class SwingUtilitiesTest extends
* this function is being tested by testConvertPointComponentPointComponent()
*/
public void testConvertPointComponentintintComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
/*
@@ -533,6 +558,10 @@ public class SwingUtilitiesTest extends
*/
@SuppressWarnings("deprecation")
public void testConvertPointComponentPointComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Point pointBefore, pointToPass, pointAfter;
JWindow window1 = new JWindow();
JWindow window2 = new JWindow();
@@ -593,6 +622,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleAt() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO uncomment when Accessibility is implemented
/*
class JComponentInaccessible extends JComponent {
@@ -662,6 +695,10 @@ public class SwingUtilitiesTest extends
}
public void testCalculateInnerArea() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JWindow window = new JWindow();
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -708,6 +745,10 @@ public class SwingUtilitiesTest extends
}
public void testComputeDifference() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Rectangle rect11 = new Rectangle(0, 0, 300, 300);
Rectangle rect12 = new Rectangle(100, 100, 100, 100);
// different null testcases
@@ -763,6 +804,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAncestorNamed() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String name1 = "name1";
String name2 = "name2";
String name3 = "name3";
@@ -802,6 +847,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAncestorOfClass() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -836,12 +885,20 @@ public class SwingUtilitiesTest extends
* this method is being tested by testPaintComponentGraphicsComponentContainerintintintint()
*/
public void testPaintComponentGraphicsComponentContainerRectangle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
/*
* Class under test for void paintComponent(Graphics, Component, Container, int, int, int, int)
*/
public void testPaintComponentGraphicsComponentContainerintintintint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// final JComponent component = new JButton("JButton");
// JFrame window = new JFrame() {
// public void paint(Graphics g) {
@@ -861,6 +918,10 @@ public class SwingUtilitiesTest extends
}
public void testGetRootPane() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNull(SwingUtilities.getRootPane(null));
assertNull(SwingUtilities.getRootPane(new JButton()));
JWindow window = new JWindow(new Frame());
@@ -884,6 +945,10 @@ public class SwingUtilitiesTest extends
}
public void testReplaceUIInputMap() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UIInputMap uiInputMap1 = new UIInputMap();
UIInputMap uiInputMap2 = new UIInputMap();
JComponent component = new JPanel();
@@ -916,6 +981,10 @@ public class SwingUtilitiesTest extends
}
public void testGetUIInputMap() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UIInputMap uiInputMap1 = new UIInputMap();
UIInputMap uiInputMap2 = new UIInputMap();
JComponent component = new JPanel();
@@ -948,6 +1017,10 @@ public class SwingUtilitiesTest extends
}
public void testReplaceUIActionMap() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UIActionMap uiActionMap1 = new UIActionMap();
UIActionMap uiActionMap2 = new UIActionMap();
JComponent component = new JPanel();
@@ -969,6 +1042,10 @@ public class SwingUtilitiesTest extends
}
public void testGetUIActionMap() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UIActionMap uiActionMap1 = new UIActionMap();
UIActionMap uiActionMap2 = new UIActionMap();
JComponent component = new JPanel();
@@ -994,6 +1071,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleStateSet() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Component component1 = new JPanel();
Component component3 = new JDialog();
AccessibleStateSet stateSet = SwingUtilities.getAccessibleStateSet(component1);
@@ -1010,6 +1091,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleChild() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(SwingUtilities.getAccessibleIndexInParent(new JButton()) == -1);
JPanel panel = new JPanel();
assertTrue(SwingUtilities.getAccessibleIndexInParent(panel) == -1);
@@ -1030,6 +1115,10 @@ public class SwingUtilitiesTest extends
}
public void testComputeStringWidth() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JFrame frame = new JFrame();
JWindow window = new JWindow(frame);
window.setVisible(true);
@@ -1058,6 +1147,10 @@ public class SwingUtilitiesTest extends
}
public void testWindowForComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1078,6 +1171,10 @@ public class SwingUtilitiesTest extends
}
public void testGetWindowAncestor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1107,6 +1204,10 @@ public class SwingUtilitiesTest extends
}
public void testIsRectangleContainingRectangle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Rectangle rect1 = new Rectangle(100, 100, 100, 100);
Rectangle rect2 = new Rectangle(150, 150, 30, 30);
Rectangle rect3 = new Rectangle(150, 150, 50, 50);
@@ -1123,6 +1224,10 @@ public class SwingUtilitiesTest extends
}
public void testComputeUnion() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(SwingUtilities.computeUnion(0, 0, 100, 100,
new Rectangle(100, 100, 100, 100)).equals(new Rectangle(0, 0, 200, 200)));
assertTrue(SwingUtilities.computeUnion(100, 100, 100, 100,
@@ -1138,6 +1243,10 @@ public class SwingUtilitiesTest extends
}
public void testComputeIntersection() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(new Dimension(0, 0), SwingUtilities.computeIntersection(0, 0, 100, 100,
new Rectangle(100, 100, 100, 100)).getSize());
assertEquals(new Rectangle(150, 150, 20, 20), SwingUtilities.computeIntersection(100,
@@ -1157,6 +1266,10 @@ public class SwingUtilitiesTest extends
}
public void testGetLocalBounds() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int width = 200;
int height = 200;
Component component = new JPanel();
@@ -1175,6 +1288,10 @@ public class SwingUtilitiesTest extends
}
public void testConvertPointToScreen() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Point point;
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -1195,6 +1312,10 @@ public class SwingUtilitiesTest extends
}
public void testConvertPointFromScreen() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Point point;
JComponent panel1 = new JPanel();
JComponent panel2 = new JPanel();
@@ -1215,6 +1336,10 @@ public class SwingUtilitiesTest extends
}
public void testIsDescendingFrom() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final Window window = new Window(new Frame());
JPanel panel1 = new JPanel();
JPanel panel2 = new JPanel();
@@ -1246,6 +1371,10 @@ public class SwingUtilitiesTest extends
@SuppressWarnings("deprecation")
public void testGetDeepestComponentAt() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (isHarmony()) {
return;
}
@@ -1272,6 +1401,10 @@ public class SwingUtilitiesTest extends
}
public void testGetRoot() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JWindow window1 = new JWindow();
// Code should be enabled when JApplet is supported.
//JApplet window2 = new JApplet();
@@ -1308,21 +1441,37 @@ public class SwingUtilitiesTest extends
* this method is supposed to be tested by FocusManager.getCurrentManager().getFocusOwner()
*/
public void testFindFocusOwner() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
/**
* this method is supposed to be tested by EventQueue.invokeLater()
*/
public void testInvokeLater() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
/**
* this method is supposed to be tested by EventQueue.invokeAndWait()
*/
public void testInvokeAndWait() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testIsRightMouseButton() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1337,6 +1486,10 @@ public class SwingUtilitiesTest extends
}
public void testIsMiddleMouseButton() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1351,6 +1504,10 @@ public class SwingUtilitiesTest extends
}
public void testIsLeftMouseButton() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = new JPanel();
panel.setPreferredSize(new Dimension(100, 100));
MouseEvent event1 = new MouseEvent(panel, 100, 100, InputEvent.BUTTON1_DOWN_MASK, 50,
@@ -1365,6 +1522,10 @@ public class SwingUtilitiesTest extends
}
public void testProcessKeyBindings() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
class ActionListenerDummy implements ActionListener {
public ActionEvent event = null;
@@ -1466,6 +1627,10 @@ public class SwingUtilitiesTest extends
}
public void testUpdateComponentTreeUI() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LookAndFeel laf = UIManager.getLookAndFeel();
try {
JPanel panel1 = new JPanel();
@@ -1509,6 +1674,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleIndexInParent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(SwingUtilities.getAccessibleIndexInParent(new JButton()) == -1);
JPanel panel = new JPanel();
assertTrue(SwingUtilities.getAccessibleIndexInParent(panel) == -1);
@@ -1529,6 +1698,10 @@ public class SwingUtilitiesTest extends
}
public void testGetAccessibleChildrenCount() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new NullPointerCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -1549,6 +1722,10 @@ public class SwingUtilitiesTest extends
}
public void testIsEventDispatchThread() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(SwingUtilities.isEventDispatchThread());
}
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/Timer_MultithreadedTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.io.PrintStream;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class Timer_MultithreadedTest extends TestCase {
private Timer timer;
@@ -133,6 +134,10 @@ public class Timer_MultithreadedTest ext
}
public void testFireActionPerformed() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener1 = new ConcreteActionListener("1");
ConcreteActionListener listener2 = new ConcreteActionListener("2");
ConcreteActionListener listener3 = new ConcreteActionListener("3");
@@ -154,6 +159,10 @@ public class Timer_MultithreadedTest ext
}
public void testSetRepeats() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener1 = new ConcreteActionListener("1");
timer = new Timer(10, listener1);
timer.setRepeats(true);
@@ -211,6 +220,10 @@ public class Timer_MultithreadedTest ext
}
public void testSetInitialDelay() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener1 = new ConcreteActionListener("1");
timer = new Timer(10, listener1);
timer.setInitialDelay(100);
@@ -239,6 +252,10 @@ public class Timer_MultithreadedTest ext
}
public void testSetDelay() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
timer.setDelay(100);
@@ -266,6 +283,10 @@ public class Timer_MultithreadedTest ext
}
public void testIsRunning() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -294,6 +315,10 @@ public class Timer_MultithreadedTest ext
}
public void testStop() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -308,6 +333,10 @@ public class Timer_MultithreadedTest ext
}
public void testStart() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener = new ConcreteActionListener("listener");
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -362,6 +391,10 @@ public class Timer_MultithreadedTest ext
}
public void testRestart() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ConcreteActionListener listener = new ConcreteActionListener();
timer = new Timer(10, listener);
listener.waitAction(200);
@@ -379,6 +412,10 @@ public class Timer_MultithreadedTest ext
}
public void testSetLogTimers() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
class LogOutputStream extends OutputStream {
public boolean written = false;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/CompoundBorderTest.java Wed May 26 09:31:07 2010
@@ -25,12 +25,17 @@ import java.awt.Color;
import java.awt.Insets;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
public class CompoundBorderTest extends SwingTestCase {
/*
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 10, false);
LineBorder border2 = new LineBorder(Color.red, 3, false);
CompoundBorder border4 = new CompoundBorder(border1, border2);
@@ -59,6 +64,10 @@ public class CompoundBorderTest extends
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 10, false);
LineBorder border2 = new LineBorder(Color.red, 3, false);
EmptyBorder border3 = new EmptyBorder(101, 102, 103, 104);
@@ -87,6 +96,10 @@ public class CompoundBorderTest extends
}
public void testPaintBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// JPanel panel1 = new JPanel();
// JPanel panel2 = new JPanel();
// JPanel panel3 = new JPanel();
@@ -118,6 +131,10 @@ public class CompoundBorderTest extends
}
public void testIsBorderOpaque() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, false);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -137,6 +154,10 @@ public class CompoundBorderTest extends
* Class under test for void CompoundBorder(Border, Border)
*/
public void testCompoundBorderBorderBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -158,12 +179,20 @@ public class CompoundBorderTest extends
* Class under test for void CompoundBorder()
*/
public void testCompoundBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
CompoundBorder border = new CompoundBorder();
assertNull(border.getInsideBorder());
assertNull(border.getOutsideBorder());
}
public void testGetOutsideBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -180,6 +209,10 @@ public class CompoundBorderTest extends
}
public void testGetInsideBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.red, 33, true);
EmptyBorder border3 = new EmptyBorder(1, 1, 1, 1);
@@ -196,6 +229,10 @@ public class CompoundBorderTest extends
}
public void testReadWriteObject() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
EmptyBorder border2 = new EmptyBorder(1, 1, 1, 1);
CompoundBorder border3 = new CompoundBorder(border1, border2);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/EtchedBorderTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import java.awt.Insets;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
public class EtchedBorderTest extends SwingTestCase {
public static void main(final String[] args) {
@@ -36,6 +37,10 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder()
*/
public void testEtchedBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int etchType = EtchedBorder.LOWERED;
Color shadowColor = null;
Color highlightedColor = null;
@@ -50,6 +55,10 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(int)
*/
public void testEtchedBorderint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int etchType = EtchedBorder.LOWERED;
Color shadowColor = null;
Color highlightedColor = null;
@@ -70,6 +79,10 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(Color, Color)
*/
public void testEtchedBorderColorColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int etchType = EtchedBorder.LOWERED;
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
@@ -91,6 +104,10 @@ public class EtchedBorderTest extends Sw
* Class under test for void EtchedBorder(int, Color, Color)
*/
public void testEtchedBorderintColorColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int etchType = EtchedBorder.LOWERED;
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
@@ -113,6 +130,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness1 = 2;
int thickness2 = 22;
int thickness3 = 33;
@@ -147,6 +168,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness1 = 2;
int thickness2 = 22;
int thickness3 = 33;
@@ -174,6 +199,10 @@ public class EtchedBorderTest extends Sw
}
public void testPaintBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// JPanel panel1 = new JPanel();
// JPanel panel2 = new JPanel();
// JPanel panel3 = new JPanel();
@@ -198,6 +227,10 @@ public class EtchedBorderTest extends Sw
}
public void testIsBorderOpaque() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color shadowColor = Color.GREEN;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -210,6 +243,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getShadowColor(Component)
*/
public void testGetShadowColorComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent c1 = new JPanel();
JComponent c2 = new JPanel();
c1.setBackground(new Color(110, 110, 110));
@@ -230,6 +267,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getHighlightColor(Component)
*/
public void testGetHighlightColorComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent c1 = new JPanel();
JComponent c2 = new JPanel();
c1.setBackground(new Color(110, 110, 110));
@@ -254,6 +295,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getShadowColor()
*/
public void testGetShadowColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -268,6 +313,10 @@ public class EtchedBorderTest extends Sw
* Class under test for Color getHighlightColor()
*/
public void testGetHighlightColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color shadowColor = Color.YELLOW;
Color highlightedColor = Color.RED;
EtchedBorder border = new EtchedBorder(highlightedColor, shadowColor);
@@ -281,6 +330,10 @@ public class EtchedBorderTest extends Sw
}
public void testGetEtchType() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int etchType = EtchedBorder.LOWERED;
EtchedBorder border = new EtchedBorder(etchType);
assertEquals("Etch type coinsides", etchType, border.getEtchType());
@@ -290,6 +343,10 @@ public class EtchedBorderTest extends Sw
}
public void testReadWriteObject() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color shadowColor1 = Color.RED;
Color shadowColor2 = Color.BLUE;
Color highlightedColor1 = Color.YELLOW;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/LineBorderTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import java.awt.Color;
import java.awt.Insets;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
public class LineBorderTest extends SwingTestCase {
public static void main(final String[] args) {
@@ -35,6 +36,10 @@ public class LineBorderTest extends Swin
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness1 = 11;
int thickness2 = 22;
int thickness3 = 33;
@@ -65,6 +70,10 @@ public class LineBorderTest extends Swin
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness = 11;
LineBorder border = new LineBorder(Color.black, thickness);
Insets insets = null;
@@ -84,6 +93,10 @@ public class LineBorderTest extends Swin
}
public void testPaintBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// JPanel panel = new JPanel();
//
// panel.setBorder(new LineBorder(Color.red, 10, true));
@@ -97,6 +110,10 @@ public class LineBorderTest extends Swin
}
public void testIsBorderOpaque() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.black);
LineBorder border2 = new LineBorder(Color.black, 11, true);
LineBorder border3 = new LineBorder(Color.black, 13, false);
@@ -109,6 +126,10 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color, int, boolean)
*/
public void testLineBorderColorintboolean() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness = 11;
boolean roundedCorners = true;
Color color = Color.yellow;
@@ -136,6 +157,10 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color, int)
*/
public void testLineBorderColorint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness = 11;
boolean roundedCorners = false;
Color color = Color.yellow;
@@ -161,6 +186,10 @@ public class LineBorderTest extends Swin
* Class under test for void LineBorder(Color)
*/
public void testLineBorderColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness = 1;
boolean roundedCorners = false;
Color color = Color.yellow;
@@ -181,6 +210,10 @@ public class LineBorderTest extends Swin
}
public void testGetLineColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color color = Color.yellow;
LineBorder border = new LineBorder(color, 1, true);
assertEquals("Colors coinsides", color, border.getLineColor());
@@ -193,6 +226,10 @@ public class LineBorderTest extends Swin
}
public void testGetRoundedCorners() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
boolean roundedCorners = true;
LineBorder border = new LineBorder(Color.black, 1, roundedCorners);
assertEquals("RoundedCorners coinsides", roundedCorners, border.getRoundedCorners());
@@ -204,6 +241,10 @@ public class LineBorderTest extends Swin
}
public void testGetThickness() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int thickness = 11;
LineBorder border = new LineBorder(Color.black, thickness);
assertEquals("Thickness coinsides", thickness, border.getThickness());
@@ -216,6 +257,10 @@ public class LineBorderTest extends Swin
}
public void testCreateGrayLineBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border = (LineBorder) LineBorder.createGrayLineBorder();
assertEquals("Thickness coinsides", 1, border.getThickness());
assertFalse("RoundedCorners coinsides", border.getRoundedCorners());
@@ -223,6 +268,10 @@ public class LineBorderTest extends Swin
}
public void testCreateBlackLineBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border = (LineBorder) LineBorder.createBlackLineBorder();
assertEquals("Thickness coinsides", 1, border.getThickness());
assertFalse("RoundedCorners coinsides", border.getRoundedCorners());
@@ -230,6 +279,10 @@ public class LineBorderTest extends Swin
}
public void testReadWriteObject() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
LineBorder border1 = new LineBorder(Color.red, 33, false);
LineBorder border2 = new LineBorder(Color.yellow, 47, true);
LineBorder resurrectedBorder = (LineBorder) serializeObject(border1);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/border/TitledBorderTest.java Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.SwingTestCase;
import javax.swing.UIManager;
+import tests.support.Support_Excludes;
public class TitledBorderTest extends SwingTestCase {
protected JComponent panel;
@@ -57,6 +58,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(Border, String, int, int, Font, Color)
*/
public void testTitledBorderBorderStringintintFontColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color color1 = Color.GREEN;
Color color2 = null;
Font font1 = new Font(null, Font.TRUETYPE_FONT, 30);
@@ -94,6 +99,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(Border, String, int, int, Font)
*/
public void testTitledBorderBorderStringintintFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Font font1 = new Font(null, Font.TRUETYPE_FONT, 30);
Font font2 = null;
String string1 = "string1";
@@ -130,6 +139,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(Border, String, int, int)
*/
public void testTitledBorderBorderStringintint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String string1 = "string1";
String string2 = null;
Border border3 = new EmptyBorder(1, 1, 1, 1);
@@ -165,6 +178,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(Border, String)
*/
public void testTitledBorderBorderString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String string1 = "string1";
String string2 = null;
Border border3 = new EmptyBorder(1, 1, 1, 1);
@@ -198,6 +215,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(Border)
*/
public void testTitledBorderBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Border border3 = new EmptyBorder(1, 1, 1, 1);
Border border4 = null;
TitledBorder border1 = new TitledBorder(border3);
@@ -229,6 +250,10 @@ public class TitledBorderTest extends Sw
* Class under test for void TitledBorder(String)
*/
public void testTitledBorderString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String string1 = "string1";
String string2 = null;
TitledBorder border1 = new TitledBorder(string1);
@@ -261,6 +286,10 @@ public class TitledBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component, Insets)
*/
public void testGetBorderInsetsComponentInsets() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Insets insets = new Insets(0, 0, 0, 0);
Font font1 = new Font(null, Font.BOLD, 10);
Font font2 = new Font(null, Font.ITALIC, 20);
@@ -293,6 +322,10 @@ public class TitledBorderTest extends Sw
* Class under test for Insets getBorderInsets(Component)
*/
public void testGetBorderInsetsComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Font font1 = new Font(null, Font.BOLD, 10);
Font font2 = new Font(null, Font.ITALIC, 20);
Border border1 = new EmptyBorder(10, 10, 10, 10);
@@ -339,6 +372,10 @@ public class TitledBorderTest extends Sw
}
public void testPaintBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// int numJust = 6;
// int numPos = 7;
// String title = "Title";
@@ -361,6 +398,10 @@ public class TitledBorderTest extends Sw
}
public void testIsBorderOpaque() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Border border1 = new TitledBorder("Text");
Border border2 = new TitledBorder(new LineBorder(Color.WHITE));
Border border3 = new TitledBorder(new LineBorder(Color.WHITE), "Text");
@@ -370,6 +411,10 @@ public class TitledBorderTest extends Sw
}
public void testGetFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
class PublicTitledBorder extends TitledBorder {
private static final long serialVersionUID = 1L;
@@ -401,6 +446,10 @@ public class TitledBorderTest extends Sw
}
public void testGetMinimumSize() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Font font1 = new Font(null, Font.BOLD, 10);
Font font2 = new Font(null, Font.ITALIC, 20);
Border border1 = new EmptyBorder(10, 10, 10, 10);
@@ -432,9 +481,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetBorder()
*/
public void testSetBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetBorder() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
Border border1 = new EmptyBorder(1, 1, 1, 1);
Border border2 = new EmptyBorder(2, 2, 2, 2);
@@ -456,9 +513,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetTitle()
*/
public void testSetTitle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetTitle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
String string1 = "string1";
String string2 = "string2";
@@ -478,9 +543,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetTitleFont()
*/
public void testSetTitleFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetTitleFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
Font newFont1 = new Font(null, Font.BOLD, 10);
Font newFont2 = new Font(null, Font.ITALIC, 20);
@@ -502,9 +575,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetTitleColor()
*/
public void testSetTitleColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetTitleColor() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
Color color1 = Color.RED;
Color color2 = Color.YELLOW;
@@ -526,9 +607,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetTitlePosition()
*/
public void testSetTitlePosition() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetTitlePosition() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
int pos1 = 0;
int pos2 = 3;
@@ -561,9 +650,17 @@ public class TitledBorderTest extends Sw
* This method is being tested in testGetTitleJustification()
*/
public void testSetTitleJustification() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetTitleJustification() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TitledBorder titledBorder = new TitledBorder("hello, border!!");
int just1 = 0;
int just2 = 3;
@@ -596,6 +693,10 @@ public class TitledBorderTest extends Sw
}
public void testReadWriteObject() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Border border3 = new LineBorder(Color.red, 33, false);
String title4 = "new LineBorder(Color.yellow, 47, true);";
TitledBorder border1 = new TitledBorder(border3);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/colorchooser/ColorChooserComponentFactoryTest.java Wed May 26 09:31:07 2010
@@ -30,6 +30,7 @@ import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.JSpinner;
import javax.swing.UIManager;
+import tests.support.Support_Excludes;
public class ColorChooserComponentFactoryTest extends BasicSwingTestCase {
private JColorChooser colorChooser;
@@ -45,6 +46,10 @@ public class ColorChooserComponentFactor
}
public void testSwatchPanel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AbstractColorChooserPanel swatchPanel = ColorChooserComponentFactory
.getDefaultChooserPanels()[0];
UIManager.put("ColorChooser.swatchesSwatchSize", new Dimension(25, 25));
@@ -54,6 +59,10 @@ public class ColorChooserComponentFactor
}
public void testRGBPanel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AbstractColorChooserPanel rgbPanel = ColorChooserComponentFactory
.getDefaultChooserPanels()[2];
assertEquals("RGB", rgbPanel.getDisplayName());
@@ -114,6 +123,10 @@ public class ColorChooserComponentFactor
}
public void testHSBPanel() throws InterruptedException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AbstractColorChooserPanel hsbPanel = ColorChooserComponentFactory
.getDefaultChooserPanels()[1];
assertEquals("HSB", hsbPanel.getDisplayName());
@@ -165,6 +178,10 @@ public class ColorChooserComponentFactor
}
public void testPreviewPanel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JComponent panel = ColorChooserComponentFactory.getPreviewPanel();
assertTrue(panel instanceof JPanel);
assertEquals(colorChooser.getPreviewPanel().getForeground(), Color.GREEN);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/event/AncestorEventTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JPanel;
+import tests.support.Support_Excludes;
public class AncestorEventTest extends BasicSwingTestCase {
protected static class TestAncestorListener extends EventsController implements
@@ -120,6 +121,10 @@ public class AncestorEventTest extends B
}
public void testAncestorEvent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int id = 123;
JComponent source = new JPanel();
AncestorEvent event = new AncestorEvent(source, id, null, null);
@@ -128,21 +133,37 @@ public class AncestorEventTest extends B
}
public void testGetComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AncestorEvent event = new AncestorEvent(component, 0, null, null);
assertEquals(component, event.getComponent());
}
public void testGetAncestor() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AncestorEvent event = new AncestorEvent(component, 0, ancestor, null);
assertEquals(ancestor, event.getAncestor());
}
public void testGetAncestorParent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AncestorEvent event = new AncestorEvent(component, 0, null, ancestor);
assertEquals(ancestor, event.getAncestorParent());
}
public void testAncestorAddedEventWhenAncestorVisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setVisible(false);
component.setVisible(true);
@@ -155,6 +176,10 @@ public class AncestorEventTest extends B
}
public void testAncestorAddedEventWhenComponentVisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setVisible(true);
component.setVisible(false);
@@ -167,6 +192,10 @@ public class AncestorEventTest extends B
}
public void testAncestorAddedEventWhenInvisibleComponentAncestorVisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setVisible(false);
component.setVisible(false);
@@ -178,6 +207,10 @@ public class AncestorEventTest extends B
}
public void testAncestorAddedEventWhenInvisibleAncestorComponentVisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setVisible(false);
component.setVisible(false);
@@ -189,6 +222,10 @@ public class AncestorEventTest extends B
}
public void testAncestorAddedEventWhenComponentAdded() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.remove(component);
waitForIdle();
@@ -204,6 +241,10 @@ public class AncestorEventTest extends B
}
public void testAncestorAddedEventWhenAncestorAdded() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
waitForIdle();
assertTrue(listener.getNumEvents() >= 3);
@@ -217,6 +258,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenAncestorInvisibleAncestorMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setBounds(10, 10, 10, 10);
ancestor.setVisible(false);
@@ -233,6 +278,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenComponentInvisibleAncestorMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setBounds(10, 10, 10, 10);
component.setVisible(false);
@@ -248,6 +297,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenAncestorInvisibleComponentMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
component.setBounds(10, 10, 10, 10);
ancestor.setVisible(false);
@@ -264,6 +317,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenComponentInvisibleComponentMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
component.setBounds(10, 10, 10, 10);
component.setVisible(false);
@@ -280,6 +337,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenAncestorMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
ancestor.setBounds(10, 10, 10, 10);
waitForIdle();
@@ -295,6 +356,10 @@ public class AncestorEventTest extends B
}
public void testAncestorMovedEventWhenComponentMoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
component.setSize(200, 200);
waitForIdle();
assertEquals(0, listener.getNumEvents());
@@ -309,6 +374,10 @@ public class AncestorEventTest extends B
}
public void testAncestorRemovedEventWhenComponentInvisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
waitForIdle();
listener.reset();
@@ -319,6 +388,10 @@ public class AncestorEventTest extends B
}
public void testAncestorRemovedEventWhenComponentRemoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
waitForIdle();
listener.reset();
@@ -329,6 +402,10 @@ public class AncestorEventTest extends B
}
public void testAncestorRemovedEventWhenAncestorInvisible() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
waitForIdle();
listener.reset();
@@ -339,6 +416,10 @@ public class AncestorEventTest extends B
}
public void testAncestorRemovedEventWhenAncestorRemoved() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
frame = createVisibleFrameWithAncestor();
waitForIdle();
listener.reset();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicCheckBoxMenuItemUITest.java Wed May 26 09:31:07 2010
@@ -20,6 +20,7 @@
package javax.swing.plaf.basic;
import javax.swing.plaf.ComponentUI;
+import tests.support.Support_Excludes;
public class BasicCheckBoxMenuItemUITest extends BasicMenuItemUITest {
protected BasicCheckBoxMenuItemUI checkBoxUI;
@@ -44,6 +45,10 @@ public class BasicCheckBoxMenuItemUITest
*/
@Override
public void testCreateUI() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ComponentUI ui1 = BasicCheckBoxMenuItemUI.createUI(null);
ComponentUI ui2 = BasicCheckBoxMenuItemUI.createUI(null);
assertTrue(ui1 instanceof BasicCheckBoxMenuItemUI);
@@ -55,6 +60,10 @@ public class BasicCheckBoxMenuItemUITest
*/
@Override
public void testGetPropertyPrefix() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals("CheckBoxMenuItem", menuItemUI.getPropertyPrefix());
}
@@ -62,12 +71,20 @@ public class BasicCheckBoxMenuItemUITest
* Test method for 'javax.swing.plaf.basic.BasicCheckBoxMenuItemUI.processMouseEvent(JMenuItem, MouseEvent, MenuElement[], MenuSelectionManager)'
*/
public void testProcessMouseEvent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
/*
* Test method for 'javax.swing.plaf.basic.BasicCheckBoxMenuItemUI.getMinimumSize(null)/getMaximumSize(null)'
*/
public void testGetSizes() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
try { //Regression test for HARMONY-2695
checkBoxUI.getMinimumSize(null);
fail("NullPointerException should have been thrown");
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/plaf/basic/BasicColorChooserUITest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import javax.swing.JPanel;
import javax.swing.JTabbedPane;
import javax.swing.colorchooser.AbstractColorChooserPanel;
import javax.swing.colorchooser.DefaultColorSelectionModel;
+import tests.support.Support_Excludes;
public class BasicColorChooserUITest extends BasicSwingTestCase {
private JColorChooser ch;
@@ -46,18 +47,30 @@ public class BasicColorChooserUITest ext
}
public void testCreateUI() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(BasicColorChooserUI.createUI(ch));
assertNotSame(BasicColorChooserUI.createUI(ch), BasicColorChooserUI.createUI(ch));
assertSame(BasicColorChooserUI.class, BasicColorChooserUI.createUI(ch).getClass());
}
public void testCreateDefaultChoosers() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(ui.createDefaultChoosers());
assertNotSame(ui.createDefaultChoosers(), ui.createDefaultChoosers());
assertEquals(3, ui.createDefaultChoosers().length);
}
public void testCreatePropertychangeListener() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(ui.createPropertyChangeListener());
if (isHarmony()) {
assertNotSame(ui.createPropertyChangeListener(), ui.createPropertyChangeListener());
@@ -67,6 +80,10 @@ public class BasicColorChooserUITest ext
}
public void testInstallUninstallPreviewPanel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(2, ch.getComponentCount());
assertNotNull(findComponent(ch, JTabbedPane.class, true));
ch.remove(ch.getComponent(1));
@@ -78,6 +95,10 @@ public class BasicColorChooserUITest ext
}
public void testUninstallDefaultChoosers() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(2, ch.getComponentCount());
assertNotNull(findComponent(ch, JTabbedPane.class, true));
assertEquals(3, ((JTabbedPane) findComponent(ch, JTabbedPane.class, true))
@@ -100,6 +121,10 @@ public class BasicColorChooserUITest ext
}
public void testInstallUninstallListeners() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ui.uninstallListeners();
int propChangeListCount = ch.getPropertyChangeListeners().length;
int changeListcount = ((DefaultColorSelectionModel) ch.getSelectionModel())