Index: modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java (revision 501787) +++ modules/swing/src/test/api/java/common/javax/swing/text/StyleConstantsTest.java (working copy) @@ -20,13 +20,16 @@ */ package javax.swing.text; -import junit.framework.TestCase; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; + import javax.swing.Icon; import javax.swing.JLabel; +import javax.swing.SwingUtilities; +import junit.framework.TestCase; + public class StyleConstantsTest extends TestCase { protected StyleConstants sc; @@ -34,6 +37,8 @@ String message = "Test for StyleConstants"; + private Component component; + @Override protected void setUp() throws Exception { super.setUp(); @@ -427,20 +432,27 @@ assertEquals("component", StyleConstants.ComponentAttribute.toString()); } - public void testGetComponent() { + public void testGetComponent() throws Exception { assertNull(StyleConstants.getComponent(SimpleAttributeSet.EMPTY)); - Component val = new JLabel("test component"); - putAttribute(StyleConstants.ComponentAttribute, val); - assertEquals(val, StyleConstants.getComponent(attr)); + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + component = new JLabel("test component"); + } + }); + putAttribute(StyleConstants.ComponentAttribute, component); + assertEquals(component, StyleConstants.getComponent(attr)); } - public void testSetComponent() { + public void testSetComponent() throws Exception { attr.removeAttributes(attr); - Component val = new JLabel("test component"); - StyleConstants.setComponent(attr, val); - assertEquals(AbstractDocument.ElementNameAttribute + "=component component=" + val - + " ", attr.toString()); - assertEquals(val, attr.getAttribute(StyleConstants.ComponentAttribute)); + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + component = new JLabel("test component"); + } + }); + StyleConstants.setComponent(attr, component); + assertEquals(2, attr.getAttributeCount()); + assertEquals(component, attr.getAttribute(StyleConstants.ComponentAttribute)); assertEquals(StyleConstants.ComponentElementName, attr .getAttribute(AbstractDocument.ElementNameAttribute)); } @@ -499,8 +511,7 @@ } }; StyleConstants.setIcon(attr, val); - assertEquals(AbstractDocument.ElementNameAttribute + "=icon icon=" + val + " ", attr - .toString()); + assertEquals(2, attr.getAttributeCount()); assertEquals(val, attr.getAttribute(StyleConstants.IconAttribute)); assertEquals(StyleConstants.IconElementName, attr .getAttribute(AbstractDocument.ElementNameAttribute));