harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [20/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/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.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/DecimalFormatTest.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/DecimalFormatTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/DecimalFormatTest.java Sat Jun  5 08:34:57 2010
@@ -33,16 +33,11 @@ import java.util.Locale;
 import junit.framework.TestCase;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
-import tests.support.Support_Excludes;
 
 
 public class DecimalFormatTest extends TestCase {
 
     public void testAttributedCharacterIterator() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for http://issues.apache.org/jira/browse/HARMONY-333
         AttributedCharacterIterator iterator = new DecimalFormat().formatToCharacterIterator(new Integer(1));
         assertNotNull(iterator);
@@ -55,10 +50,6 @@ public class DecimalFormatTest extends T
      */
     public void test_isParseBigDecimalLjava_lang_Boolean_isParseIntegerOnlyLjava_lang_Boolean() {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // parseBigDecimal default to false
         DecimalFormat form = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
         assertFalse(form.isParseBigDecimal());
@@ -74,10 +65,6 @@ public class DecimalFormatTest extends T
     // Test the type of the returned object
 
     public void test_parseLjava_lang_String_Ljava_text_ParsePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat form = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
         Number number = form.parse("23.1", new ParsePosition(0));
         assertTrue(number instanceof Double);
@@ -345,10 +332,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_getMaximumFractionDigits() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -373,10 +356,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_getMinimumFractionDigits() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -398,10 +377,6 @@ public class DecimalFormatTest extends T
 
     //FIXME This test fails on Harmony ClassLibrary
     public void test_getMaximumIntegerDigits() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final int maxIntDigit = 309;
 
         // When use default locale, in this case zh_CN
@@ -450,10 +425,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_getMinimumIntegerDigits() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final int minIntDigit = 1;
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
@@ -476,10 +447,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_formatLjava_lang_Obj_Ljava_StringBuffer_Ljava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -635,10 +602,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_setMaximumFractionDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -650,10 +613,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_setMinimumFractionDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -665,10 +624,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_setMaximumIntegerDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -680,10 +635,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_setMinimumIntegerDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -697,10 +648,6 @@ public class DecimalFormatTest extends T
     // When MaxFractionDigits is set first and less than MinFractionDigits, max
     // will be changed to min value
     public void test_setMinimumFactionDigitsLjava_lang_Integer_setMaximumFractionDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -720,10 +667,6 @@ public class DecimalFormatTest extends T
     // When MinFractionDigits is set first and less than MaxFractionDigits, min
     // will be changed to max value
     public void test_setMaximumFactionDigitsLjava_lang_Integer_setMinimumFractionDigitsLjava_lang_Integer() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
 
@@ -741,10 +684,6 @@ public class DecimalFormatTest extends T
     }
 
     public void test_equalsLjava_lang_Object() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
         DecimalFormat cloned = (DecimalFormat) format.clone();
         cloned.setDecimalFormatSymbols(new DecimalFormatSymbols(Locale.US));
@@ -757,46 +696,26 @@ public class DecimalFormatTest extends T
     }
 
     public void test_setPositivePrefixLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat();
         assertEquals("", format.getPositivePrefix());
     }
 
     public void test_setPositiveSuffixLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat();
         assertEquals("", format.getPositiveSuffix());
     }
 
     public void test_setNegativePrefixLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat();
         assertEquals("-", format.getNegativePrefix());
     }
 
     public void test_setNegativeSuffixLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat();
         assertEquals("", format.getNegativeSuffix());
     }
 
     public void test_setGroupingUse() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat();
         StringBuffer buf = new StringBuffer();
         format.setGroupingUsed(false);
@@ -809,10 +728,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#DecimalFormat(java.lang.String)
      */
     public void test_ConstructorLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.DecimalFormat(java.lang.String)
         // the constructor form that specifies a pattern is equal to the form
         // constructed with no pattern and applying that pattern using the
@@ -828,10 +743,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#applyPattern(java.lang.String)
      */
     public void test_applyPatternLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = new DecimalFormat("#.#");
         assertEquals("Wrong pattern 1", "#0.#", format.toPattern());
         format = new DecimalFormat("#.");
@@ -846,10 +757,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#clone()
      */
     public void test_clone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
         DecimalFormat cloned = (DecimalFormat) format.clone();
         assertEquals(cloned.getDecimalFormatSymbols(), format
@@ -885,10 +792,6 @@ public class DecimalFormatTest extends T
      */
     //FIXME This test fails on Harmony ClassLibrary
     public void test_formatDLjava_lang_StringBufferLjava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         new Support_DecimalFormat(
                 "test_formatDLjava_lang_StringBufferLjava_text_FieldPosition")
                 .t_format_with_FieldPosition();
@@ -1122,10 +1025,6 @@ public class DecimalFormatTest extends T
      */
     //FIXME This test fails on Harmony ClassLibrary
     public void test_formatJLjava_lang_StringBufferLjava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int failCount = 0;
         BitSet failures = new BitSet();
 
@@ -1200,10 +1099,6 @@ public class DecimalFormatTest extends T
     //FIXME This test fails on Harmony ClassLibrary
     public void test_formatToCharacterIteratorLjava_lang_Object() {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             // Regression for HARMONY-466
             new DecimalFormat().formatToCharacterIterator(null);
@@ -1221,10 +1116,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#format(double)
      */
     public void test_formatD() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = (DecimalFormat) NumberFormat
                 .getInstance(Locale.ENGLISH);
         format.setGroupingUsed(false);
@@ -1274,10 +1165,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#getDecimalFormatSymbols()
      */
     public void test_getDecimalFormatSymbols() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = (DecimalFormat) NumberFormat
                 .getInstance(Locale.ENGLISH);
         DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
@@ -1289,10 +1176,6 @@ public class DecimalFormatTest extends T
      */
     //FIXME This test fails on Harmony ClassLibrary
     public void test_getCurrency() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Currency currK = Currency.getInstance("KRW");
         Currency currX = Currency.getInstance("XXX");
         Currency currE = Currency.getInstance("EUR");
@@ -1334,10 +1217,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#getGroupingSize()
      */
     public void test_getGroupingSize() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##");
         assertEquals("Wrong unset size", 0, df.getGroupingSize());
         df = new DecimalFormat("#,##0.##");
@@ -1350,10 +1229,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#getMultiplier()
      */
     public void test_getMultiplier() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final int defaultMultiplier = 1;
         NumberFormat nform = DecimalFormat.getInstance(Locale.US);
         DecimalFormat form = (DecimalFormat) nform;
@@ -1371,10 +1246,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#isDecimalSeparatorAlwaysShown()
      */
     public void test_isDecimalSeparatorAlwaysShown() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##");
         assertTrue("Wrong unset value", !df.isDecimalSeparatorAlwaysShown());
         df = new DecimalFormat("###0.00");
@@ -1389,10 +1260,6 @@ public class DecimalFormatTest extends T
      */
     //FIXME This test fails on Harmony ClassLibrary
     public void test_parseLjava_lang_StringLjava_text_ParsePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat format = (DecimalFormat) NumberFormat
                 .getNumberInstance(Locale.ENGLISH);
         ParsePosition pos = new ParsePosition(0);
@@ -1486,10 +1353,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setDecimalFormatSymbols(java.text.DecimalFormatSymbols)
      */
     public void test_setDecimalFormatSymbolsLjava_text_DecimalFormatSymbols() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##");
         DecimalFormatSymbols dfs = new DecimalFormatSymbols();
         dfs.setDecimalSeparator('@');
@@ -1511,10 +1374,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setDecimalSeparatorAlwaysShown(boolean)
      */
     public void test_setDecimalSeparatorAlwaysShownZ() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##",
                                              new DecimalFormatSymbols(Locale.US));
         assertEquals("Wrong default result", "5", df.format(5));
@@ -1527,10 +1386,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setCurrency(java.util.Currency)
      */
     public void test_setCurrencyLjava_util_Currency() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Locale locale = Locale.CANADA;
         DecimalFormat df = ((DecimalFormat) NumberFormat
                 .getCurrencyInstance(locale));
@@ -1557,10 +1412,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setGroupingSize(int)
      */
     public void test_setGroupingSizeI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##",
                 new DecimalFormatSymbols(Locale.ENGLISH));
         df.setGroupingUsed(true);
@@ -1574,10 +1425,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setMaximumFractionDigits(int)
      */
     public void test_setMaximumFractionDigitsI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##",
                                              new DecimalFormatSymbols(Locale.US));
         df.setMaximumFractionDigits(3);
@@ -1592,10 +1439,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setMaximumIntegerDigits(int)
      */
     public void test_setMaximumIntegerDigitsI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##");
         df.setMaximumIntegerDigits(2);
         assertEquals("Not set", 2, df.getMaximumIntegerDigits());
@@ -1609,10 +1452,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setMinimumFractionDigits(int)
      */
     public void test_setMinimumFractionDigitsI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##",
                                              new DecimalFormatSymbols(Locale.US));
         df.setMinimumFractionDigits(4);
@@ -1627,10 +1466,6 @@ public class DecimalFormatTest extends T
      * @tests java.text.DecimalFormat#setMinimumIntegerDigits(int)
      */
     public void test_setMinimumIntegerDigitsI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##",
                                              new DecimalFormatSymbols(Locale.US));
         df.setMinimumIntegerDigits(3);
@@ -1646,10 +1481,6 @@ public class DecimalFormatTest extends T
      */
     //FIXME This test fails on Harmony ClassLibrary
     public void test_setMultiplierI() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         DecimalFormat df = new DecimalFormat("###0.##");
         df.setMultiplier(10);
         assertEquals("Wrong multiplier", 10, df.getMultiplier());
@@ -1666,10 +1497,6 @@ public class DecimalFormatTest extends T
      * @tests serialization/deserialization compatibility.
      */
     public void testSerializationSelf() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SerializationTest.verifySelf(new DecimalFormat());
     }
 
@@ -1677,10 +1504,6 @@ public class DecimalFormatTest extends T
      * @tests serialization compatibility with RI
      */
     public void test_serializationHarmonyRICompatible() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         NumberFormat nf = NumberFormat.getInstance(Locale.FRANCE);
 
         DecimalFormat df = null;
@@ -1739,10 +1562,6 @@ public class DecimalFormatTest extends T
      * Test whether DecimalFormat can parse Positive infinity correctly
      */
     public void testParseInfinityBigDecimalFalse() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for HARMONY-106
         DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance();
         DecimalFormatSymbols symbols = new DecimalFormatSymbols();
@@ -1756,10 +1575,6 @@ public class DecimalFormatTest extends T
      * Test whether DecimalFormat can parse Negative infinity correctly
      */
     public void testParseMinusInfinityBigDecimalFalse() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for HARMONY-106
         DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance();
         DecimalFormatSymbols symbols = new DecimalFormatSymbols();
@@ -1774,10 +1589,6 @@ public class DecimalFormatTest extends T
      * when it is called with null parameter.
      */
     public void testSetDecimalFormatSymbolsAsNull(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	// Regression for HARMONY-1070
         DecimalFormat format = (DecimalFormat)DecimalFormat.getInstance();
         format.setDecimalFormatSymbols(null);                     

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.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/MessageFormatTest.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/MessageFormatTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/MessageFormatTest.java Sat Jun  5 08:34:57 2010
@@ -38,7 +38,6 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class MessageFormatTest extends TestCase {
 
@@ -70,10 +69,6 @@ public class MessageFormatTest extends T
      *        java.util.Locale)
      */
     public void test_ConstructorLjava_lang_StringLjava_util_Locale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.MessageFormat(java.lang.String,
         // java.util.Locale)
         Locale mk = new Locale("mk", "MK");
@@ -94,10 +89,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#MessageFormat(java.lang.String)
      */
     public void test_ConstructorLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.MessageFormat(java.lang.String)
         MessageFormat format = new MessageFormat(
                 "abc {4,time} def {3,date} ghi {2,number} jkl {1,choice,0#low|1#high} mnop {0}");
@@ -174,10 +165,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#applyPattern(java.lang.String)
      */
     public void test_applyPatternLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.MessageFormat.applyPattern(java.lang.String)
         MessageFormat format = new MessageFormat("test");
@@ -321,10 +308,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#clone()
      */
     public void test_clone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.Object java.text.MessageFormat.clone()
         MessageFormat format = new MessageFormat("'{'choice'}'{0}");
         MessageFormat clone = (MessageFormat) format.clone();
@@ -343,10 +326,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#equals(java.lang.Object)
      */
     public void test_equalsLjava_lang_Object() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method boolean
         // java.text.MessageFormat.equals(java.lang.Object)
         MessageFormat format1 = new MessageFormat("{0}");
@@ -364,10 +343,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#hashCode()
      */
     public void test_hashCode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method
         // int java.text.MessageFormat.hashCode()
         assertEquals("Should be equal", 3648, new MessageFormat("rr", null).hashCode());
@@ -387,10 +362,6 @@ public class MessageFormatTest extends T
      *        java.lang.StringBuffer, java.text.FieldPosition)
      */
     public void test_format$Ljava_lang_ObjectLjava_lang_StringBufferLjava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.StringBuffer
         // java.text.MessageFormat.format(java.lang.Object [],
         // java.lang.StringBuffer, java.text.FieldPosition)
@@ -415,10 +386,6 @@ public class MessageFormatTest extends T
      *        java.lang.StringBuffer, java.text.FieldPosition)
      */
     public void test_formatLjava_lang_ObjectLjava_lang_StringBufferLjava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.StringBuffer
         // java.text.MessageFormat.format(java.lang.Object,
         // java.lang.StringBuffer, java.text.FieldPosition)
@@ -431,10 +398,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#getFormats()
      */
     public void test_getFormats() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.Format []
         // java.text.MessageFormat.getFormats()
 
@@ -477,10 +440,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#getFormatsByArgumentIndex()
      */
     public void test_getFormatsByArgumentIndex() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.Format [] test_getFormatsByArgumentIndex()
 
         // test with repeating formats and max argument index < max offset
@@ -521,10 +480,6 @@ public class MessageFormatTest extends T
      *        java.text.Format)
      */
     public void test_setFormatByArgumentIndexILjava_text_Format() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test for method setFormatByArgumentIndex(int, Format)
         MessageFormat f1 = (MessageFormat) format1.clone();
         f1.setFormatByArgumentIndex(0, DateFormat.getTimeInstance());
@@ -605,10 +560,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#setFormatsByArgumentIndex(java.text.Format[])
      */
     public void test_setFormatsByArgumentIndex$Ljava_text_Format() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // test for method setFormatByArgumentIndex(Format[])
         MessageFormat f1 = (MessageFormat) format1.clone();
 
@@ -697,10 +648,6 @@ public class MessageFormatTest extends T
      *        java.text.ParsePosition)
      */
     public void test_parseLjava_lang_StringLjava_text_ParsePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MessageFormat format = new MessageFormat("date is {0,date,MMM d, yyyy}");
         ParsePosition pos = new ParsePosition(2);
         Object[] result = (Object[]) format
@@ -732,10 +679,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#setLocale(java.util.Locale)
      */
     public void test_setLocaleLjava_util_Locale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.MessageFormat.setLocale(java.util.Locale)
         MessageFormat format = new MessageFormat("date {0,date}");
@@ -750,10 +693,6 @@ public class MessageFormatTest extends T
      * @tests java.text.MessageFormat#toPattern()
      */
     public void test_toPattern() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String java.text.MessageFormat.toPattern()
         String pattern = "[{0}]";
         MessageFormat mf = new MessageFormat(pattern);
@@ -796,10 +735,6 @@ public class MessageFormatTest extends T
 	 * @tests java.text.MessageFormat(java.util.Locale)
 	 */
 	public void test_ConstructorLjava_util_Locale() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Regression for HARMONY-65
 		try {
 			new MessageFormat("{0,number,integer", Locale.US);
@@ -813,10 +748,6 @@ public class MessageFormatTest extends T
 	 * @tests java.text.MessageFormat#parse(java.lang.String)
 	 */
 	public void test_parse() throws ParseException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Regression for HARMONY-63
 		MessageFormat mf = new MessageFormat("{0,number,#,####}", Locale.US);
 		Object[] res = mf.parse("1,00,00");
@@ -825,10 +756,6 @@ public class MessageFormatTest extends T
 	}
 
 	public void test_format_Object() { 
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Regression for HARMONY-1875
         Locale.setDefault(Locale.CANADA); 
         TimeZone.setDefault(TimeZone.getTimeZone("UTC")); 
@@ -842,10 +769,6 @@ public class MessageFormatTest extends T
     } 
 
     public void testHARMONY5323() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
     	Object []messageArgs = new Object[11];
     	for (int i = 0; i < messageArgs.length; i++)
     		messageArgs[i] = "dumb"+i;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.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/RuleBasedCollatorTest.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/RuleBasedCollatorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/RuleBasedCollatorTest.java Sat Jun  5 08:34:57 2010
@@ -27,15 +27,10 @@ import java.text.StringCharacterIterator
 import java.util.Locale;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class RuleBasedCollatorTest extends TestCase {
 
 	public void test_getCollationKeyLjava_lang_String() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Regression test for HARMONY-28
 		String source = null;
 		RuleBasedCollator rbc = null;
@@ -50,10 +45,6 @@ public class RuleBasedCollatorTest exten
 	}
     
     public void testHashCode() throws ParseException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         {
             String rule = "< a < b < c < d";
             RuleBasedCollator coll = new RuleBasedCollator(rule);
@@ -69,10 +60,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testClone() throws ParseException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         RuleBasedCollator coll = (RuleBasedCollator) Collator
                 .getInstance(Locale.US);
         RuleBasedCollator clone = (RuleBasedCollator) coll.clone();
@@ -86,10 +73,6 @@ public class RuleBasedCollatorTest exten
      * Class under test for boolean equals(java.lang.Object)
      */
     public void testEqualsObject() throws ParseException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String rule = "< a < b < c < d < e";
         RuleBasedCollator coll = new RuleBasedCollator(rule);
 
@@ -110,20 +93,12 @@ public class RuleBasedCollatorTest exten
      * Class under test for int compare(java.lang.String, java.lang.String)
      */
     public void testCompareStringString() throws ParseException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String rule = "< c < b < a";
         RuleBasedCollator coll = new RuleBasedCollator(rule);
         assertEquals(-1, coll.compare("c", "a"));
     }
 
     public void testGetCollationKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         RuleBasedCollator coll = (RuleBasedCollator) Collator
                 .getInstance(Locale.GERMAN);
         String source = "abc";
@@ -138,10 +113,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testGetRules() throws ParseException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String rule = "< a = b < c";
         RuleBasedCollator coll = new RuleBasedCollator(rule);
         assertEquals(rule, coll.getRules());
@@ -152,10 +123,6 @@ public class RuleBasedCollatorTest exten
      * getCollationElementIterator(java.lang.String)
      */
     public void testGetCollationElementIteratorString() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         {
             Locale locale = new Locale("es", "", "TRADITIONAL");
             RuleBasedCollator coll = (RuleBasedCollator) Collator
@@ -205,10 +172,6 @@ public class RuleBasedCollatorTest exten
      * getCollationElementIterator(java.text.CharacterIterator)
      */
     public void testGetCollationElementIteratorCharacterIterator() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         {
             Locale locale = new Locale("es", "", "TRADITIONAL");
             RuleBasedCollator coll = (RuleBasedCollator) Collator
@@ -257,10 +220,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testStrength() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         RuleBasedCollator coll = (RuleBasedCollator) Collator
                 .getInstance(Locale.US);
         for (int i = 0; i < 4; i++) {
@@ -271,10 +230,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testDecomposition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         RuleBasedCollator coll = (RuleBasedCollator) Collator
                 .getInstance(Locale.US);
         for (int i = 0; i < 2; i++) {
@@ -284,10 +239,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testCollator_GetInstance() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Collator coll = Collator.getInstance();
         Object obj1 = "a";
         Object obj2 = "b";
@@ -298,10 +249,6 @@ public class RuleBasedCollatorTest exten
     }
 
     public void testGetAvailableLocales() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Locale[] locales = Collator.getAvailableLocales();
         // for (int i = 0; i < locales.length; i++) {
         // Locale locale = locales[i];
@@ -310,10 +257,6 @@ public class RuleBasedCollatorTest exten
 
     // Test CollationKey
     public void testCollationKey() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Collator coll = Collator.getInstance(Locale.US);
         String text = "abc";
         CollationKey key = coll.getCollationKey(text);
@@ -328,10 +271,6 @@ public class RuleBasedCollatorTest exten
      * @tests java.text.RuleBasedCollator.RuleBasedCollator(java.lang.String)
      */
     public void testNullPointerException() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //Regression for HARMONY-241
         try {
             new RuleBasedCollator(null);
@@ -344,10 +283,6 @@ public class RuleBasedCollatorTest exten
      * @tests java.text.RuleBasedCollator.compare(java.lang.String, java.lang.String)
      */
     public void testCompareNull() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //Regression for HARMONY-836
         try {
             new RuleBasedCollator("< a").compare(null, null);
@@ -360,10 +295,6 @@ public class RuleBasedCollatorTest exten
      * @tests java.text.RuleBasedCollator.RuleBasedCollator(java.lang.String)
      */
     public void testEmptyStringException() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         //Regression for HARMONY-241
         try {
             new RuleBasedCollator("");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.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/SimpleDateFormatTest.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/SimpleDateFormatTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/text/src/test/java/org/apache/harmony/text/tests/java/text/SimpleDateFormatTest.java Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ import java.util.GregorianCalendar;
 import java.util.Locale;
 import java.util.SimpleTimeZone;
 import java.util.TimeZone;
-import tests.support.Support_Excludes;
 
 
 public class SimpleDateFormatTest extends junit.framework.TestCase {
@@ -46,10 +45,6 @@ public class SimpleDateFormatTest extend
 
         public void test(String pattern, Calendar cal, String expected,
                 int field) {
-            if (Support_Excludes.isExcluded()) {
-                return;
-            }
-
             StringBuffer buffer = new StringBuffer();
             FieldPosition position = new FieldPosition(field);
             format.applyPattern(pattern);
@@ -112,10 +107,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#SimpleDateFormat()
      */
     public void test_Constructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.SimpleDateFormat()
         SimpleDateFormat f2 = new SimpleDateFormat();
         assertTrue("Wrong class", f2.getClass() == SimpleDateFormat.class);
@@ -131,10 +122,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#SimpleDateFormat(java.lang.String)
      */
     public void test_ConstructorLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.SimpleDateFormat(java.lang.String)
         SimpleDateFormat f2 = new SimpleDateFormat("yyyy");
         assertTrue("Wrong class", f2.getClass() == SimpleDateFormat.class);
@@ -169,10 +156,6 @@ public class SimpleDateFormatTest extend
      *        java.text.DateFormatSymbols)
      */
     public void test_ConstructorLjava_lang_StringLjava_text_DateFormatSymbols() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.SimpleDateFormat(java.lang.String,
         // java.text.DateFormatSymbols)
         DateFormatSymbols symbols = new DateFormatSymbols(Locale.ENGLISH);
@@ -190,10 +173,6 @@ public class SimpleDateFormatTest extend
      *        java.util.Locale)
      */
     public void test_ConstructorLjava_lang_StringLjava_util_Locale() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.SimpleDateFormat(java.lang.String,
         // java.util.Locale)
         SimpleDateFormat f2 = new SimpleDateFormat("'yyyy' MM yy",
@@ -210,10 +189,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#applyLocalizedPattern(java.lang.String)
      */
     public void test_applyLocalizedPatternLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.SimpleDateFormat.applyLocalizedPattern(java.lang.String)
         SimpleDateFormat f2 = new SimpleDateFormat("y", new Locale("de", "CH"));
@@ -258,10 +233,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#applyPattern(java.lang.String)
      */
     public void test_applyPatternLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.SimpleDateFormat.applyPattern(java.lang.String)
         SimpleDateFormat f2 = new SimpleDateFormat("y", new Locale("de", "CH"));
@@ -298,10 +269,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#clone()
      */
     public void test_clone() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.Object java.text.SimpleDateFormat.clone()
         SimpleDateFormat f2 = new SimpleDateFormat();
         SimpleDateFormat clone = (SimpleDateFormat) f2.clone();
@@ -320,10 +287,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#equals(java.lang.Object)
      */
     public void test_equalsLjava_lang_Object() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method boolean
         // java.text.SimpleDateFormat.equals(java.lang.Object)
         SimpleDateFormat format = (SimpleDateFormat) DateFormat.getInstance();
@@ -334,10 +297,6 @@ public class SimpleDateFormatTest extend
     }
 
     public void test_equals_afterFormat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression test for HARMONY-209
         SimpleDateFormat df = new SimpleDateFormat();
         df.format(new Date());
@@ -349,10 +308,6 @@ public class SimpleDateFormatTest extend
      */
     public void test_formatToCharacterIteratorLjava_lang_Object() {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             // Regression for HARMONY-466
             new SimpleDateFormat().formatToCharacterIterator(null);
@@ -372,10 +327,6 @@ public class SimpleDateFormatTest extend
      *        java.lang.StringBuffer, java.text.FieldPosition)
      */
     public void test_formatLjava_util_DateLjava_lang_StringBufferLjava_text_FieldPosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.StringBuffer
         // java.text.SimpleDateFormat.format(java.util.Date,
         // java.lang.StringBuffer, java.text.FieldPosition)
@@ -555,10 +506,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#format(java.util.Date)
      */
     public void test_timeZoneFormatting() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // tests specific to formatting of timezones
         Date summerDate = new GregorianCalendar(1999, Calendar.JUNE, 2, 15, 3,
                 6).getTime();
@@ -599,10 +546,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#get2DigitYearStart()
      */
     public void test_get2DigitYearStart() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.util.Date
         // java.text.SimpleDateFormat.get2DigitYearStart()
         SimpleDateFormat f1 = new SimpleDateFormat("y");
@@ -618,10 +561,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#getDateFormatSymbols()
      */
     public void test_getDateFormatSymbols() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.text.DateFormatSymbols
         // java.text.SimpleDateFormat.getDateFormatSymbols()
         SimpleDateFormat df = (SimpleDateFormat) DateFormat.getInstance();
@@ -634,10 +573,6 @@ public class SimpleDateFormatTest extend
      *        java.text.ParsePosition)
      */
     public void test_parseLjava_lang_StringLjava_text_ParsePosition() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.util.Date
         // java.text.SimpleDateFormat.parse(java.lang.String,
         // java.text.ParsePosition)
@@ -844,10 +779,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#set2DigitYearStart(java.util.Date)
      */
     public void test_set2DigitYearStartLjava_util_Date() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.SimpleDateFormat.set2DigitYearStart(java.util.Date)
         SimpleDateFormat f1 = new SimpleDateFormat("yy");
@@ -875,10 +806,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#setDateFormatSymbols(java.text.DateFormatSymbols)
      */
     public void test_setDateFormatSymbolsLjava_text_DateFormatSymbols() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method void
         // java.text.SimpleDateFormat.setDateFormatSymbols(java.text.DateFormatSymbols)
         SimpleDateFormat f1 = new SimpleDateFormat("a");
@@ -900,10 +827,6 @@ public class SimpleDateFormatTest extend
      * @tests java.text.SimpleDateFormat#toLocalizedPattern()
      */
     public void test_toLocalizedPattern() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Test for method java.lang.String
         // java.text.SimpleDateFormat.toLocalizedPattern()
         SimpleDateFormat f2 = new SimpleDateFormat("GyMdkHmsSEDFwWahKz",
@@ -923,10 +846,6 @@ public class SimpleDateFormatTest extend
      *        java.text.ParsePosition)
      */
     public void test_parse_with_spaces() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-502
         SimpleDateFormat df = new SimpleDateFormat("HH:mm:ss");
         df.setLenient(false);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/x-net/make/run-test.xml Sat Jun  5 08:34:57 2010
@@ -33,7 +33,7 @@
 
     <target name="test-module"
             depends="-test-module,-test-module-impl" />
-    <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="x-net" jar="x-net_api_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/support/Support_Excludes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/support/Support_Excludes.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/support/Support_Excludes.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/support/src/test/java/tests/support/Support_Excludes.java Sat Jun  5 08:34:57 2010
@@ -1,166 +0,0 @@
-/* 
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package tests.support;
-
-import java.util.HashMap;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-
-
-
-public class Support_Excludes {
-
-    static boolean isInitialized = false;
-    static boolean verbose = false;
-    static boolean ignoreExcludes = false;
-    static final HashMap<String,String> excludes =
-        new HashMap<String,String>();
-    static final HashMap<String,String> archMap = new HashMap<String,String>();
-
-    static {
-        archMap.put("amd64", "x86_64");
-        archMap.put("i386", "x86");
-        archMap.put("i686", "x86");
-        archMap.put("ppc", "ppc32");
-        ignoreExcludes = System.getProperty("hy.excludes.ignore") != null;
-        verbose = System.getProperty("hy.excludes.verbose") != null;
-    }
-
-
-    public static boolean isExcluded() {
-        return isExcluded(null, 3);
-    }
-
-    public static boolean isExcluded(String tag) {
-        return isExcluded(tag, 3);
-    }
-
-    public static boolean isRI() {
-        return arch().equals("ri");
-    }
-
-    static String arch() {
-        String arch = System.getProperty("os.arch").toLowerCase();
-        if (archMap.containsKey(arch)) {
-            arch = archMap.get(arch);
-        }
-        return arch;
-    }
-
-    static String os() {
-        String os = System.getProperty("os.name").toLowerCase();
-        return os;
-    }
-
-    static String vm() {
-        // allow the vm value to be overriden using:
-        //   ant -Dhy.test.vmargs=-Dhy.excludes.vm=myvm test
-        String vm = System.getProperty("hy.excludes.vm");
-        if (vm != null) {
-            return vm.toLowerCase();
-        }
-        String vendor = System.getProperty("java.vm.vendor").toLowerCase();
-        if (vendor.startsWith("apache")) {
-            return "drlvm";
-        }
-        if (vendor.startsWith("sun")) {
-            return "ri";
-        }
-        if (vendor.startsWith("ibm")) {
-            return "ibm";
-            // String version = System.getProperty("java.vm.version");
-            // return "ibm" + version;
-        }
-        return "unknown";
-    }
-
-    static StackTraceElement caller(int depth) {
-        Throwable t = new Throwable();
-        StackTraceElement[] stack = (new Throwable()).getStackTrace();
-        return stack[depth];
-    }
-
-    static void load(String suffix) {
-        String excludeFile = "exclude."+suffix;
-        if (verbose) {
-            System.err.println("loading: excludes/"+excludeFile);
-        }
-        try {
-            BufferedReader reader =
-                new BufferedReader(new FileReader("excludes/"+excludeFile));
-            String line;
-            while ((line = reader.readLine()) != null
-                   && !line.startsWith("#")) {
-                if (line.endsWith(".java")) {
-                    line = line.substring(0,line.length()-5);
-                } else if (line.endsWith(".class")) {
-                    line = line.substring(0,line.length()-6);
-                }
-                line = line.replace('/', '.');
-                excludes.put(line,excludeFile);
-                if (verbose) {
-                    System.err.println("excluding: "+line);
-                }
-            }
-            reader.close();
-        } catch (IOException e) {
-            // ignore
-        }
-    }
-
-    static void load() {
-        isInitialized = true;
-        load("common");
-        load("interm");
-        String platform = os()+"."+arch()+"."+vm();
-        load(platform);
-        load(platform + ".interm");
-    }
-
-    static boolean existsExclude(String key) {
-        if (excludes.containsKey(key)) {
-            if (verbose) {
-                System.err.println("excluding, reason: "+key
-                                   +"("+excludes.get(key)+")");
-            }
-            return true;
-        }
-        return false;
-    }
-
-    static boolean isExcluded(String tag, int depth) {
-        if (ignoreExcludes) {
-            return false;
-        }
-        if (!isInitialized) {
-            load();
-        }
-        String suffix = "";
-        if (tag != null) {
-            if (existsExclude(tag)) {
-                return true;
-            }
-            suffix = "+" + tag;
-        }
-        StackTraceElement context = caller(depth);
-        return existsExclude(context.getClassName()+suffix)
-            || existsExclude(context.getClassName()+"#"
-                             +context.getMethodName()+suffix);
-    }
-}

Modified: harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml (original)
+++ harmony/enhanced/java/branches/mrh/common_resources/make/properties.xml Sat Jun  5 08:34:57 2010
@@ -120,6 +120,14 @@
     <property name="build.module" value="*" />
     <property name="exclude.module" value="nothing" />
 
+    <!-- names of exclude lists, used by prepare-exclude-list macro -->
+    <property name="common.exclude.file" value="exclude.common" />
+    <property name="common.exclude.interm" value="exclude.interm" />
+    <property name="platform.exclude.file"
+              value="exclude.${hy.platform}.${hy.test.vm.name}" />
+    <property name="platform.exclude.interm"
+              value="exclude.${hy.platform}.${hy.test.vm.name}.interm" />
+
     <!-- flags -->
     <property name="hy.no.thr" value="false" />
     <condition property="hy.skip.thr" value="true">
@@ -308,6 +316,30 @@ properties in preference to these:
     </macrodef>
     <convert-test from="test.case" to="converted.tc" />
     
+    <!-- Concatenate several exclude lists into single list -->
+    <macrodef name="prepare-exclude-list">
+       <attribute name="moduleName"/>
+       <!-- directory with exclude lists for the module -->
+       <attribute name="dir"/>
+       <!-- name of concatenated list, should be an absolute pathname -->
+       <attribute name="result"/>
+       <sequential>
+           <dirname file="@{result}" property="@{result}.dir" />
+           <mkdir dir="${@{result}.dir}" />
+
+           <echo message="" file="@{result}"/>
+           <concat destfile="@{result}" force="yes" fixlastline="yes" append="true">
+               <fileset dir="@{dir}">
+                   <include name="${common.exclude.file}"/> 
+                   <include name="${platform.exclude.file}"/>
+                   <include name="${common.exclude.interm}" if="exclude.interm" />
+                   <include name="${platform.exclude.interm}" if="exclude.interm" />
+                   <size value="0" when="more"/>
+               </fileset>
+           </concat>
+       </sequential>
+   </macrodef>
+    
     <macrodef name="ensure-javac">
         <sequential>
             <fail>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jdktools/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="jdktools" jar="jdktools_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/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">
         <property name="test.jre.home" value="${hy.jdk}/jre" />
         <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
         <property name="test.debugger.jvm" value="${test.jre.jvm}" />

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassUnloadTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassUnloadTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassUnloadTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/Events/ClassUnloadTest.java Sat Jun  5 08:34:57 2010
@@ -32,7 +32,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
 import org.apache.harmony.jpda.tests.framework.jdwp.exceptions.TimeoutException;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 /**
  * JDWP Unit test for CLASS_UNLOAD event.
@@ -57,10 +56,6 @@ public class ClassUnloadTest extends JDW
      * This testcase is for CLASS_UNLOAD event.
      */
     public void testClassUnloadEvent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         logWriter.println("==> testClassUnloadEvent started");
         
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/ClassObjectIDTest.java Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPUnitDebuggeeWrapper;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -54,10 +53,6 @@ public class ClassObjectIDTest extends J
      */
     public void testClassObjectID001() {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/EnableCollectionTest.java Sat Jun  5 08:34:57 2010
@@ -34,7 +34,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPUnitDebuggeeWrapper;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -60,10 +59,6 @@ public class EnableCollectionTest extend
      * <BR>It is expected that checked object is garbage collected after re-connection.
      */
     public void testEnableCollection001() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String thisTestName = "testEnableCollection001";
         logWriter.println("==> testEnableCollection001 started..");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/MultiSession/RefTypeIDTest.java Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPUnitDebuggeeWrapper;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -54,10 +53,6 @@ public class RefTypeIDTest extends JDWPS
      */
     public void testRefTypeID001() {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
         
         long classID = debuggeeWrapper.vmMirror.getClassID(DEBUGGEE_SIGNATURE);

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/ObjectReference/EnableCollectionTest.java Sat Jun  5 08:34:57 2010
@@ -32,7 +32,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.framework.jdwp.Value;
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -59,10 +58,6 @@ public class EnableCollectionTest extend
      * <BR>If so the test passes. Otherwise it fails in case when pattern object is unloaded.
      */
     public void testEnableCollection001() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String thisTestName = "testEnableCollection001";
         logWriter.println("==> " + thisTestName + " for " + thisCommandName + ": START...");
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/src/test/java/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/CapabilitiesNewTest.java Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ import org.apache.harmony.jpda.tests.fra
 import org.apache.harmony.jpda.tests.framework.jdwp.ReplyPacket;
 import org.apache.harmony.jpda.tests.jdwp.share.JDWPSyncTestCase;
 import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -85,10 +84,6 @@ public class CapabilitiesNewTest extends
      * there are no extra data in the reply packet;
      */
     public void testCapabilitiesNew001() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         synchronizer.receiveMessage(JPDADebuggeeSynchronizer.SGNL_READY);
 
         CommandPacket packet = new CommandPacket(

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jretools/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="jretools" jar="jretools_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/samsa/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">
         <echo message="Running SAMSA tests" />
         <echo message="test.jre.home=${test.jre.home}" />
 



Mime
View raw message