harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [18/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...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.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/UtilitiesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/UtilitiesTest.java Wed May 26 09:31:07 2010
@@ -31,6 +31,7 @@ import javax.swing.JTextArea;
 import javax.swing.JTextField;
 import javax.swing.SwingTestCase;
 import javax.swing.plaf.basic.BasicTextUI;
+import tests.support.Support_Excludes;
 
 public class UtilitiesTest extends SwingTestCase {
     JTextComponent textComponent;
@@ -225,6 +226,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testDrawTabbedText() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         drawTabbedTextTest(jta);
         drawTabbedTextTest(jtf);
         //drawTabbedTextTest(jtp);
@@ -260,6 +265,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetTabbedTextWidth() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getTabbedTextWidthTest(jta);
         getTabbedTextWidthTest(jtf);
         //getTabbedTextWidthTest(jtp);
@@ -329,6 +338,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetTabbedTextOffsetRound_BoundaryCases() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getTabbedTextOffsetRoundTest_BoundaryCases(jta);
         getTabbedTextOffsetRoundTest_BoundaryCases(jtf);
         //getTabbedTextOffsetRoundTest(jtp);
@@ -362,6 +375,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetTabbedTextOffsetRound() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getTabbedTextOffsetRoundTest(jta);
         getTabbedTextOffsetRoundTest(jtf);
         //getTabbedTextOffsetRoundTest(jtp);
@@ -396,6 +413,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetTabbedTextOffsetRound_NoTabExpander() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getTabbedTextOffsetRoundTest_NoTabExpander(jta);
         getTabbedTextOffsetRoundTest_NoTabExpander(jtf);
         //getTabbedTextOffsetRoundTest_NoTabExpander(jtp);
@@ -429,6 +450,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetTabbedTextOffset() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getTabbedTextOffsetTest(jta);
         getTabbedTextOffsetTest(jtf);
         //getTabbedTextOffsetTest(jtp);
@@ -484,6 +509,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetBreakLocation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (isHarmony()) {
             getBreakLocationTest(jta);
         }
@@ -511,6 +540,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetParagraphElement() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getParagraphElementTest(jta);
         //getParagraphElementTest(jtp);
         getParagraphElementTest(jtf);
@@ -625,6 +658,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetPositionAboveBelow() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getPositionAboveBelowTest(jta);
         //getPositionAboveBelowTest(jtp);
         getPositionAboveBelowTest(jtf);
@@ -632,12 +669,20 @@ public class UtilitiesTest extends Swing
 
     // HARMONY-2745
     public void testGetPositionAbove() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jta = new JTextArea();
         assertEquals(-1, Utilities.getPositionAbove(jta, 1, 0));
     }
 
     // HARMONY-2745
     public void testGetPositionBelow() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jta = new JTextArea();
         assertEquals(-1, Utilities.getPositionBelow(jta, 1, 0));
     }
@@ -685,6 +730,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetWordStart() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getWordStartTest(jta);
         //getWordStartTest(jtp);
         getWordStartTest(jtf);
@@ -727,6 +776,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetWordEnd() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getWordEndTest(jta);
         //getWordEndTest(jtp);
         getWordEndTest(jtf);
@@ -828,6 +881,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetRowStartEnd() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getRowStartEndTest(jta);
         //getRowStartEndTest(jtp);
         getRowStartEndTest(jtf);
@@ -880,6 +937,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetPreviousWord() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getPreviousWordTest(jta);
         //getPreviousWordTest(jtp);
         getPreviousWordTest(jtf);
@@ -934,6 +995,10 @@ public class UtilitiesTest extends Swing
     }
 
     public void testGetNextWord() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         getNextWordTest(jta);
         getNextWordTest(jtf);
         //getNextWordTest(jtp);
@@ -941,6 +1006,10 @@ public class UtilitiesTest extends Swing
 
     // HARMONY-2744
     public void testGetNextWord02() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jta = new JTextArea("");
         try {
             Utilities.getNextWord(jta, 0);
@@ -952,6 +1021,10 @@ public class UtilitiesTest extends Swing
 
     // HARMONY-2744
     public void testGetNextWord03() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jta = new JTextArea("a");
         try {
             Utilities.getNextWord(jta, 0);
@@ -970,6 +1043,10 @@ public class UtilitiesTest extends Swing
 
     // HARMONY-2744
     public void testGetNextWord04() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jta = new JTextArea("a b");
         assertEquals(2, Utilities.getNextWord(jta, 0));
         assertEquals(2, Utilities.getNextWord(jta, 1));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.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/View_ForwardUpdateRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_ForwardUpdateRTest.java Wed May 26 09:31:07 2010
@@ -30,6 +30,7 @@ import javax.swing.text.CompositeView_Mo
 import javax.swing.text.CompositeView_ModelViewTest.WithChildrenView;
 import javax.swing.text.Position.Bias;
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class View_ForwardUpdateRTest extends TestCase {
     private class ParentView extends WithChildrenView {
@@ -167,6 +168,10 @@ public class View_ForwardUpdateRTest ext
     private List<View> viewsForwardedTo = new ArrayList<View>();
 
     public void testForwardUpdate01() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         doc = new PlainDocument();
         doc.insertString(doc.getLength(), "line1", null);
         doc.insertString(doc.getLength(), "\nline2", null);
@@ -202,6 +207,10 @@ public class View_ForwardUpdateRTest ext
     }
 
     public void testForwardUpdate02() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         initStyledDocument();
         final MutableAttributeSet fontSize = new SimpleAttributeSet();
         StyleConstants.setFontSize(fontSize, 36);
@@ -228,6 +237,10 @@ public class View_ForwardUpdateRTest ext
     }
 
     public void testForwardUpdate03() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         initStyledDocument();
         final List<View> expected = new ArrayList<View>();
         // We will use the view for the second paragraph

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.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/View_NextVisualPositionFromTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_NextVisualPositionFromTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,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 default implementation of View.getNextVisualPositionFrom method.
@@ -62,6 +63,10 @@ public class View_NextVisualPositionFrom
     private Bias[] bias;
 
     public void testGetNextVisualPositionFromEast() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(1, view.getNextVisualPositionFrom(0, Bias.Forward, shape,
                 SwingConstants.EAST, bias));
         assertSame(Bias.Forward, bias[0]);
@@ -84,6 +89,10 @@ public class View_NextVisualPositionFrom
     }
 
     public void testGetNextVisualPositionFromWest() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(1, view.getNextVisualPositionFrom(2, Bias.Forward, shape,
                 SwingConstants.WEST, bias));
         assertSame(Bias.Forward, bias[0]);
@@ -95,6 +104,10 @@ public class View_NextVisualPositionFrom
     }
 
     public void testGetNextVisualPositionFromNorth() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape posRect = view.modelToView(doc.getLength(), shape, Bias.Forward);
         caret.magicPoint = posRect.getBounds().getLocation();
         assertNotNull(caret.getMagicCaretPosition());
@@ -115,6 +128,10 @@ public class View_NextVisualPositionFrom
     }
 
     public void testGetNextVisualPositionFromSouth() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Shape posRect = view.modelToView(doc.getLength(), shape, Bias.Forward);
         caret.magicPoint = posRect.getBounds().getLocation();
         assertNotNull(area.getCaret().getMagicCaretPosition());
@@ -138,6 +155,10 @@ public class View_NextVisualPositionFrom
     }
 
     public void testGetNextVisualPositionFromInvalid() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // BadLocation left
         try {
             int p = view.getNextVisualPositionFrom(-2, Bias.Forward, shape,

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.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/View_VisualPositionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPositionTest.java Wed May 26 09:31:07 2010
@@ -18,6 +18,7 @@ package javax.swing.text;
 
 import static javax.swing.text.VisualPositionHelper.assertNextPosition;
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 /**
  * Tests <code>View.getNextVisualPositionFrom</code> method on
@@ -48,6 +49,10 @@ public class View_VisualPositionTest ext
     }
 
     public void testGetNextVisualPositionFrom_Right() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = 0; i < length; i++) {
             assertNextPosition(i + 1, i, View.EAST, view, null);
         };
@@ -56,6 +61,10 @@ public class View_VisualPositionTest ext
     public void testGetNextVisualPositionFrom_RightAtBeginning()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(0, -1, View.EAST, view, null);
 
         assertNextPosition(-1, -2, View.EAST, view, null);
@@ -68,6 +77,10 @@ public class View_VisualPositionTest ext
     public void testGetNextVisualPositionFrom_RightAtEnd()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(length, length - 1, View.EAST, view, null);
         assertNextPosition(length, length, View.EAST, view, null);
 
@@ -79,6 +92,10 @@ public class View_VisualPositionTest ext
     }
 
     public void testGetNextVisualPositionFrom_Left() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = 1; i <= length; i++) {
             assertNextPosition(i - 1, i, View.WEST, view, null);
         };
@@ -87,6 +104,10 @@ public class View_VisualPositionTest ext
     public void testGetNextVisualPositionFrom_LeftAtBeginning()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(0, 1, View.WEST, view, null);
         assertNextPosition(0, 0, View.WEST, view, null);
 
@@ -101,6 +122,10 @@ public class View_VisualPositionTest ext
     public void testGetNextVisualPositionFrom_LeftAtEnd()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(length - 1, length, View.WEST, view, null);
         assertNextPosition(length, length + 1, View.WEST, view, null);
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.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/View_VisualPosition_PartTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/View_VisualPosition_PartTest.java Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ import java.awt.Rectangle;
 import java.awt.Shape;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 /**
  * Tests <code>View.getNextVisualPositionFrom</code> method on
@@ -66,6 +67,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_Right()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = 0; i < length; i++) {
             assertNextPosition(i + 1, i, View.EAST, view, alloc);
         };
@@ -74,6 +79,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_RightAtBeginning()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(startOffset, -1, View.EAST, view, alloc);
 
         assertNextPosition(1, 0, View.EAST, view, alloc);
@@ -89,6 +98,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_RightAtEnd()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = endOffset - 2; i <= endOffset + 2; i++) {
             assertNextPosition(i + 1, i, View.EAST, view, alloc);
         }
@@ -104,6 +117,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_Left()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = 1; i <= length; i++) {
             assertNextPosition(i - 1, i, View.WEST, view, alloc);
         };
@@ -112,6 +129,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_LeftAtBeginning()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNextPosition(endOffset - 1, -1, View.WEST, view, alloc);
 
         assertNextPosition(0, 0, View.WEST, view, alloc);
@@ -127,6 +148,10 @@ public class View_VisualPosition_PartTes
     public void testGetNextVisualPositionFrom_LeftAtEnd()
         throws BadLocationException {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         for (int i = endOffset - 2; i <= endOffset + 2; i++) {
             assertNextPosition(i - 1, i, View.WEST, view, alloc);
         }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.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/WrappedPlainViewRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewRTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import javax.swing.JFrame;
 import javax.swing.JTextArea;
 import javax.swing.SwingTestCase;
 import javax.swing.text.Position.Bias;
+import tests.support.Support_Excludes;
 
 public class WrappedPlainViewRTest extends SwingTestCase {
     private Document doc;
@@ -71,6 +72,10 @@ public class WrappedPlainViewRTest exten
      * Tests the value returned where the point lies below the last line.
      */
     public void testViewToModel() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Bias[] bias = new Bias[1];
         width = getTextWidth(root.getElementCount() - 1) * 3 / 4;
         view.setSize(width, height);
@@ -83,6 +88,10 @@ public class WrappedPlainViewRTest exten
      * breakes in it.
      */
     public void testViewToModelNoBreaks() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Bias[] bias = new Bias[1];
         textArea.setSize(500, height);
         shape = new Rectangle(500, height);
@@ -99,6 +108,10 @@ public class WrappedPlainViewRTest exten
      * This tests that no NPE is thrown when a line is removed.
      */
     public void testInsertUpdate() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         textArea.setText("line1\n\n\n\n");
         assertEquals(5, view.getViewCount());
         assertSame(doc, textArea.getDocument());
@@ -109,6 +122,10 @@ public class WrappedPlainViewRTest exten
      * This tests that no NPE is thrown when a line is removed.
      */
     public void testRemoveUpdate() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         textArea.setText("line1\n\n\n\n");
         assertEquals(5, view.getViewCount());
         assertSame(doc, textArea.getDocument());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.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/WrappedPlainViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainViewTest.java Wed May 26 09:31:07 2010
@@ -25,6 +25,7 @@ import java.awt.Rectangle;
 import javax.swing.JFrame;
 import javax.swing.JTextArea;
 import javax.swing.SwingTestCase;
+import tests.support.Support_Excludes;
 
 /**
  * Tests WrappedPlainView methods which require "real" initialization.
@@ -83,16 +84,28 @@ public class WrappedPlainViewTest extend
     }
 
     public void testGetMaximumSpan() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(Integer.MAX_VALUE, (int) view.getMaximumSpan(X_AXIS));
         assertEquals(getSum(Y_AXIS), (int) view.getMaximumSpan(Y_AXIS));
     }
 
     public void testGetMinimumSpan() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(view.getWidth(), (int) view.getMinimumSpan(X_AXIS));
         assertEquals(getSum(Y_AXIS), (int) view.getMinimumSpan(Y_AXIS));
     }
 
     public void testGetPreferredSpan() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(view.getWidth(), (int) view.getPreferredSpan(X_AXIS));
         assertEquals(getSum(Y_AXIS), (int) view.getPreferredSpan(Y_AXIS));
         assertEquals(shape.width, view.getWidth());
@@ -100,6 +113,10 @@ public class WrappedPlainViewTest extend
     }
 
     public void testDrawSelectedText() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         textArea.setText("line1\nline2");
         Graphics g = textArea.getGraphics();
         g.setFont(textArea.getFont());
@@ -126,6 +143,10 @@ public class WrappedPlainViewTest extend
     }
 
     public void testDrawUnselectedText() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         textArea.setText("line1\nline2");
         Graphics g = textArea.getGraphics();
         g.setFont(textArea.getFont());
@@ -152,6 +173,10 @@ public class WrappedPlainViewTest extend
     }
     /*
      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/WrappedPlainView_SimpleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.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/WrappedPlainView_SimpleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/WrappedPlainView_SimpleTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.swing.SwingTestCase;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.DocumentEvent.ElementChange;
+import tests.support.Support_Excludes;
 
 /**
  * Tests WrappedPlainView methods which can be tested with more simple
@@ -128,6 +129,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testLoadChildren() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, view.getViewCount());
         view.loadChildren(null);
         assertEquals(root.getElementCount(), view.getViewCount());
@@ -137,6 +142,10 @@ public class WrappedPlainView_SimpleTest
      * Class under test for void WrappedPlainView(Element)
      */
     public void testWrappedPlainViewElement() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view = new WrappedPlainViewImpl(root);
         assertSame(root, view.getElement());
         assertEquals("Major axis expected to be Y", View.Y_AXIS, view.getAxis());
@@ -160,6 +169,10 @@ public class WrappedPlainView_SimpleTest
      * Class under test for void WrappedPlainView(Element, boolean)
      */
     public void testWrappedPlainViewElementboolean() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view = new WrappedPlainViewImpl(root, true);
         assertSame(root, view.getElement());
         assertEquals("Major axis expected to be Y", View.Y_AXIS, view.getAxis());
@@ -172,6 +185,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testNextTabStop() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = view.getContainer();
         FontMetrics metrics = container.getFontMetrics(container.getFont());
         view.setSize(300, 100);
@@ -189,12 +206,20 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testGetTabSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(8, view.getTabSize());
         doc.putProperty(PlainDocument.tabSizeAttribute, new Integer(4));
         assertEquals(4, view.getTabSize());
     }
 
     public void testGetLineBuffer() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Segment buffer = view.getLineBuffer();
         assertNotNull(buffer);
         assertSame(buffer, view.getLineBuffer());
@@ -205,6 +230,10 @@ public class WrappedPlainView_SimpleTest
      * Tests calculateBreakPosition method with word wrapping turned off.
      */
     public void testCalculateBreakPosition01() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Container container = view.getContainer();
         FontMetrics metrics = container.getFontMetrics(container.getFont());
         Element line = root.getElement(0);
@@ -238,6 +267,10 @@ public class WrappedPlainView_SimpleTest
      * Tests calculateBreakPosition method with word wrapping turned on.
      */
     public void testCalculateBreakPosition02() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view = new WrappedPlainViewImpl(root, true);
         Container container = view.getContainer();
         FontMetrics metrics = container.getFontMetrics(container.getFont());
@@ -271,6 +304,10 @@ public class WrappedPlainView_SimpleTest
      * very-very long string.
      */
     public void testCalculateBreakPosition03() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String veryLongString = "aVeryVeryVeryLongString";
         doc.insertString(root.getElement(1).getStartOffset(), veryLongString, null);
         Container container = view.getContainer();
@@ -289,6 +326,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testInsertUpdate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view.loadChildren(null);
         view.insertUpdate(docEvent, shape, null);
         if (BasicSwingTestCase.isHarmony()) {
@@ -300,6 +341,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testRemoveUpdate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view.loadChildren(null);
         view.removeUpdate(docEvent, shape, null);
         if (BasicSwingTestCase.isHarmony()) {
@@ -309,6 +354,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testChangedUpdate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         view.loadChildren(null);
         view.changedUpdate(docEvent, shape, null);
         if (BasicSwingTestCase.isHarmony()) {
@@ -318,6 +367,10 @@ public class WrappedPlainView_SimpleTest
     }
 
     public void testSetSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(view.isLayoutValid(View.X_AXIS));
         assertFalse(view.isLayoutValid(View.Y_AXIS));
         view.setSize(width, height);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.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/html/FormViewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormViewTest.java Wed May 26 09:31:07 2010
@@ -50,6 +50,7 @@ import javax.swing.text.StyleConstants;
 import javax.swing.text.View;
 
 import org.apache.harmony.x.swing.text.html.form.FormAttributes;
+import tests.support.Support_Excludes;
 
 public class FormViewTest extends SwingTestCase {
 
@@ -148,6 +149,10 @@ public class FormViewTest extends SwingT
 
     public void testFormView() throws Exception {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Wrong element
         elem = createElement();
         formView = new FormView(elem);
@@ -233,6 +238,10 @@ public class FormViewTest extends SwingT
     }
 
     public void testFormView_Models() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createFormView(FormAttributes.INPUT_TYPE_BUTTON);
         if (isHarmony()) {
             //TODO uncomment when HTMLDocument would be implemented
@@ -266,6 +275,10 @@ public class FormViewTest extends SwingT
     }
 
     public void testCreateComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component component;
 
         createFormView(FormAttributes.INPUT_TYPE_BUTTON);
@@ -373,6 +386,10 @@ public class FormViewTest extends SwingT
     }
 
     public void testCreateComponent_Models() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component component;
 
         createFormView(FormAttributes.INPUT_TYPE_BUTTON);
@@ -499,6 +516,10 @@ public class FormViewTest extends SwingT
 
     public void testGetMaximumSpan() throws Exception {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         elem = doc.getElement(FormAttributes.INPUT_TYPE_TEXT);
         formView = new FormView(elem) {
             protected Component createComponent() {
@@ -594,6 +615,10 @@ public class FormViewTest extends SwingT
     }
 
     public void testGetMaximumSpan_WithValidElements() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createFormView(FormAttributes.INPUT_TYPE_BUTTON);
         checkMaxSpan(formView);
 
@@ -678,14 +703,26 @@ public class FormViewTest extends SwingT
     }
 
     public void testImageSubmit() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         throw new UnsupportedOperationException("Not implemented");
     }
 
     public void testSubmitData() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         throw new UnsupportedOperationException("Not implemented");
     }
 
     public void testActionPerformed() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Component component;
 
         elem = doc.getElement("submit2");
@@ -711,6 +748,10 @@ public class FormViewTest extends SwingT
     }
 
     public void testIsElementSuccessfull() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         StringBuffer src = new StringBuffer();
         src.append("<HTML><HEAD></HEAD><BODY> Test");
         src.append("<FORM ACTION = \"\">");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.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/html/FormView_FormInputElementTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormInputElementTest.java Wed May 26 09:31:07 2010
@@ -42,6 +42,7 @@ import javax.swing.text.JTextComponent;
 import javax.swing.text.StyleConstants;
 
 import org.apache.harmony.x.swing.Utilities;
+import tests.support.Support_Excludes;
 
 public class FormView_FormInputElementTest extends SwingTestCase {
 
@@ -71,6 +72,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateButtonComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("button");
         JButton button;
 
@@ -103,6 +108,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateCheckBoxComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("checkbox");
         JCheckBox checkBox;
 
@@ -137,6 +146,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateImageComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("image");
         JButton image;
 
@@ -205,6 +218,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreatePasswordComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JPasswordField passwordField;
         createHTMLSample("password");
 
@@ -237,6 +254,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateRadioComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("radio");
         JRadioButton radioButton;
 
@@ -266,6 +287,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testRadioGroups() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         StringBuffer htmlSrc = new StringBuffer();
         htmlSrc.append("<HTML> <HEAD></HEAD><BODY>");
         htmlSrc.append("   Hello word!");
@@ -293,6 +318,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateResetComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("reset");
         JButton resetButton;
 
@@ -324,6 +353,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateSubmitComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("submit");
         JButton submitButton;
 
@@ -355,6 +388,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateTextComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JTextField textField;
         createHTMLSample("text");
 
@@ -384,6 +421,10 @@ public class FormView_FormInputElementTe
     }
 
     public void testCreateFileComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         createHTMLSample("file");
 
         //Default VALUE

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.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/html/FormView_FormSelectElementTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/FormView_FormSelectElementTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.SwingTestCase;
 import javax.swing.text.Element;
+import tests.support.Support_Excludes;
 
 public class FormView_FormSelectElementTest extends SwingTestCase {
 
@@ -51,11 +52,19 @@ public class FormView_FormSelectElementT
         }
 
         public void testModelAttributes() throws Exception {
+            if (Support_Excludes.isExcluded()) {
+                return;
+            }
+
             createHTMLSample();
 
         }
 
         public void testCreateComponent() throws Exception {
+            if (Support_Excludes.isExcluded()) {
+                return;
+            }
+
             createHTMLSample();
             createFormViewWithParent("option_disabled_attribute");
             JComboBox comboBox = (JComboBox)formView.getComponent();
@@ -74,6 +83,10 @@ public class FormView_FormSelectElementT
         }
 
         public void testCreateMultipleSelectionComponent() throws Exception {
+            if (Support_Excludes.isExcluded()) {
+                return;
+            }
+
             createHTMLSample();
 
             createFormViewWithParent("select_multiple_name_only");
@@ -104,6 +117,10 @@ public class FormView_FormSelectElementT
         }
 
         public void testCreateSimpleSelectionComponent() throws Exception {
+            if (Support_Excludes.isExcluded()) {
+                return;
+            }
+
             createHTMLSample();
 
             createFormViewWithParent("select");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.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/html/HTMLDocumentTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocumentTest.java Wed May 26 09:31:07 2010
@@ -45,6 +45,7 @@ import javax.swing.text.html.HTMLDocumen
 import javax.swing.text.html.HTMLDocumentTestCase.DocumentController;
 import javax.swing.text.html.HTMLDocumentTestCase.PublicHTMLDocument;
 import javax.swing.text.html.parser.ParserDelegator;
+import tests.support.Support_Excludes;
 
 public class HTMLDocumentTest extends DefaultStyledDocumentTest {
 
@@ -66,6 +67,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testHTMLDocumentContentStyleSheet() throws MalformedURLException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         StyleSheet styles = new StyleSheet();
         final GapContent gapContent = new GapContent(10);
         htmlDoc = new PublicHTMLDocument(gapContent, styles);
@@ -79,6 +84,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testHTMLDocumentStyleSheet() throws BadLocationException, MalformedURLException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         StyleSheet styles = new StyleSheet();
         htmlDoc = new PublicHTMLDocument(styles);
         assertSame(styles, htmlDoc.getAttributeContextPublicly());
@@ -92,6 +101,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testHTMLDocument() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc = new PublicHTMLDocument();
         assertTrue(htmlDoc.getContentPublicly() instanceof GapContent);
         AttributeContext styleSheet = htmlDoc.getAttributeContextPublicly();
@@ -106,6 +119,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testCreateLeafElement() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element leaf = htmlDoc.createLeafElement(null, null, 0, 1);
         assertTrue(leaf instanceof HTMLDocument.RunElement);
         assertNull(leaf.getParentElement());
@@ -128,6 +145,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testCreateBranchElement() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element branch = htmlDoc.createBranchElement(null, null);
         assertTrue(branch instanceof HTMLDocument.BlockElement);
         assertNull(branch.getParentElement());
@@ -168,6 +189,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testCreateDefaultRoot() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             htmlDoc.insertString(0, "123", null);
         } catch (BadLocationException e) {}
@@ -229,6 +254,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetElementElementObjectObject() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Element root = htmlDoc.getDefaultRootElement();
         final String value = "ASD";
         assertNull(htmlDoc.getElement(root, HTML.Attribute.ID, value));
@@ -255,6 +284,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetElementString() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final Element root = htmlDoc.getDefaultRootElement();
         final String value = "B";
         assertNull(htmlDoc.getElement(value));
@@ -270,6 +303,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetIterator() throws BadLocationException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final SimpleAttributeSet attr = new SimpleAttributeSet();
         attr.addAttribute(StyleConstants.NameAttribute, Tag.B.toString());
         htmlDoc.insertString(0, "0000", attr);
@@ -361,6 +398,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetReaderIntIntIntTag() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         HTMLEditorKit.ParserCallback reader1 = htmlDoc.getReader(0, 10, 100, null);
         HTMLEditorKit.ParserCallback reader2 = htmlDoc.getReader(0, 10, 100, null);
         HTMLEditorKit.ParserCallback reader3 = htmlDoc.getReader(10, 100, 10, Tag.P);
@@ -377,6 +418,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetReaderInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         HTMLEditorKit.ParserCallback reader1 = htmlDoc.getReader(0);
         HTMLEditorKit.ParserCallback reader2 = htmlDoc.getReader(0);
         HTMLEditorKit.ParserCallback reader3 = htmlDoc.getReader(1);
@@ -393,12 +438,20 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetStyleSheet() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AttributeContext styleSheet = htmlDoc.getAttributeContextPublicly();
         assertTrue(styleSheet instanceof StyleSheet);
         assertSame(styleSheet, htmlDoc.getStyleSheet());
     }
 
     public void testProcessHTMLFrameHyperlinkEvent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final String frameSetHTML = "<FRAMESET><FRAME name=\"1\" src=\"1.html\"><FRAME name=\"2\" src=\"2.html\"><img name=\"3\" src=\"3.jpg\"></FRAMESET>";
         HTMLDocumentTestCase.loadDocument(htmlDoc, frameSetHTML);
         final Element body = htmlDoc.getDefaultRootElement().getElement(1);
@@ -471,6 +524,10 @@ public class HTMLDocumentTest extends De
     }
     
     public void testGetSetBase() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         URL u1 = new URL("http://www.apache.org");
         URL u2 = new URL("http://www.harmony.incubator.apache.org");
         String tail = "tail";
@@ -483,6 +540,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetSetParser() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(htmlDoc.getParser());
         ParserDelegator parser = new ParserDelegator();
         htmlDoc.setParser(parser);
@@ -490,6 +551,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetSetPreservesUnknownTags() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(htmlDoc.getPreservesUnknownTags());
 
         htmlDoc.setPreservesUnknownTags(false);
@@ -523,6 +588,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetSetTokenThreshold() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(Integer.MAX_VALUE, htmlDoc.getTokenThreshold());
 
         htmlDoc.setTokenThreshold(100);
@@ -618,9 +687,17 @@ public class HTMLDocumentTest extends De
     }
 
     public void testGetDefaultRootElement() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     public void testInsertUpdate() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         doc.insertString(0, "1111", null);
         final AttributeSet attr = doc.getCharacterElement(2).getAttributes();
         assertEquals(1, attr.getAttributeCount());
@@ -628,6 +705,10 @@ public class HTMLDocumentTest extends De
     }
 
     public void testSerializable() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     protected static void checkAttributes(final AttributeSet attr, final Object key, final Object value) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.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/html/HTMLDocument_InsertsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/HTMLDocument_InsertsTest.java Wed May 26 09:31:07 2010
@@ -32,6 +32,7 @@ import javax.swing.text.StyleConstants;
 import javax.swing.text.DefaultStyledDocument.ElementSpec;
 import javax.swing.text.html.HTML.Tag;
 import javax.swing.text.html.parser.ParserDelegator;
+import tests.support.Support_Excludes;
 
 public class HTMLDocument_InsertsTest extends HTMLDocumentTestCase {
 
@@ -50,6 +51,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterEnd_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td>table</td></td></tr></table>");
         htmlDoc.setEditable(false);
@@ -99,6 +104,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterEnd_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         htmlDoc.setEditable(false);
         
@@ -124,6 +133,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterEnd_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -143,6 +156,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterEnd_Structure() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -178,6 +195,10 @@ public class HTMLDocument_InsertsTest ex
     }
         
     public void testInsertAfterEnd_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
@@ -195,6 +216,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterStart_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td><div>cell</div></td></tr></table>");
         htmlDoc.setEditable(true);
@@ -255,6 +280,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterStart_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         htmlDoc.setEditable(false);
         
@@ -275,6 +304,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertAfterStart_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -298,6 +331,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testInsertAfterStart_Strucutre() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -330,6 +367,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testInsertAfterStart_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -358,6 +399,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeEnd_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td><div>table</div></td</td></tr></table>");
         htmlDoc.setEditable(false);
@@ -411,6 +456,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeEnd_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         htmlDoc.setEditable(false);
         
@@ -431,6 +480,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeEnd_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -450,6 +503,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testInsertBeforeEnd_Strucutre() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -486,6 +543,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeEnd_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -514,6 +575,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeStart_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td>table</td></tr></table>");
         htmlDoc.setEditable(true);
@@ -569,6 +634,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeStart_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         htmlDoc.setEditable(false);
         
@@ -590,6 +659,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testInsertBeforeStart_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
         Element branch2 = branch1.getElement(0);
@@ -617,6 +690,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testInsertBeforeStart_Structure() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Element root = htmlDoc.getDefaultRootElement();
         Element body = root.getElement(0);
         Element p = body.getElement(0);
@@ -649,6 +726,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testInsertBeforeStart_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -666,6 +747,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetInnerHTML_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td>table</td></tr></table>");
         htmlDoc.setEditable(false);
@@ -733,6 +818,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetInnerHTML_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         htmlDoc.setEditable(false);
         
@@ -756,6 +845,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetInnerHTML_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -778,6 +871,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetInnerHTML_Structure() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -800,6 +897,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testSetInnerHTML_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -823,6 +924,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetOuterHTML_Specs() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         loadDocument(htmlDoc, "<table><tr><td><br>table</td></tr></table>");
         
@@ -903,6 +1008,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetOuterHTML_Specs2() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         htmlDoc.setParser(new ParserDelegator());
         
         Element root = htmlDoc.getDefaultRootElement();
@@ -925,6 +1034,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetOuterHTML_Events() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -953,6 +1066,10 @@ public class HTMLDocument_InsertsTest ex
     }
     
     public void testSetOuterHTML_Structure() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);
@@ -974,6 +1091,10 @@ public class HTMLDocument_InsertsTest ex
     }
 
     public void testSetOuterHTML_Exceptions() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         addElements();
         Element root = htmlDoc.getDefaultRootElement();
         Element branch1 = root.getElement(0);



Mime
View raw message