harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [19/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/html/StyleSheetTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheetTest.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/html/StyleSheetTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheetTest.java Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ import javax.swing.text.StyleContext.Sma
 import javax.swing.text.html.CSS.Attribute;
 import javax.swing.text.html.StyleSheet.BoxPainter;
 import javax.swing.text.html.StyleSheet.ListPainter;
-import tests.support.Support_Excludes;
 
 public class StyleSheetTest extends BasicSwingTestCase {
     private abstract class NumberFormatCase extends ExceptionalCase {
@@ -81,10 +80,6 @@ public class StyleSheetTest extends Basi
      * <code>CSS.Attribute.FONT_SIZE</code>.
      */
     public void testAddAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         attr = ss.addAttribute(empty, StyleConstants.FontSize, new Integer(10));
         Enumeration names = attr.getAttributeNames();
         Object name = names.nextElement();
@@ -103,10 +98,6 @@ public class StyleSheetTest extends Basi
      * hash codes for <em>almost equal</em> objects are different.
      */
     public void testAddAttributeEquals() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         attr = ss.addAttribute(empty, StyleConstants.FontSize, new Integer(10));
         simple.addAttribute(StyleConstants.FontSize, new Integer(10));
 
@@ -126,10 +117,6 @@ public class StyleSheetTest extends Basi
      * <code>CSS</code> equivalent to <code>StyleConstants</code> attribute.
      */
     public void testAddAttributeNoCSS() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         attr = ss.addAttribute(empty, StyleConstants.BidiLevel, new Integer(0));
         assertEquals(1, attr.getAttributeCount());
 
@@ -146,10 +133,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with StyleConstants key.
      */
     public void testAddAttributeCSSAsSC() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -172,10 +155,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with CSS key.
      */
     public void testAddAttributeCSSAsCSS() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -191,10 +170,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with CSS key.
      */
     public void testAddAttributeCSSAsString() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -225,10 +200,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with CSS key.
      */
     public void testAddAttributeCSSAsInteger() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(Attribute.FONT_SIZE, new Integer(21));
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -259,10 +230,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute with CSS-key but with invalid value for that key.
      */
     public void testAddAttributeInvalidValue01() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             testExceptionalCase(new NullPointerCase() {
                 public void exceptionalAction() throws Exception {
@@ -285,10 +252,6 @@ public class StyleSheetTest extends Basi
      * Adding an invalid value for SC-attribute.
      */
     public void testAddAttributeInvalidValue02() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             testExceptionalCase(new NullPointerCase() {
                 public void exceptionalAction() throws Exception {
@@ -314,10 +277,6 @@ public class StyleSheetTest extends Basi
      * corresponding <code>CSS.Attribute</code> ones.
      */
     public void testAddAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(StyleConstants.FontSize, new Integer(10));
         simple.addAttribute(StyleConstants.Alignment,
                             new Integer(StyleConstants.ALIGN_CENTER));
@@ -344,10 +303,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with StyleConstants key.
      */
     public void testAddAttributesCSSAsSC() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -372,10 +327,6 @@ public class StyleSheetTest extends Basi
      * Adding an attribute stored as CSS-attribute with CSS key.
      */
     public void testAddAttributesCSSAsCSS() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
         Object fs = simple.getAttribute(Attribute.FONT_SIZE);
@@ -388,10 +339,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetFont() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_FAMILY, "serif");
         ss.addCSSAttribute(simple, Attribute.FONT_WEIGHT, "bold");
         assertEquals(2, simple.getAttributeCount());
@@ -405,10 +352,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetFontCSSSizeAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         assertEquals(1, simple.getAttributeCount());
 
@@ -418,10 +361,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetFontSCSizeAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(StyleConstants.FontSize, new Integer(8));
 
         Font f = ss.getFont(simple);
@@ -430,10 +369,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetFontCSSAndSCSizeAttributesMixed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.FONT_SIZE, "21pt");
         simple.addAttribute(StyleConstants.FontSize, new Integer(8));
         assertEquals(2, simple.getAttributeCount());
@@ -444,10 +379,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetForeground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.COLOR, "rgb(50%, 25%, 75%)");
         assertEquals(1, simple.getAttributeCount());
 
@@ -457,19 +388,11 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetForegroundSC() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(StyleConstants.Foreground, new Color(63, 127, 191));
         assertSame(Color.BLACK, ss.getForeground(empty));
     }
 
     public void testGetBackground() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addCSSAttribute(simple, Attribute.BACKGROUND_COLOR,
                            "rgb(77%, 55%, 33%)");
         assertEquals(1, simple.getAttributeCount());
@@ -480,19 +403,11 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetBackgroundSC() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         simple.addAttribute(StyleConstants.Background, new Color(140, 196, 84));
         assertNull(ss.getBackground(empty));
     }
 
     public void testRemoveAttribute() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         attr = ss.addAttribute(empty, StyleConstants.FontSize, new Integer(10));
         assertEquals(1, attr.getAttributeCount());
         assertNotNull(attr.getAttribute(Attribute.FONT_SIZE));
@@ -505,10 +420,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_Copy() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple = new SimpleAttributeSet(attr);
@@ -522,10 +433,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_CopyReversed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple = new SimpleAttributeSet(attr);
@@ -539,10 +446,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_StyleConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple.addAttribute(StyleConstants.Bold, Boolean.TRUE);
@@ -567,10 +470,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_Reversed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple.addAttribute(StyleConstants.Bold, Boolean.TRUE);
@@ -587,10 +486,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_Mixed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple.addAttribute(StyleConstants.Bold, Boolean.TRUE);
@@ -614,10 +509,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetAttributeSet_MixedSameValue() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         assertEquals(0, simple.getAttributeCount());
@@ -650,10 +541,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetEnumeration_StyleConstants() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple.addAttribute(StyleConstants.Bold, Boolean.FALSE);
@@ -676,10 +563,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testRemoveAttributesAttributeSetEnumeration_CSS() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initAttributes();
 
         simple.addAttribute(Attribute.FONT_STYLE, Boolean.FALSE);
@@ -698,10 +581,6 @@ public class StyleSheetTest extends Basi
      * (<code>CSS.Attribute.BACKGROUND_COLOR</code> is used.)
      */
     public void testAddCSSAttribute01() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, simple.getAttributeCount());
         ss.addCSSAttribute(simple, Attribute.BACKGROUND_COLOR, "red");
 
@@ -726,10 +605,6 @@ public class StyleSheetTest extends Basi
      * background-related properties.
      */
     public void testAddCSSAttribute02() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, simple.getAttributeCount());
         ss.addCSSAttribute(simple, Attribute.BACKGROUND, "red repeat-y");
 
@@ -767,10 +642,6 @@ public class StyleSheetTest extends Basi
      * despite attribute sets contain equal values.
      */
     public void testAddCSSAttribute03() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, simple.getAttributeCount());
         ss.addCSSAttribute(simple, Attribute.BACKGROUND_COLOR, "red");
         assertEquals(1, simple.getAttributeCount());
@@ -796,10 +667,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testAddCSSAttributeFromHTML_Color() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ss.addCSSAttributeFromHTML(simple, Attribute.COLOR,
                                               "#112233"));
         assertEquals("#112233",
@@ -819,10 +686,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testAddCSSAttributeFromHTML_Align() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ss.addCSSAttributeFromHTML(simple, Attribute.TEXT_ALIGN,
                                               "left"));
         assertEquals("left",
@@ -845,10 +708,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testAddCSSAttributeFromHTML_Background() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(ss.addCSSAttributeFromHTML(simple,
                                               Attribute.BACKGROUND_IMAGE,
                                               "bg.jpg"));
@@ -858,10 +717,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testAddCSSAttributeFromHTML_AddCSS() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         ss = new StyleSheet() {
             public void addCSSAttribute(final MutableAttributeSet attr,
@@ -877,10 +732,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testCreateSmallAttributeSet() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Object value = new Integer(12);
         simple.addAttribute(StyleConstants.FontSize, value);
         attr = ss.createSmallAttributeSet(simple);
@@ -893,10 +744,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testCreateLargeAttributeSet() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Object value = new Integer(12);
         simple.addAttribute(StyleConstants.FontSize, value);
         attr = ss.createLargeAttributeSet(simple);
@@ -909,20 +756,12 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetBoxPainter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         BoxPainter bp = ss.getBoxPainter(empty);
         assertNotNull(bp);
         assertNotSame(bp, ss.getBoxPainter(empty));
     }
 
     public void testGetBoxPainterAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker borderStyle = new Marker();
         final Marker marginTop = new Marker();
         final Marker marginRight = new Marker();
@@ -984,10 +823,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetBoxPainterAttributesBorderStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker borderStyle = new Marker();
         final Marker borderTopWidth = new Marker();
         final Marker borderRightWidth = new Marker();
@@ -1043,20 +878,12 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetListPainter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ListPainter lp = ss.getListPainter(empty);
         assertNotNull(lp);
         assertNotSame(lp, ss.getListPainter(empty));
     }
 
     public void testGetListPainterAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker listStyleImage = new Marker();
         final Marker listStyleType = new Marker();
 
@@ -1084,10 +911,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testImportStyleSheet() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final File cssFile = File.createTempFile(getName(), ".css");
         cssFile.deleteOnExit();
         final FileWriter writer = new FileWriter(cssFile);
@@ -1114,10 +937,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testImportStyleSheetAddStyles() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final File cssFile = File.createTempFile(getName(), ".css");
         cssFile.deleteOnExit();
         final FileWriter writer = new FileWriter(cssFile);
@@ -1143,10 +962,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testImportStyleSheetWithImports() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final File cssFile = File.createTempFile(getName(), ".css");
         cssFile.deleteOnExit();
         FileWriter writer = new FileWriter(cssFile);
@@ -1182,18 +997,10 @@ public class StyleSheetTest extends Basi
     }
 
     public void testImportStyleSheetNull() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.importStyleSheet(null);
     }
 
     public void testLoadRules() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final File cssFile = File.createTempFile(getName(), ".css");
         cssFile.deleteOnExit();
         final FileWriter writer = new FileWriter(cssFile);
@@ -1226,10 +1033,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testLoadRulesWithImports() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final File cssFile = File.createTempFile(getName(), ".css");
         cssFile.deleteOnExit();
         FileWriter writer = new FileWriter(cssFile);
@@ -1265,28 +1068,16 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBase() throws MalformedURLException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         URL base = new URL("http://www.somesite.com/styles/");
         ss.setBase(base);
         assertSame(base, ss.getBase());
     }
 
     public void testGetBase() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ss.getBase());
     }
 
     public void testGetIndexOfSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int[][] size = {
             // {scSizeSet, cssSize, scSizeRead}
              {6,  1},        {7,  1},
@@ -1315,10 +1106,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.setBaseFontSize(3);
         assertEquals(sizes[3], (int)ss.getPointSize("+1"));
         assertEquals(sizes[2], (int)ss.getPointSize("+0"));
@@ -1331,10 +1118,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(7, sizes.length);
         for (int i = 0; i < sizes.length; i++) {
             ss.setBaseFontSize(String.valueOf(i + 1));
@@ -1347,10 +1130,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeStringRelativeUp() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(sizes[3], (int)ss.getPointSize("+0"));
         ss.setBaseFontSize("+1");
         assertEquals(sizes[5], (int)ss.getPointSize("+1"));
@@ -1364,10 +1143,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeStringRelativeDown() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(sizes[3], (int)ss.getPointSize("+0"));
         ss.setBaseFontSize("-1");
         assertEquals(sizes[3], (int)ss.getPointSize("+1"));
@@ -1381,10 +1156,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeStringInvalidLetter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new NumberFormatCase() {
             public void exceptionalAction() throws Exception {
                 ss.setBaseFontSize("a");
@@ -1393,10 +1164,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeStringInvalidMinus() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             testExceptionalCase(new NumberFormatCase() {
                 public void exceptionalAction() throws Exception {
@@ -1416,10 +1183,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testSetBaseFontSizeStringInvalidPlus() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new NumberFormatCase() {
             public void exceptionalAction() throws Exception {
                 ss.setBaseFontSize("++1");
@@ -1428,10 +1191,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(7, sizes.length);
         for (int i = 0; i < sizes.length; i++) {
             assertEquals("@ " + i, sizes[i], (int)ss.getPointSize(i + 1));
@@ -1441,10 +1200,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(7, sizes.length);
         for (int i = 0; i < sizes.length; i++) {
             assertEquals("@ " + i, sizes[i],
@@ -1455,10 +1210,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringRelative() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(sizes[4], (int)ss.getPointSize("+1"));
         assertEquals(sizes[5], (int)ss.getPointSize("+2"));
         assertEquals(sizes[6], (int)ss.getPointSize("+3"));
@@ -1470,10 +1221,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringRelativeBase() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.setBaseFontSize(5);
         assertEquals(sizes[5], (int)ss.getPointSize("+1"));
         assertEquals(sizes[6], (int)ss.getPointSize("+2"));
@@ -1484,10 +1231,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringRelativeBaseLeftEnd() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.setBaseFontSize(1);
         assertEquals(sizes[1], (int)ss.getPointSize("+1"));
         assertEquals(sizes[0], (int)ss.getPointSize("-1"));
@@ -1496,10 +1239,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringRelativeBaseRightEnd() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.setBaseFontSize(7);
         assertEquals(sizes[6], (int)ss.getPointSize("+1"));
         assertEquals(sizes[6], (int)ss.getPointSize("+2"));
@@ -1508,10 +1247,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringInvalidLetter() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new NumberFormatCase() {
             public void exceptionalAction() throws Exception {
                 ss.getPointSize("a");
@@ -1520,10 +1255,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringInvalidMinus() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             testExceptionalCase(new NumberFormatCase() {
                 public void exceptionalAction() throws Exception {
@@ -1541,10 +1272,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testGetPointSizeStringInvalidPlus() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         testExceptionalCase(new NumberFormatCase() {
             public void exceptionalAction() throws Exception {
                 ss.getPointSize("++1");
@@ -1556,10 +1283,6 @@ public class StyleSheetTest extends Basi
      * Tests convertion of standard colors.
      */
     public void testStringToColor01() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final String[] names = {
             "aqua",
             "black",
@@ -1638,10 +1361,6 @@ public class StyleSheetTest extends Basi
      * Tests convertion of hex strings.
      */
     public void testStringToColor02() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(new Color(0x1E, 0x2F, 0xFF), ss.stringToColor("#1E2FFF"));
         assertEquals(new Color(0xFF, 0x11, 0x22), ss.stringToColor("#FF1122"));
         assertEquals(new Color(0x12, 0x33, 0x21), ss.stringToColor("#123321"));
@@ -1668,10 +1387,6 @@ public class StyleSheetTest extends Basi
      * Tests convertion of mixed-case standard names.
      */
     public void testStringToColor03() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(Color.RED, ss.stringToColor("rEd"));
         assertEquals(Color.BLACK, ss.stringToColor("bLaCk"));
         assertEquals(Color.WHITE, ss.stringToColor("White"));
@@ -1681,10 +1396,6 @@ public class StyleSheetTest extends Basi
      * Tests convertion of extended list of named colors.
      */
     public void testStringToColor04() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNull(ss.stringToColor("azure"));
         assertNull(ss.stringToColor("blanchedalmond"));
         assertNull(ss.stringToColor("mistyrose"));
@@ -1696,10 +1407,6 @@ public class StyleSheetTest extends Basi
      * Tests with empty string.
      */
     public void testStringToColor05() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (isHarmony()) {
             assertNull(ss.stringToColor(""));
         } else {
@@ -1718,10 +1425,6 @@ public class StyleSheetTest extends Basi
     }
 
     public void testTranslateHTMLToCSS() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!isHarmony()) {
             // Calling ss.translateHTMLToCSS with all the classes I know which
             // implement AttributeSet throws ClassCastException

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesClassTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesClassTest.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/html/StyleSheet_ResolvedRulesClassTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesClassTest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import javax.swing.text.AttributeSet;
 import javax.swing.text.Element;
 import javax.swing.text.Style;
 import javax.swing.text.html.HTML.Tag;
-import tests.support.Support_Excludes;
 
 public class StyleSheet_ResolvedRulesClassTest extends BasicSwingTestCase {
     private HTMLDocument doc;
@@ -59,10 +58,6 @@ public class StyleSheet_ResolvedRulesCla
     }
 
     public void testGetRule() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         p = doc.getParagraphElement(1);
         assertEquals(1, p.getStartOffset());
         assertEquals(59, p.getEndOffset());
@@ -74,10 +69,6 @@ public class StyleSheet_ResolvedRulesCla
     }
 
     public void testGetRuleSame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         p = doc.getParagraphElement(59);
         assertEquals(59, p.getStartOffset());
         assertEquals(85, p.getEndOffset());
@@ -104,10 +95,6 @@ public class StyleSheet_ResolvedRulesCla
     }
 
     public void testGetRuleAutoChange() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         p = doc.getParagraphElement(1);
         assertEquals(1, p.getStartOffset());
         assertEquals(59, p.getEndOffset());
@@ -124,10 +111,6 @@ public class StyleSheet_ResolvedRulesCla
     }
 
     public void testGetRuleOL_LI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         reInit();
 
         Element li = doc.getParagraphElement(1).getParentElement();
@@ -142,10 +125,6 @@ public class StyleSheet_ResolvedRulesCla
     }
 
     public void testGetRuleUL_LI() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         reInit();
 
         Element li = doc.getParagraphElement(22).getParentElement();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesTest.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/html/StyleSheet_ResolvedRulesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ResolvedRulesTest.java Sat Jun  5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.swing.text.Element;
 import javax.swing.text.Style;
 import javax.swing.text.html.CSS.Attribute;
 import javax.swing.text.html.HTML.Tag;
-import tests.support.Support_Excludes;
 
 public class StyleSheet_ResolvedRulesTest extends BasicSwingTestCase {
     private static final int P_EM_START_OFFSET = 20;
@@ -64,10 +63,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_NoContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -77,10 +72,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_NoContext_Same() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -89,10 +80,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_Context() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -105,10 +92,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_Context_Same() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -117,10 +100,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_NoContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -137,10 +116,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_NoContextOverride() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -156,10 +131,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_Context() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -179,10 +150,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_ContextOverride() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -201,10 +168,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_ChangeStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -227,10 +190,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AutoChange_ChangeStyle_Override() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -253,10 +212,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_AddStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -272,10 +227,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_AddStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(5, getStyleNumber());
         assertNull(ss.getStyle("em"));
 
@@ -288,10 +239,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRule_NotSame() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET); // With no context associated
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -303,10 +250,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRule_Same() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET); // With no context associated
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -316,10 +259,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRule_Same_Context() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(PSMALL_EM_START_OFFSET); // With context associated
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -329,28 +268,16 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_NoContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rule = ss.getRule("em");
         assertEquals(0, rule.getAttributeCount());
     }
 
     public void testGetRuleString_ContextClass() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rule = ss.getRule("p.small em");
         assertEquals(2, rule.getAttributeCount());
     }
 
     public void testGetRuleString_ContextNoClass() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addRule("p em { text-decoration: underline }");
         rule = ss.getRule("p em");
         assertEquals(2, rule.getAttributeCount());
@@ -362,10 +289,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_Autochange_ContextNoClass01() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addRule("p em { text-decoration: underline }");
         rule = ss.getRule("p em");
         assertEquals(2, rule.getAttributeCount());
@@ -383,10 +306,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_Autochange_ContextNoClass02() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addRule("p em { text-decoration: underline }");
         rule = ss.getRule("p em");
         assertEquals(2, rule.getAttributeCount());
@@ -402,10 +321,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_AutoChange_NoContext() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rule = ss.getRule("em");
         assertEquals(0, rule.getAttributeCount());
 
@@ -418,10 +333,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_Listeners() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -446,10 +357,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleTagElement_RemoveStyle() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element em = doc.getCharacterElement(P_EM_START_OFFSET);
         assertNotNull(em.getAttributes().getAttribute(Tag.EM));
 
@@ -466,10 +373,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_Partial() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addRule("em { color: rgb(255, 255, 150) }");
 
         rule = ss.getRule("em");
@@ -483,10 +386,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_NoRules() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         rule = ss.getRule(HTML.Tag.ADDRESS.toString());
 
         assertEquals(0, rule.getAttributeCount());
@@ -505,10 +404,6 @@ public class StyleSheet_ResolvedRulesTes
     }
 
     public void testGetRuleString_NoRulesStyles() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ss.addStyleSheet(new StyleSheet());
         rule = ss.getRule(HTML.Tag.ADDRESS.toString());
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ViewAttributesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ViewAttributesTest.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/html/StyleSheet_ViewAttributesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/StyleSheet_ViewAttributesTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import javax.swing.text.Element;
 import javax.swing.text.Style;
 import javax.swing.text.View;
 import javax.swing.text.html.HTML.Tag;
-import tests.support.Support_Excludes;
 
 public class StyleSheet_ViewAttributesTest extends BasicSwingTestCase {
     private HTMLDocument doc;
@@ -42,10 +41,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testViewGetAttributes() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         ss = new StyleSheet() {
             public AttributeSet getViewAttributes(final View v) {
@@ -61,10 +56,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesGetRuleInline() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker tag = new Marker();
         final Marker sel = new Marker();
         ss = new StyleSheet() {
@@ -85,10 +76,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesGetRuleBlock() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker tag = new Marker();
         final Marker sel = new Marker();
         ss = new StyleSheet() {
@@ -111,10 +98,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesGetRuleInlineEm() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker tag = new Marker();
         final Marker sel = new Marker();
         ss = new StyleSheet() {
@@ -145,10 +128,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesTranslate() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Marker marker = new Marker();
         final Element block = doc.getParagraphElement(0);
         ss = new StyleSheet() {
@@ -165,10 +144,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesResolverNull() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Element block = doc.getParagraphElement(0);
         view = new BlockView(block, View.Y_AXIS);
         AttributeSet va = ss.getViewAttributes(view);
@@ -177,10 +152,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesResolver() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Element block = doc.getParagraphElement(0);
         final Element inline = block.getElement(0);
 
@@ -194,10 +165,6 @@ public class StyleSheet_ViewAttributesTe
     }
 
     public void testGetViewAttributesResolverChange() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Element block = doc.getParagraphElement(0);
         final Element inline = block.getElement(0);
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/ContentModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/ContentModelTest.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/html/parser/ContentModelTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/ContentModelTest.java Sat Jun  5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.awt.Rectangle;
 import java.util.Vector;
 
 import javax.swing.SwingTestCase;
-import tests.support.Support_Excludes;
 
 public class ContentModelTest extends SwingTestCase {
     ContentModel contentModel;
@@ -78,10 +77,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testContentModelElement() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         contentModel = new ContentModel(elements[0]);
         Utils.checkContentModel(contentModel, elements[0], 0, null);
 
@@ -90,19 +85,11 @@ public class ContentModelTest extends Sw
     }
 
     public void testContentModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         contentModel = new ContentModel();
         Utils.checkContentModel(contentModel, null, 0, null);
     }
 
     public void testContentModelIntContentModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         contentModel1 = new ContentModel(elements[0]);
 
         contentModel = new ContentModel('*', contentModel1);
@@ -116,10 +103,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testContentModelIntObjectContentModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         contentModel1 = new ContentModel(elements[0]);
         contentModel = new ContentModel(',', elements[1], contentModel1);
         Utils.checkContentModel(contentModel, elements[1], ',',
@@ -149,10 +132,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testIllegalArgumentException_Object() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (SwingTestCase.isHarmony()) {
             contentModel1 = new ContentModel(elements[0]);
             try {
@@ -225,10 +204,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testIllegalArgumentException_Type() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (SwingTestCase.isHarmony()) {
             contentModel1 = new ContentModel(elements[0]);
             try {
@@ -287,10 +262,6 @@ public class ContentModelTest extends Sw
 
 
     public void testFirst() throws Exception{
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initContentModels();
         assertEquals(elements[1], contentModel1.first());
         assertEquals(elements[2], contentModel2.first());
@@ -304,10 +275,6 @@ public class ContentModelTest extends Sw
     }
     
     public void testFirst2() throws Exception{
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //regression for HARMONY-1350
         DTD dtd = DTD.getDTD("tmp");
         ContentModel model1 = new ContentModel (dtd.getElement(2));
@@ -318,10 +285,6 @@ public class ContentModelTest extends Sw
 
 
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!SwingTestCase.isHarmony()) {
             return;
         }
@@ -362,10 +325,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testFirstObject() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!SwingTestCase.isHarmony()) {
             return;
         }
@@ -509,10 +468,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testGetElements() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         resetElemVec();
         Vector v = new Vector();
         initContentModels();
@@ -563,10 +518,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testEmpty() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //ClassCastException on RI
         if (!SwingTestCase.isHarmony()) {
             return;
@@ -589,10 +540,6 @@ public class ContentModelTest extends Sw
     }
 
     public void testSerialization() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         contentModel1 = new ContentModel(elements[0]);
         contentModel = new ContentModel('|', elements[1], contentModel1);
         contentModel2 = (ContentModel)Utils.doSerialization(contentModel);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTD401Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTD401Test.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/html/parser/DTD401Test.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTD401Test.java Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ import java.util.Vector;
 import javax.swing.SwingTestCase;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class DTD401Test extends TestCase {
     DTD dtd;
@@ -68,10 +67,6 @@ public class DTD401Test extends TestCase
     }
 
     public void testEntities() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!SwingTestCase.isHarmony()) {
             Utils401.check32Entities(dtd.entityHash);
         } else {
@@ -80,10 +75,6 @@ public class DTD401Test extends TestCase
     }
 
     public void testElements() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!SwingTestCase.isHarmony()) {
             return;
         }
@@ -110,10 +101,6 @@ public class DTD401Test extends TestCase
 
 
     public void testFields() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!SwingTestCase.isHarmony()) {
             return;
         }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.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/html/parser/DTDTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DTDTest.java Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ import java.util.Vector;
 
 import javax.swing.SwingTestCase;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /**
  * That's a test for default dtd, doesn't check dtd 4.01 and read method.
@@ -67,10 +66,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetPutDTD() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             DTD dtd1 = DTD.getDTD("DTDTest1");
             DTD dtd2 = DTD.getDTD("DTDTest1");
@@ -136,10 +131,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testFILE_VERSION() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(1, DTD.FILE_VERSION);
     }
 
@@ -220,10 +211,6 @@ public class DTDTest extends TestCase {
 
 
     public void testDTD() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DTD dtd1 = new DTD(null);
         assertNull(dtd1.getName());
 
@@ -247,18 +234,10 @@ public class DTDTest extends TestCase {
     }
 
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(dtd.getName(), dtd.toString());
     }
 
     public void testDefContentModel() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element e1 = new Element();
         e1.name = "e1";
         Element e2 = new Element();
@@ -269,10 +248,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefAttributeList() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = "name";
         int type = 22;
         int modifier = 23;
@@ -298,10 +273,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefElement() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = "newElement";
         int type = 234;
         boolean omitStart = true;
@@ -339,10 +310,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefEntityStringintString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = "newStringEntity";
         int type = 123;
         String data = "AbcD";
@@ -358,10 +325,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefEntityStringintint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = "newCharEntity";
         int type = 123;
         char data = 'J';
@@ -380,10 +343,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefineAttributes() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = HTML;
         AttributeList attl = new AttributeList("new AttributeList");
         dtd.defineAttributes(HTML, attl);
@@ -401,10 +360,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefineElement() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Element elem = (Element)dtd.elementHash.get(HTML);
         String name = elem.getName();
         int type = elem.getType();
@@ -454,10 +409,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testDefineEntity() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Entity entity = (Entity)dtd.entityHash.get("#SPACE");
         String name = entity.getName();
         int type = entity.getType();
@@ -495,10 +446,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetElementint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initDefaultElementsVector();
         for (int i = 0; i < DEFAULT_SIZE; i++) {
             assertEquals(elementNames.get(i), dtd.getElement(i).getName());
@@ -510,10 +457,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetElementString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initDefaultElementsVector();
         for (int i = 0; i < DEFAULT_SIZE; i++) {
             String name = (String)elementNames.get(i);
@@ -530,10 +473,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetEntityint() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //RI
         if (!SwingTestCase.isHarmony()) {
             assertNull(dtd.getEntity(0));
@@ -546,10 +485,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetEntityString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(dtd.entityHash.get(SPACE_ENTITY_NAME),
                      dtd.getEntity(SPACE_ENTITY_NAME));
         assertEquals(dtd.entityHash.get(RS_ENTITY_NAME),
@@ -560,10 +495,6 @@ public class DTDTest extends TestCase {
     }
 
     public void testGetName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("DTDTest1", dtd.getName());
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DocumentParserTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DocumentParserTest.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/html/parser/DocumentParserTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/DocumentParserTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing.text.html.parser;
 import java.io.IOException;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class DocumentParserTest extends TestCase {
     Utils.ExtDocumentParser dp;
@@ -37,62 +36,30 @@ public class DocumentParserTest extends 
     //parse method)... Otherwise, NPE will be thrown (no callback...)
 /*
     public void testHandleError() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         dp.handleError(5, "That's an error message");
     }
 
     public void testHandleEndTag() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testHandleStartTag() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testHandleEmptyTag() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testHandleComment() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     public void testHandleText() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
 
     public void testDocumentParser() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     }
 
     */
     public void testParseReaderParserCallbackBoolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Utils.ParserCallback cb = new Utils.ParserCallback();
         cb.checkArguments = true;
         cb.setParser(dp);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/TagElementTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/TagElementTest.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/html/parser/TagElementTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/text/html/parser/TagElementTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ package javax.swing.text.html.parser;
 import javax.swing.text.html.HTML;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class TagElementTest extends TestCase {
     Element element;
@@ -36,10 +35,6 @@ public class TagElementTest extends Test
     }
 
     public void testFictional() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(tagElement.fictional());
         tagElement = new TagElement(element, true);
         assertTrue(tagElement.fictional());
@@ -48,10 +43,6 @@ public class TagElementTest extends Test
     }
 
     public void testGetHTMLTag() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         HTML.Tag tag = tagElement.getHTMLTag();
         assertTrue(tag instanceof HTML.UnknownTag);
         //name check
@@ -65,18 +56,10 @@ public class TagElementTest extends Test
     }
 
     public void testGetElement() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(element, tagElement.getElement());
     }
 
     public void testIsPreformatted() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertFalse(tagElement.isPreformatted());
         element.name = DTDTest.conv("pre");
         tagElement = new TagElement(element);
@@ -87,10 +70,6 @@ public class TagElementTest extends Test
     }
 
     public void testBreaksFlow() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         element.name = DTDTest.conv("td");
         tagElement = new TagElement(element);
         assertTrue(tagElement.breaksFlow());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/org/apache/harmony/x/swing/plaf/resources/basic/BasicResourceBundleTest.java Sat Jun  5 08:34:57 2010
@@ -26,16 +26,11 @@ import java.util.Collections;
 import java.util.ResourceBundle;
 
 import javax.swing.BasicSwingTestCase;
-import tests.support.Support_Excludes;
 
 public class BasicResourceBundleTest extends BasicSwingTestCase {
     private static final String RESOURCE_BUNDLE = "org.apache.harmony.x.swing.plaf.resources.basic.BasicResourceBundle";
 
     public void testKeys() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ResourceBundle bundle = ResourceBundle.getBundle(RESOURCE_BUNDLE);
         assertFalse(Collections.list(bundle.getKeys()).isEmpty());
         if (isHarmony()) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/make/run-test.xml Sat Jun  5 08:34:57 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module">
+    <target name="test-module" depends="test-jre-vm-info">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="text" jar="text_tests.jar" />
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/CollationElementIteratorTest.java Sat Jun  5 08:34:57 2010
@@ -24,7 +24,6 @@ import java.text.StringCharacterIterator
 import java.util.Locale;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /**
  * Test CollationElementIterator
@@ -41,10 +40,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testGetOffset() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		String text = "abc";
 		CollationElementIterator iterator = coll
 				.getCollationElementIterator(text);
@@ -60,10 +55,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testNext() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		String text = "abc";
 		CollationElementIterator iterator = coll
 				.getCollationElementIterator(text);
@@ -88,10 +79,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testReset() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		String text = "abc";
 		CollationElementIterator iterator = coll
 				.getCollationElementIterator(text);
@@ -111,10 +98,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testGetMaxExpansion() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		String text = "cha";
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("es", "", "TRADITIONAL"));
@@ -129,10 +112,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testPrimaryOrder() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("de", "DE"));
 		String text = "\u00e6";
@@ -148,10 +127,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testSecondaryOrder() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("fr", "FR"));
 		String text = "a\u00e0";
@@ -167,10 +142,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testTertiaryOrder() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("fr", "FR"));
 		String text = "abAB";
@@ -190,10 +161,6 @@ public class CollationElementIteratorTes
 	}
 
 	public void testSetOffset() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("es", "", "TRADITIONAL"));
 		String text = "cha";
@@ -207,10 +174,6 @@ public class CollationElementIteratorTes
 	 * Class under test for void setText(java.lang.String)
 	 */
 	public void testSetTextString() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("es", "", "TRADITIONAL"));
 		String text = "caa";
@@ -227,10 +190,6 @@ public class CollationElementIteratorTes
 	 * Class under test for void setText(java.text.CharacterIterator)
 	 */
 	public void testSetTextCharacterIterator() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		RuleBasedCollator rbColl = (RuleBasedCollator) Collator
 				.getInstance(new Locale("es", "", "TRADITIONAL"));
 		String text = "caa";

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DateFormatSymbolsTest.java Sat Jun  5 08:34:57 2010
@@ -23,7 +23,6 @@ import java.io.ObjectOutputStream;
 import java.text.DateFormatSymbols;
 import java.util.Arrays;
 import java.util.Locale;
-import tests.support.Support_Excludes;
 
 public class DateFormatSymbolsTest extends junit.framework.TestCase {
 
@@ -33,10 +32,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#DateFormatSymbols()
      */
     public void test_Constructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.DateFormatSymbols()
         // Used in tests
         new DateFormatSymbols();
@@ -46,10 +41,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#DateFormatSymbols(java.util.Locale)
      */
     public void test_ConstructorLjava_util_Locale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.DateFormatSymbols(java.util.Locale)
         new DateFormatSymbols(new Locale("en", "us"));
     }
@@ -58,10 +49,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#clone()
      */
     public void test_clone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.Object java.text.DateFormatSymbols.clone()
         DateFormatSymbols symbols = new DateFormatSymbols();
         DateFormatSymbols clone = (DateFormatSymbols) symbols.clone();
@@ -72,10 +59,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#equals(java.lang.Object)
      */
     public void test_equalsLjava_lang_Object() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method boolean
         // java.text.DateFormatSymbols.equals(java.lang.Object)
         assertTrue("Equal object returned true", dfs.equals(dfs.clone()));
@@ -88,10 +71,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getAmPmStrings()
      */
     public void test_getAmPmStrings() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getAmPmStrings()
         String[] retVal = dfs.getAmPmStrings();
@@ -106,10 +85,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getEras()
      */
     public void test_getEras() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getEras()
         String[] retVal = dfs.getEras();
@@ -124,10 +99,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getLocalPatternChars()
      */
     public void test_getLocalPatternChars() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String
         // java.text.DateFormatSymbols.getLocalPatternChars()
         String retVal = dfs.getLocalPatternChars();
@@ -141,10 +112,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getMonths()
      */
     public void test_getMonths() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getMonths()
         String[] retVal = dfs.getMonths();
@@ -160,10 +127,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getShortMonths()
      */
     public void test_getShortMonths() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getShortMonths()
         String[] retVal = dfs.getShortMonths();
@@ -178,10 +141,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getShortWeekdays()
      */
     public void test_getShortWeekdays() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getShortWeekdays()
         String[] retVal = dfs.getShortWeekdays();
@@ -196,10 +155,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getWeekdays()
      */
     public void test_getWeekdays() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String []
         // java.text.DateFormatSymbols.getWeekdays()
         String[] retVal = dfs.getWeekdays();
@@ -215,10 +170,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#getZoneStrings()
      */
     public void test_getZoneStrings() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String [][]
         // java.text.DateFormatSymbols.getZoneStrings()
         String[][] val = { { "XX" }, { "YY" } };
@@ -235,10 +186,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#hashCode()
      */
     public void test_hashCode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method int java.text.DateFormatSymbols.hashCode()
         int hc1 = dfs.hashCode();
         int hc2 = dfs.hashCode();
@@ -252,10 +199,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setAmPmStrings(java.lang.String[])
      */
     public void test_setAmPmStrings$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setAmPmStrings(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -271,10 +214,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setEras(java.lang.String[])
      */
     public void test_setEras$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setEras(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -290,10 +229,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setLocalPatternChars(java.lang.String)
      */
     public void test_setLocalPatternCharsLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setLocalPatternChars(java.lang.String)
         dfs.setLocalPatternChars("GyMZZkHmsSEHHFwWahKz");
@@ -314,10 +249,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setMonths(java.lang.String[])
      */
     public void test_setMonths$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setMonths(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -334,10 +265,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setShortMonths(java.lang.String[])
      */
     public void test_setShortMonths$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setShortMonths(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -354,10 +281,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setShortWeekdays(java.lang.String[])
      */
     public void test_setShortWeekdays$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setShortWeekdays(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -374,10 +297,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setWeekdays(java.lang.String[])
      */
     public void test_setWeekdays$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setWeekdays(java.lang.String [])
         String[] val = { "XX", "YY" };
@@ -394,10 +313,6 @@ public class DateFormatSymbolsTest exten
      * @tests java.text.DateFormatSymbols#setZoneStrings(java.lang.String[][])
      */
     public void test_setZoneStrings$$Ljava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.DateFormatSymbols.setZoneStrings(java.lang.String [][])
         String[][] val = { { "XX" }, { "YY" } };
@@ -431,10 +346,6 @@ public class DateFormatSymbolsTest exten
 
     // Test serialization mechanism of DateFormatSymbols
     public void test_serialization() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DateFormatSymbols symbols = new DateFormatSymbols(Locale.FRANCE);
         String[][] zoneStrings = symbols.getZoneStrings();
         assertNotNull(zoneStrings);



Mime
View raw message