harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [7/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/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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -34,7 +34,6 @@ import java.util.Enumeration;
 
 import tests.support.Support_NetworkInterface;
 import tests.support.Support_PortManager;
-import tests.support.Support_Excludes;
 
 public class MulticastSocketTest extends SocketTestCase {
 
@@ -135,10 +134,6 @@ 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
@@ -149,10 +144,6 @@ 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();
@@ -172,10 +163,6 @@ 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);
@@ -231,10 +218,6 @@ 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
@@ -306,10 +289,6 @@ 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);
@@ -328,10 +307,6 @@ 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 {
@@ -349,10 +324,6 @@ 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;
@@ -381,10 +352,6 @@ 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 {
@@ -601,10 +568,6 @@ 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;
@@ -638,10 +601,6 @@ 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 {
@@ -737,10 +696,6 @@ 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)
 
@@ -780,10 +735,6 @@ 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
@@ -838,10 +789,6 @@ 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);
@@ -918,10 +865,6 @@ 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);
@@ -940,10 +883,6 @@ 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();
@@ -959,10 +898,6 @@ 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());
@@ -1003,10 +938,6 @@ 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()
@@ -1026,10 +957,6 @@ 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);
@@ -1048,10 +975,6 @@ 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!";
@@ -1092,10 +1015,6 @@ 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/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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -29,7 +29,6 @@ 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 {
 
@@ -41,10 +40,6 @@ 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();
@@ -52,10 +47,6 @@ 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);
@@ -69,10 +60,6 @@ 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();
@@ -89,10 +76,6 @@ 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"));
     }
@@ -102,10 +85,6 @@ 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
@@ -116,10 +95,6 @@ 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"));
@@ -130,10 +105,6 @@ 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"));
@@ -150,10 +121,6 @@ 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();
@@ -184,10 +151,6 @@ 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();
@@ -215,10 +178,6 @@ 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);
@@ -305,10 +264,6 @@ 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();
@@ -328,10 +283,6 @@ 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();
@@ -356,10 +307,6 @@ 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()) {
@@ -380,10 +327,6 @@ 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");
@@ -424,10 +367,6 @@ 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");
@@ -456,10 +395,6 @@ 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
@@ -474,10 +409,6 @@ 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#!=:");
@@ -505,10 +436,6 @@ 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);
@@ -543,10 +470,6 @@ 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");
@@ -612,10 +535,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ 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.
@@ -231,10 +230,6 @@ 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");
@@ -265,10 +260,6 @@ 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");
@@ -324,10 +315,6 @@ 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");
@@ -355,10 +342,6 @@ 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();
@@ -374,10 +357,6 @@ 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);
@@ -418,10 +397,6 @@ 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();
@@ -457,10 +432,6 @@ 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");
@@ -486,10 +457,6 @@ 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)
@@ -521,10 +488,6 @@ 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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 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-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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -43,7 +43,6 @@ 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
@@ -115,10 +114,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testConstructor() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref = new MockAbstractPreferences(
                     (AbstractPreferences) Preferences.userRoot(), "mo/ck");
@@ -167,10 +162,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testProtectedFields() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -187,10 +178,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("User Preference Node: " + pref.absolutePath(), pref
                 .toString());
 
@@ -201,10 +188,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testAbsolutePath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("/java/util/prefs/mock", pref.absolutePath());
 
         pref = new MockAbstractPreferences(pref, " ");
@@ -212,10 +195,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testChildrenNames() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(0, pref.childrenNames().length);
 
         // MockAbstractPreferences child1 = new MockAbstractPreferences(pref,
@@ -238,10 +217,6 @@ 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));
@@ -252,10 +227,6 @@ 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));
@@ -291,10 +262,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetBoolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.getBoolean(null, false);
             fail("should throw NullPointerException");
@@ -309,10 +276,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutByteArray() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putByteArray(null, new byte[0]);
             fail("should throw NullPointerException");
@@ -355,10 +318,6 @@ 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");
@@ -390,10 +349,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetDouble() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.getDouble(null, 0);
             fail("should throw NullPointerException");
@@ -412,10 +367,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetFloat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.getFloat(null, 0f);
             fail("should throw NullPointerException");
@@ -429,10 +380,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.getInt(null, 0);
             fail("should throw NullPointerException");
@@ -447,10 +394,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetLong() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.getLong(null, 0);
             fail("should throw NullPointerException");
@@ -465,10 +408,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testIsUserNode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(pref.isUserNode());
 
         pref = new MockAbstractPreferences((AbstractPreferences) Preferences
@@ -479,10 +418,6 @@ 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");
@@ -499,10 +434,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals("mock", pref.name());
 
         pref = new MockAbstractPreferences(pref, " ");
@@ -510,10 +441,6 @@ 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"));
@@ -550,10 +477,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNode() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.node(null);
             fail("should throw NullPointerException");
@@ -618,10 +541,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNodeExists() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.nodeExists(null);
             fail("should throw NullPointerException");
@@ -662,10 +581,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void test_nodeExists() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         AbstractPreferences test = (AbstractPreferences) Preferences.userRoot()
                 .node("test");
         try {
@@ -685,10 +600,6 @@ 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());
@@ -696,10 +607,6 @@ 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");
@@ -753,10 +660,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutBoolean() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putBoolean(null, false);
             fail("should throw NullPointerException");
@@ -776,10 +679,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutDouble() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putDouble(null, 3);
             fail("should throw NullPointerException");
@@ -799,10 +698,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutFloat() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putFloat(null, 3f);
             fail("should throw NullPointerException");
@@ -822,10 +717,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putInt(null, 3);
             fail("should throw NullPointerException");
@@ -845,10 +736,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testPutLong() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.putLong(null, 3L);
             fail("should throw NullPointerException");
@@ -868,10 +755,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testRemove() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pref.remove("key");
 
         pref.put("key", "value");
@@ -898,10 +781,6 @@ 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");
@@ -1009,18 +888,10 @@ 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");
@@ -1049,10 +920,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testRemovePreferenceChangeListener() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.removePreferenceChangeListener(null);
             fail("should throw IllegalArgumentException");
@@ -1081,10 +948,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testSync() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pref.sync();
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
@@ -1124,10 +987,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testFlush() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         pref.flush();
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
@@ -1176,10 +1035,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testGetChild() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1207,10 +1062,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testIsRemoved() throws BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1221,10 +1072,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testExportNode() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.exportNode(null);
             fail("should throw NullPointerException");
@@ -1278,10 +1125,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testExportSubtree() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             pref.exportSubtree(null);
             fail("should throw NullPointerException");
@@ -1339,10 +1182,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testCachedChildren() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1384,10 +1223,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testAbstractMethod() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1405,10 +1240,6 @@ public class AbstractPreferencesTest ext
 
     public void testBackingStoreException() throws IOException,
     BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1517,10 +1348,6 @@ public class AbstractPreferencesTest ext
 
     public void testRuntimeException() throws IOException,
     BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1667,10 +1494,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testSPIReturnNull() throws IOException, BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1757,10 +1580,6 @@ public class AbstractPreferencesTest ext
 
     public void testIllegalStateException() throws IOException,
     BackingStoreException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -1977,10 +1796,6 @@ public class AbstractPreferencesTest ext
     }
 
     public void testNullAndIllegalStateException() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (!(pref instanceof MockAbstractPreferences)) {
             return;
         }
@@ -2100,10 +1915,6 @@ 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=951676&r1=951675&r2=951676&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 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="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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,15 +26,10 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -24,15 +24,10 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -24,15 +24,10 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -21,15 +21,10 @@
 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,15 +26,10 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -21,15 +21,10 @@
 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -35,14 +35,9 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -23,15 +23,10 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -33,14 +33,9 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -31,14 +31,9 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,14 +26,9 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ 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 {
@@ -34,10 +33,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -28,7 +28,6 @@ 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 {
@@ -36,10 +35,6 @@ 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=951676&r1=951675&r2=951676&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 Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ 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) {
@@ -48,10 +47,6 @@ public class PrintTest extends TestCase 
     }
 
     public void testPrintSomething() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         /*Authenticator.setDefault(new PrintTestAuth());*/
 
         boolean testrun = true;

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/ValueTests.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/ValueTests.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/ValueTests.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/ValueTests.java Sat Jun  5 08:34:57 2010
@@ -55,7 +55,6 @@ import javax.print.attribute.standard.Pr
 import javax.print.attribute.standard.PrinterLocation;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class ValueTests extends TestCase {
 
@@ -81,10 +80,6 @@ static {
 }
 
 public void testDocFlavor() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("DocFlavor class testing...");
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
     assertEquals(flavor, new DocFlavor.INPUT_STREAM("image/gif"));
@@ -97,10 +92,6 @@ public void testDocFlavor() {
 }
 
 public void testSimpleDoc() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("SimpleDoc class testing...");
     
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -129,10 +120,6 @@ public void testSimpleDoc() {
 }
 
 public void testDefaultPrintService() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     boolean flg = false;
 
     startTest("PrintService class testing...");
@@ -165,10 +152,6 @@ public void testDefaultPrintService() {
 }
 
 public void testPrintJob() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("PrintJob class testing...");
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
     PrintRequestAttributeSet printRequestSet = 
@@ -184,10 +167,6 @@ public void testPrintJob() {
 }
 
 public void testStreamServiceFactory() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("StreamPrintServiceFactory class testing...");
     boolean flg = false;
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -217,10 +196,6 @@ public void testStreamServiceFactory() {
 }
 
 public void testStreamPrintService() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("StreamPrintService class testing...");
     
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -253,10 +228,6 @@ public void testStreamPrintService() {
 }
 
 public void testStreamServicePrinting() throws Exception {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("StreamPrintServiceFactory class testing...");
     
     byte [] forChecking = {'%', '!', 'P', 'S', '-', 'A', 'd', 'o', 'b', 'e'};
@@ -299,10 +270,6 @@ public void testStreamServicePrinting() 
 }
 
 public void testHashDocAttributeSet() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("HashDocAttributeSet class testing...");
 
     DocAttributeSet set1 = new HashDocAttributeSet();
@@ -345,10 +312,6 @@ public void testHashDocAttributeSet() {
 }
 
 public void testHashPrintJobAttributeSet() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("HashPrintJobAttributeSet class testing...");
 
     PrintJobAttributeSet set1 = new HashPrintJobAttributeSet();
@@ -391,10 +354,6 @@ public void testHashPrintJobAttributeSet
 }
 
 public void testHashPrintRequestAttributeSet() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("HashPrintRequestAttributeSet class testing...");
 
     Copies copies = new Copies(2);
@@ -434,10 +393,6 @@ public void testHashPrintRequestAttribut
 }
 
 public void testHashPrintServiceAttributeSet() {
-    if (Support_Excludes.isExcluded()) {
-        return;
-    }
-
     startTest("HashPrintJobAttributeSet class testing...");
 
     PrintServiceAttributeSet set1 = new HashPrintServiceAttributeSet();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/attribute/ExtendEnumSyntax.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/attribute/ExtendEnumSyntax.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/attribute/ExtendEnumSyntax.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/print/src/test/api/java/common/javax/print/attribute/ExtendEnumSyntax.java Sat Jun  5 08:34:57 2010
@@ -21,7 +21,6 @@
 package javax.print.attribute;
 
 import java.io.ObjectStreamException;
-import tests.support.Support_Excludes;
 
 /*
  * Auxiliary class for EnumSyntax unit test

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

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/DGCTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/DGCTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/DGCTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/DGCTest.java Sat Jun  5 08:34:57 2010
@@ -37,7 +37,6 @@ import org.apache.harmony.rmi.test.TestO
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import tests.support.Support_Excludes;
 
 
 /**
@@ -96,10 +95,6 @@ public class DGCTest extends RMITestBase
      *          If some error occurs.
      */
     public void test0() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         System.out.println("test0 starting");
         test0(CONFIG_DIRECT_SOCKET, true,
               CONFIG_DIRECT_SOCKET, true,
@@ -114,10 +109,6 @@ public class DGCTest extends RMITestBase
      *          If some error occurs.
      */
     public void test3() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         System.out.println("test3 starting");
         test3(CONFIG_DIRECT_SOCKET, true);
         System.out.println("test3 complete");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/DefaultParamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/DefaultParamTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/DefaultParamTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/DefaultParamTest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import org.apache.harmony.rmi.JavaInvoke
 import org.apache.harmony.rmi.common.SubProcess;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class DefaultParamTest extends TestCase {
 
@@ -71,10 +70,6 @@ public class DefaultParamTest extends Te
     }
 
     public void testSimpleInstall() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             Properties props = new Properties();
             ActivationGroupDesc groupDesc = new ActivationGroupDesc(props, null);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/StartupShutdownTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/StartupShutdownTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/StartupShutdownTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/rmi/src/test/api/java/org/apache/harmony/rmi/tests/java/rmi/activation/StartupShutdownTest.java Sat Jun  5 08:34:57 2010
@@ -23,14 +23,9 @@ import java.rmi.activation.ActivationSys
 import org.apache.harmony.rmi.JavaInvoker;
 import org.apache.harmony.rmi.common.SubProcess;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class StartupShutdownTest extends TestCase {
     public void testStartup() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SubProcess rmid = JavaInvoker.invokeSimilar((String[]) null,
                 "org.apache.harmony.rmi.activation.Rmid", (String[]) null, true, true);
         rmid.pipeError();

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java Sat Jun  5 08:34:57 2010
@@ -47,7 +47,6 @@ import java.util.Set;
 
 import tests.support.Support_TestProvider;
 import tests.support.resource.Support_Resources;
-import tests.support.Support_Excludes;
 
 public class KeyStore2Test extends junit.framework.TestCase {
     static PrivateKey privateKey;
@@ -160,10 +159,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#aliases()
 	 */
 	public void test_aliases() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.util.Enumeration
 		// java.security.KeyStore.aliases()
 		// NOT COMPATIBLE WITH PCS#12
@@ -202,10 +197,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#containsAlias(java.lang.String)
 	 */
 	public void test_containsAliasLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method boolean
 		// java.security.KeyStore.containsAlias(java.lang.String)
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -230,10 +221,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#getCertificate(java.lang.String)
 	 */
 	public void test_getCertificateLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.cert.Certificate
 		// java.security.KeyStore.getCertificate(java.lang.String)
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -268,10 +255,6 @@ public class KeyStore2Test extends junit
 	 */
 	public void test_getCertificateAliasLjava_security_cert_Certificate()
 			throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.lang.String
 		// java.security.KeyStore.getCertificateAlias(java.security.cert.Certificate)
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -306,10 +289,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#getCertificateChain(java.lang.String)
 	 */
 	public void test_getCertificateChainLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.cert.Certificate []
 		// java.security.KeyStore.getCertificateChain(java.lang.String)
 		// creatCertificate();
@@ -344,10 +323,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#getInstance(java.lang.String)
 	 */
 	public void test_getInstanceLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.KeyStore
 		// java.security.KeyStore.getInstance(java.lang.String)
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
@@ -362,10 +337,6 @@ public class KeyStore2Test extends junit
 	 */
 	public void test_getInstanceLjava_lang_StringLjava_lang_String()
 			throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.KeyStore
 		// java.security.KeyStore.getInstance(java.lang.String,
 		// java.lang.String)
@@ -382,10 +353,6 @@ public class KeyStore2Test extends junit
 	 */
 	public void test_getKeyLjava_lang_String$C() throws Exception {
 
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.Key
 		// java.security.KeyStore.getKey(java.lang.String, char [])
 		// creatCertificate();
@@ -424,10 +391,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#getProvider()
 	 */
 	public void test_getProvider() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.security.Provider
 		// java.security.KeyStore.getProvider()
 		KeyStore keyTest = KeyStore.getInstance("PKCS#12/Netscape",
@@ -441,10 +404,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#getType()
 	 */
 	public void test_getType() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.lang.String java.security.KeyStore.getType()
 		KeyStore keyTest = KeyStore.getInstance("PKCS#12/Netscape",
 				"TestProvider");
@@ -457,10 +416,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#isCertificateEntry(java.lang.String)
 	 */
 	public void test_isCertificateEntryLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method boolean
 		// java.security.KeyStore.isCertificateEntry(java.lang.String)
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -485,10 +440,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#isKeyEntry(java.lang.String)
 	 */
 	public void test_isKeyEntryLjava_lang_String() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method boolean
 		// java.security.KeyStore.isKeyEntry(java.lang.String)
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -513,10 +464,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#load(java.io.InputStream, char[])
 	 */
 	public void test_loadLjava_io_InputStream$C() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method void java.security.KeyStore.load(java.io.InputStream,
 		// char [])
 		byte[] keyStore = creatCertificate();
@@ -557,10 +504,6 @@ public class KeyStore2Test extends junit
 	 */
 	public void test_setCertificateEntryLjava_lang_StringLjava_security_cert_Certificate()
 			throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method void
 		// java.security.KeyStore.setCertificateEntry(java.lang.String,
 		// java.security.cert.Certificate)
@@ -589,10 +532,6 @@ public class KeyStore2Test extends junit
 	public void test_setKeyEntryLjava_lang_String$B$Ljava_security_cert_Certificate()
 			throws Exception {
 
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 //		fail("Test hangs - requires a full math implementation ??");
 
 		// Test for method void
@@ -619,10 +558,6 @@ public class KeyStore2Test extends junit
 	public void test_setKeyEntryLjava_lang_StringLjava_security_Key$C$Ljava_security_cert_Certificate()
 			throws Exception {
 
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method void
 		// java.security.KeyStore.setKeyEntry(java.lang.String,
 		// java.security.Key, char [], java.security.cert.Certificate [])
@@ -643,10 +578,6 @@ public class KeyStore2Test extends junit
 	 * @tests java.security.KeyStore#size()
 	 */
 	public void test_size() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method int java.security.KeyStore.size()
 
 		CertificateFactory cf = CertificateFactory.getInstance("X.509");
@@ -669,10 +600,6 @@ public class KeyStore2Test extends junit
     
     
     public void test_Constructor() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         KeyStore ks = new MockKeyStore(new MockKeyStoreSpi(), null,
                 "MockKeyStore");
         ks.load(null, null);

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

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

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/make/run-test.xml Sat Jun  5 08:34:57 2010
@@ -31,11 +31,11 @@
 
     <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="swing" jar="swing_tests.jar">
             <junit-elements>
-                <jvmarg value="-Xbootclasspath/a:swing_tests.jar${path.separator}../junit.jar${path.separator}../support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:swing_tests.jar${path.separator}../junit.jar"/>
             </junit-elements>
         </run-hdk-tests>
     </target>

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/AccessibleJComponent_MultithreadedTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/AccessibleJComponent_MultithreadedTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/AccessibleJComponent_MultithreadedTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/AccessibleJComponent_MultithreadedTest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import java.awt.event.FocusListener;
 import java.lang.reflect.InvocationTargetException;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleState;
-import tests.support.Support_Excludes;
 
 public class AccessibleJComponent_MultithreadedTest extends BasicSwingTestCase {
     protected JComponent panel;
@@ -93,10 +92,6 @@ public class AccessibleJComponent_Multit
     @SuppressWarnings("deprecation")
     public void testRemovePropertyChangeListenerPropertyChangeListener()
             throws InterruptedException, InvocationTargetException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SynchronizedPropertyListener listener1 = new SynchronizedPropertyListener();
         SynchronizedPropertyListener listener2 = new SynchronizedPropertyListener();
         aContext.addPropertyChangeListener(listener1);
@@ -140,10 +135,6 @@ public class AccessibleJComponent_Multit
     @SuppressWarnings("deprecation")
     public void testAddPropertyChangeListenerPropertyChangeListener()
             throws InterruptedException, InvocationTargetException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ConcreteFocusListener focusListener = new ConcreteFocusListener();
         SynchronizedPropertyListener listener = new SynchronizedPropertyListener();
         aContext.addPropertyChangeListener(listener);
@@ -203,10 +194,6 @@ public class AccessibleJComponent_Multit
     @SuppressWarnings("deprecation")
     public void testGetAccessibleStateSet() throws InterruptedException,
             InvocationTargetException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue("Enabled", aContext.getAccessibleStateSet()
                 .contains(AccessibleState.ENABLED));
         assertFalse("Focused", aContext.getAccessibleStateSet().contains(



Mime
View raw message