harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [4/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/ classlib...
Date Sat, 05 Jun 2010 08:35:05 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java Sat Jun  5 08:34:57 2010
@@ -43,7 +43,6 @@ import org.apache.harmony.testframework.
 import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
 
 import tests.util.SerializationTester;
-import tests.support.Support_Excludes;
 
 /**
  * Unit test for VetoableChangeSupport
@@ -54,10 +53,6 @@ public class VetoableChangeSupportTest e
      * Constructor a VetoableChangeSupport instance with normal input
      */
     public void testVetoableChangeSupport() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         new VetoableChangeSupport(source);
 
@@ -68,10 +63,6 @@ public class VetoableChangeSupportTest e
      * VetoableChangeListener)
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -105,10 +96,6 @@ public class VetoableChangeSupportTest e
      * add a null listener
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -130,10 +117,6 @@ public class VetoableChangeSupportTest e
      * add a listener which has already been added.
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener_duplicate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -190,10 +173,6 @@ public class VetoableChangeSupportTest e
      * add listener with null property name.
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener_property_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -207,10 +186,6 @@ public class VetoableChangeSupportTest e
      * add listeners to an invalid property
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener_property_invalid() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -235,10 +210,6 @@ public class VetoableChangeSupportTest e
      * add different listener with a particular property name.
      */
     public void testAddVetoableChangeListenerStringVetoableChangeListener_property_duplicate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -278,10 +249,6 @@ public class VetoableChangeSupportTest e
      * addVetoableChangeListener(VetoableChangeListener)
      */
     public void testAddVetoableChangeListenerVetoableChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -310,10 +277,6 @@ public class VetoableChangeSupportTest e
      * add a null listener
      */
     public void testAddVetoableChangeListenerVetoableChangeListener_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
         support.addVetoableChangeListener(null);
@@ -337,10 +300,6 @@ public class VetoableChangeSupportTest e
      * add duplicated listeners
      */
     public void testAddVetoableChangeListenerVetoableChangeListener_duplicate() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -371,10 +330,6 @@ public class VetoableChangeSupportTest e
      * add two different listeners
      */
     public void testAddVetoableChangeListenerVetoableChangeListener_TwoDifferent() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -407,10 +362,6 @@ public class VetoableChangeSupportTest e
      * add a VetoableChangeListenerProxy
      */
     public void testAddVetoableChangeListenerVetoableChangeListener_Proxy() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -469,10 +420,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangePropertyChangeEvent()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -488,10 +435,6 @@ public class VetoableChangeSupportTest e
 
     public void testFireVetoableChangePropertyChangeEvent_Veto()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -571,10 +514,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangePropertyChangeEvent_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -594,10 +533,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangePropertyChangeEvent_property()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -615,10 +550,6 @@ public class VetoableChangeSupportTest e
 
     public void testFireVetoableChangePropertyChangeEvent_property_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -639,10 +570,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangePropertyChangeEvent_DuplicateListener()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -667,10 +594,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangePropertyChangeEvent_listener_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -685,10 +608,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -705,10 +624,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_listener_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -721,10 +636,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_property()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -741,10 +652,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_listener_null_property()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -758,10 +665,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_twoListeners()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -783,10 +686,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_property_twoListeners()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -808,10 +707,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_Property_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -827,10 +722,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_listener_Property_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -846,10 +737,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_listener_Null_Property_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -865,10 +752,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_Property_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -887,10 +770,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_listener_Property_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -915,10 +794,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringbooleanboolean_SameValue()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -937,10 +812,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -957,10 +828,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_property_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -977,10 +844,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_property_Invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -997,10 +860,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_SameValue()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1019,10 +878,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_listener()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1038,10 +893,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_listener_property_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1058,10 +909,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_listener_property_Invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1078,10 +925,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringintint_listener_SameValue()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1095,10 +938,6 @@ public class VetoableChangeSupportTest e
 
     public void testFireVetoableChangeStringintint_listener_Invalid_property()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1117,10 +956,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1136,10 +971,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_property_Null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1155,10 +986,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_property_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1174,10 +1001,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_SameValue()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1193,10 +1016,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_SameValue_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1214,10 +1033,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1233,10 +1048,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener_property_Null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1252,10 +1063,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener_property_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1271,10 +1078,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener_SameValue()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1290,10 +1093,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener_SameValue_null()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1309,10 +1108,6 @@ public class VetoableChangeSupportTest e
      */
     public void testFireVetoableChangeStringObjectObject_listener_invalid()
             throws PropertyVetoException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1324,10 +1119,6 @@ public class VetoableChangeSupportTest e
     }
 
     public void testFireVetoableChangeException_revert_event() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final VetoableChangeSupport support = new VetoableChangeSupport(
                 new Object());
         final StringBuffer sb = new StringBuffer();
@@ -1373,10 +1164,6 @@ public class VetoableChangeSupportTest e
      * register listener for property
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_property() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1397,10 +1184,6 @@ public class VetoableChangeSupportTest e
      * register listener for property, two same listeners
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_property_more() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1424,10 +1207,6 @@ public class VetoableChangeSupportTest e
      * register listener for property, two different listeners
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_property_diff() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1455,10 +1234,6 @@ public class VetoableChangeSupportTest e
      * register listener for property, two different listeners
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_listener_diff() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1481,10 +1256,6 @@ public class VetoableChangeSupportTest e
     }
 
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_listener_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1507,10 +1278,6 @@ public class VetoableChangeSupportTest e
      * register listener for property.
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_all() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1531,10 +1298,6 @@ public class VetoableChangeSupportTest e
      * remove listener from null property
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_propertyName_Null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1551,10 +1314,6 @@ public class VetoableChangeSupportTest e
      * propertyname is invalid
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_propertyName_Invalid() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1575,10 +1334,6 @@ public class VetoableChangeSupportTest e
      * no listener attached to the property
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_propertyName_NoListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1598,10 +1353,6 @@ public class VetoableChangeSupportTest e
      * listener null
      */
     public void testRemoveVetoableChangeListenerStringVetoableChangeListener_listener_null_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1622,10 +1373,6 @@ public class VetoableChangeSupportTest e
      * register listener for all
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_all() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1646,10 +1393,6 @@ public class VetoableChangeSupportTest e
      * two same listeners
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_all_more() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1674,10 +1417,6 @@ public class VetoableChangeSupportTest e
      * two different listeners
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_all_more_diff() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1705,10 +1444,6 @@ public class VetoableChangeSupportTest e
      * listener null
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_all_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1732,10 +1467,6 @@ public class VetoableChangeSupportTest e
      * register for one property
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_property() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1759,10 +1490,6 @@ public class VetoableChangeSupportTest e
      * listener null
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1786,10 +1513,6 @@ public class VetoableChangeSupportTest e
      * register null listener, remove null listener.
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_null_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1812,10 +1535,6 @@ public class VetoableChangeSupportTest e
      * Regression test for HARMONY-321
      */
     public void testFireVetoableChange_regression() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         VetoableChangeSupport vcs = new VetoableChangeSupport(this);
         MockVetoListener2 vlistener = new MockVetoListener2();
 
@@ -1834,10 +1553,6 @@ public class VetoableChangeSupportTest e
      * no this listener
      */
     public void testRemoveVetoableChangeListenerVetoableChangeListener_invalid() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1856,10 +1571,6 @@ public class VetoableChangeSupportTest e
     }
 
     public void testSerialization() throws IOException, ClassNotFoundException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockSource source = new MockSource();
         VetoableChangeSupport support = new VetoableChangeSupport(source);
 
@@ -1899,10 +1610,6 @@ public class VetoableChangeSupportTest e
     }
 
      public void testSerialization_Compatibility() throws Exception {
-         if (Support_Excludes.isExcluded()) {
-             return;
-         }
-
          MockSource source = new MockSource();
          VetoableChangeSupport support = new VetoableChangeSupport(source);
  
@@ -2113,10 +1820,6 @@ public class VetoableChangeSupportTest e
      *        java.lang.Object)
      */
     public void testVetoableChangeSupport_null() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-228
         try {
             new VetoableChangeSupport(null);
@@ -2130,20 +1833,12 @@ public class VetoableChangeSupportTest e
      *        java.beans.VetoableChangeListener)
      */
     public void test_addPropertyChangeListenerNullNull() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-441
         new VetoableChangeSupport("bean1")
                 .addVetoableChangeListener(null, null);
     }
 
     public void test_readObject() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Regression for HARMONY-421
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
@@ -2163,10 +1858,6 @@ public class VetoableChangeSupportTest e
      * The test checks the method add() with no property specified
      */
     public void testAddVetoableChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
         VetoableChangeListener vcl = new VetoableChangeListener() {
 
@@ -2185,10 +1876,6 @@ public class VetoableChangeSupportTest e
      * The test checks the method add() for property specified
      */
     public void testAddVetoableChangeListenerByPropertyName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
         VetoableChangeListener vcl = new VetoableChangeListener() {
 
@@ -2208,10 +1895,6 @@ public class VetoableChangeSupportTest e
      * The test checks the method add() for VetoableChangeListenerProxy
      */
     public void testAddVetoableChangeListenerProxy() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         VetoableChangeSupport vcs = new VetoableChangeSupport("bean1");
         VetoableChangeListener vcl = new VetoableChangeListener() {
 
@@ -2233,10 +1916,6 @@ public class VetoableChangeSupportTest e
     
     
     public void testSerializationForm(){
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ObjectStreamClass objectStreamClass = ObjectStreamClass.lookup(VetoableChangeSupport.class);
         assertNotNull(objectStreamClass.getField("source"));
         assertNotNull(objectStreamClass.getField("children"));

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/AbstractQueuedSynchronizerTest.java Sat Jun  5 08:34:57 2010
@@ -12,7 +12,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.*;
 import java.io.*;
-import tests.support.Support_Excludes;
 
 public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -98,10 +97,6 @@ public class AbstractQueuedSynchronizerT
      * isHeldExclusively is false upon construction
      */
     public void testIsHeldExclusively() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Mutex rl = new Mutex();
         assertFalse(rl.isHeldExclusively());
     }
@@ -110,10 +105,6 @@ public class AbstractQueuedSynchronizerT
      * acquiring released sync succeeds
      */
     public void testAcquire() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Mutex rl = new Mutex();
         rl.acquire(1);
         assertTrue(rl.isHeldExclusively());
@@ -125,10 +116,6 @@ public class AbstractQueuedSynchronizerT
      * tryAcquire on an released sync succeeds
      */
     public void testTryAcquire() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Mutex rl = new Mutex();
         assertTrue(rl.tryAcquire(1));
         assertTrue(rl.isHeldExclusively());
@@ -139,10 +126,6 @@ public class AbstractQueuedSynchronizerT
      * hasQueuedThreads reports whether there are waiting threads
      */
     public void testhasQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -172,10 +155,6 @@ public class AbstractQueuedSynchronizerT
      * isQueued(null) throws NPE
      */
     public void testIsQueuedNPE() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         try {
             sync.isQueued(null);
@@ -188,10 +167,6 @@ public class AbstractQueuedSynchronizerT
      * isQueued reports whether a thread is queued.
      */
     public void testIsQueued() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -226,10 +201,6 @@ public class AbstractQueuedSynchronizerT
      * getFirstQueuedThread returns first waiting thread or null if none
      */
     public void testGetFirstQueuedThread() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -261,10 +232,6 @@ public class AbstractQueuedSynchronizerT
      * hasContended reports false if no thread has ever blocked, else true
      */
     public void testHasContended() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -294,10 +261,6 @@ public class AbstractQueuedSynchronizerT
      * getQueuedThreads includes waiting threads
      */
     public void testGetQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -330,10 +293,6 @@ public class AbstractQueuedSynchronizerT
      * getExclusiveQueuedThreads includes waiting threads
      */
     public void testGetExclusiveQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -366,10 +325,6 @@ public class AbstractQueuedSynchronizerT
      * getSharedQueuedThreads does not include exclusively waiting threads
      */
     public void testGetSharedQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
         Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
@@ -400,10 +355,6 @@ public class AbstractQueuedSynchronizerT
      * tryAcquireNanos is interruptible.
      */
     public void testInterruptedException2() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
 	sync.acquire(1);
 	Thread t = new Thread(new Runnable() {
@@ -427,10 +378,6 @@ public class AbstractQueuedSynchronizerT
      * TryAcquire on exclusively held sync fails
      */
     public void testTryAcquireWhenSynced() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
 	sync.acquire(1);
 	Thread t = new Thread(new Runnable() {
@@ -451,10 +398,6 @@ public class AbstractQueuedSynchronizerT
      * tryAcquireNanos on an exclusively held sync times out
      */
     public void testAcquireNanos_Timeout() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
 	sync.acquire(1);
 	Thread t = new Thread(new Runnable() {
@@ -480,10 +423,6 @@ public class AbstractQueuedSynchronizerT
      * getState is true when acquired and false when not
      */
     public void testGetState() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
 	sync.acquire(1);
 	assertTrue(sync.isHeldExclusively());
@@ -517,10 +456,6 @@ public class AbstractQueuedSynchronizerT
      * acquireInterruptibly is interruptible.
      */
     public void testAcquireInterruptibly1() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
 	sync.acquire(1);
 	Thread t = new Thread(new InterruptedSyncRunnable(sync));
@@ -540,10 +475,6 @@ public class AbstractQueuedSynchronizerT
      * acquireInterruptibly succeeds when released, else is interruptible
      */
     public void testAcquireInterruptibly2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
 	try {
             sync.acquireInterruptibly(1);
@@ -565,10 +496,6 @@ public class AbstractQueuedSynchronizerT
      * owns is true for a condition created by sync else false
      */
     public void testOwns() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         final Mutex sync2 = new Mutex();
@@ -580,10 +507,6 @@ public class AbstractQueuedSynchronizerT
      * Calling await without holding sync throws IllegalMonitorStateException
      */
     public void testAwait_IllegalMonitor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         try {
@@ -601,10 +524,6 @@ public class AbstractQueuedSynchronizerT
      * Calling signal without holding sync throws IllegalMonitorStateException
      */
     public void testSignal_IllegalMonitor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         try {
@@ -622,10 +541,6 @@ public class AbstractQueuedSynchronizerT
      * awaitNanos without a signal times out
      */
     public void testAwaitNanos_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         try {
@@ -643,10 +558,6 @@ public class AbstractQueuedSynchronizerT
      *  Timed await without a signal times out
      */
     public void testAwait_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         try {
@@ -663,10 +574,6 @@ public class AbstractQueuedSynchronizerT
      * awaitUntil without a signal times out
      */
     public void testAwaitUntil_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
         try {
@@ -684,10 +591,6 @@ public class AbstractQueuedSynchronizerT
      * await returns when signalled
      */
     public void testAwait() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -723,10 +626,6 @@ public class AbstractQueuedSynchronizerT
      * hasWaiters throws NPE if null
      */
     public void testHasWaitersNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         try {
             sync.hasWaiters(null);
@@ -741,10 +640,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitQueueLength throws NPE if null
      */
     public void testGetWaitQueueLengthNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         try {
             sync.getWaitQueueLength(null);
@@ -760,10 +655,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitingThreads throws NPE if null
      */
     public void testGetWaitingThreadsNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         try {
             sync.getWaitingThreads(null);
@@ -779,10 +670,6 @@ public class AbstractQueuedSynchronizerT
      * hasWaiters throws IAE if not owned
      */
     public void testHasWaitersIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
 	final Mutex sync2 = new Mutex();
@@ -799,10 +686,6 @@ public class AbstractQueuedSynchronizerT
      * hasWaiters throws IMSE if not synced
      */
     public void testHasWaitersIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
         try {
@@ -819,10 +702,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitQueueLength throws IAE if not owned
      */
     public void testGetWaitQueueLengthIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
 	final Mutex sync2 = new Mutex();
@@ -839,10 +718,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitQueueLength throws IMSE if not synced
      */
     public void testGetWaitQueueLengthIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
         try {
@@ -859,10 +734,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitingThreads throws IAE if not owned
      */
     public void testGetWaitingThreadsIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
 	final Mutex sync2 = new Mutex();	
@@ -879,10 +750,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitingThreads throws IMSE if not synced
      */
     public void testGetWaitingThreadsIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
         try {
@@ -900,10 +767,6 @@ public class AbstractQueuedSynchronizerT
      * hasWaiters returns true when a thread is waiting, else false
      */
     public void testHasWaiters() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -946,10 +809,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitQueueLength returns number of waiting threads
      */
     public void testGetWaitQueueLength() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1011,10 +870,6 @@ public class AbstractQueuedSynchronizerT
      * getWaitingThreads returns only and all waiting threads
      */
     public void testGetWaitingThreads() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1080,10 +935,6 @@ public class AbstractQueuedSynchronizerT
      * awaitUninterruptibly doesn't abort on interrupt
      */
     public void testAwaitUninterruptibly() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1113,10 +964,6 @@ public class AbstractQueuedSynchronizerT
      * await is interruptible
      */
     public void testAwait_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1148,10 +995,6 @@ public class AbstractQueuedSynchronizerT
      * awaitNanos is interruptible
      */
     public void testAwaitNanos_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1183,10 +1026,6 @@ public class AbstractQueuedSynchronizerT
      * awaitUntil is interruptible
      */
     public void testAwaitUntil_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1219,10 +1058,6 @@ public class AbstractQueuedSynchronizerT
      * signalAll wakes up all threads
      */
     public void testSignalAll() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final Mutex sync = new Mutex();	
         final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1273,10 +1108,6 @@ public class AbstractQueuedSynchronizerT
      * toString indicates current state
      */
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Mutex sync = new Mutex();
         String us = sync.toString();
         assertTrue(us.indexOf("State = 0") >= 0);
@@ -1289,10 +1120,6 @@ public class AbstractQueuedSynchronizerT
      * A serialized AQS deserializes with current state
      */
     public void testSerialization() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Mutex l = new Mutex();
         l.acquire(1);
         assertTrue(l.isHeldExclusively());
@@ -1318,10 +1145,6 @@ public class AbstractQueuedSynchronizerT
      * tryReleaseShared setting state changes getState
      */
     public void testGetStateWithReleaseShared() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final BooleanLatch l = new BooleanLatch();
 	assertFalse(l.isSignalled());
 	l.releaseShared(0);
@@ -1332,10 +1155,6 @@ public class AbstractQueuedSynchronizerT
      * releaseShared has no effect when already signalled
      */
     public void testReleaseShared() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final BooleanLatch l = new BooleanLatch();
 	assertFalse(l.isSignalled());
 	l.releaseShared(0);
@@ -1348,10 +1167,6 @@ public class AbstractQueuedSynchronizerT
      * acquireSharedInterruptibly returns after release, but not before
      */
     public void testAcquireSharedInterruptibly() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final BooleanLatch l = new BooleanLatch();
 
 	Thread t = new Thread(new Runnable() {
@@ -1382,10 +1197,6 @@ public class AbstractQueuedSynchronizerT
      * acquireSharedTimed returns after release
      */
     public void testAsquireSharedTimed() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final BooleanLatch l = new BooleanLatch();
 
 	Thread t = new Thread(new Runnable() {
@@ -1416,10 +1227,6 @@ public class AbstractQueuedSynchronizerT
      * acquireSharedInterruptibly throws IE if interrupted before released
      */
     public void testAcquireSharedInterruptibly_InterruptedException() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new Runnable() {
                 public void run() {
@@ -1444,10 +1251,6 @@ public class AbstractQueuedSynchronizerT
      * acquireSharedTimed throws IE if interrupted before released
      */
     public void testAcquireSharedNanos_InterruptedException() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new Runnable() {
                 public void run() {
@@ -1473,10 +1276,6 @@ public class AbstractQueuedSynchronizerT
      * acquireSharedTimed times out if not released before timeout
      */
     public void testAcquireSharedNanos_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final BooleanLatch l = new BooleanLatch();
         Thread t = new Thread(new Runnable() {
                 public void run() {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ExecutorsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ExecutorsTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ExecutorsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ExecutorsTest.java Sat Jun  5 08:34:57 2010
@@ -12,7 +12,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.math.BigInteger;
 import java.security.*;
-import tests.support.Support_Excludes;
 
 public class ExecutorsTest extends JSR166TestCase{
     public static void main(String[] args) {
@@ -66,10 +65,6 @@ public class ExecutorsTest extends JSR16
      * A newCachedThreadPool can execute runnables
      */
     public void testNewCachedThreadPool1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newCachedThreadPool();
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -81,10 +76,6 @@ public class ExecutorsTest extends JSR16
      * A newCachedThreadPool with given ThreadFactory can execute runnables
      */
     public void testNewCachedThreadPool2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -96,10 +87,6 @@ public class ExecutorsTest extends JSR16
      * A newCachedThreadPool with null ThreadFactory throws NPE
      */
     public void testNewCachedThreadPool3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.newCachedThreadPool(null);
             shouldThrow();
@@ -113,10 +100,6 @@ public class ExecutorsTest extends JSR16
      * A new SingleThreadExecutor can execute runnables
      */
     public void testNewSingleThreadExecutor1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newSingleThreadExecutor();
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -128,10 +111,6 @@ public class ExecutorsTest extends JSR16
      * A new SingleThreadExecutor with given ThreadFactory can execute runnables
      */
     public void testNewSingleThreadExecutor2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -143,10 +122,6 @@ public class ExecutorsTest extends JSR16
      * A new SingleThreadExecutor with null ThreadFactory throws NPE
      */
     public void testNewSingleThreadExecutor3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.newSingleThreadExecutor(null);
             shouldThrow();
@@ -159,10 +134,6 @@ public class ExecutorsTest extends JSR16
      * A new SingleThreadExecutor cannot be casted to concrete implementation
      */
     public void testCastNewSingleThreadExecutor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newSingleThreadExecutor();
         try {
             ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
@@ -177,10 +148,6 @@ public class ExecutorsTest extends JSR16
      * A new newFixedThreadPool can execute runnables
      */
     public void testNewFixedThreadPool1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newFixedThreadPool(2);
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -192,10 +159,6 @@ public class ExecutorsTest extends JSR16
      * A new newFixedThreadPool with given ThreadFactory can execute runnables
      */
     public void testNewFixedThreadPool2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -207,10 +170,6 @@ public class ExecutorsTest extends JSR16
      * A new newFixedThreadPool with null ThreadFactory throws NPE
      */
     public void testNewFixedThreadPool3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.newFixedThreadPool(2, null);
             shouldThrow();
@@ -223,10 +182,6 @@ public class ExecutorsTest extends JSR16
      * A new newFixedThreadPool with 0 threads throws IAE
      */
     public void testNewFixedThreadPool4() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.newFixedThreadPool(0);
             shouldThrow();
@@ -240,10 +195,6 @@ public class ExecutorsTest extends JSR16
      * An unconfigurable newFixedThreadPool can execute runnables
      */
     public void testunconfigurableExecutorService() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
         e.execute(new NoOpRunnable());
         e.execute(new NoOpRunnable());
@@ -255,10 +206,6 @@ public class ExecutorsTest extends JSR16
      * unconfigurableExecutorService(null) throws NPE
      */
     public void testunconfigurableExecutorServiceNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.unconfigurableExecutorService(null);
         }
@@ -270,10 +217,6 @@ public class ExecutorsTest extends JSR16
      * unconfigurableScheduledExecutorService(null) throws NPE
      */
     public void testunconfigurableScheduledExecutorServiceNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
         }
@@ -286,10 +229,6 @@ public class ExecutorsTest extends JSR16
      * a newSingleThreadScheduledExecutor successfully runs delayed task
      */
     public void testNewSingleThreadScheduledExecutor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	try {
             TrackedCallable callable = new TrackedCallable();
             ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
@@ -310,10 +249,6 @@ public class ExecutorsTest extends JSR16
      * a newScheduledThreadPool successfully runs delayed task
      */
     public void testnewScheduledThreadPool() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	try {
             TrackedCallable callable = new TrackedCallable();
             ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
@@ -334,10 +269,6 @@ public class ExecutorsTest extends JSR16
      * an unconfigurable  newScheduledThreadPool successfully runs delayed task
      */
     public void testunconfigurableScheduledExecutorService() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	try {
             TrackedCallable callable = new TrackedCallable();
             ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
@@ -358,10 +289,6 @@ public class ExecutorsTest extends JSR16
      *  timeouts from execute will time out if they compute too long.
      */
     public void testTimedCallable() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int N = 10000;
         ExecutorService executor = Executors.newSingleThreadExecutor();
         List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
@@ -404,10 +331,6 @@ public class ExecutorsTest extends JSR16
      * specified group, priority, daemon status, and name
      */
     public void testDefaultThreadFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
         Runnable r = new Runnable() {
                 public void run() {
@@ -451,10 +374,6 @@ public class ExecutorsTest extends JSR16
      * access control context and context class loader
      */
     public void testPrivilegedThreadFactory() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Policy savedPolicy = null;
         try {
             savedPolicy = Policy.getPolicy();
@@ -524,10 +443,6 @@ public class ExecutorsTest extends JSR16
      * privilegedCallableUsingCurrentClassLoader throws ACE
      */
     public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Policy savedPolicy = null;
         try {
             savedPolicy = Policy.getPolicy();
@@ -563,10 +478,6 @@ public class ExecutorsTest extends JSR16
      * privilegedCallableUsingCurrentClassLoader does not throw ACE
      */
     public void testprivilegedCallableUsingCCLWithPrivs() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Policy savedPolicy = null;
         try {
             savedPolicy = Policy.getPolicy();
@@ -593,10 +504,6 @@ public class ExecutorsTest extends JSR16
      * Without permissions, calling privilegedCallable throws ACE
      */
     public void testprivilegedCallableWithNoPrivs() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Callable task;
         Policy savedPolicy = null;
         AdjustablePolicy policy = null;
@@ -637,10 +544,6 @@ public class ExecutorsTest extends JSR16
      * With permissions, calling privilegedCallable succeeds
      */
     public void testprivilegedCallableWithPrivs() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	Policy savedPolicy = null;
         try {
             savedPolicy = Policy.getPolicy();
@@ -666,10 +569,6 @@ public class ExecutorsTest extends JSR16
      * callable(Runnable) returns null when called
      */ 
     public void testCallable1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Callable c = Executors.callable(new NoOpRunnable());
             assertNull(c.call());
@@ -683,10 +582,6 @@ public class ExecutorsTest extends JSR16
      * callable(Runnable, result) returns result when called
      */ 
     public void testCallable2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Callable c = Executors.callable(new NoOpRunnable(), one);
             assertEquals(one, c.call());
@@ -699,10 +594,6 @@ public class ExecutorsTest extends JSR16
      * callable(PrivilegedAction) returns its result when called
      */ 
     public void testCallable3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Callable c = Executors.callable(new PrivilegedAction() {
                     public Object run() { return one; }});
@@ -716,10 +607,6 @@ public class ExecutorsTest extends JSR16
      * callable(PrivilegedExceptionAction) returns its result when called
      */ 
     public void testCallable4() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Callable c = Executors.callable(new PrivilegedExceptionAction() {
                     public Object run() { return one; }});
@@ -734,10 +621,6 @@ public class ExecutorsTest extends JSR16
      * callable(null Runnable) throws NPE
      */ 
     public void testCallableNPE1() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Runnable r = null;
             Callable c = Executors.callable(r);
@@ -749,10 +632,6 @@ public class ExecutorsTest extends JSR16
      * callable(null, result) throws NPE
      */ 
     public void testCallableNPE2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Runnable r = null;
             Callable c = Executors.callable(r, one);
@@ -764,10 +643,6 @@ public class ExecutorsTest extends JSR16
      * callable(null PrivilegedAction) throws NPE
      */ 
     public void testCallableNPE3() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             PrivilegedAction r = null;
             Callable c = Executors.callable(r);
@@ -779,10 +654,6 @@ public class ExecutorsTest extends JSR16
      * callable(null PrivilegedExceptionAction) throws NPE
      */ 
     public void testCallableNPE4() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             PrivilegedExceptionAction r = null;
             Callable c = Executors.callable(r);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/concurrent/src/test/java/ReentrantLockTest.java Sat Jun  5 08:34:57 2010
@@ -11,7 +11,6 @@ import java.util.concurrent.locks.*;
 import java.util.concurrent.*;
 import java.util.*;
 import java.io.*;
-import tests.support.Support_Excludes;
 
 public class ReentrantLockTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -69,10 +68,6 @@ public class ReentrantLockTest extends J
      * Constructor sets given fairness
      */
     public void testConstructor() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock rl = new ReentrantLock();
         assertFalse(rl.isFair());
 	ReentrantLock r2 = new ReentrantLock(true);
@@ -83,10 +78,6 @@ public class ReentrantLockTest extends J
      * locking an unlocked lock succeeds
      */
     public void testLock() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock rl = new ReentrantLock();
         rl.lock();
         assertTrue(rl.isLocked());
@@ -97,10 +88,6 @@ public class ReentrantLockTest extends J
      * locking an unlocked fair lock succeeds
      */
     public void testFairLock() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock rl = new ReentrantLock(true);
         rl.lock();
         assertTrue(rl.isLocked());
@@ -111,10 +98,6 @@ public class ReentrantLockTest extends J
      * Unlocking an unlocked lock throws IllegalMonitorStateException
      */
     public void testUnlock_IllegalMonitorStateException() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock rl = new ReentrantLock();
 	try {
 	    rl.unlock();
@@ -127,10 +110,6 @@ public class ReentrantLockTest extends J
      * tryLock on an unlocked lock succeeds
      */
     public void testTryLock() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock rl = new ReentrantLock();
         assertTrue(rl.tryLock());
         assertTrue(rl.isLocked());
@@ -142,10 +121,6 @@ public class ReentrantLockTest extends J
      * hasQueuedThreads reports whether there are waiting threads
      */
     public void testhasQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         Thread t1 = new Thread(new InterruptedLockRunnable(lock));
         Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
@@ -175,10 +150,6 @@ public class ReentrantLockTest extends J
      * getQueueLength reports number of waiting threads
      */
     public void testGetQueueLength() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         Thread t1 = new Thread(new InterruptedLockRunnable(lock));
         Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
@@ -208,10 +179,6 @@ public class ReentrantLockTest extends J
      * getQueueLength reports number of waiting threads
      */
     public void testGetQueueLength_fair() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock(true);
         Thread t1 = new Thread(new InterruptedLockRunnable(lock));
         Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
@@ -241,10 +208,6 @@ public class ReentrantLockTest extends J
      * hasQueuedThread(null) throws NPE
      */
     public void testHasQueuedThreadNPE() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock sync = new ReentrantLock();
         try {
             sync.hasQueuedThread(null);
@@ -257,10 +220,6 @@ public class ReentrantLockTest extends J
      * hasQueuedThread reports whether a thread is queued.
      */
     public void testHasQueuedThread() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock sync = new ReentrantLock();
         Thread t1 = new Thread(new InterruptedLockRunnable(sync));
         Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
@@ -296,10 +255,6 @@ public class ReentrantLockTest extends J
      * getQueuedThreads includes waiting threads
      */
     public void testGetQueuedThreads() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final PublicReentrantLock lock = new PublicReentrantLock();
         Thread t1 = new Thread(new InterruptedLockRunnable(lock));
         Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
@@ -333,10 +288,6 @@ public class ReentrantLockTest extends J
      * timed tryLock is interruptible.
      */
     public void testInterruptedException2() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
 	lock.lock();
 	Thread t = new Thread(new Runnable() {
@@ -360,10 +311,6 @@ public class ReentrantLockTest extends J
      * TryLock on a locked lock fails
      */
     public void testTryLockWhenLocked() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
 	lock.lock();
 	Thread t = new Thread(new Runnable() {
@@ -384,10 +331,6 @@ public class ReentrantLockTest extends J
      * Timed tryLock on a locked lock times out
      */
     public void testTryLock_Timeout() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
 	lock.lock();
 	Thread t = new Thread(new Runnable() {
@@ -412,10 +355,6 @@ public class ReentrantLockTest extends J
      * getHoldCount returns number of recursive holds
      */
     public void testGetHoldCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	ReentrantLock lock = new ReentrantLock();
 	for(int i = 1; i <= SIZE; i++) {
 	    lock.lock();
@@ -432,10 +371,6 @@ public class ReentrantLockTest extends J
      * isLocked is true when locked and false when not
      */
     public void testIsLocked() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
 	lock.lock();
 	assertTrue(lock.isLocked());
@@ -469,10 +404,6 @@ public class ReentrantLockTest extends J
      * lockInterruptibly is interruptible.
      */
     public void testLockInterruptibly1() { 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
 	lock.lock();
 	Thread t = new Thread(new InterruptedLockRunnable(lock));
@@ -492,10 +423,6 @@ public class ReentrantLockTest extends J
      * lockInterruptibly succeeds when unlocked, else is interruptible
      */
     public void testLockInterruptibly2() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
 	try {
             lock.lockInterruptibly();
@@ -518,10 +445,6 @@ public class ReentrantLockTest extends J
      * Calling await without holding lock throws IllegalMonitorStateException
      */
     public void testAwait_IllegalMonitor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
         try {
@@ -539,10 +462,6 @@ public class ReentrantLockTest extends J
      * Calling signal without holding lock throws IllegalMonitorStateException
      */
     public void testSignal_IllegalMonitor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
         try {
@@ -560,10 +479,6 @@ public class ReentrantLockTest extends J
      * awaitNanos without a signal times out
      */
     public void testAwaitNanos_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
         try {
@@ -581,10 +496,6 @@ public class ReentrantLockTest extends J
      *  timed await without a signal times out
      */
     public void testAwait_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
         try {
@@ -601,10 +512,6 @@ public class ReentrantLockTest extends J
      * awaitUntil without a signal times out
      */
     public void testAwaitUntil_Timeout() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
         try {
@@ -622,10 +529,6 @@ public class ReentrantLockTest extends J
      * await returns when signalled
      */
     public void testAwait() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -659,10 +562,6 @@ public class ReentrantLockTest extends J
      * hasWaiters throws NPE if null
      */
     public void testHasWaitersNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         try {
             lock.hasWaiters(null);
@@ -677,10 +576,6 @@ public class ReentrantLockTest extends J
      * getWaitQueueLength throws NPE if null
      */
     public void testGetWaitQueueLengthNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         try {
             lock.getWaitQueueLength(null);
@@ -696,10 +591,6 @@ public class ReentrantLockTest extends J
      * getWaitingThreads throws NPE if null
      */
     public void testGetWaitingThreadsNPE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final PublicReentrantLock lock = new PublicReentrantLock();
         try {
             lock.getWaitingThreads(null);
@@ -715,10 +606,6 @@ public class ReentrantLockTest extends J
      * hasWaiters throws IAE if not owned
      */
     public void testHasWaitersIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         final Condition c = (lock.newCondition());
 	final ReentrantLock lock2 = new ReentrantLock();
@@ -735,10 +622,6 @@ public class ReentrantLockTest extends J
      * hasWaiters throws IMSE if not locked
      */
     public void testHasWaitersIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         final Condition c = (lock.newCondition());
         try {
@@ -755,10 +638,6 @@ public class ReentrantLockTest extends J
      * getWaitQueueLength throws IAE if not owned
      */
     public void testGetWaitQueueLengthIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         final Condition c = (lock.newCondition());
 	final ReentrantLock lock2 = new ReentrantLock();
@@ -775,10 +654,6 @@ public class ReentrantLockTest extends J
      * getWaitQueueLength throws IMSE if not locked
      */
     public void testGetWaitQueueLengthIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();
         final Condition c = (lock.newCondition());
         try {
@@ -795,10 +670,6 @@ public class ReentrantLockTest extends J
      * getWaitingThreads throws IAE if not owned
      */
     public void testGetWaitingThreadsIAE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final PublicReentrantLock lock = new PublicReentrantLock();	
         final Condition c = (lock.newCondition());
 	final PublicReentrantLock lock2 = new PublicReentrantLock();	
@@ -815,10 +686,6 @@ public class ReentrantLockTest extends J
      * getWaitingThreads throws IMSE if not locked
      */
     public void testGetWaitingThreadsIMSE() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final PublicReentrantLock lock = new PublicReentrantLock();	
         final Condition c = (lock.newCondition());
         try {
@@ -836,10 +703,6 @@ public class ReentrantLockTest extends J
      * hasWaiters returns true when a thread is waiting, else false
      */
     public void testHasWaiters() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -882,10 +745,6 @@ public class ReentrantLockTest extends J
      * getWaitQueueLength returns number of waiting threads
      */
     public void testGetWaitQueueLength() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -947,10 +806,6 @@ public class ReentrantLockTest extends J
      * getWaitingThreads returns only and all waiting threads
      */
     public void testGetWaitingThreads() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final PublicReentrantLock lock = new PublicReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1041,10 +896,6 @@ public class ReentrantLockTest extends J
      * awaitUninterruptibly doesn't abort on interrupt
      */
     public void testAwaitUninterruptibly() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final ReentrantLock lock = new ReentrantLock();
         final Condition c = lock.newCondition();
         UninterruptableThread thread = new UninterruptableThread(lock, c);
@@ -1077,10 +928,6 @@ public class ReentrantLockTest extends J
      * await is interruptible
      */
     public void testAwait_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1112,10 +959,6 @@ public class ReentrantLockTest extends J
      * awaitNanos is interruptible
      */
     public void testAwaitNanos_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1147,10 +990,6 @@ public class ReentrantLockTest extends J
      * awaitUntil is interruptible
      */
     public void testAwaitUntil_Interrupt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t = new Thread(new Runnable() { 
@@ -1183,10 +1022,6 @@ public class ReentrantLockTest extends J
      * signalAll wakes up all threads
      */
     public void testSignalAll() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1236,10 +1071,6 @@ public class ReentrantLockTest extends J
      * await after multiple reentrant locking preserves lock count
      */
     public void testAwaitLockCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
 	final ReentrantLock lock = new ReentrantLock();	
         final Condition c = lock.newCondition();
 	Thread t1 = new Thread(new Runnable() { 
@@ -1295,10 +1126,6 @@ public class ReentrantLockTest extends J
      * A serialized lock deserializes as unlocked
      */
     public void testSerialization() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ReentrantLock l = new ReentrantLock();
         l.lock();
         l.unlock();
@@ -1324,10 +1151,6 @@ public class ReentrantLockTest extends J
      * toString indicates current lock state
      */
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ReentrantLock lock = new ReentrantLock();
         String us = lock.toString();
         assertTrue(us.indexOf("Unlocked") >= 0);



Mime
View raw message