harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [16/20] - 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/auth/make/ classli...
Date Sat, 05 Jun 2010 08:35:05 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FlowViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FlowViewTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FlowViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/FlowViewTest.java Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.text.FlowView.FlowStrategy;
 import javax.swing.text.ViewTestHelpers.ChildrenFactory;
 import javax.swing.text.ViewTestHelpers.ElementPartView;
-import tests.support.Support_Excludes;
 
 /**
  * Tests the majority of methods of FlowView class.
@@ -118,10 +117,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testSetParent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(view.getParent());
         assertNull(view.layoutPool);
         assertEquals(0, view.getViewCount());
@@ -137,10 +132,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testSetParentWithFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         assertNull(view.getParent());
         assertNull(view.layoutPool);
@@ -161,10 +152,6 @@ public class FlowViewTest extends BasicS
      * elements.
      */
     public void testGetViewIndexAtPositionEntire() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, view.getViewCount());
         final ViewFactory vf = new ChildrenFactory();
         final Element first = root.getElement(0);
@@ -188,10 +175,6 @@ public class FlowViewTest extends BasicS
      * of elements.
      */
     public void testGetViewIndexAtPositionPartial() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, view.getViewCount());
         final ViewFactory vf = new ChildrenFactory();
         final Element first = root.getElement(0);
@@ -215,10 +198,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLoadChildren() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(view.layoutPool);
         assertNull(view.getViewFactory());
         view.loadChildren(new ChildrenFactory());
@@ -229,10 +208,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLoadChildrenWithFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         assertNull(view.layoutPool);
         assertNotNull(view.getViewFactory());
@@ -244,10 +219,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLoadChildrenWithFactoryEmtpyPool() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         assertNull(view.layoutPool);
         assertNotNull(view.getViewFactory());
@@ -259,10 +230,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLoadChildrenEmtpyPoolNullFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         assertNull(view.layoutPool);
         assertNotNull(view.getViewFactory());
@@ -274,10 +241,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLoadChildrenStrategy() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final boolean[] called = new boolean[] { false };
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         view.strategy = new FlowStrategy() {
@@ -295,10 +258,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testCalculateMinorAxisRequirements() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view.layoutPool = new PlainView(root) {
             @Override
             public float getPreferredSpan(int axis) {
@@ -334,10 +293,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testLayout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final List<Integer> layoutChanges = new ArrayList<Integer>();
         final Marker prefMarker = new Marker();
         view = new FlowViewImplWithFactory(root, View.Y_AXIS) {
@@ -414,10 +369,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testFlowView() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(root, view.getElement());
         assertEquals(View.Y_AXIS, view.getAxis());
         assertEquals(Short.MAX_VALUE, view.layoutSpan);
@@ -428,10 +379,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetFlowAxis() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(View.Y_AXIS, view.getAxis());
         assertEquals(View.X_AXIS, view.getFlowAxis());
         view = new FlowViewImpl(root, View.X_AXIS);
@@ -445,10 +392,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetFlowStart() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, view.getViewCount());
         assertEquals(0, view.getFlowStart(0));
         assertEquals(0, view.getFlowStart(1));
@@ -460,10 +403,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetFlowSpan() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, view.getViewCount());
         assertEquals(Short.MAX_VALUE, view.layoutSpan);
         view.layoutSpan = -10;
@@ -477,10 +416,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanNoRow() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         view.loadChildren(null);
         assertEquals(0, view.getViewCount());
@@ -508,10 +443,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanOneRowNoChildren() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         view.loadChildren(null);
         assertEquals(0, view.getViewCount());
@@ -541,10 +472,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanOneRowOneChild() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         view.loadChildren(null);
         assertEquals(0, view.getViewCount());
@@ -575,10 +502,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanNoRowFlexible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ChildrenFactory factory = new ChildrenFactory();
         factory.makeFlexible();
         view = new FlowViewImplWithFactory(root, View.Y_AXIS, factory);
@@ -604,10 +527,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanOneRowNoChildrenFlexible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ChildrenFactory factory = new ChildrenFactory();
         factory.makeFlexible();
         view = new FlowViewImplWithFactory(root, View.Y_AXIS, factory);
@@ -635,10 +554,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetSpanOneRowOneChildFlexible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ChildrenFactory factory = new ChildrenFactory();
         factory.makeFlexible();
         view = new FlowViewImplWithFactory(root, View.Y_AXIS, factory);
@@ -668,10 +583,6 @@ public class FlowViewTest extends BasicS
     }
 
     public void testGetAttributesLayoutPool() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view = new FlowViewImplWithFactory(root, View.Y_AXIS);
         view.loadChildren(null);
         assertSame(view.getAttributes(), view.layoutPool.getAttributes());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContentTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import java.util.List;
 import java.util.Vector;
 import javax.swing.BasicSwingTestCase;
 import javax.swing.undo.UndoableEdit;
-import tests.support.Support_Excludes;
 
 public class GapContentTest extends AbstractDocument_ContentTest {
     protected AbstractDocument.Content content;
@@ -40,10 +39,6 @@ public class GapContentTest extends Abst
     }
 
     public void testGetPositionsInRangeVector() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Vector<Object> v = new Vector<Object>();
         v.add(new Object());
         v.add(new Object());
@@ -61,10 +56,6 @@ public class GapContentTest extends Abst
     }
 
     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);
@@ -86,10 +77,6 @@ public class GapContentTest extends Abst
     }
 
     public void testUpdatePositions() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         GapContent cont1 = new GapContent();
         final Vector<Position> pos = new Vector<Position>();
         final int posSize = 5;
@@ -132,20 +119,12 @@ public class GapContentTest extends Abst
      * the returned vector.
      */
     public void testGetPositionsInRangeEnd() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         content.createPosition(10);
         Vector<?> v = ((GapContent) content).getPositionsInRange(null, 0, 10);
         assertEquals(1, v.size());
     }
 
     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) {
@@ -179,19 +158,11 @@ public class GapContentTest extends Abst
 
     @Override
     public void testGetCharsAfterGap() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsAfterGap();
         isContentArraySame(true);
     }
 
     public void testGetCharsAfterGapNoImplied() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Move the gap
         obj.insertString(10, "big ");
         // Don't include the implied char
@@ -202,29 +173,17 @@ public class GapContentTest extends Abst
 
     @Override
     public void testGetCharsBeforeGap() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsBeforeGap();
         isContentArraySame(true);
     }
 
     @Override
     public void testGetCharsFullLength() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsFullLength();
         isContentArraySame(false);
     }
 
     public void testGetCharsFullActualLength() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         obj.getChars(0, obj.length() - 1, text);
         assertEquals("This is a test string.", text.toString());
         isContentArraySame(true);
@@ -232,19 +191,11 @@ public class GapContentTest extends Abst
 
     @Override
     public void testGetCharsImpliedChar() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsImpliedChar();
         isContentArraySame(false);
     }
 
     public void testGetCharsImpliedCharPartial() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         obj = content = new GapContent();
         assertEquals(1, content.length());
         text.setPartialReturn(false);
@@ -259,30 +210,18 @@ public class GapContentTest extends Abst
 
     @Override
     public void testGetCharsPartial() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsPartial();
         isContentArraySame(true);
     }
 
     @Override
     public void testGetCharsWithGap() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         super.testGetCharsWithGap();
         isContentArraySame(false);
     }
 
     // Regression for HARMONY-2566
     public void testGetCharsMaxInteger() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             content.getChars(1, Integer.MAX_VALUE, null);
             fail("BadLocationException is expected");
@@ -291,10 +230,6 @@ public class GapContentTest extends Abst
     }
 
     public void testGetCharsNullSegment() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             content.getChars(1, 1, null);
             fail("NullPointerException is expected");
@@ -303,10 +238,6 @@ public class GapContentTest extends Abst
     }
 
     public void testCreatePositionBeforeUndo() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UndoableEdit ue = content.remove(3, 8);
         Position pos = content.createPosition(3);
         assertEquals(3, pos.getOffset());
@@ -317,10 +248,6 @@ public class GapContentTest extends Abst
     }
 
     public void testCreatePositionAfterUndone() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UndoableEdit ue = content.remove(3, 8);
         ue.undo();
         Position pos = content.createPosition(5);
@@ -332,10 +259,6 @@ public class GapContentTest extends Abst
     }
 
     public void testCreatePositionAfterInsert() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         UndoableEdit ue = content.insertString(10, "big ");
         Position pos = content.createPosition(12);
         assertEquals(12, pos.getOffset());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContent_InternalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContent_InternalTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContent_InternalTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GapContent_InternalTest.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@ package javax.swing.text;
 
 import java.util.List;
 import javax.swing.BasicSwingTestCase;
-import tests.support.Support_Excludes;
 
 /**
  * Tests some internal functionality of GapContent but not its methods.
@@ -37,10 +36,6 @@ public class GapContent_InternalTest ext
     }
 
     public void testBufferExpansion() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -55,10 +50,6 @@ public class GapContent_InternalTest ext
     }
 
     public void testInsertPosition() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -84,10 +75,6 @@ public class GapContent_InternalTest ext
      * @throws BadLocationException
      */
     public void testPositionSort() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -109,10 +96,6 @@ public class GapContent_InternalTest ext
     }
 
     public void testPositionGC() throws BadLocationException {
-        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/GlyphView_AttributesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GlyphView_AttributesTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GlyphView_AttributesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/GlyphView_AttributesTest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import java.awt.Container;
 import java.awt.Font;
 import javax.swing.JTextArea;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /**
  * Tests GlyphView class, its methods to get attributes.
@@ -146,10 +145,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testGetForeground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame(StyleConstants.getForeground(leaf.getAttributes()), styledView
                 .getForeground());
         assertCalledMethods(FORE);
@@ -163,10 +158,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testGetBackground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(styledView.getBackground());
         assertCalledMethods(NONE);
         assertNull(styledWithParent.getBackground());
@@ -183,10 +174,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testGetFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Font font = styledView.getFont();
         assertEquals(StyleConstants.getFontFamily(leaf.getAttributes()), font.getFamily());
         assertEquals(StyleConstants.getFontSize(leaf.getAttributes()), font.getSize());
@@ -202,10 +189,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testIsUnderline() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(styledView.isUnderline());
         assertFalse(styledWithParent.isUnderline());
         assertFalse(plainView.isUnderline());
@@ -216,10 +199,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testIsStrikeThrough() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(styledView.isStrikeThrough());
         assertFalse(styledWithParent.isStrikeThrough());
         assertFalse(plainView.isUnderline());
@@ -230,10 +209,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testIsSubscript() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(styledView.isSubscript());
         assertFalse(styledWithParent.isSubscript());
         assertFalse(plainView.isSubscript());
@@ -244,10 +219,6 @@ public class GlyphView_AttributesTest ex
     }
 
     public void testIsSuperscript() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(styledView.isSuperscript());
         assertFalse(styledWithParent.isSuperscript());
         assertFalse(plainView.isSuperscript());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/InternationalFormatterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/InternationalFormatterTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/InternationalFormatterTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/InternationalFormatterTest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.text.NumberFormat;
 import java.text.ParseException;
 import javax.swing.JFormattedTextField;
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class InternationalFormatterTest extends SwingTestCase {
     InternationalFormatter formatter;
@@ -68,19 +67,11 @@ public class InternationalFormatterTest 
     }
 
     public void testInternationalFormatter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(formatter.getFormat());
         checkMainProperties();
     }
 
     public void testInternationalFormatterFormat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Format format = NumberFormat.getNumberInstance();
         formatter = new InternationalFormatter(format);
         assertEquals(format, formatter.getFormat());
@@ -88,10 +79,6 @@ public class InternationalFormatterTest 
     }
 
     public void testClone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object clone = null;
         formatter.install(ftf);
         formatter.setValueClass(Integer.class);
@@ -120,17 +107,9 @@ public class InternationalFormatterTest 
     }
 
     public void testGetActions() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testStringToValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(formatter.getFormat());
         assertNull(formatter.getValueClass());
         try {
@@ -174,10 +153,6 @@ public class InternationalFormatterTest 
     }
 
     public void testValueToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             assertEquals("", formatter.valueToString(null));
             Object value;
@@ -199,10 +174,6 @@ public class InternationalFormatterTest 
     }
 
     public void testGetFields() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ftf.setValue(new Integer(345));
         formatter = (InternationalFormatter) ftf.getFormatter();
         Format format = formatter.getFormat();
@@ -217,20 +188,12 @@ public class InternationalFormatterTest 
     }
 
     public void testSetGetFormat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Format format = NumberFormat.getCurrencyInstance();
         formatter.setFormat(format);
         assertEquals(format, formatter.getFormat());
     }
 
     public void testSetGetMaximum() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Integer max = new Integer(35);
         Integer min = new Integer(40);
         formatter.setMaximum(max);
@@ -240,10 +203,6 @@ public class InternationalFormatterTest 
     }
 
     public void testSetGetMinimum() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Integer max = new Integer(10);
         Integer min = new Integer(20);
         formatter.setMinimum(min);

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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -57,7 +57,6 @@ 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;
@@ -275,17 +274,9 @@ 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");
@@ -309,19 +300,11 @@ 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");
@@ -331,10 +314,6 @@ 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);
@@ -344,10 +323,6 @@ public class JTextComponentTest extends 
     }
 
     public void testSetGetDocument() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(jtc.getDocument());
         jtc.setText("testSetGetDocument");
         Highlighter highlighter = jtc.getHighlighter();
@@ -368,10 +343,6 @@ 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);
@@ -390,10 +361,6 @@ 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");
@@ -420,10 +387,6 @@ 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");
@@ -439,19 +402,11 @@ 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"));
@@ -467,10 +422,6 @@ public class JTextComponentTest extends 
     }
 
     public void testReplaceSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtc.setText("JTextComponent");
         jtc.select(5, 8);
         jtc.replaceSelection(null);
@@ -488,10 +439,6 @@ 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();
@@ -514,10 +461,6 @@ 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");
@@ -541,10 +484,6 @@ 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");
@@ -562,10 +501,6 @@ 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);
@@ -575,10 +510,6 @@ 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);
@@ -597,10 +528,6 @@ 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);
@@ -624,10 +551,6 @@ 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),
@@ -636,10 +559,6 @@ public class JTextComponentTest extends 
     }
 
     public void testSetGetDragEnabled() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         /*
          * class RunnableCase0 extends RunnableWrap { public void run() {
          * assertFalse(jtc.getDragEnabled());
@@ -685,10 +604,6 @@ 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());
@@ -717,10 +632,6 @@ public class JTextComponentTest extends 
     }
 
     public void testSetGetSelectionStartEnd() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -788,10 +699,6 @@ 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());
@@ -820,10 +727,6 @@ public class JTextComponentTest extends 
     }
 
     public void testMoveCaretPosition() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtc.setText("JTextComponent");
         jtc.setCaretPosition(5);
         jtc.moveCaretPosition(8);
@@ -851,10 +754,6 @@ 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;
@@ -872,10 +771,6 @@ public class JTextComponentTest extends 
     }
 
     public void testSelectAll() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtc.selectAll();
         assertNull(jtc.getSelectedText());
         jtc.setText("JTextComponent");
@@ -890,10 +785,6 @@ 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;
@@ -922,10 +813,6 @@ 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;
@@ -964,10 +851,6 @@ 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;
@@ -986,10 +869,6 @@ 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());
@@ -1021,10 +900,6 @@ 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);
@@ -1071,19 +946,11 @@ 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);
@@ -1144,10 +1011,6 @@ 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);
@@ -1172,10 +1035,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ 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;
@@ -179,10 +178,6 @@ public class JTextComponent_AccessibleJT
     }
 
     public void testAccessibleJTextComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(accessible);
     }
 
@@ -197,10 +192,6 @@ 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";
@@ -255,10 +246,6 @@ 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);
@@ -276,10 +263,6 @@ 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);
@@ -301,10 +284,6 @@ 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);
@@ -322,10 +301,6 @@ 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,
@@ -359,10 +334,6 @@ public class JTextComponent_AccessibleJT
     }
 
     public void testGetAccessibleText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(accessible, accessible.getAccessibleText());
     }
 
@@ -394,10 +365,6 @@ 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));
@@ -412,43 +379,23 @@ 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);
@@ -458,10 +405,6 @@ 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 {
@@ -476,19 +419,11 @@ 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));
@@ -496,10 +431,6 @@ public class JTextComponent_AccessibleJT
     }
 
     public void testGetSelectedText() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtc.setCaretPosition(5);
         assertNull(accessible.getSelectedText());
         jtc.moveCaretPosition(8);
@@ -507,19 +438,11 @@ 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());
@@ -566,10 +489,6 @@ 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;
@@ -590,20 +509,12 @@ 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;
@@ -618,10 +529,6 @@ public class JTextComponent_AccessibleJT
     }
 
     public void testGetSelectionStartEnd() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtc.setSelectionStart(5);
         jtc.setSelectionEnd(8);
         assertEquals(5, accessible.getSelectionStart());
@@ -629,18 +536,10 @@ 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);
@@ -648,10 +547,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ 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;
@@ -87,10 +86,6 @@ 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");
@@ -132,10 +127,6 @@ 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");
@@ -149,10 +140,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ 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;
@@ -142,10 +141,6 @@ public class JTextComponent_IMLocationTe
     }
 
     public void testGetLocationOffset() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             setComposedText();
             Rectangle rect;
@@ -166,10 +161,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -33,7 +33,6 @@ 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;
@@ -149,10 +148,6 @@ 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);
@@ -166,10 +161,6 @@ 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);
@@ -178,10 +169,6 @@ 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));
@@ -228,10 +215,6 @@ 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";
@@ -265,10 +248,6 @@ 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));
@@ -305,10 +284,6 @@ 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));
@@ -321,10 +296,6 @@ 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));
@@ -334,10 +305,6 @@ 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);
@@ -350,10 +317,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ 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;
@@ -68,10 +67,6 @@ public class JTextComponent_Multithreade
     }
 
     public void testReplaceSelection() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Runnable test = new Runnable() {
             public void run() {
                 jtc.setText("JTextComponent");
@@ -111,10 +106,6 @@ 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);
@@ -140,10 +131,6 @@ 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");
@@ -198,10 +185,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -33,7 +33,6 @@ 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;
@@ -108,10 +107,6 @@ 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);
@@ -119,10 +114,6 @@ 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();
@@ -134,10 +125,6 @@ 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();
@@ -151,10 +138,6 @@ public class JTextComponent_byAuxiliaryC
     }
 
     public void testJTextComponent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         jtComp = new JTextComp();
         assertNotNull(jtComp);
         assertTrue(jtComp.getUI() instanceof TextCompUI);
@@ -172,10 +155,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ 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;
@@ -93,10 +92,6 @@ 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);
@@ -110,10 +105,6 @@ 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();
@@ -123,10 +114,6 @@ public class PasswordViewTest extends Sw
     }
 
     public void testDrawSelectedText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Graphics g = pf.getGraphics();
         Color color = g.getColor();
         try {
@@ -142,10 +129,6 @@ public class PasswordViewTest extends Sw
     }
 
     public void testDrawUnselectedText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Graphics g = pf.getGraphics();
         Color old = g.getColor();
         try {
@@ -161,10 +144,6 @@ 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);
@@ -187,10 +166,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -23,7 +23,6 @@ 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.
@@ -44,10 +43,6 @@ 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,
@@ -67,10 +62,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ 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
@@ -80,10 +79,6 @@ public class PlainViewI18N_LineView_Upda
     }
 
     public void testInsertUpdateLTRNoChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -95,10 +90,6 @@ public class PlainViewI18N_LineView_Upda
     }
 
     public void testInsertUpdateRTLNoChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -109,10 +100,6 @@ public class PlainViewI18N_LineView_Upda
     }
 
     public void testInsertUpdateLTRWithChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -126,10 +113,6 @@ public class PlainViewI18N_LineView_Upda
     }
 
     public void testInsertUpdateRTLWithChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -148,10 +131,6 @@ 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);
@@ -160,10 +139,6 @@ 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);
@@ -172,10 +147,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ 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.
@@ -80,10 +79,6 @@ public class PlainViewI18N_ModelViewTest
      * with Forward and Backward biases.
      */
     public void testGetNextVisualPositionEast01() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -102,10 +97,6 @@ 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]);
@@ -121,10 +112,6 @@ public class PlainViewI18N_ModelViewTest
      * with Forward and Backward biases.
      */
     public void testGetNextVisualPositionEast03() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -143,10 +130,6 @@ 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]);
@@ -162,10 +145,6 @@ public class PlainViewI18N_ModelViewTest
      * with Forward and Backward biases.
      */
     public void testGetNextVisualPositionWest01() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -184,10 +163,6 @@ public class PlainViewI18N_ModelViewTest
      * with Forward and Backward biases.
      */
     public void testGetNextVisualPositionWest02() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -206,10 +181,6 @@ public class PlainViewI18N_ModelViewTest
      * with Forward and Backward biases.
      */
     public void testGetNextVisualPositionWest03() throws BadLocationException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             return;
         }
@@ -228,10 +199,6 @@ 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]);
@@ -257,10 +224,6 @@ 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);
@@ -271,10 +234,6 @@ 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);
@@ -283,10 +242,6 @@ 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;
@@ -302,10 +257,6 @@ 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);
@@ -326,10 +277,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ 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.
@@ -47,10 +46,6 @@ 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;
@@ -76,10 +71,6 @@ 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;
@@ -106,10 +97,6 @@ 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);
@@ -126,10 +113,6 @@ 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);
@@ -181,10 +164,6 @@ 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);
@@ -197,10 +176,6 @@ 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,
@@ -223,10 +198,6 @@ 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);
@@ -252,10 +223,6 @@ 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();
@@ -358,17 +325,9 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ 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
@@ -113,19 +112,11 @@ 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;
@@ -158,19 +149,11 @@ 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));
@@ -183,10 +166,6 @@ 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());
@@ -203,10 +182,6 @@ 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());
@@ -225,10 +200,6 @@ 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());
@@ -243,10 +214,6 @@ public class PlainView_ChangesTest exten
     }
 
     public void testRemoveUpdate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         view.removeUpdate(event, shape, null);
         assertTrue(updateDamageCalled);
     }
@@ -255,10 +222,6 @@ 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
@@ -308,10 +271,6 @@ 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
@@ -344,10 +303,6 @@ 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
@@ -380,10 +335,6 @@ public class PlainView_ChangesTest exten
     }
 
     public void testUpdateMetrics() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(view.metrics);
         view.updateMetrics();
         assertNotNull(view.metrics);



Mime
View raw message