harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [7/21] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/archive/src/test/ja...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java Wed May 26 09:31:07 2010
@@ -32,6 +32,7 @@ import org.apache.harmony.testframework.
 import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;
 
 import tests.support.Support_Configuration;
+import tests.support.Support_Excludes;
 
 public class InetAddressTest extends junit.framework.TestCase {
     
@@ -134,6 +135,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByName(String)
      */
     public void test_getByNameUnknownHostException() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Related to HARMONY-5784
 
         // loop a few times to flex the negative cache paths
@@ -151,6 +156,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#equals(java.lang.Object)
      */
     public void test_equalsLjava_lang_Object() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean java.net.InetAddress.equals(java.lang.Object)
         InetAddress ia1 = InetAddress
                 .getByName(Support_Configuration.InetTestAddress);
@@ -164,6 +173,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getAddress()
      */
     public void test_getAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method byte [] java.net.InetAddress.getAddress()
         try {
             InetAddress ia = InetAddress
@@ -187,6 +200,10 @@ public class InetAddressTest extends jun
      */
     @SuppressWarnings("nls")
     public void test_getAllByNameLjava_lang_String() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.net.InetAddress []
         // java.net.InetAddress.getAllByName(java.lang.String)
         InetAddress[] all = InetAddress
@@ -240,6 +257,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByName(java.lang.String)
      */
     public void test_getByNameLjava_lang_String() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.net.InetAddress
         // java.net.InetAddress.getByName(java.lang.String)
         InetAddress ia2 = InetAddress
@@ -270,6 +291,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getHostAddress()
      */
     public void test_getHostAddress() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.String
         // java.net.InetAddress.getHostAddress()
         InetAddress ia2 = InetAddress
@@ -284,6 +309,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getHostName()
      */
     public void test_getHostName() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.String java.net.InetAddress.getHostName()
         InetAddress ia = InetAddress
                 .getByName(Support_Configuration.InetTestIP);
@@ -376,6 +405,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getLocalHost()
      */
     public void test_getLocalHost() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.net.InetAddress
         // java.net.InetAddress.getLocalHost()
 
@@ -392,6 +425,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getLocalHost()
      */
     public void test_getLocalHost_extended() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         class Inet_SecurityManager extends SecurityManager {
             @Override
             public void checkConnect(String host, int port) {
@@ -421,6 +458,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#hashCode()
      */
     public void test_hashCode() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method int java.net.InetAddress.hashCode()
         try {
             InetAddress host = InetAddress
@@ -437,6 +478,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isMulticastAddress()
      */
     public void test_isMulticastAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertTrue(ia2.isMulticastAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -447,6 +492,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isAnyLocalAddress()
      */
     public void test_isAnyLocalAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isAnyLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -457,6 +506,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLinkLocalAddress()
      */
     public void test_isLinkLocalAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isLinkLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -467,6 +520,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLoopbackAddress()
      */
     public void test_isLoopbackAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isLoopbackAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -479,6 +536,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLoopbackAddress()
      */
     public void test_isSiteLocalAddress() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isSiteLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -495,6 +556,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isMCGlobal()/isMCLinkLocal/isMCNodeLocal/isMCOrgLocal/isMCSiteLocal
      */
     public void test_isMCVerify() throws UnknownHostException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isMCGlobal());
         assertFalse(ia2.isMCLinkLocal());
@@ -525,6 +590,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#toString()
      */
     public void test_toString() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.String java.net.InetAddress.toString()
         InetAddress ia2 = InetAddress
                 .getByName(Support_Configuration.InetTestIP);
@@ -540,6 +609,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByAddress(java.lang.String, byte[])
      */
     public void test_getByAddressLjava_lang_String$B() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Check an IPv4 address with an IPv6 hostname
         byte ipAddress[] = { 127, 0, 0, 1 };
         String addressStr = "::1";
@@ -567,6 +640,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getCanonicalHostName()
      */
     public void test_getCanonicalHostName() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress theAddress = null;
         theAddress = InetAddress.getLocalHost();
         assertTrue("getCanonicalHostName returned a zero length string ",
@@ -592,6 +669,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isReachableI
      */
     public void test_isReachableI() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InetAddress ia = Inet4Address.getByName("127.0.0.1");
         assertTrue(ia.isReachable(10000));
         ia = Inet4Address.getByName("127.0.0.1");
@@ -607,6 +688,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isReachableLjava_net_NetworkInterfaceII
      */
     public void test_isReachableLjava_net_NetworkInterfaceII() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // tests local address
         InetAddress ia = Inet4Address.getByName("127.0.0.1");
         assertTrue(ia.isReachable(null, 0, 10000));
@@ -663,6 +748,10 @@ public class InetAddressTest extends jun
     
     // Regression Test for Harmony-2290
     public void test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final int TTL = 20;
         final int TIME_OUT = 3000;
         
@@ -701,6 +790,10 @@ public class InetAddressTest extends jun
      */
     public void testSerializationSelf() throws Exception {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         SerializationTest.verifySelf(InetAddress.getByName("localhost"),
                 COMPARATOR);
     }
@@ -710,6 +803,10 @@ public class InetAddressTest extends jun
      */
     public void testSerializationCompatibility() throws Exception {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         SerializationTest.verifyGolden(this,
                 InetAddress.getByName("localhost"), COMPARATOR);
     }
@@ -718,6 +815,10 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByAddress(byte[])
      */
     public void test_getByAddress() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-61
         try {
             InetAddress.getByAddress(null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java Wed May 26 09:31:07 2010
@@ -34,6 +34,7 @@ import java.util.Enumeration;
 
 import tests.support.Support_NetworkInterface;
 import tests.support.Support_PortManager;
+import tests.support.Support_Excludes;
 
 public class MulticastSocketTest extends SocketTestCase {
 
@@ -134,6 +135,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#MulticastSocket()
 	 */
 	public void test_Constructor() throws IOException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// regression test for 497
         MulticastSocket s = new MulticastSocket();
         // regression test for Harmony-1162
@@ -144,6 +149,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#MulticastSocket(int)
 	 */
 	public void test_ConstructorI() throws IOException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 	    MulticastSocket orig = new MulticastSocket();
         int port = orig.getLocalPort();
         orig.close();
@@ -163,6 +172,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#getInterface()
 	 */
 	public void test_getInterface() throws Exception {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method java.net.InetAddress
 		// java.net.MulticastSocket.getInterface()
 		assertTrue("Used for testing.", true);
@@ -218,6 +231,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#getNetworkInterface()
 	 */
 	public void test_getNetworkInterface() throws IOException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
         int groupPort = Support_PortManager.getNextPortForUDP();
         if (atLeastOneInterface) {
             // validate that we get the expected response when one was not
@@ -289,6 +306,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#getTimeToLive()
 	 */
 	public void test_getTimeToLive() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		try {
 			mss = new MulticastSocket();
 			mss.setTimeToLive(120);
@@ -307,6 +328,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#getTTL()
 	 */
 	public void test_getTTL() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method byte java.net.MulticastSocket.getTTL()
 
 		try {
@@ -324,6 +349,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#joinGroup(java.net.InetAddress)
 	 */
 	public void test_joinGroupLjava_net_InetAddress() throws Exception {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method void
 		// java.net.MulticastSocket.joinGroup(java.net.InetAddress)
                 String msg = null;
@@ -352,6 +381,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#joinGroup(java.net.SocketAddress,java.net.NetworkInterface)
 	 */
 	public void test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface() throws IOException, InterruptedException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// security manager that allows us to check that we only return the
 		// addresses that we should
 		class mySecurityManager extends SecurityManager {
@@ -568,6 +601,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#leaveGroup(java.net.InetAddress)
 	 */
 	public void test_leaveGroupLjava_net_InetAddress() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method void
 		// java.net.MulticastSocket.leaveGroup(java.net.InetAddress)
 		String msg = null;
@@ -601,6 +638,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#leaveGroup(java.net.SocketAddress,java.net.NetworkInterface)
 	 */
 	public void test_leaveGroupLjava_net_SocketAddressLjava_net_NetworkInterface() throws Exception {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// security manager that allows us to check that we only return the
 		// addresses that we should
 		class mySecurityManager extends SecurityManager {
@@ -696,6 +737,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#send(java.net.DatagramPacket, byte)
 	 */
 	public void test_sendLjava_net_DatagramPacketB() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method void
 		// java.net.MulticastSocket.send(java.net.DatagramPacket, byte)
 
@@ -735,6 +780,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setInterface(java.net.InetAddress)
 	 */
 	public void test_setInterfaceLjava_net_InetAddress() throws UnknownHostException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method void
 		// java.net.MulticastSocket.setInterface(java.net.InetAddress)
 		// Note that the machine is not multi-homed
@@ -789,6 +838,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setNetworkInterface(java.net.NetworkInterface)
 	 */
 	public void test_setNetworkInterfaceLjava_net_NetworkInterface() throws IOException, InterruptedException {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		String msg = null;
 		InetAddress group = null;
 		int[] ports = Support_PortManager.getNextPortsForUDP(2);
@@ -865,6 +918,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setTimeToLive(int)
 	 */
 	public void test_setTimeToLiveI() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		try {
 			mss = new MulticastSocket();
 			mss.setTimeToLive(120);
@@ -883,6 +940,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setTTL(byte)
 	 */
 	public void test_setTTLB() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		// Test for method void java.net.MulticastSocket.setTTL(byte)
 		try {
 			mss = new MulticastSocket();
@@ -898,6 +959,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#MulticastSocket(java.net.SocketAddress)
 	 */
 	public void test_ConstructorLjava_net_SocketAddress() throws Exception {	
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		MulticastSocket ms = new MulticastSocket((SocketAddress) null);
         assertTrue("should not be bound", !ms.isBound() && !ms.isClosed()
                 && !ms.isConnected());
@@ -938,6 +1003,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#getLoopbackMode()
 	 */
 	public void test_getLoopbackMode() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		try {
 			MulticastSocket ms = new MulticastSocket((SocketAddress) null);
 			assertTrue("should not be bound", !ms.isBound() && !ms.isClosed()
@@ -957,6 +1026,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setLoopbackMode(boolean)
 	 */
 	public void test_setLoopbackModeZ() {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		try {
 			MulticastSocket ms = new MulticastSocket();
 			ms.setLoopbackMode(true);
@@ -975,6 +1048,10 @@ public class MulticastSocketTest extends
      * @tests java.net.MulticastSocket#setLoopbackMode(boolean)
      */
     public void test_setLoopbackModeSendReceive() throws IOException{
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final String ADDRESS = "224.1.2.3";
         final int PORT = Support_PortManager.getNextPortForUDP();
         final String message = "Hello, world!";
@@ -1015,6 +1092,10 @@ public class MulticastSocketTest extends
 	 * @tests java.net.MulticastSocket#setReuseAddress(boolean)
 	 */
 	public void test_setReuseAddressZ() throws Exception {
+	    if (Support_Excludes.isExcluded()) {
+	        return;
+	    }
+
 		try {
 			// test case were we set it to false
 			MulticastSocket theSocket1 = null;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/ArrayListTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import java.util.Set;
 import java.util.Vector;
 
 import tests.support.Support_ListTest;
+import tests.support.Support_Excludes;
 
 public class ArrayListTest extends junit.framework.TestCase {
 
@@ -43,6 +44,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#ArrayList()
      */
     public void test_Constructor() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.util.ArrayList()
         new Support_ListTest("", alist).runTest();
 
@@ -56,6 +61,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#ArrayList(int)
      */
     public void test_ConstructorI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.util.ArrayList(int)
         ArrayList al = new ArrayList(5);
         assertEquals("Incorrect arrayList created", 0, al.size());
@@ -75,6 +84,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#ArrayList(java.util.Collection)
      */
     public void test_ConstructorLjava_util_Collection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.util.ArrayList(java.util.Collection)
         ArrayList al = new ArrayList(Arrays.asList(objArray));
         assertTrue("arrayList created from collection has incorrect size", al
@@ -87,6 +100,10 @@ public class ArrayListTest extends junit
     }
 
     public void testConstructorWithConcurrentCollection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Collection<String> collection = shrinksOnSize("A", "B", "C", "D");
         ArrayList<String> list = new ArrayList<String>(collection);
         assertFalse(list.contains(null));
@@ -96,6 +113,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#add(int, java.lang.Object)
      */
     public void test_addILjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method void java.util.ArrayList.add(int, java.lang.Object)
         Object o;
         alist.add(50, o = new Object());
@@ -157,6 +178,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#add(int, java.lang.Object)
      */
     public void test_addILjava_lang_Object_2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Object o = new Object();
         int size = alist.size();
         alist.add(size, o);
@@ -177,6 +202,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#add(java.lang.Object)
      */
     public void test_addLjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean java.util.ArrayList.add(java.lang.Object)
         Object o = new Object();
         alist.add(o);
@@ -189,6 +218,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#addAll(int, java.util.Collection)
      */
     public void test_addAllILjava_util_Collection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean java.util.ArrayList.addAll(int,
         // java.util.Collection)
         alist.addAll(50, alist);
@@ -227,6 +260,10 @@ public class ArrayListTest extends junit
      */
     @SuppressWarnings("unchecked")
     public void test_addAllILjava_util_Collection_2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-467
         ArrayList obj = new ArrayList();
         try {
@@ -295,6 +332,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#addAll(int, java.util.Collection)
      */
     public void test_addAllILjava_util_Collection_3() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList obj = new ArrayList();
         obj.addAll(0, obj);
         obj.addAll(obj.size(), obj);
@@ -339,6 +380,10 @@ public class ArrayListTest extends junit
     }
 
     public void test_addAllCollectionOfQextendsE() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-539
         // https://issues.apache.org/jira/browse/HARMONY-539
         ArrayList<String> alist = new ArrayList<String>();
@@ -358,6 +403,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#addAll(java.util.Collection)
      */
     public void test_addAllLjava_util_Collection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean
         // java.util.ArrayList.addAll(java.util.Collection)
         List l = new ArrayList();
@@ -415,6 +464,10 @@ public class ArrayListTest extends junit
     }
 
         public void test_ArrayList_addAll_scenario1() {
+            if (Support_Excludes.isExcluded()) {
+                return;
+            }
+
         ArrayList arrayListA = new ArrayList();
         arrayListA.add(1);
         ArrayList arrayListB = new ArrayList();
@@ -428,6 +481,10 @@ public class ArrayListTest extends junit
     }
 
     public void test_ArrayList_addAll_scenario2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList arrayList = new ArrayList();
         arrayList.add(1);
         arrayList.addAll(1, arrayList);
@@ -440,6 +497,10 @@ public class ArrayListTest extends junit
         
     // Regression test for HARMONY-5839
     public void testaddAllHarmony5839() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Collection coll = Arrays.asList(new String[] { "1", "2" });
         List list = new ArrayList();
         list.add("a");
@@ -462,6 +523,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#clear()
      */
     public void test_clear() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method void java.util.ArrayList.clear()
         alist.clear();
         assertEquals("List did not clear", 0, alist.size());
@@ -482,6 +547,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#clone()
      */
     public void test_clone() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object java.util.ArrayList.clone()
         ArrayList x = (ArrayList) (((ArrayList) (alist)).clone());
         assertTrue("Cloned list was inequal to original", x.equals(alist));
@@ -504,6 +573,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#contains(java.lang.Object)
      */
     public void test_containsLjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean
         // java.util.ArrayList.contains(java.lang.Object)
         assertTrue("Returned false for valid element", alist
@@ -523,6 +596,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#ensureCapacity(int)
      */
     public void test_ensureCapacityI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method void java.util.ArrayList.ensureCapacity(int)
         // TODO : There is no good way to test this as it only really impacts on
         // the private implementation.
@@ -552,6 +629,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#get(int)
      */
     public void test_getI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object java.util.ArrayList.get(int)
         assertTrue("Returned incorrect element", alist.get(22) == objArray[22]);
         try {
@@ -567,6 +648,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#indexOf(java.lang.Object)
      */
     public void test_indexOfLjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method int java.util.ArrayList.indexOf(java.lang.Object)
         assertEquals("Returned incorrect index", 87, alist
                 .indexOf(objArray[87]));
@@ -582,6 +667,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#isEmpty()
      */
     public void test_isEmpty() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method boolean java.util.ArrayList.isEmpty()
         assertTrue("isEmpty returned false for new list", new ArrayList()
                 .isEmpty());
@@ -593,6 +682,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#lastIndexOf(java.lang.Object)
      */
     public void test_lastIndexOfLjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method int java.util.ArrayList.lastIndexOf(java.lang.Object)
         alist.add(new Integer(99));
         assertEquals("Returned incorrect index", 100, alist
@@ -609,6 +702,10 @@ public class ArrayListTest extends junit
      * @tests {@link java.util.ArrayList#removeRange(int, int)}
      */
     public void test_removeRange() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MockArrayList mylist = new MockArrayList();
         mylist.removeRange(0, 0);
 
@@ -666,6 +763,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#remove(int)
      */
     public void test_removeI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object java.util.ArrayList.remove(int)
         alist.remove(10);
         assertEquals("Failed to remove element", -1, alist
@@ -719,6 +820,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#set(int, java.lang.Object)
      */
     public void test_setILjava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object java.util.ArrayList.set(int,
         // java.lang.Object)
         Object obj;
@@ -770,6 +875,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#size()
      */
     public void test_size() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method int java.util.ArrayList.size()
         assertEquals("Returned incorrect size for exiting list", 100, alist
                 .size());
@@ -781,6 +890,10 @@ public class ArrayListTest extends junit
      * @tests java.util.AbstractCollection#toString()
      */
     public void test_toString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList l = new ArrayList(1);
         l.add(l);
         String result = l.toString();
@@ -791,6 +904,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#toArray()
      */
     public void test_toArray() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object [] java.util.ArrayList.toArray()
         alist.set(25, null);
         alist.set(75, null);
@@ -813,6 +930,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#toArray(java.lang.Object[])
      */
     public void test_toArray$Ljava_lang_Object() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method java.lang.Object []
         // java.util.ArrayList.toArray(java.lang.Object [])
         alist.set(25, null);
@@ -838,6 +959,10 @@ public class ArrayListTest extends junit
      * @tests java.util.ArrayList#trimToSize()
      */
     public void test_trimToSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method void java.util.ArrayList.trimToSize()
         for (int i = 99; i > 24; i--)
             alist.remove(i);
@@ -863,6 +988,10 @@ public class ArrayListTest extends junit
      * @test java.util.ArrayList#addAll(int, Collection)
      */
     public void test_addAll() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList list = new ArrayList();
         list.add("one");
         list.add("two");
@@ -901,12 +1030,20 @@ public class ArrayListTest extends junit
     }
 
     public void testAddAllWithConcurrentCollection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList<String> list = new ArrayList<String>();
         list.addAll(shrinksOnSize("A", "B", "C", "D"));
         assertFalse(list.contains(null));
     }
 
     public void testAddAllAtPositionWithConcurrentCollection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList<String> list = new ArrayList<String>(
                 Arrays.asList("A", "B", "C", "D"));
 
@@ -915,6 +1052,10 @@ public class ArrayListTest extends junit
     }
 
     public void test_override_size() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayList testlist = new MockArrayList();
         // though size is overriden, it should passed without exception
         testlist.add("test_0");
@@ -955,6 +1096,10 @@ public class ArrayListTest extends junit
     }
 
     public void test_subclassing() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ArrayListExtend a = new ArrayListExtend();
         /*
          * Regression test for subclasses that override size() (which used to

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/PropertiesTest.java Wed May 26 09:31:07 2010
@@ -29,6 +29,7 @@ import java.util.NoSuchElementException;
 import java.util.Properties;
 
 import tests.support.resource.Support_Resources;
+import tests.support.Support_Excludes;
 
 public class PropertiesTest extends junit.framework.TestCase {
 
@@ -40,6 +41,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#Properties()
      */
     public void test_Constructor() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties p = new Properties();
         // do something to avoid getting a variable unused warning
         p.clear();
@@ -47,6 +52,10 @@ public class PropertiesTest extends juni
     }
 
     public void test_loadLjava_io_InputStream_NPE() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties p = new Properties();
         try {
             p.load((InputStream) null);
@@ -60,6 +69,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#Properties(java.util.Properties)
      */
     public void test_ConstructorLjava_util_Properties() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties systemProperties = System.getProperties();
         Properties properties = new Properties(systemProperties);
         Enumeration<?> propertyNames = systemProperties.propertyNames();
@@ -76,6 +89,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#getProperty(java.lang.String)
      */
     public void test_getPropertyLjava_lang_String() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("Did not retrieve property", "this is a test property",
                 tProps.getProperty("test.prop"));
     }
@@ -85,6 +102,10 @@ public class PropertiesTest extends juni
      *        java.lang.String)
      */
     public void test_getPropertyLjava_lang_StringLjava_lang_String() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("Did not retrieve property", "this is a test property",
                 tProps.getProperty("test.prop", "Blarg"));
         assertEquals("Did not return default value", "Gabba", tProps
@@ -95,6 +116,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#getProperty(java.lang.String)
      */
     public void test_getPropertyLjava_lang_String2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // regression test for HARMONY-3518
         MyProperties props = new MyProperties();
         assertNull(props.getProperty("key"));
@@ -105,6 +130,10 @@ public class PropertiesTest extends juni
      *        java.lang.String)
      */
     public void test_getPropertyLjava_lang_StringLjava_lang_String2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // regression test for HARMONY-3518
         MyProperties props = new MyProperties();
         assertEquals("defaultValue", props.getProperty("key", "defaultValue"));
@@ -121,6 +150,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#list(java.io.PrintStream)
      */
     public void test_listLjava_io_PrintStream() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream ps = new PrintStream(baos);
         Properties myProps = new Properties();
@@ -151,6 +184,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#list(java.io.PrintWriter)
      */
     public void test_listLjava_io_PrintWriter() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintWriter pw = new PrintWriter(baos);
         Properties myProps = new Properties();
@@ -178,6 +215,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#load(java.io.InputStream)
      */
     public void test_loadLjava_io_InputStream() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InputStream is = new ByteArrayInputStream(writeProperties());
         Properties prop = new Properties();
         prop.load(is);
@@ -264,6 +305,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#load(java.io.InputStream)
      */
     public void test_loadLjava_io_InputStream_Special() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Test for method void java.util.Properties.load(java.io.InputStream)
         Properties prop = null;
         prop = new Properties();
@@ -283,6 +328,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#load(java.io.InputStream)
      */
     public void test_loadLjava_io_InputStream_subtest0() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InputStream is = Support_Resources
                 .getStream("hyts_PropertiesTest.properties");
         Properties props = new Properties();
@@ -307,6 +356,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#propertyNames()
      */
     public void test_propertyNames() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties myPro = new Properties(tProps);
         Enumeration names = myPro.propertyNames();
         while (names.hasMoreElements()) {
@@ -327,6 +380,10 @@ public class PropertiesTest extends juni
     }
 
     public void test_propertyNames_sequence() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties parent = new Properties();
         parent.setProperty("parent.a.key", "parent.a.value");
         parent.setProperty("parent.b.key", "parent.b.value");
@@ -367,6 +424,10 @@ public class PropertiesTest extends juni
      */
     public void test_saveLjava_io_OutputStreamLjava_lang_String()
             throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties myProps = new Properties();
         myProps.setProperty("Property A", "aye");
         myProps.setProperty("Property B", "bee");
@@ -395,6 +456,10 @@ public class PropertiesTest extends juni
      *        java.lang.String)
      */
     public void test_setPropertyLjava_lang_StringLjava_lang_String() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties myProps = new Properties();
         myProps.setProperty("Yoink", "Yabba");
         assertEquals("Failed to set property", "Yabba", myProps
@@ -409,6 +474,10 @@ public class PropertiesTest extends juni
      */
     public void test_storeLjava_io_OutputStreamLjava_lang_String()
             throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties myProps = new Properties();
         myProps.put("Property A", " aye\\\f\t\n\r\b");
         myProps.put("Property B", "b ee#!=:");
@@ -436,6 +505,10 @@ public class PropertiesTest extends juni
      * @tests java.util.Properties#loadFromXML(java.io.InputStream)
      */
     public void test_loadFromXMLLjava_io_InputStream() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InputStream is = new ByteArrayInputStream(writePropertiesXML("UTF-8"));
         Properties prop = new Properties();
         prop.loadFromXML(is);
@@ -470,6 +543,10 @@ public class PropertiesTest extends juni
      */
     public void test_storeToXMLLjava_io_OutputStreamLjava_lang_StringLjava_lang_String()
             throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties myProps = new Properties();
         myProps.setProperty("key1", "value1");
         myProps.setProperty("key2", "value2");
@@ -535,6 +612,10 @@ public class PropertiesTest extends juni
      * should be same as loading from "hello="
      */
     public void testLoadSingleLine() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Properties props = new Properties();
         InputStream sr = new ByteArrayInputStream("hello".getBytes());
         props.load(sr);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/PersistenceTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/PersistenceTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/PersistenceTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/impl/common/org/apache/harmony/luni/tests/internal/net/www/protocol/http/PersistenceTest.java Wed May 26 09:31:07 2010
@@ -40,6 +40,7 @@ import tests.support.Support_HttpServerS
 import tests.support.Support_Jetty;
 import tests.support.Support_PortManager;
 import tests.support.Support_URLConnector;
+import tests.support.Support_Excludes;
 
 /**
  * Tests for <code>HttpURLConnection</code> persistence.
@@ -230,6 +231,10 @@ public class PersistenceTest extends Tes
      * Test that an HTTP connection persists
      */
     public void testConnectionsPersist() throws IOException, InterruptedException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         MockServer httpServer =
                 new MockServer("ServerSocket for HttpURLConnectionTest");
@@ -260,6 +265,10 @@ public class PersistenceTest extends Tes
      * Test that multiple HTTP connections persist
      */
     public void testMultipleConnectionsPersist() throws IOException, InterruptedException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         MockServer httpServer =
                 new MockServer("ServerSocket for HttpURLConnectionTest");
@@ -315,6 +324,10 @@ public class PersistenceTest extends Tes
      * @throws URISyntaxException
      */
     public void testForcedClosure() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         MockServer httpServer =
                 new MockServer("ServerSocket for HttpURLConnectionTest");
@@ -342,6 +355,10 @@ public class PersistenceTest extends Tes
      * @throws Exception
      */
     public void testIncorrectUsage() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         HttpURLConnection c = (HttpURLConnection)
             new URL("http://localhost:" + port).openConnection();
@@ -357,6 +374,10 @@ public class PersistenceTest extends Tes
      * Here client gets NOT_FOUND response.
      */
     public void testConnectionNonPersistence() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MockHTTPServer httpServer =
             new MockHTTPServer("HTTP Server for NOT FOUND checking", 1,
                     MockHTTPServer.NOT_FOUND_CODE);
@@ -397,6 +418,10 @@ public class PersistenceTest extends Tes
      * @throws Exception 
      */
     public void testCorrectUsage() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         HttpURLConnection c = (HttpURLConnection)
             new URL("http://localhost:" + port).openConnection();
@@ -432,6 +457,10 @@ public class PersistenceTest extends Tes
      * Test that the http.keepAlive system property has the required effect on persistent connections
      */
     public void testKeepAliveSystemProperty() throws IOException, InterruptedException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.setProperty("http.keepAlive", "false");
         MockServer httpServer =
                 new MockServer("ServerSocket for HttpURLConnectionTest");
@@ -457,6 +486,10 @@ public class PersistenceTest extends Tes
      * @throws Exception
      */
     public void testMaxConnectionsSystemProperty() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         int initialFreeConnections = HttpConnectionManager.getDefault().numFreeConnections();
         System.setProperty("http.maxConnections", "2");
         HttpURLConnection c = (HttpURLConnection)
@@ -488,6 +521,10 @@ public class PersistenceTest extends Tes
     }
     
     public void testClosingOutputStream() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
 //      create a serversocket
         Support_HttpServerSocket serversocket = new Support_HttpServerSocket();
         int portNumber = Support_PortManager.getNextPort();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/math/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="math" jar="math_tests.jar" />
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/misc/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="misc" jar="misc_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="nio" jar="nio_tests.jar" />
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/nio_char/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="nio_char" jar="nio_char_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/pack200/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="pack200" jar="pack200_tests.jar">
             <junit-elements>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-selected-hdk-tests module="prefs" jar="prefs_tests.jar">
             <excludeorinclude>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/prefs/src/test/java/org/apache/harmony/prefs/tests/java/util/prefs/AbstractPreferencesTest.java Wed May 26 09:31:07 2010
@@ -43,6 +43,7 @@ import org.apache.xpath.XPathAPI;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.xml.sax.SAXException;
+import tests.support.Support_Excludes;
 
 /**
  * TODO: refine this test to adapt all implementations
@@ -114,6 +115,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testConstructor() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref = new MockAbstractPreferences(
                     (AbstractPreferences) Preferences.userRoot(), "mo/ck");
@@ -162,6 +167,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testProtectedFields() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -178,6 +187,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testToString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("User Preference Node: " + pref.absolutePath(), pref
                 .toString());
 
@@ -188,6 +201,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testAbsolutePath() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("/java/util/prefs/mock", pref.absolutePath());
 
         pref = new MockAbstractPreferences(pref, " ");
@@ -195,6 +212,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testChildrenNames() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, pref.childrenNames().length);
 
         // MockAbstractPreferences child1 = new MockAbstractPreferences(pref,
@@ -217,6 +238,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testClear() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         pref.put("testClearKey", "testClearValue");
         pref.put("testClearKey1", "testClearValue1");
         assertEquals("testClearValue", pref.get("testClearKey", null));
@@ -227,6 +252,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGet() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(pref.get("", null));
         assertEquals("default", pref.get("key", "default"));
         assertNull(pref.get("key", null));
@@ -262,6 +291,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetBoolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getBoolean(null, false);
             fail("should throw NullPointerException");
@@ -276,6 +309,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutByteArray() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putByteArray(null, new byte[0]);
             fail("should throw NullPointerException");
@@ -318,6 +355,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetByteArray() throws UnsupportedEncodingException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getByteArray(null, new byte[0]);
             fail("should throw NullPointerException");
@@ -349,6 +390,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getDouble(null, 0);
             fail("should throw NullPointerException");
@@ -367,6 +412,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getFloat(null, 0f);
             fail("should throw NullPointerException");
@@ -380,6 +429,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getInt(null, 0);
             fail("should throw NullPointerException");
@@ -394,6 +447,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetLong() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.getLong(null, 0);
             fail("should throw NullPointerException");
@@ -408,6 +465,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testIsUserNode() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(pref.isUserNode());
 
         pref = new MockAbstractPreferences((AbstractPreferences) Preferences
@@ -418,6 +479,10 @@ public class AbstractPreferencesTest ext
     // TODO, how to test the "stored defaults"
     // TODO, how to test the multi-thread
     public void testKeys() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, pref.keys().length);
 
         pref.put("key0", "value");
@@ -434,6 +499,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testName() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("mock", pref.name());
 
         pref = new MockAbstractPreferences(pref, " ");
@@ -441,6 +510,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testCharCase() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertSame(pref.node("samechild"), pref.node("samechild"));
         assertNotSame(pref.node("sameChild"), pref.node("samechild"));
         assertNotSame(pref.node("child"), pref.node("Child"));
@@ -477,6 +550,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNode() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.node(null);
             fail("should throw NullPointerException");
@@ -541,6 +618,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNodeExists() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.nodeExists(null);
             fail("should throw NullPointerException");
@@ -581,6 +662,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void test_nodeExists() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AbstractPreferences test = (AbstractPreferences) Preferences.userRoot()
                 .node("test");
         try {
@@ -600,6 +685,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testParent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertSame(parent, pref.parent());
         AbstractPreferences child1 = new MockAbstractPreferences(pref, "child1");
         assertSame(pref, child1.parent());
@@ -607,6 +696,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPut() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         pref.put("", "emptyvalue");
         assertEquals("emptyvalue", pref.get("", null));
         pref.put("testPutkey", "value1");
@@ -660,6 +753,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutBoolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putBoolean(null, false);
             fail("should throw NullPointerException");
@@ -679,6 +776,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutDouble() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putDouble(null, 3);
             fail("should throw NullPointerException");
@@ -698,6 +799,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutFloat() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putFloat(null, 3f);
             fail("should throw NullPointerException");
@@ -717,6 +822,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutInt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putInt(null, 3);
             fail("should throw NullPointerException");
@@ -736,6 +845,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutLong() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.putLong(null, 3L);
             fail("should throw NullPointerException");
@@ -755,6 +868,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testRemove() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         pref.remove("key");
 
         pref.put("key", "value");
@@ -781,6 +898,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testRemoveNode() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Preferences child = pref.node("child");
         Preferences child1 = pref.node("child1");
         Preferences grandchild = child.node("grandchild");
@@ -888,10 +1009,18 @@ public class AbstractPreferencesTest ext
     // }
 
     public void testAddPreferenceChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // TODO: start from here
     }
 
     public void testRemoveNodeChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.removeNodeChangeListener(null);
             fail("should throw IllegalArgumentException");
@@ -920,6 +1049,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testRemovePreferenceChangeListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.removePreferenceChangeListener(null);
             fail("should throw IllegalArgumentException");
@@ -948,6 +1081,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testSync() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         pref.sync();
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
@@ -987,6 +1124,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testFlush() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         pref.flush();
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
@@ -1035,6 +1176,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetChild() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1062,6 +1207,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testIsRemoved() throws BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1072,6 +1221,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testExportNode() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.exportNode(null);
             fail("should throw NullPointerException");
@@ -1125,6 +1278,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testExportSubtree() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {
             pref.exportSubtree(null);
             fail("should throw NullPointerException");
@@ -1182,6 +1339,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testCachedChildren() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1223,6 +1384,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testAbstractMethod() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1240,6 +1405,10 @@ public class AbstractPreferencesTest ext
 
     public void testBackingStoreException() throws IOException,
     BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1348,6 +1517,10 @@ public class AbstractPreferencesTest ext
 
     public void testRuntimeException() throws IOException,
     BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1494,6 +1667,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testSPIReturnNull() throws IOException, BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1580,6 +1757,10 @@ public class AbstractPreferencesTest ext
 
     public void testIllegalStateException() throws IOException,
     BackingStoreException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1796,6 +1977,10 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNullAndIllegalStateException() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1915,6 +2100,10 @@ public class AbstractPreferencesTest ext
      * Regression for HARMONY-828
      */
     public void testLongPath() throws Exception { 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(pref.nodeExists("ddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd"));
     } 
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/make/run-test.xml Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="print" jar="print_tests.jar">
             <excludeorinclude>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributeTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributeTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributeTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributeTest.java Wed May 26 09:31:07 2010
@@ -26,10 +26,15 @@ import javax.print.attribute.standard.Pr
 import javax.print.attribute.standard.QueuedJobCount;
 import javax.print.attribute.standard.RequestingUserName;
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetAttributeTest extends TestCase {
     @SuppressWarnings("unchecked")
     public void testGetAttribute() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PrintService[] services;
         Object probe;
         Class[] clazz = new Class[] { PrinterIsAcceptingJobs.ACCEPTING_JOBS.getCategory(),

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetAttributesTest.java Wed May 26 09:31:07 2010
@@ -24,10 +24,15 @@ import javax.print.attribute.Attribute;
 import javax.print.attribute.PrintServiceAttributeSet;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetAttributesTest extends TestCase {
 
     public void testGetAttributes() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START testGetAttributes ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetDefaultAttributeValueTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetDefaultAttributeValueTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetDefaultAttributeValueTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetDefaultAttributeValueTest.java Wed May 26 09:31:07 2010
@@ -24,10 +24,15 @@ import javax.print.attribute.standard.Jo
 import javax.print.attribute.standard.Media;
 import javax.print.attribute.standard.RequestingUserName;
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetDefaultAttributeValueTest extends TestCase {
     @SuppressWarnings("unchecked")
     public void testGetDefaultAttributeValue() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         PrintService[] services;
         Object probe;
         services = PrintServiceLookup.lookupPrintServices(null, null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeCategoriesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeCategoriesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeCategoriesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeCategoriesTest.java Wed May 26 09:31:07 2010
@@ -21,10 +21,15 @@
 package javax.print;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetSupportedAttributeCategoriesTest extends TestCase {
 
     public void testGetSupportedAttributeCategories() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out.println("============= START testGetSupportedAttributeCategories ================");
 
         PrintService[] services;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeValuesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeValuesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeValuesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedAttributeValuesTest.java Wed May 26 09:31:07 2010
@@ -26,10 +26,15 @@ import javax.print.attribute.standard.Me
 import javax.print.attribute.standard.OrientationRequested;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetSupportedAttributeValuesTest extends TestCase {
 
     public void testGetSupportedAttributeValues() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START testGetSupportedAttributeValues ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedDocFlavorsTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedDocFlavorsTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedDocFlavorsTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetSupportedDocFlavorsTest.java Wed May 26 09:31:07 2010
@@ -21,10 +21,15 @@
 package javax.print;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetSupportedDocFlavorsTest extends TestCase {
 
     public void testGetSupportedDocFlavors() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START testGetSupportedDocFlavors ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetUnsupportedAttributesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetUnsupportedAttributesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetUnsupportedAttributesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/GetUnsupportedAttributesTest.java Wed May 26 09:31:07 2010
@@ -35,9 +35,14 @@ import javax.print.attribute.standard.Me
 import javax.print.attribute.standard.RequestingUserName;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class GetUnsupportedAttributesTest extends TestCase {
     public void testIsAttributeValueSupported() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START GetUnsupportedAttributesTest ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeCategorySupportedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeCategorySupportedTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeCategorySupportedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeCategorySupportedTest.java Wed May 26 09:31:07 2010
@@ -23,10 +23,15 @@ package javax.print;
 import javax.print.attribute.standard.JobStateReason;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class IsAttributeCategorySupportedTest extends TestCase {
 
     public void testIsAttributeCategorySupported() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START testIsAttributeCategorySupported ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/IsAttributeValueSupportedTest.java Wed May 26 09:31:07 2010
@@ -33,9 +33,14 @@ import javax.print.attribute.standard.Re
 import javax.print.attribute.standard.Sides;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class IsAttributeValueSupportedTest extends TestCase {
     public void testIsAttributeValueSupported() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("============= START testIsAttributeValueSupported ================");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupDefaultPrintServiceTest.java Wed May 26 09:31:07 2010
@@ -31,9 +31,14 @@ import javax.print.attribute.standard.Me
 import javax.print.attribute.standard.Sides;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class LookupDefaultPrintServiceTest extends TestCase {
     public void testLookupDefaultPrintService() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out
                 .println("======= START LookupDefaultPrintServiceTest ======");
 

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/LookupPrintServicesTest.java Wed May 26 09:31:07 2010
@@ -26,9 +26,14 @@ import javax.print.attribute.HashPrintRe
 import javax.print.attribute.PrintRequestAttributeSet;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class LookupPrintServicesTest extends TestCase {
     public void testLookupPrintServices() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out.println("======== START LookupPrintServicesTest ========");
 
         PrintService[] services;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintAutosenseTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import javax.print.attribute.HashDocAttr
 import javax.print.attribute.standard.MediaSizeName;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class PrintAutosenseTest extends TestCase {
     public static void main(String[] args) throws Exception {
@@ -33,6 +34,10 @@ public class PrintAutosenseTest extends 
     }
 
     public void testPrintAutosense() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out.println("======== START PrintAutosenseTest ========");
 
         PrintService[] services;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintJpegTest.java Wed May 26 09:31:07 2010
@@ -28,6 +28,7 @@ import javax.print.attribute.PrintReques
 import javax.print.attribute.standard.MediaSizeName;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class PrintJpegTest extends TestCase {
     public static void main(String[] args) throws Exception {
@@ -35,6 +36,10 @@ public class PrintJpegTest extends TestC
     }
     
     public void testPrintJpeg() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         System.out.println("======== START PrintJpegTest ========");
 
         PrintService[] services;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/PrintTest.java Wed May 26 09:31:07 2010
@@ -40,6 +40,7 @@ import javax.print.attribute.standard.Me
 import javax.print.attribute.standard.RequestingUserName;
 
 import junit.framework.TestCase;
+import tests.support.Support_Excludes;
 
 public class PrintTest extends TestCase {
     public static void main(String[] args) {
@@ -47,6 +48,10 @@ public class PrintTest extends TestCase 
     }
 
     public void testPrintSomething() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         /*Authenticator.setDefault(new PrintTestAuth());*/
 
         boolean testrun = true;



Mime
View raw message