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 [17/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/text/JTextComponentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponentTest.java Wed May 26 09:31:07 2010
@@ -57,6 +57,7 @@ import javax.swing.UIDefaults;
import javax.swing.UIManager;
import javax.swing.event.CaretEvent;
import javax.swing.event.CaretListener;
+import tests.support.Support_Excludes;
public class JTextComponentTest extends SwingTestCase {
JFrame jf;
@@ -274,9 +275,17 @@ public class JTextComponentTest extends
}
public void testRemoveNotify() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetToolTipTextMouseEvent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jf.dispose();
jf = new JFrame();
jtc = new JTextArea("just for prefSize");
@@ -300,11 +309,19 @@ public class JTextComponentTest extends
}
public void testSetGetNavigationFilter() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNull(jtc.getNavigationFilter());
jtc.setNavigationFilter(navFilter);
}
public void testSetGetKeymap() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Keymap keyMap1 = jtc.getKeymap();
assertNotNull(keyMap1);
SimpleKeyMap keyMap2 = new SimpleKeyMap("Second");
@@ -314,6 +331,10 @@ public class JTextComponentTest extends
}
public void testSetGetHighlighter() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
DefaultHighlighter dh1 = (DefaultHighlighter) jtc.getHighlighter();
DefaultHighlighter dh2 = new DefaultHighlighter();
assertTrue(jtc.getHighlighter() instanceof DefaultHighlighter);
@@ -323,6 +344,10 @@ public class JTextComponentTest extends
}
public void testSetGetDocument() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(jtc.getDocument());
jtc.setText("testSetGetDocument");
Highlighter highlighter = jtc.getHighlighter();
@@ -343,6 +368,10 @@ public class JTextComponentTest extends
}
public void testSetGetCaret() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
DefaultCaret dc1 = (DefaultCaret) jtc.getCaret();
DefaultCaret dc2 = new DefaultCaret();
assertTrue(jtc.getCaret() instanceof DefaultCaret);
@@ -361,6 +390,10 @@ public class JTextComponentTest extends
}
public void testCaretListeners() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.addCaretListener(null);
SimpleCaretListener listener1 = new SimpleCaretListener("1");
SimpleCaretListener listener2 = new SimpleCaretListener("2");
@@ -387,6 +420,10 @@ public class JTextComponentTest extends
}
public void testFireCaretUpdate() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setText("JTextComponent");
SimpleCaretListener listener1 = new SimpleCaretListener("1");
SimpleCaretListener listener2 = new SimpleCaretListener("2");
@@ -402,11 +439,19 @@ public class JTextComponentTest extends
// Regression for HARMONY-2819
public void testFireCaretUpdateNull() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
new JTextArea().fireCaretUpdate(null);
// no exception is expected
}
public void testSetGetText() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(jtc.getText().equals(""));
jtc.setText("JTextComponent");
assertTrue(jtc.getText().equals("JTextComponent"));
@@ -422,6 +467,10 @@ public class JTextComponentTest extends
}
public void testReplaceSelection() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setText("JTextComponent");
jtc.select(5, 8);
jtc.replaceSelection(null);
@@ -439,6 +488,10 @@ public class JTextComponentTest extends
}
public void testReadWrite() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String s = "JTextComponent\nRead\nWrite\n";
String sProperty = "CurrentStreamDescriptionProperty";
StringWriter writer = new StringWriter();
@@ -461,6 +514,10 @@ public class JTextComponentTest extends
}
public void testAddInputMethodListener() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SimpleInputMethodListener listener1 = new SimpleInputMethodListener("1");
SimpleInputMethodListener listener2 = new SimpleInputMethodListener("2");
SimpleInputMethodListener listener3 = new SimpleInputMethodListener("3");
@@ -484,6 +541,10 @@ public class JTextComponentTest extends
}
public void testProcessInputMethodEventInputMethodEvent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SimpleInputMethodListener listener1 = new SimpleInputMethodListener("1");
SimpleInputMethodListener listener2 = new SimpleInputMethodListener("2");
SimpleInputMethodListener listener3 = new SimpleInputMethodListener("3");
@@ -501,6 +562,10 @@ public class JTextComponentTest extends
}
public void testSetGetMargin() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Insets insets1 = new Insets(0, 0, 0, 0);
assertEquals(insets1, jtc.getMargin());
Insets insets2 = new Insets(10, 20, 30, 40);
@@ -510,6 +575,10 @@ public class JTextComponentTest extends
}
public void testSetGetComponentOrientation() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(ComponentOrientation.UNKNOWN, jtc.getComponentOrientation());
docXXX = (AbstractDocument) jtc.getDocument();
jtc.setComponentOrientation(ComponentOrientation.RIGHT_TO_LEFT);
@@ -528,6 +597,10 @@ public class JTextComponentTest extends
}
public void testSetGetColors() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Color color1 = getColorProperty("caretForeground");
assertEquals(color1, jtc.getCaretColor());
jtc.setCaretColor(color);
@@ -551,6 +624,10 @@ public class JTextComponentTest extends
}
public void testSetIsEditable() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(jtc.isEditable());
jtc.setEditable(false);
assertEqualsPropertyChangeEvent("editable", new Boolean(true), new Boolean(false),
@@ -559,6 +636,10 @@ public class JTextComponentTest extends
}
public void testSetGetDragEnabled() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
/*
* class RunnableCase0 extends RunnableWrap { public void run() {
* assertFalse(jtc.getDragEnabled());
@@ -604,6 +685,10 @@ public class JTextComponentTest extends
}
public void testSelect() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setText("JTextComponent");
jtc.select(5, 8);
assertEquals("Com", jtc.getSelectedText());
@@ -632,6 +717,10 @@ public class JTextComponentTest extends
}
public void testSetGetSelectionStartEnd() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -699,6 +788,10 @@ public class JTextComponentTest extends
}
public void testSetGetCaretPosition() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(0, jtc.getCaretPosition());
jtc.setText("JTextComponent");
assertEquals(14, jtc.getCaretPosition());
@@ -727,6 +820,10 @@ public class JTextComponentTest extends
}
public void testMoveCaretPosition() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setText("JTextComponent");
jtc.setCaretPosition(5);
jtc.moveCaretPosition(8);
@@ -754,6 +851,10 @@ public class JTextComponentTest extends
}
public void testSetGetFocusAccelerator() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
//TODO It's very strange but in 1.5.0 PropertyChangeEvent's
//name doesn't equal JTextComponent.FOCUS_ACCELERATOR_KEY
String name = JTextComponent.FOCUS_ACCELERATOR_KEY;
@@ -771,6 +872,10 @@ public class JTextComponentTest extends
}
public void testSelectAll() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.selectAll();
assertNull(jtc.getSelectedText());
jtc.setText("JTextComponent");
@@ -785,6 +890,10 @@ public class JTextComponentTest extends
}
public void testPaste() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO: uncomment when System clipboard is properly supported
// if (jtc.getToolkit().getSystemClipboard() == null)
// return;
@@ -813,6 +922,10 @@ public class JTextComponentTest extends
}
public void testCut() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO: uncomment when System clipboard is properly supported
// if (jtc.getToolkit().getSystemClipboard() == null)
// return;
@@ -851,6 +964,10 @@ public class JTextComponentTest extends
}
public void testCopy() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO: uncomment when System clipboard is properly supported
// if (jtc.getToolkit().getSystemClipboard() == null)
// return;
@@ -869,6 +986,10 @@ public class JTextComponentTest extends
}
public void testAddRemoveKeymaps() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Keymap keyMap = jtc.getKeymap();
Keymap keyMap1 = JTextComponent.addKeymap("First", keyMap);
assertEquals("First", keyMap1.getName());
@@ -900,6 +1021,10 @@ public class JTextComponentTest extends
}
public void testLoadKeymap() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
JTextArea jta = new JTextArea();
Keymap k = jta.getKeymap();
KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK);
@@ -946,11 +1071,19 @@ public class JTextComponentTest extends
}
public void testConstants() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals("default", JTextComponent.DEFAULT_KEYMAP);
assertEquals("focusAcceleratorKey", JTextComponent.FOCUS_ACCELERATOR_KEY);
}
public void testJTextComponent_KeyBinding() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
KeyStroke keyStroke = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK);
JTextComponent.KeyBinding keyBinding = new JTextComponent.KeyBinding(keyStroke, s);
assertNotNull(keyBinding);
@@ -1011,6 +1144,10 @@ public class JTextComponentTest extends
assertEquals(0, jtc1.getHighlighter().getHighlights().length);
} */
public void testKeyMap() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
KeyStroke keyStrokeA = KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK);
KeyStroke keyStrokeB = KeyStroke.getKeyStroke(KeyEvent.VK_B, InputEvent.CTRL_MASK);
KeyStroke keyStrokeC = KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK);
@@ -1035,6 +1172,10 @@ public class JTextComponentTest extends
}
public void testKeymapToString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
KeyStroke keyStrokeX = KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK);
KeyStroke keyStrokeY = KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK);
KeyStroke keyStrokeZ = KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponentTest.java Wed May 26 09:31:07 2010
@@ -40,6 +40,7 @@ import javax.swing.JTextField;
import javax.swing.SwingTestCase;
import javax.swing.text.JTextComponentTest.JTextComp;
import javax.swing.text.JTextComponentTest.SimplePropertyChangeListener;
+import tests.support.Support_Excludes;
public class JTextComponent_AccessibleJTextComponentTest extends SwingTestCase {
JFrame jf;
@@ -178,6 +179,10 @@ public class JTextComponent_AccessibleJT
}
public void testAccessibleJTextComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNotNull(accessible);
}
@@ -192,6 +197,10 @@ public class JTextComponent_AccessibleJT
}
public void testSetAttributesGetCharacterAttributes() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AttributeSet samples[] = new AttributeSet[20];
AttributeSet as;
String name1 = "ATTRIBUTE_NAME1";
@@ -246,6 +255,10 @@ public class JTextComponent_AccessibleJT
}
public void testRemoveUpdate() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
listener.InterestProperty(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY);
try {
jtc.getDocument().remove(0, 4);
@@ -263,6 +276,10 @@ public class JTextComponent_AccessibleJT
}
public void testInsertUpdate() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
listener.InterestProperty(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY);
try {
jtc.getDocument().insertString(0, "TEST", null);
@@ -284,6 +301,10 @@ public class JTextComponent_AccessibleJT
}
public void testChangedUpdate() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
listener.InterestProperty(AccessibleContext.ACCESSIBLE_TEXT_PROPERTY);
try {
((AbstractDocument) jtc.getDocument()).replace(0, 3, "TEST", null);
@@ -301,6 +322,10 @@ public class JTextComponent_AccessibleJT
}
public void testCaretUpdate() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
listener.InterestProperty(AccessibleContext.ACCESSIBLE_CARET_PROPERTY);
listener.InterestProperty(AccessibleContext.ACCESSIBLE_SELECTION_PROPERTY);
String s[] = new String[] { AccessibleContext.ACCESSIBLE_CARET_PROPERTY,
@@ -334,6 +359,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetAccessibleText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(accessible, accessible.getAccessibleText());
}
@@ -365,6 +394,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetAccessibleStateSet() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AccessibleStateSet ass = accessible.getAccessibleStateSet();
assertTrue(ass.contains(AccessibleState.MULTI_LINE));
assertTrue(ass.contains(AccessibleState.EDITABLE));
@@ -379,23 +412,43 @@ public class JTextComponent_AccessibleJT
}
public void testGetAccessibleRole() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(AccessibleRole.TEXT, accessible.getAccessibleRole());
}
public void testGetAccessibleEditableText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(accessible, accessible.getAccessibleEditableText());
}
public void testGetAccessibleAction() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(accessible, accessible.getAccessibleAction());
}
public void testSetTextContents() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
accessible.setTextContents("NEW Text");
assertEquals("NEW Text", jtc.getText());
}
public void testInsertTextAtIndex() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setCaretPosition(5);
jtc.setDocument(new DefaultStyledDocument());
jtc.setText(text);
@@ -405,6 +458,10 @@ public class JTextComponent_AccessibleJT
}
public void testReplaceText() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
accessible.replaceText(5, 8, "XXX");
assertEquals(text.replaceFirst("Com", "XXX"), jtc.getText());
try {
@@ -419,11 +476,19 @@ public class JTextComponent_AccessibleJT
}
public void testGetTextRange() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals("JTextCo", accessible.getTextRange(0, 7));
assertEquals("omponent\n" + "\u05dc" + "JTe", accessible.getTextRange(6, 19));
}
public void testGetAccessibleActionDescription() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
for (int i = 0; i < jtc.getActions().length; i++) {
assertEquals(jtc.getActions()[i].getValue(Action.NAME), accessible
.getAccessibleActionDescription(i));
@@ -431,6 +496,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetSelectedText() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setCaretPosition(5);
assertNull(accessible.getSelectedText());
jtc.moveCaretPosition(8);
@@ -438,11 +507,19 @@ public class JTextComponent_AccessibleJT
}
public void testSelectText() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
accessible.selectText(5, 8);
assertEquals("Com", accessible.getSelectedText());
}
public void testDelete() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
accessible.delete(4, 6);
text = text.replaceFirst("tC", "");
assertEquals(text, jtc.getText());
@@ -489,6 +566,10 @@ public class JTextComponent_AccessibleJT
}
public void testCut() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO: uncomment when System clipboard is properly supported
// if (jtc.getToolkit().getSystemClipboard() == null)
// return;
@@ -509,12 +590,20 @@ public class JTextComponent_AccessibleJT
}
public void testDoAccessibleAction() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(accessible.doAccessibleAction(0));
assertTrue(accessible.doAccessibleAction(1));
assertTrue(accessible.doAccessibleAction(2));
}
public void testPaste() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// TODO: uncomment when System clipboard is properly supported
// if (jtc.getToolkit().getSystemClipboard() == null)
// return;
@@ -529,6 +618,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetSelectionStartEnd() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setSelectionStart(5);
jtc.setSelectionEnd(8);
assertEquals(5, accessible.getSelectionStart());
@@ -536,10 +629,18 @@ public class JTextComponent_AccessibleJT
}
public void testGetCharCount() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(jtc.getDocument().getLength(), accessible.getCharCount());
}
public void testGetCaretPosition() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtc.setCaretPosition(5);
assertEquals(5, accessible.getCaretPosition());
jtc.setCaretPosition(7);
@@ -547,6 +648,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetAccessibleActionCount() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(53, accessible.getAccessibleActionCount());
}
}
\ No newline at end of file
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_AccessibleJTextComponent_variousTextTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingUtilities;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class JTextComponent_AccessibleJTextComponent_variousTextTest extends TestCase {
JFrame jf;
@@ -86,6 +87,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetBeforeAfterAtIndex() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
jtc.setText("In\n" + " this test. for AccessibleJTextComponent\n" + "LALALA");
@@ -127,6 +132,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetCharacterBounds() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
jtc.setText("\u05dc" + "\u0061" + "\u05dc" + "\u0061");
@@ -140,6 +149,10 @@ public class JTextComponent_AccessibleJT
}
public void testGetIndexAtPoint() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
//Bidirectional text is not supported
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMLocationTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMLocationTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMLocationTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMLocationTest.java Wed May 26 09:31:07 2010
@@ -35,6 +35,7 @@ import javax.swing.JTextArea;
import javax.swing.SwingWaitTestCase;
import org.apache.harmony.awt.text.ComposedTextParams;
import org.apache.harmony.awt.text.PropertyNames;
+import tests.support.Support_Excludes;
public class JTextComponent_IMLocationTest extends SwingWaitTestCase {
JTextArea jta;
@@ -141,6 +142,10 @@ public class JTextComponent_IMLocationTe
}
public void testGetLocationOffset() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
try {
setComposedText();
Rectangle rect;
@@ -161,6 +166,10 @@ public class JTextComponent_IMLocationTe
}
public void testGetTextLocation() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
try {
setComposedText();
int pos = 7;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_IMTest.java Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ import javax.swing.JTextArea;
import javax.swing.SwingTestCase;
import org.apache.harmony.awt.text.ComposedTextParams;
import org.apache.harmony.awt.text.PropertyNames;
+import tests.support.Support_Excludes;
public class JTextComponent_IMTest extends SwingTestCase {
JTextArea jta;
@@ -148,6 +149,10 @@ public class JTextComponent_IMTest exten
}
public void testProcessItME_Caret() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
setComposedText();
for (int i = 0; i < 10; i++) {
int pos = Math.min(12, i + 7);
@@ -161,6 +166,10 @@ public class JTextComponent_IMTest exten
}
public void testProcessIME_Text_NPE() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String content = "12345";
iter = getIterator(content, putSegmentAttribute(map, Color.RED));
ime = getTextEvent(null, 0, null, null);
@@ -169,6 +178,10 @@ public class JTextComponent_IMTest exten
}
public void testProcessIME_Text() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String content = "12345";
iter = getIterator(content, putSegmentAttribute(map, Color.RED));
ime = getTextEvent(iter, 0, TextHitInfo.afterOffset(0), TextHitInfo.afterOffset(0));
@@ -215,6 +228,10 @@ public class JTextComponent_IMTest exten
//InputMethodRequest tests==========================================
public void testCancelLatestCommittedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AttributedCharacterIterator.Attribute[] attributes = new AttributedCharacterIterator.Attribute[] { SEGMENT_ATTRIBUTE };
assertNull(imr.cancelLatestCommittedText(attributes));
String content = "fghij";
@@ -248,6 +265,10 @@ public class JTextComponent_IMTest exten
}
public void testGetCommittedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(7, imr.getCommittedTextLength());
String content = "fghij";
iter = getIterator(content, putSegmentAttribute(map, Color.BLACK));
@@ -284,6 +305,10 @@ public class JTextComponent_IMTest exten
}
public void testGetCommittedTextLength() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(7, imr.getCommittedTextLength());
iter = getIterator("fghij", putSegmentAttribute(map, Color.BLACK));
ime = getTextEvent(iter, 5, TextHitInfo.afterOffset(0), TextHitInfo.afterOffset(0));
@@ -296,6 +321,10 @@ public class JTextComponent_IMTest exten
}
public void testGetInsertPositionOffset() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
setComposedText();
assertEquals(7, imr.getInsertPositionOffset());
iter = getIterator("finish", putSegmentAttribute(map, Color.PINK));
@@ -305,6 +334,10 @@ public class JTextComponent_IMTest exten
}
public void testGetSelectedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNull(imr.getSelectedText(null));
jta.select(2, 5);
checkIterator(imr.getSelectedText(null), 0, 0, 3);
@@ -317,6 +350,10 @@ public class JTextComponent_IMTest exten
}
public void testDoubleCancelLatestCommittedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
String content = "fghij";
iter = getIterator(content, putSegmentAttribute(map, Color.BLACK));
ime = getTextEvent(iter, 5, TextHitInfo.afterOffset(0), TextHitInfo.afterOffset(0));
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_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/text/JTextComponent_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_MultithreadedTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.SwingWaitTestCase;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class JTextComponent_MultithreadedTest extends TestCase {
JFrame jf;
@@ -67,6 +68,10 @@ public class JTextComponent_Multithreade
}
public void testReplaceSelection() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
jtc.setText("JTextComponent");
@@ -106,6 +111,10 @@ public class JTextComponent_Multithreade
}
public void testModelToView() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
jtc.setText(sLTR + sRTL + sLTR + sRTL + sLTR);
@@ -131,6 +140,10 @@ public class JTextComponent_Multithreade
}
public void testViewToModel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Runnable test = new Runnable() {
public void run() {
jtc.setText("test View To Model");
@@ -185,6 +198,10 @@ public class JTextComponent_Multithreade
}
public void testScrollable() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jf.dispose();
jf = new JFrame();
jep = new JTextField();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_byAuxiliaryComponentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_byAuxiliaryComponentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_byAuxiliaryComponentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/JTextComponent_byAuxiliaryComponentTest.java Wed May 26 09:31:07 2010
@@ -33,6 +33,7 @@ import javax.swing.plaf.TextUI;
import javax.swing.plaf.basic.BasicTextAreaUI;
import javax.swing.plaf.basic.BasicTextUI;
import javax.swing.plaf.basic.TextCompUI;
+import tests.support.Support_Excludes;
public class JTextComponent_byAuxiliaryComponentTest extends SwingTestCase {
JFrame jf;
@@ -107,6 +108,10 @@ public class JTextComponent_byAuxiliaryC
}
public void testGetAccessibleContext() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AccessibleContext ac = jtComp.getAccessibleContext();
assertTrue(jtComp.getAccessibleContext() instanceof JTextComponent.AccessibleJTextComponent);
assertTrue(jtComp.getAccessibleContext() instanceof JTextComponent.AccessibleJTextComponent);
@@ -114,6 +119,10 @@ public class JTextComponent_byAuxiliaryC
}
public void testGetActions() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Action actions[] = new DefaultEditorKit().getActions();
Action actions1[] = jtComp.getActions();
Action actions2[] = new DefaultEditorKit().getActions();
@@ -125,6 +134,10 @@ public class JTextComponent_byAuxiliaryC
}
public void testUpdateUI() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(jtComp.getUI() instanceof TextCompUI);
TextUI textUI1 = jtComp.getUI();
SimplePropertyChangeListener listener = new SimplePropertyChangeListener();
@@ -138,6 +151,10 @@ public class JTextComponent_byAuxiliaryC
}
public void testJTextComponent() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
jtComp = new JTextComp();
assertNotNull(jtComp);
assertTrue(jtComp.getUI() instanceof TextCompUI);
@@ -155,6 +172,10 @@ public class JTextComponent_byAuxiliaryC
}
public void testSetGetUITextUI() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertTrue(jtComp.getUI() instanceof TextCompUI);
TextUI textUI1 = jtComp.getUI();
SimplePropertyChangeListener listener = new SimplePropertyChangeListener();
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PasswordViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PasswordViewTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PasswordViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PasswordViewTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.swing.JFrame;
import javax.swing.JPasswordField;
import javax.swing.SwingTestCase;
import javax.swing.plaf.basic.BasicTextUI;
+import tests.support.Support_Excludes;
public class PasswordViewTest extends SwingTestCase {
PasswordView view;
@@ -92,6 +93,10 @@ public class PasswordViewTest extends Sw
}
public void testGetPreferredSpan() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(echoCharsWidth, (int) view.getPreferredSpan(View.X_AXIS));
assertEquals(height, (int) view.getPreferredSpan(View.Y_AXIS));
pf.setColumns(3);
@@ -105,6 +110,10 @@ public class PasswordViewTest extends Sw
}
public void testDrawEchoCharacter() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
char c = '&';
int m_width = fm.charWidth(c);
Graphics g = pf.getGraphics();
@@ -114,6 +123,10 @@ public class PasswordViewTest extends Sw
}
public void testDrawSelectedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Graphics g = pf.getGraphics();
Color color = g.getColor();
try {
@@ -129,6 +142,10 @@ public class PasswordViewTest extends Sw
}
public void testDrawUnselectedText() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Graphics g = pf.getGraphics();
Color old = g.getColor();
try {
@@ -144,6 +161,10 @@ public class PasswordViewTest extends Sw
}
public void testModelToView() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Shape shape = new Rectangle(2, 20, 30, 40);
Rectangle adjustRect = view.adjustAllocation(shape).getBounds();
Rectangle rect = (Rectangle) view.modelToView(1, shape, Position.Bias.Forward);
@@ -166,6 +187,10 @@ public class PasswordViewTest extends Sw
}
public void testViewToModel() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Shape shape = new Rectangle(10, 20, 30, 40);
int px = 10 + fm.stringWidth("***");
int py = 20 + fm.getAscent() - 1;
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LayoutTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LayoutTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LayoutTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LayoutTest.java Wed May 26 09:31:07 2010
@@ -23,6 +23,7 @@ import javax.swing.JFrame;
import javax.swing.JTextArea;
import javax.swing.SwingTestCase;
import javax.swing.text.Position.Bias;
+import tests.support.Support_Excludes;
/**
* Tests PlainViewI18N class, in particular how views are laid out.
@@ -43,6 +44,10 @@ public class PlainViewI18N_LayoutTest ex
* Tests values returned by <code>flipEastAndWestAtEnds()</code>.
*/
public void testFlipEastAndWest() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
boolean[] forward = new boolean[] { false, false, false, false, false, false, false,
false, false, false, false, false };
boolean[] backward = new boolean[] { false, false, false, false, false, false, false,
@@ -62,6 +67,10 @@ public class PlainViewI18N_LayoutTest ex
* resposible for.
*/
public void testViewLayout() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int[] levels = new int[] { 0, 1, 2, 1, 0 };
Element bidiRoot = ((AbstractDocument) doc).getBidiRootElement();
assertEquals(5, bidiRoot.getElementCount());
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LineView_UpdateTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LineView_UpdateTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LineView_UpdateTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_LineView_UpdateTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import javax.swing.event.DocumentListene
import javax.swing.event.DocumentEvent.ElementChange;
import javax.swing.text.PlainViewI18N_BidiTextViewTest.PreferenceChange;
import javax.swing.text.PlainViewI18N_LineViewTest.PlainViewI18NWithTextArea;
+import tests.support.Support_Excludes;
/**
* Tests PlainViewI18N.LineView class, in particular how it reacts to changes
@@ -79,6 +80,10 @@ public class PlainViewI18N_LineView_Upda
}
public void testInsertUpdateLTRNoChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -90,6 +95,10 @@ public class PlainViewI18N_LineView_Upda
}
public void testInsertUpdateRTLNoChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -100,6 +109,10 @@ public class PlainViewI18N_LineView_Upda
}
public void testInsertUpdateLTRWithChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -113,6 +126,10 @@ public class PlainViewI18N_LineView_Upda
}
public void testInsertUpdateRTLWithChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -131,6 +148,10 @@ public class PlainViewI18N_LineView_Upda
// handle this situation, these tests may become actual.
/*
public void testRemoveUpdateLTRNoChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
doc.remove(startOffset + PlainViewI18N_LineViewTest.RTLLength + 1, 1);
view.removeUpdate(removeEvent, shape, null);
@@ -139,6 +160,10 @@ public class PlainViewI18N_LineView_Upda
}
public void testRemoveUpdateRTLNoChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
doc.remove(startOffset + 1, 1);
view.removeUpdate(removeEvent, shape, null);
@@ -147,6 +172,10 @@ public class PlainViewI18N_LineView_Upda
}
*/
public void testRemoveUpdateWithChange() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_ModelViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_ModelViewTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_ModelViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewI18N_ModelViewTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import javax.swing.JTextArea;
import javax.swing.SwingConstants;
import javax.swing.SwingTestCase;
import javax.swing.text.Position.Bias;
+import tests.support.Support_Excludes;
/**
* Tests model/view conversions in PlainViewI18N class.
@@ -79,6 +80,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionEast01() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -97,6 +102,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionEast02() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(0, view.getNextVisualPositionFrom(1, Bias.Forward, shape,
SwingConstants.EAST, bias));
assertSame(Bias.Forward, bias[0]);
@@ -112,6 +121,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionEast03() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -130,6 +143,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionEast04() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(6, view.getNextVisualPositionFrom(3, Bias.Forward, shape,
SwingConstants.EAST, bias));
assertSame(Bias.Forward, bias[0]);
@@ -145,6 +162,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionWest01() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -163,6 +184,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionWest02() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -181,6 +206,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionWest03() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!isHarmony()) {
return;
}
@@ -199,6 +228,10 @@ public class PlainViewI18N_ModelViewTest
* with Forward and Backward biases.
*/
public void testGetNextVisualPositionWest04() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(4, view.getNextVisualPositionFrom(3, Bias.Forward, shape,
SwingConstants.WEST, bias));
assertSame(Bias.Forward, bias[0]);
@@ -224,6 +257,10 @@ public class PlainViewI18N_ModelViewTest
* <p>The offsets used are 0, 2.
*/
public void testModelToView01() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Rectangle viewAt0F = (Rectangle) view.modelToView(0, shape, Bias.Forward);
Rectangle viewAt2B = (Rectangle) view.modelToView(2, shape, Bias.Forward);
assertEquals(viewAt0F.x, viewAt2B.x);
@@ -234,6 +271,10 @@ public class PlainViewI18N_ModelViewTest
}
public void testModelToView02() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Rectangle viewAt1F = (Rectangle) view.modelToView(1, shape, Bias.Forward);
Rectangle viewAt1B = (Rectangle) view.modelToView(1, shape, Bias.Backward);
assertEquals(viewAt1F, viewAt1B);
@@ -242,6 +283,10 @@ public class PlainViewI18N_ModelViewTest
}
public void testViewToModel() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(2, view.viewToModel(rtlWidth, 0, shape, bias));
assertSame(Bias.Forward, bias[0]);
bias[0] = null;
@@ -257,6 +302,10 @@ public class PlainViewI18N_ModelViewTest
}
public void testViewToModelRTL() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
View rtl;
if (BasicSwingTestCase.isHarmony()) {
rtl = view.getView(0).getView(0);
@@ -277,6 +326,10 @@ public class PlainViewI18N_ModelViewTest
}
public void testViewToModelLTR() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
View ltr;
if (BasicSwingTestCase.isHarmony()) {
ltr = view.getView(0).getView(1);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainViewTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import java.awt.Shape;
import javax.swing.JFrame;
import javax.swing.JTextArea;
import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
/**
* This class tests PlainView behavior.
@@ -46,6 +47,10 @@ public class PlainViewTest extends Swing
private PlainView view;
public void testDrawSelectedText() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("line1\nline2");
Graphics g = view.getGraphics();
FontMetrics m = view.metrics;
@@ -71,6 +76,10 @@ public class PlainViewTest extends Swing
}
public void testDrawUnselectedText() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("line1\nline2");
Graphics g = view.getGraphics();
FontMetrics m = view.metrics;
@@ -97,6 +106,10 @@ public class PlainViewTest extends Swing
}
public void testGetPreferredSpan() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("1: 0\n2: 012345\n3:\n");
assertEquals(view.metrics.stringWidth("2: 012345"), // longest line
view.getPreferredSpan(View.X_AXIS), 0.00001f);
@@ -113,6 +126,10 @@ public class PlainViewTest extends Swing
* Generic tests of <code>modelToView(int, Shape, Position.Bias)</code>.
*/
public void testModelToViewintShapeBias01() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("1: 0\n2: 012345\n3:\n");
// 01234 5678901234 567
assertTrue(view.modelToView(0, shape, Position.Bias.Backward) instanceof Rectangle);
@@ -164,6 +181,10 @@ public class PlainViewTest extends Swing
* <code>shape.getBounds().y != 0</code>.
*/
public void testModelToViewintShapeBias02() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("1: 0\n2: 012345\n3:\n");
((Rectangle) shape).setLocation(7, 10);
assertFalse(((Rectangle) shape).x == 0);
@@ -176,6 +197,10 @@ public class PlainViewTest extends Swing
* with zero-length document.
*/
public void testModelToViewintShapeBias03() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("");
assertEquals(0, view.getDocument().getLength());
assertEquals(new Rectangle(1, view.metrics.getHeight()), view.modelToView(0, shape,
@@ -198,6 +223,10 @@ public class PlainViewTest extends Swing
* Tests nextTabStop method with default tab size of 8.
*/
public void testNextTabStop01() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
float tabPos = view.getTabSize() * view.metrics.charWidth('m');
assertEquals(8, view.getTabSize());
assertEquals(tabPos, view.nextTabStop(0.0f, 0), 0.00001f);
@@ -223,6 +252,10 @@ public class PlainViewTest extends Swing
* int viewToModel(float, float, Shape, Position.Bias[])
*/
public void testViewToModelfloatfloatShapeBiasArray() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
area.setText("1: 0\n2: 012345\n3:\n");
// 01234 5678901234 567
int h = view.metrics.getHeight();
@@ -325,9 +358,17 @@ public class PlainViewTest extends Swing
// Painting methods are not tested
/*
public void testDrawLine() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testPaint() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
*/
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainView_ChangesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainView_ChangesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainView_ChangesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/PlainView_ChangesTest.java Wed May 26 09:31:07 2010
@@ -30,6 +30,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.AbstractDocument.DefaultDocumentEvent;
import javax.swing.text.AbstractDocument.ElementEdit;
+import tests.support.Support_Excludes;
/**
* Tests mostly methods which are used when processing change
@@ -112,11 +113,19 @@ public class PlainView_ChangesTest exten
private PlainView view;
public void testChangedUpdate() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
view.changedUpdate(event, shape, null);
assertTrue(updateDamageCalled);
}
public void testDamageLineRange() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
view.updateMetrics();
final int height = view.metrics.getHeight();
final int y = 300;
@@ -149,11 +158,19 @@ public class PlainView_ChangesTest exten
* <code>updateDamage</code> to perform the actual updates.
*/
public void testInsertUpdateDamage() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
view.insertUpdate(event, shape, null);
assertTrue(updateDamageCalled);
}
public void testLineToRect() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
view.updateMetrics();
final int height = view.metrics.getHeight();
assertEquals(new Rectangle(0, 0, 500, height), view.lineToRect(shape, 0));
@@ -166,6 +183,10 @@ public class PlainView_ChangesTest exten
* Tests nextTabStop method with TabSize set to 4.
*/
public void testNextTabStop02() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Set tab size to 4
doc.putProperty(PlainDocument.tabSizeAttribute, new Integer(4));
assertEquals(4, view.getTabSize());
@@ -182,6 +203,10 @@ public class PlainView_ChangesTest exten
* Tests nextTabStop method with TabSize set to a negative value.
*/
public void testNextTabStop03() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Set tab size to -4
doc.putProperty(PlainDocument.tabSizeAttribute, new Integer(-4));
assertEquals(-4, view.getTabSize());
@@ -200,6 +225,10 @@ public class PlainView_ChangesTest exten
* Tests nextTabStop method with TabSize set to zero.
*/
public void testNextTabStop04() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Set tab size to 0
doc.putProperty(PlainDocument.tabSizeAttribute, new Integer(0));
assertEquals(0, view.getTabSize());
@@ -214,6 +243,10 @@ public class PlainView_ChangesTest exten
}
public void testRemoveUpdate() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
view.removeUpdate(event, shape, null);
assertTrue(updateDamageCalled);
}
@@ -222,6 +255,10 @@ public class PlainView_ChangesTest exten
* Tests updateDamage with insert event
*/
public void testUpdateDamage01() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
createEvent();
doc.insertString(0, "1:0123\n2:\n3:abcdefg", null);
// 0123456 789 012345678
@@ -271,6 +308,10 @@ public class PlainView_ChangesTest exten
* Tests updateDamage with remove event
*/
public void testUpdateDamage02() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
createEvent();
doc.insertString(0, "1:0123\n2:\n3:abcdefg", null);
// 0123456 789 012345678
@@ -303,6 +344,10 @@ public class PlainView_ChangesTest exten
* Tests updateDamage with change event
*/
public void testUpdateDamage03() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
createEvent();
doc.insertString(0, "1:0123\n2:\n3:abcdefg", null);
// 0123456 789 012345678
@@ -335,6 +380,10 @@ public class PlainView_ChangesTest exten
}
public void testUpdateMetrics() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertNull(view.metrics);
view.updateMetrics();
assertNotNull(view.metrics);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest.java Wed May 26 09:31:07 2010
@@ -24,6 +24,7 @@ import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
import java.util.Vector;
import javax.swing.undo.UndoableEdit;
+import tests.support.Support_Excludes;
/**
* Tests StringContent class.
@@ -43,6 +44,10 @@ public class StringContentTest extends A
@Override
public void testGetCharsNegativeLength() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@Override
@@ -65,6 +70,10 @@ public class StringContentTest extends A
@Override
public void testGetCharsPartial() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
obj.insertString(10, "big ");
text.setPartialReturn(true);
obj.getChars(8, 10, text);
@@ -73,6 +82,10 @@ public class StringContentTest extends A
@Override
public void testGetStringNegativeLength() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@Override
@@ -96,6 +109,10 @@ public class StringContentTest extends A
}
public void testStringContent() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -104,6 +121,10 @@ public class StringContentTest extends A
}
public void testStringContent_WithValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent(20);
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -112,6 +133,10 @@ public class StringContentTest extends A
}
public void testStringContent_WithInvalidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent(0);
assertEquals(1, content.length());
content.getChars(0, content.length(), text);
@@ -120,6 +145,10 @@ public class StringContentTest extends A
}
public void testCreatePositionBeforeUndo() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -139,6 +168,10 @@ public class StringContentTest extends A
}
public void testCreatePositionAfterUndone() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -153,6 +186,10 @@ public class StringContentTest extends A
}
public void testCreatePositionAfterInsert() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit undoable;
content = new StringContent(10);
content.insertString(0, "0123456789");
@@ -166,6 +203,10 @@ public class StringContentTest extends A
}
public void testCreatePosition_WithInvalidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent(10);
content.insertString(0, "012345");
if (isHarmony()) {
@@ -187,6 +228,10 @@ public class StringContentTest extends A
}
public void testGetChars_WithValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
content.getChars(0, 1, text);
content.getChars(0, 0, text);
@@ -196,6 +241,10 @@ public class StringContentTest extends A
}
public void testGetChars_WithInvalidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
if (isHarmony()) {
testExceptionalCase(new BadLocationCase() {
@@ -236,6 +285,10 @@ public class StringContentTest extends A
}
public void testGetPositionsInRangeVector() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Vector<Object> v = new Vector<Object>();
v.add(new Object());
v.add(new Object());
@@ -253,17 +306,29 @@ public class StringContentTest extends A
}
public void testGetPositionsInRange() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content.createPosition(10);
Vector<?> v = content.getPositionsInRange(null, 0, 10);
assertEquals(1, v.size());
}
public void testGetString_WithValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content.getString(0, 0);
content.getString(0, content.length());
}
public void testGetString_WithInValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
testExceptionalCase(new BadLocationCase() {
@Override
public void exceptionalAction() throws Exception {
@@ -309,6 +374,10 @@ public class StringContentTest extends A
}
public void testInsertString_WithValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit ue = content.insertString(2, "^^^");
assertNotNull(ue);
content.getChars(0, content.length(), text);
@@ -321,6 +390,10 @@ public class StringContentTest extends A
}
public void testInsertString_WithInvalidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
testExceptionalCase(new BadLocationCase() {
@Override
@@ -343,6 +416,10 @@ public class StringContentTest extends A
}
public void testInsertString_UndoableEdit() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit undoable;
final String redoName = isHarmony() ? "Redo addition" : "Redo";
final String undoName = isHarmony() ? "Undo addition" : "Undo";
@@ -363,6 +440,10 @@ public class StringContentTest extends A
}
public void testRemove_WithValidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
content.insertString(0, "012345^11111");
content.getChars(0, content.length(), text);
@@ -387,6 +468,10 @@ public class StringContentTest extends A
}
public void testRemove_UndoableEdit() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
UndoableEdit undoable = content.remove(2, 3);
final String redoName = isHarmony() ? "Redo deletion" : "Redo";
final String undoName = isHarmony() ? "Undo deletion" : "Undo";
@@ -411,6 +496,10 @@ public class StringContentTest extends A
}
public void testRemove_WithInvalidValues() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
content.insertString(0, "012345^11111");
content.getChars(0, content.length(), text);
@@ -429,6 +518,10 @@ public class StringContentTest extends A
}
public void testPositionGC() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Vector<WeakReference<Position>> pos = new Vector<WeakReference<Position>>(10);
ReferenceQueue<Position> rq = new ReferenceQueue<Position>();
for (int i = 0; i < content.length(); i += 2) {
@@ -451,6 +544,10 @@ public class StringContentTest extends A
}
public void testLength_ForStringContent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent();
assertEquals(1, content.length());
content.insertString(0, " Hello word ");
@@ -482,6 +579,10 @@ public class StringContentTest extends A
}
public void testInnerContentSize() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content = new StringContent(30);
insertStringManyTimes("a", 160, content);
content.getChars(0, content.length(), text);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StringContentTest_CommonTest.java Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ package javax.swing.text;
import java.util.Vector;
import javax.swing.BasicSwingTestCase;
import javax.swing.undo.UndoableEdit;
+import tests.support.Support_Excludes;
public class StringContentTest_CommonTest extends GapContentTest {
@Override
@@ -33,6 +34,10 @@ public class StringContentTest_CommonTes
@Override
public void testGetCharsImpliedCharPartial() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
obj = content = new StringContent();
assertEquals(1, content.length());
text.setPartialReturn(false);
@@ -45,6 +50,10 @@ public class StringContentTest_CommonTes
@Override
public void testGetPositionsInRangeVector() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Vector<Object> v = new Vector<Object>();
v.add(new Object());
v.add(new Object());
@@ -67,6 +76,10 @@ public class StringContentTest_CommonTes
*/
@Override
public void testGetPositionsInRangeEnd() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
content.createPosition(10);
Vector<?> v = ((StringContent) content).getPositionsInRange(null, 0, 10);
assertEquals(1, v.size());
@@ -74,6 +87,10 @@ public class StringContentTest_CommonTes
@Override
public void testGetPositionsInRange() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Vector<Position> pos = new Vector<Position>();
for (int i = 0; i < content.length(); i += 2) {
Position p = content.createPosition(i);
@@ -96,51 +113,91 @@ public class StringContentTest_CommonTes
@Override
public void testGetCharsNegativeLength() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Is Already tested in StringContentTest
}
@Override
public void testGetCharsAfterGapNoImplied() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsAfterGap() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsBeforeGap() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsFullLength() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsFullActualLength() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsImpliedChar() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsPartial() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetCharsWithGap() throws BadLocationException {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// N/A
}
@Override
public void testGetStringNegativeLength() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Is Already tested in StringContentTest
}
}
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyleContextTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.text.StyleContext.SmallAttributeSet;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class StyleContextTest extends TestCase implements ChangeListener {
/**
@@ -144,6 +145,10 @@ public class StyleContextTest extends Te
* contain exactly one style (default).
*/
public void testStyleContext() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
int count = 0;
Enumeration<?> names = sc.getStyleNames();
Object name = null;
@@ -156,6 +161,10 @@ public class StyleContextTest extends Te
}
public void testCollectGarbageInCache() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!BasicSwingTestCase.isHarmony()) {
// This is internal test only
return;
@@ -182,6 +191,10 @@ public class StyleContextTest extends Te
}
public void testCollectGarbageInCacheFont() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
if (!BasicSwingTestCase.isHarmony()) {
// This is internal test only
return;
@@ -203,6 +216,10 @@ public class StyleContextTest extends Te
}
public void testAddStyle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Style aStyle = sc.addStyle("aStyle", null);
Style anotherStyle = sc.addStyle("anotherStyle", aStyle);
int count = 0;
@@ -242,6 +259,10 @@ public class StyleContextTest extends Te
}
public void testAddStyleMisc() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
// Add styles with diff parameters
Object[] styles = { null, null, "one", null, null, sc.new NamedStyle(), "two",
sc.new NamedStyle() };
@@ -253,6 +274,10 @@ public class StyleContextTest extends Te
}
public void testAddStyleTwice() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final String styleName = "styleName";
final Style style = sc.addStyle(styleName, null);
final Style another = sc.addStyle(styleName, null);
@@ -261,6 +286,10 @@ public class StyleContextTest extends Te
}
public void testCreateSmallAttributeSet() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AttributeSet as = sc.createSmallAttributeSet(sc.getEmptySet());
assertTrue(as instanceof SmallAttributeSet);
assertEquals(0, as.getAttributeCount());
@@ -268,6 +297,10 @@ public class StyleContextTest extends Te
}
public void testGetStyle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Style style = sc.getStyle("default");
assertEquals("default", style.getName());
sc.addStyle("aStyle", style);
@@ -277,17 +310,29 @@ public class StyleContextTest extends Te
}
public void testCreateLargeAttributeSet() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
AttributeSet as = sc.createLargeAttributeSet(new SimpleAttributeSet());
assertTrue(as instanceof SimpleAttributeSet);
}
public void testGetEmptySet() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertSame(sc.getEmptySet(), sc.getEmptySet());
assertEquals(0, sc.getEmptySet().getAttributeCount());
}
// test {add,remove}ChangeListener while adding styles
public void testChangeListenerAddStyle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
bStateChanged = false;
sc.addStyle("one", null);
assertFalse(bStateChanged);
@@ -303,6 +348,10 @@ public class StyleContextTest extends Te
// test if a listener gets called when adding style with null name
public void testChangeListenerAddStyleNull() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
sc.addChangeListener(this);
bStateChanged = false;
sc.addStyle(null, StyleContext.getDefaultStyleContext().new NamedStyle());
@@ -321,6 +370,10 @@ public class StyleContextTest extends Te
// test {add,remove}ChangeListener while removing styles
public void testChangeListenerRemoveStyle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
sc.addStyle("one", null);
sc.addStyle("two", null);
sc.addStyle("three", null);
@@ -338,6 +391,10 @@ public class StyleContextTest extends Te
}
public void testGetChangeListeners() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ChangeListener[] listeners = sc.getChangeListeners();
assertEquals(0, listeners.length);
sc.addChangeListener(this);
@@ -349,6 +406,10 @@ public class StyleContextTest extends Te
}
public void testGetStyleNamesDef() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
boolean wasDefault = false;
int count = 0;
Enumeration<?> names = sc.getStyleNames();
@@ -362,6 +423,10 @@ public class StyleContextTest extends Te
}
public void testGetStyleNames() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
sc.addStyle("style", null);
boolean wasDefault = false;
boolean wasStyle = false;
@@ -379,6 +444,10 @@ public class StyleContextTest extends Te
}
public void testRemoveStyle() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
sc.addStyle("style", null);
sc.removeStyle("style");
boolean wasDefault = false;
@@ -397,6 +466,10 @@ public class StyleContextTest extends Te
}
public void testToString() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Style style = sc.getStyle(StyleContext.DEFAULT_STYLE);
style.addAttribute(StyleConstants.Bold, Boolean.TRUE);
style.addAttribute(StyleConstants.Italic, Boolean.FALSE);
@@ -456,10 +529,18 @@ public class StyleContextTest extends Te
}
public void testGetCompressionThreshold() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
assertEquals(9, sc.getCompressionThreshold());
}
public void testGetDefaultStyleContext() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
StyleContext def;
assertSame(def = StyleContext.getDefaultStyleContext(), StyleContext
.getDefaultStyleContext());
@@ -508,6 +589,10 @@ public class StyleContextTest extends Te
}
public void testCaching() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
StyleContextX sc = new StyleContextX();
int addStyle = sc.count;
sc.addStyle("aStyle", null);
@@ -520,6 +605,10 @@ public class StyleContextTest extends Te
/*
public void testReclaim() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
*/
public void stateChanged(final ChangeEvent event) {
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/StyledEditorKitTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import javax.swing.Action;
import javax.swing.JEditorPane;
import javax.swing.SwingTestCase;
import javax.swing.event.ChangeListener;
+import tests.support.Support_Excludes;
public class StyledEditorKitTest extends SwingTestCase {
StyledEditorKit kit;
@@ -96,15 +97,27 @@ public class StyledEditorKitTest extends
}
public void testStyledEditorKit() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testClone() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Object kit1 = kit.clone();
assertNotSame(kit1, kit);
assertTrue(kit1 instanceof StyledEditorKit);
}
public void testGetActions() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Action[] actions = kit.getActions();
Action[] superActions = new DefaultEditorKit().getActions();
Action[] newActions = new Action[] {
@@ -163,6 +176,10 @@ public class StyledEditorKitTest extends
}
public void testCreateDefaultDocument() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
Document doc1 = kit.createDefaultDocument();
Document doc2 = kit.createDefaultDocument();
String className = "javax.swing.text.DefaultStyledDocument";
@@ -192,6 +209,10 @@ public class StyledEditorKitTest extends
}
public void testCreateInputAttributes() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SimpleAttributeSet sas = createAttributeSet();
SimpleElement element = new SimpleElement("");
element.setAttributeSet(sas);
@@ -205,9 +226,17 @@ public class StyledEditorKitTest extends
}
public void testDeinstallJEditorPane() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
public void testGetCharacterAttributeRun() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SimpleAttributeSet set = createAttributeSet();
JEditorPane jep = new JEditorPane();
DefaultStyledDocument doc = new DefaultStyledDocument();
@@ -224,6 +253,10 @@ public class StyledEditorKitTest extends
}
public void testGetInputAttributes() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
SimpleAttributeSet set = createAttributeSet();
JEditorPane jep = new JEditorPane();
DefaultStyledDocument doc = new DefaultStyledDocument();
@@ -244,6 +277,10 @@ public class StyledEditorKitTest extends
}
public void testGetInputAttributesNoComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
final AttributeSet as = kit.getInputAttributes();
assertNotNull(as);
assertEquals(0, as.getAttributeCount());
@@ -259,6 +296,10 @@ public class StyledEditorKitTest extends
}
public void testGetViewFactory() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
ViewFactory factory = kit.getViewFactory();
Element element = new SimpleElement(AbstractDocument.ContentElementName);
assertEquals("javax.swing.text.LabelView", factory.create(element).getClass().getName());
@@ -281,6 +322,10 @@ public class StyledEditorKitTest extends
}
public void testInstallJEditorPane() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
}
@@ -289,6 +334,10 @@ public class StyledEditorKitTest extends
* Regression test for HARMONY-2594
* */
public void testcreateInputAttributes() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
MyStyledEditorKit msek = new MyStyledEditorKit();
MutableAttributeSet set = new Style() {
public void removeChangeListener(ChangeListener p0) {
@@ -358,6 +407,10 @@ public class StyledEditorKitTest extends
* Regression test for HARMONY-2594
* */
public void testCreateInputAttributes2() {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
MyStyledEditorKit msek = new MyStyledEditorKit();
try {
msek.createInputAttributes(new SimpleElement(""), null);
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_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/text/TextAction_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/TextAction_MultithreadedTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.SwingWaitTestCase;
import junit.framework.TestCase;
+import tests.support.Support_Excludes;
public class TextAction_MultithreadedTest extends TestCase {
JDialog window1;
@@ -60,6 +61,10 @@ public class TextAction_MultithreadedTes
}
public void testGetFocusedComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TextAction action = new TextAction("") {
private static final long serialVersionUID = 1L;
@@ -94,6 +99,10 @@ public class TextAction_MultithreadedTes
}
public void testGetTextComponent() throws Exception {
+ if (Support_Excludes.isExcluded()) {
+ return;
+ }
+
TextAction action = new TextAction("") {
private static final long serialVersionUID = 1L;