harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r951676 [6/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/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryManagerMXBeanTest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.lang.management.MemoryManage
 import java.util.List;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class MemoryManagerMXBeanTest extends TestCase {
 
@@ -49,10 +48,6 @@ public class MemoryManagerMXBeanTest ext
      * 'java.lang.management.MemoryManagerMXBean.getMemoryPoolNames()'
      */
     public void testGetMemoryPoolNames() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryManagerMXBean mb : allBeans) {
             String[] managedPools = mb.getMemoryPoolNames();
             assertNotNull(managedPools);
@@ -67,10 +62,6 @@ public class MemoryManagerMXBeanTest ext
      * Test method for 'java.lang.management.MemoryManagerMXBean.getName()'
      */
     public void testGetName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryManagerMXBean mb : allBeans) {
             String name = mb.getName();
             assertNotNull(name);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/MemoryPoolMXBeanTest.java Sat Jun  5 08:34:57 2010
@@ -27,7 +27,6 @@ import java.lang.management.MemoryUsage;
 import java.util.List;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class MemoryPoolMXBeanTest extends TestCase {
 
@@ -50,10 +49,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getCollectionUsage()'
      */
     public void testGetCollectionUsage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             // If this method is not supported then it returns null.
             MemoryUsage mu = mb.getCollectionUsage();
@@ -70,10 +65,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getCollectionUsageThreshold()'
      */
     public void testGetCollectionUsageThreshold() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isCollectionUsageThresholdSupported()) {
                 assertTrue(mb.getCollectionUsageThreshold() > -1);
@@ -92,10 +83,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getCollectionUsageThresholdCount()'
      */
     public void testGetCollectionUsageThresholdCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isCollectionUsageThresholdSupported()) {
                 assertTrue(mb.getCollectionUsageThresholdCount() > -1);
@@ -114,10 +101,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getMemoryManagerNames()'
      */
     public void testGetMemoryManagerNames() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             String[] managers = mb.getMemoryManagerNames();
             assertNotNull(managers);
@@ -132,10 +115,6 @@ public class MemoryPoolMXBeanTest extend
      * Test method for 'java.lang.management.MemoryPoolMXBean.getName()'
      */
     public void testGetName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         allBeans = ManagementFactory.getMemoryPoolMXBeans();
         for (MemoryPoolMXBean mb : allBeans) {
             String name = mb.getName();
@@ -148,10 +127,6 @@ public class MemoryPoolMXBeanTest extend
      * Test method for 'java.lang.management.MemoryPoolMXBean.getPeakUsage()'
      */
     public void testGetPeakUsage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isValid()) {
                 MemoryUsage mu = mb.getPeakUsage();
@@ -173,10 +148,6 @@ public class MemoryPoolMXBeanTest extend
      * Test method for 'java.lang.management.MemoryPoolMXBean.getType()'
      */
     public void testGetType() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MemoryType[] allTypes = MemoryType.values();
         for (MemoryPoolMXBean mb : allBeans) {
             MemoryType type = mb.getType();
@@ -196,10 +167,6 @@ public class MemoryPoolMXBeanTest extend
      * Test method for 'java.lang.management.MemoryPoolMXBean.getUsage()'
      */
     public void testGetUsage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isValid()) {
                 MemoryUsage mu = mb.getUsage();
@@ -222,10 +189,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getUsageThreshold()'
      */
     public void testGetUsageThreshold() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isUsageThresholdSupported()) {
                 assertTrue(mb.getUsageThreshold() > -1);
@@ -244,10 +207,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.getUsageThresholdCount()'
      */
     public void testGetUsageThresholdCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isUsageThresholdSupported()) {
                 assertTrue(mb.getUsageThresholdCount() > -1);
@@ -266,10 +225,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.isCollectionUsageThresholdExceeded()'
      */
     public void testIsCollectionUsageThresholdExceeded() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isCollectionUsageThresholdSupported()) {
                 // Not a lot to test here. Maybe it will throw an exception ?
@@ -289,10 +244,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.isUsageThresholdExceeded()'
      */
     public void testIsUsageThresholdExceeded() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isUsageThresholdSupported()) {
                 mb.isUsageThresholdExceeded();
@@ -310,10 +261,6 @@ public class MemoryPoolMXBeanTest extend
      * Test method for 'java.lang.management.MemoryPoolMXBean.resetPeakUsage()'
      */
     public void testResetPeakUsage() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             MemoryUsage current = mb.getUsage();
             mb.resetPeakUsage();
@@ -330,10 +277,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.setCollectionUsageThreshold(long)'
      */
     public void testSetCollectionUsageThreshold() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isCollectionUsageThresholdSupported()) {
                 long before = mb.getCollectionUsageThreshold();
@@ -355,10 +298,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.setCollectionUsageThreshold(long)'
      */
     public void testSetCollectionUsageThresholdWithNegative() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isCollectionUsageThresholdSupported()) {
                 try {
@@ -381,10 +320,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.setUsageThreshold(long)'
      */
     public void testSetUsageThreshold() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isUsageThresholdSupported()) {
                 long before = mb.getUsageThreshold();
@@ -406,10 +341,6 @@ public class MemoryPoolMXBeanTest extend
      * 'java.lang.management.MemoryPoolMXBean.setUsageThreshold(long)'
      */
     public void testSetUsageThresholdWithNegative() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (MemoryPoolMXBean mb : allBeans) {
             if (mb.isUsageThresholdSupported()) {
                 try {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/RuntimeMXBeanTest.java Sat Jun  5 08:34:57 2010
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Map;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class RuntimeMXBeanTest extends TestCase {
 
@@ -45,10 +44,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getBootClassPath()'
      */
     public void testGetBootClassPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         if (mb.isBootClassPathSupported()) {
             String bootclasspath = mb.getBootClassPath();
             assertNotNull(bootclasspath);
@@ -66,10 +61,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getClassPath()'
      */
     public void testGetClassPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getClassPath(), System.getProperty("java.class.path"));
     }
 
@@ -77,10 +68,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getInputArguments()'
      */
     public void testGetInputArguments() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         List<String> args = mb.getInputArguments();
         assertNotNull(args);
         for (String string : args) {
@@ -93,10 +80,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getLibraryPath()'
      */
     public void testGetLibraryPath() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getLibraryPath(), System
                 .getProperty("java.library.path"));
     }
@@ -106,10 +89,6 @@ public class RuntimeMXBeanTest extends T
      * 'java.lang.management.RuntimeMXBean.getManagementSpecVersion()'
      */
     public void testGetManagementSpecVersion() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String specVersion = mb.getManagementSpecVersion();
         assertNotNull(specVersion);
         assertTrue(specVersion.length() > 0);
@@ -119,10 +98,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getName()'
      */
     public void testGetName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String name = mb.getName();
         assertNotNull(name);
         assertTrue(name.length() > 0);
@@ -132,10 +107,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getSpecName()'
      */
     public void testGetSpecName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getSpecName(), System
                 .getProperty("java.vm.specification.name"));
     }
@@ -144,10 +115,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getSpecVendor()'
      */
     public void testGetSpecVendor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getSpecVendor(), System
                 .getProperty("java.vm.specification.vendor"));
     }
@@ -156,10 +123,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getSpecVersion()'
      */
     public void testGetSpecVersion() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getSpecVersion(), System
                 .getProperty("java.vm.specification.version"));
     }
@@ -168,10 +131,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getStartTime()'
      */
     public void testGetStartTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(mb.getStartTime() > -1);
     }
 
@@ -180,10 +139,6 @@ public class RuntimeMXBeanTest extends T
      * 'java.lang.management.RuntimeMXBean.getSystemProperties()'
      */
     public void testGetSystemProperties() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Map<String, String> props = mb.getSystemProperties();
         assertNotNull(props);
         assertTrue(props.size() > 0);
@@ -198,10 +153,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getUptime()'
      */
     public void testGetUptime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(mb.getUptime() > -1);
     }
 
@@ -209,10 +160,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getVmName()'
      */
     public void testGetVmName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getVmName(), System.getProperty("java.vm.name"));
     }
 
@@ -220,10 +167,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getVmVendor()'
      */
     public void testGetVmVendor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getVmVendor(), System.getProperty("java.vm.vendor"));
     }
 
@@ -231,10 +174,6 @@ public class RuntimeMXBeanTest extends T
      * Test method for 'java.lang.management.RuntimeMXBean.getVmVersion()'
      */
     public void testGetVmVersion() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(mb.getVmVersion(), System.getProperty("java.vm.version"));
     }
 }

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/lang/management/ThreadMXBeanTest.java Sat Jun  5 08:34:57 2010
@@ -25,7 +25,6 @@ import java.lang.management.ThreadInfo;
 import java.lang.management.ThreadMXBean;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 public class ThreadMXBeanTest extends TestCase {
 
@@ -45,10 +44,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.findMonitorDeadlockedThreads()'
      */
     public void testFindMonitorDeadlockedThreads() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Check that if there are no deadlocked threads we get back
         // a null rather than a zero length array.
         long[] ids = mb.findMonitorDeadlockedThreads();
@@ -61,10 +56,6 @@ public class ThreadMXBeanTest extends Te
      * Test method for 'java.lang.management.ThreadMXBean.getAllThreadIds()'
      */
     public void testGetAllThreadIds() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int count = mb.getThreadCount();
         long[] ids = mb.getAllThreadIds();
         assertNotNull(ids);
@@ -76,10 +67,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getCurrentThreadCpuTime()'
      */
     public void testGetCurrentThreadCpuTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Outcome depends on whether or not CPU time measurement is supported
         // and enabled.
         if (mb.isCurrentThreadCpuTimeSupported()) {
@@ -102,10 +89,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getCurrentThreadUserTime()'
      */
     public void testGetCurrentThreadUserTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Outcome depends on whether or not CPU time measurement is supported
         // and enabled.
         if (mb.isCurrentThreadCpuTimeSupported()) {
@@ -128,10 +111,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getDaemonThreadCount()'
      */
     public void testGetDaemonThreadCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(mb.getDaemonThreadCount() > -1);
     }
 
@@ -139,10 +118,6 @@ public class ThreadMXBeanTest extends Te
      * Test method for 'java.lang.management.ThreadMXBean.getPeakThreadCount()'
      */
     public void testGetPeakThreadCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(mb.getPeakThreadCount() > -1);
     }
 
@@ -150,10 +125,6 @@ public class ThreadMXBeanTest extends Te
      * Test method for 'java.lang.management.ThreadMXBean.getThreadCount()'
      */
     public void testGetThreadCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertTrue(mb.getThreadCount() > -1);
     }
 
@@ -162,10 +133,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getThreadCpuTime(long)'
      */
     public void testGetThreadCpuTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Outcome depends on whether or not CPU time measurement is supported
         // and enabled.
         if (mb.isThreadCpuTimeSupported()) {
@@ -198,10 +165,6 @@ public class ThreadMXBeanTest extends Te
      * Test method for 'java.lang.management.ThreadMXBean.getThreadInfo(long)'
      */
     public void testGetThreadInfoLong() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Should throw exception if a Thread id of 0 or less is input
         try {
             mb.getThreadInfo(0);
@@ -254,10 +217,6 @@ public class ThreadMXBeanTest extends Te
      * Test method for 'java.lang.management.ThreadMXBean.getThreadInfo(long[])'
      */
     public void testGetThreadInfoLongArray() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Should throw exception if a Thread id of 0 or less is input
         try {
             long[] input = new long[] { 0 };
@@ -283,10 +242,6 @@ public class ThreadMXBeanTest extends Te
      * int)'
      */
     public void testGetThreadInfoLongArrayInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Should throw exception if a Thread id of 0 or less is input
         try {
             long[] input = new long[] { 0 };
@@ -319,10 +274,6 @@ public class ThreadMXBeanTest extends Te
      * int)'
      */
     public void testGetThreadInfoLongInt() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Should throw exception if a Thread id of 0 or less is input
         try {
             mb.getThreadInfo(0, 0);
@@ -346,10 +297,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getThreadUserTime(long)'
      */
     public void testGetThreadUserTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Outcome depends on whether or not CPU time measurement is supported
         // and enabled.
         if (mb.isThreadCpuTimeSupported()) {
@@ -383,10 +330,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.getTotalStartedThreadCount()'
      */
     public void testGetTotalStartedThreadCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         long before = mb.getTotalStartedThreadCount();
 
         // Create another thread in the VM.
@@ -417,10 +360,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.isCurrentThreadCpuTimeSupported()'
      */
     public void testIsCurrentThreadCpuTimeSupported() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Should get the same response as a call to the
         // method isThreadCpuTimeSupported().
         assertEquals(mb.isCurrentThreadCpuTimeSupported(), mb
@@ -432,10 +371,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.resetPeakThreadCount()'
      */
     public void testResetPeakThreadCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int currentThreadCount = mb.getThreadCount();
         mb.resetPeakThreadCount();
         assertEquals(currentThreadCount, mb.getPeakThreadCount());
@@ -446,10 +381,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.setThreadContentionMonitoringEnabled(boolean)'
      */
     public void testSetThreadContentionMonitoringEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Response depends on whether or not thread contention
         // monitoring is supported.
         if (mb.isThreadContentionMonitoringSupported()) {
@@ -489,10 +420,6 @@ public class ThreadMXBeanTest extends Te
      * 'java.lang.management.ThreadMXBean.setThreadCpuTimeEnabled(boolean)'
      */
     public void testSetThreadCpuTimeEnabled() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         // Depends on whether or not Thread CPU timing is actually
         // supported on the current VM.
         if (mb.isThreadCpuTimeSupported()) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ClassLoadingMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import javax.management.MBeanNotificatio
 import javax.management.MBeanOperationInfo;
 
 import org.apache.harmony.lang.management.ClassLoadingMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class ClassLoadingMXBeanImplTest extends

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/CompilationMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/CompilationMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/CompilationMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/CompilationMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -35,7 +35,6 @@ import javax.management.MBeanNotificatio
 import javax.management.MBeanOperationInfo;
 
 import org.apache.harmony.lang.management.CompilationMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class CompilationMXBeanImplTest extends

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/GarbageCollectorMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -38,7 +38,6 @@ import javax.management.MBeanOperationIn
 
 import org.apache.harmony.lang.management.DynamicMXBeanImpl;
 import org.apache.harmony.lang.management.GarbageCollectorMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class GarbageCollectorMXBeanImplTest extends

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/LoggingMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/LoggingMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/LoggingMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/LoggingMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.management.ReflectionExcept
 
 import org.apache.harmony.lang.management.LoggingMXBeanImpl;
 import org.apache.harmony.lang.management.ManagementUtils;
-import tests.support.Support_Excludes;
 
 
 public class LoggingMXBeanImplTest extends SingleInstanceDynamicMXBeanImplTestBase {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -44,7 +44,6 @@ import javax.management.openmbean.Compos
 
 import org.apache.harmony.lang.management.ManagementUtils;
 import org.apache.harmony.lang.management.MemoryMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class MemoryMXBeanImplTest extends SingleInstanceDynamicMXBeanImplTestBase {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryManagerImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryManagerImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryManagerImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryManagerImplTest.java Sat Jun  5 08:34:57 2010
@@ -39,7 +39,6 @@ import javax.management.MBeanOperationIn
 import org.apache.harmony.lang.management.DynamicMXBeanImpl;
 import org.apache.harmony.lang.management.GarbageCollectorMXBeanImpl;
 import org.apache.harmony.lang.management.MemoryManagerMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class MemoryManagerImplTest extends MultiInstanceDynamicMXBeanImplTestBase {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/MemoryPoolMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -42,7 +42,6 @@ import javax.management.openmbean.Compos
 
 import org.apache.harmony.lang.management.DynamicMXBeanImpl;
 import org.apache.harmony.lang.management.MemoryPoolMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class MemoryPoolMXBeanImplTest extends
@@ -443,10 +442,6 @@ public class MemoryPoolMXBeanImplTest ex
     }
 
     public void testSetUsageThresholdAttribute() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (DynamicMXBeanImpl mb : mbList) {
             if (((MemoryPoolMXBean) mb).isUsageThresholdSupported()) {
                 long originalUT = (Long) mb.getAttribute("UsageThreshold");
@@ -470,10 +465,6 @@ public class MemoryPoolMXBeanImplTest ex
     }
 
     public void testSetCollectionUsageThresholdAttribute() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (DynamicMXBeanImpl mb : mbList) {
             if (((MemoryPoolMXBean) mb).isCollectionUsageThresholdSupported()) {
                 long originalCUT = (Long) mb
@@ -499,10 +490,6 @@ public class MemoryPoolMXBeanImplTest ex
 
     @Override
     public void testSetAttribute() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         for (DynamicMXBeanImpl mb : mbList) {
             // Good case - set the UsageThreshold value
             if (((Boolean) mb.getAttribute("UsageThresholdSupported"))) {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/RuntimeMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -40,7 +40,6 @@ import javax.management.MBeanOperationIn
 import javax.management.openmbean.TabularData;
 
 import org.apache.harmony.lang.management.RuntimeMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 public class RuntimeMXBeanImplTest extends SingleInstanceDynamicMXBeanImplTestBase {

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadInfoTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadInfoTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadInfoTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadInfoTest.java Sat Jun  5 08:34:57 2010
@@ -31,7 +31,6 @@ import javax.management.openmbean.OpenTy
 import javax.management.openmbean.SimpleType;
 
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /**
  * ThreadInfo objects can only be obtained from the ThreadMXBean or else by
@@ -224,10 +223,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getBlockedCount()'
      */
     public void testGetBlockedCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_BLOCKED_COUNT, ti.getBlockedCount());
     }
 
@@ -235,10 +230,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getBlockedTime()'
      */
     public void testGetBlockedTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_BLOCKED_TIME, ti.getBlockedTime());
     }
 
@@ -246,10 +237,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getLockOwnerId()'
      */
     public void testGetLockOwnerId() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_LOCK_OWNER_ID, ti.getLockOwnerId());
     }
 
@@ -257,10 +244,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getLockOwnerName()'
      */
     public void testGetLockOwnerName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_LOCK_OWNER_NAME, ti.getLockOwnerName());
     }
 
@@ -268,10 +251,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getStackTrace()'
      */
     public void testGetStackTrace() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         StackTraceElement[] stack = ti.getStackTrace();
         assertEquals(GOOD_STACK_SIZE, stack.length);
         for (StackTraceElement element : stack) {
@@ -287,10 +266,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getThreadId()'
      */
     public void testGetThreadId() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_THREAD_ID, ti.getThreadId());
     }
 
@@ -298,10 +273,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getThreadName()'
      */
     public void testGetThreadName() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_THREAD_NAME, ti.getThreadName());
     }
 
@@ -309,10 +280,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getThreadState()'
      */
     public void testGetThreadState() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_THREAD_STATE, (ti.getThreadState()));
     }
 
@@ -320,10 +287,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getWaitedCount()'
      */
     public void testGetWaitedCount() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_WAITED_COUNT, ti.getWaitedCount());
     }
 
@@ -331,10 +294,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.getWaitedTime()'
      */
     public void testGetWaitedTime() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_WAITED_TIME, ti.getWaitedTime());
     }
 
@@ -342,10 +301,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.isInNative()'
      */
     public void testIsInNative() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_IN_NATIVE, ti.isInNative());
     }
 
@@ -353,10 +308,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.isSuspended()'
      */
     public void testIsSuspended() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(GOOD_SUSPENDED, ti.isSuspended());
     }
 
@@ -364,10 +315,6 @@ public class ThreadInfoTest extends Test
      * Test method for 'java.lang.management.ThreadInfo.toString()'
      */
     public void testToString() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertEquals(getGoodToStringVal(), ti.toString());
     }
 
@@ -376,10 +323,6 @@ public class ThreadInfoTest extends Test
      * with more than 13 essential fields
      */
     public void test_from_fields() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Object stackTraceElementData = createGoodStackTraceCompositeData();
         CompositeType stackTraceElementType = createGoodStackTraceElementCompositeType();
         String[] names = { "threadId", "threadName", "threadState",
@@ -437,10 +380,6 @@ public class ThreadInfoTest extends Test
             "lock", 2L, "lockOwner", stackTraceElementData, "additionalValue" };
 
     public void test_from_scenario1() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
                 SimpleType.STRING, SimpleType.BOOLEAN, SimpleType.BOOLEAN,
@@ -475,10 +414,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario2() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[0] = "1";
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.STRING, SimpleType.STRING,
@@ -498,10 +433,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario3() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         int length = 10;
         String[] names = new String[length];
         for (int index = 0; index < length; index++) {
@@ -537,10 +468,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario4() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[0] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -560,10 +487,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario5() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[1] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -583,10 +506,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario6() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[2] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -606,10 +525,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario7() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[3] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -629,10 +544,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario8() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[4] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -652,10 +563,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario9() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[5] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -675,10 +582,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario10() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[6] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -698,10 +601,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario11() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[7] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -721,10 +620,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario12() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[8] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -744,10 +639,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario13() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[9] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -783,10 +674,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario14() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[10] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -806,10 +693,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario15() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[11] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,
@@ -846,10 +729,6 @@ public class ThreadInfoTest extends Test
     }
 
     public void test_from_scenario16() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         initialValues[12] = null;
         ArrayType stackTraceArray = new ArrayType(1, stackTraceElementType);
         OpenType[] types = { SimpleType.LONG, SimpleType.STRING,

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadMXBeanImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadMXBeanImplTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadMXBeanImplTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/lang-management/src/test/impl/java/org/apache/harmony/lang/management/ThreadMXBeanImplTest.java Sat Jun  5 08:34:57 2010
@@ -37,7 +37,6 @@ import javax.management.MBeanOperationIn
 import javax.management.openmbean.CompositeData;
 
 import org.apache.harmony.lang.management.ThreadMXBeanImpl;
-import tests.support.Support_Excludes;
 
 
 

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java Sat Jun  5 08:34:57 2010
@@ -38,7 +38,6 @@ import junit.framework.TestCase;
 
 import org.apache.harmony.logging.tests.java.util.logging.HandlerTest.NullOutputStream;
 import org.apache.harmony.logging.tests.java.util.logging.util.EnvironmentHelper;
-import tests.support.Support_Excludes;
 
 /**
  * 
@@ -110,10 +109,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddGetLogger() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger log = new MockLogger(FOO, null);
 		Logger foo = mockManager.getLogger(FOO);
 		assertNull(foo);
@@ -147,10 +142,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddGetLogger_duplicateName() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// add logger with duplicate name has no effect
 		Logger foo = new MockLogger(FOO, null);
 		Logger foo2 = new MockLogger(FOO, null);
@@ -168,10 +159,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddGetLogger_Hierachy() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger foo = new MockLogger("testAddGetLogger_Hierachy.foo", null);
 		Logger child = new MockLogger("testAddGetLogger_Hierachy.foo.child",
 				null);
@@ -215,10 +202,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddLoggerReverseOrder() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger root = new MockLogger("testAddLoggerReverseOrder", null);
 		Logger foo = new MockLogger("testAddLoggerReverseOrder.foo", null);
 		Logger fooChild = new MockLogger("testAddLoggerReverseOrder.foo.child",
@@ -254,10 +237,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddSimiliarLogger() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger root = new MockLogger("testAddSimiliarLogger", null);
 		Logger foo = new MockLogger("testAddSimiliarLogger.foo", null);
 		Logger similiarFoo = new MockLogger("testAddSimiliarLogger.fop", null);
@@ -292,10 +271,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddGetLogger_nameWithSpace() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger foo = new MockLogger(FOO, null);
 		Logger fooBeforeSpace = new MockLogger(FOO+" ", null);
 		Logger fooAfterSpace = new MockLogger(" "+FOO, null);
@@ -312,10 +287,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddGetLogger_addRoot() throws IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		Logger foo = new MockLogger(FOO, null);
 		Logger fooChild = new MockLogger(FOO+".child", null);
 		Logger other = new MockLogger("other", null);
@@ -346,10 +317,6 @@ public class LogManagerTest extends Test
 	 * @tests java.util.logging.LogManager#addLogger(Logger)
 	 */
 	public void test_addLoggerLLogger_Security() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// regression test for Harmony-1286
 		SecurityManager originalSecurityManager = System.getSecurityManager();
 		System.setSecurityManager(new SecurityManager());
@@ -363,10 +330,6 @@ public class LogManagerTest extends Test
 	}
 	
 	public void testDefaultLoggerProperties() throws Exception{
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// mock LogManager has no default logger
 		assertNull(mockManager.getLogger(""));
 		assertNull(mockManager.getLogger("global"));
@@ -392,10 +355,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testLoggingPermission() throws IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		System.setSecurityManager(new MockSecurityManagerLogPermission());
 		mockManager.addLogger(new MockLogger("abc", null));
 		mockManager.getLogger("");
@@ -448,10 +407,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testMockGetProperty() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// mock manager doesn't read configuration until you call
 		// readConfiguration()
 		Logger root = new MockLogger("", null);
@@ -470,10 +425,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testGetProperty() throws SecurityException, IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 //      //FIXME: move it to exec
         //        manager.readConfiguration(EnvironmentHelper.PropertiesToInputStream(props));
 //		Logger root = manager.getLogger("");
@@ -497,10 +448,6 @@ public class LogManagerTest extends Test
 
 	public void testReadConfiguration_null() throws SecurityException,
 			IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		try {
 			manager.readConfiguration(null);
 			fail("should throw null pointer exception");
@@ -512,10 +459,6 @@ public class LogManagerTest extends Test
     public void testReadConfiguration() throws SecurityException,
             IOException {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         MockConfigLogManager lm = new MockConfigLogManager();
         assertFalse(lm.isCalled);
 
@@ -585,10 +528,6 @@ public class LogManagerTest extends Test
 	 * Class under test for void readConfiguration(InputStream)
 	 */
 	public void testReadConfigurationInputStream() throws IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// mock LogManager
 		InputStream stream = EnvironmentHelper.PropertiesToInputStream(props);
 
@@ -621,10 +560,6 @@ public class LogManagerTest extends Test
 
 	public void testReadConfigurationInputStream_null()
 			throws SecurityException, IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		try {
 			mockManager.readConfiguration(null);
 			fail("should throw null pointer exception");
@@ -634,10 +569,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testReadConfigurationInputStream_root() throws IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		InputStream stream = EnvironmentHelper.PropertiesToInputStream(props);
 		manager.readConfiguration(EnvironmentHelper.PropertiesToInputStream(props));
 
@@ -671,10 +602,6 @@ public class LogManagerTest extends Test
 
     public void testReadConfigurationUpdatesRootLoggersHandlers()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Properties properties = new Properties();
         LogManager.getLogManager().readConfiguration(
                 EnvironmentHelper.PropertiesToInputStream(properties));
@@ -691,10 +618,6 @@ public class LogManagerTest extends Test
 
     public void testReadConfigurationDoesNotUpdateOtherLoggers()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Properties properties = new Properties();
         LogManager.getLogManager().readConfiguration(
                 EnvironmentHelper.PropertiesToInputStream(properties));
@@ -711,10 +634,6 @@ public class LogManagerTest extends Test
     }
 
 	public void testAddRemovePropertyChangeListener() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		MockPropertyChangeListener listener1 = new MockPropertyChangeListener();
 		MockPropertyChangeListener listener2 = new MockPropertyChangeListener();
 		// add same listener1 two times
@@ -761,10 +680,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testAddRemovePropertyChangeListener_null() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// seems nothing happened
         try{
             mockManager.addPropertyChangeListener(null);
@@ -775,10 +690,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testReset() throws SecurityException, IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// mock LogManager
 		mockManager.readConfiguration(EnvironmentHelper.PropertiesToInputStream(props));
 		assertNotNull(mockManager.getProperty("handlers"));
@@ -813,10 +724,6 @@ public class LogManagerTest extends Test
 	}
 
 	public void testGlobalPropertyConfig() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
         PrintStream err = System.err;
         try {
             System.setErr(new PrintStream(new NullOutputStream()));
@@ -907,10 +814,6 @@ public class LogManagerTest extends Test
     }
 
     public void testValidConfigClass() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String oldPropertyValue = System.getProperty(CONFIG_CLASS);
         try {
             System.setProperty(CONFIG_CLASS, this.getClass().getName()
@@ -934,10 +837,6 @@ public class LogManagerTest extends Test
     }
 
     public void testNotExistConfigFile() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String oldPropertyValue = System.getProperty(CONFIG_FILE);
         System.setProperty(CONFIG_FILE, "not.exist.config.file");
         try {
@@ -957,10 +856,6 @@ public class LogManagerTest extends Test
 
     // regression for HARMONY-3075
     public void testGetLoggingMXBean() throws Exception{
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertNotNull(LogManager.getLoggingMXBean());
     }
     

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.drl Sat Jun  5 08:34:57 2010
@@ -1,2 +1,4 @@
+org/apache/harmony/luni/tests/java/lang/ThreadTest.java
+
 # HARMONY-4043 (was duplicate HARMONY-4753)
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86.ibm Sat Jun  5 08:34:57 2010
@@ -1,2 +1,4 @@
+org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
+org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.drl Sat Jun  5 08:34:57 2010
@@ -1,4 +1,5 @@
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java
+org/apache/harmony/luni/tests/java/lang/ThreadTest.java
 org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
 
 # HARMONY-4043 (was duplicate HARMONY-4753)

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.linux.x86_64.ibm Sat Jun  5 08:34:57 2010
@@ -1,2 +1,4 @@
+org/apache/harmony/luni/tests/java/util/PropertiesTest.java
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
+org/apache/harmony/luni/tests/java/lang/PackageTest.java
 org/apache/harmony/luni/tests/java/net/InetAddressTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86_64.drl?rev=951676&r1=951675&r2=951676&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/make/exclude.windows.x86_64.drl Sat Jun  5 08:34:57 2010
@@ -1,4 +1,5 @@
 org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
+org/apache/harmony/luni/tests/java/util/ArrayListTest.java
 
 # HARMONY-4043 (was duplicate HARMONY-4753)
 org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java

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

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.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/lang/PackageTest.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/lang/PackageTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/PackageTest.java Sat Jun  5 08:34:57 2010
@@ -22,7 +22,6 @@ import java.net.URL;
 import java.net.URLClassLoader;
 
 import tests.support.resource.Support_Resources;
-import tests.support.Support_Excludes;
 
 public class PackageTest extends junit.framework.TestCase {
 
@@ -64,10 +63,6 @@ public class PackageTest extends junit.f
      */
     public void test_helper_Attributes() throws Exception {
 
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_all_attributes.jar", "p.C");
         assertEquals(
                 "Package getImplementationTitle returns a wrong string (1)",
@@ -177,10 +172,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#getName()
      */
     public void test_getName() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_pq.jar", "p.q.C");
         assertEquals("Package getName returns a wrong string", "p.q", p
                 .getName());
@@ -190,10 +181,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#getPackage(java.lang.String)
      */
     public void test_getPackageLjava_lang_String() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         assertSame("Package getPackage failed for java.lang", Package
                 .getPackage("java.lang"), Package.getPackage("java.lang"));
 
@@ -205,10 +192,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#getPackages()
      */
     public void test_getPackages() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package[] pckgs = Package.getPackages();
         boolean found = false;
         for (int i = 0; i < pckgs.length; i++) {
@@ -224,10 +207,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#hashCode()
      */
     public void test_hashCode() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p1 = Package.getPackage("java.lang");
         if (p1 != null) {
             assertEquals(p1.hashCode(), "java.lang".hashCode());
@@ -238,10 +217,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#isCompatibleWith(java.lang.String)
      */
     public void test_isCompatibleWithLjava_lang_String() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_c.jar", "p.C");
 
         assertTrue("Package isCompatibleWith fails with lower version", p
@@ -292,10 +267,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#isSealed()
      */
     public void test_isSealed() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_pq.jar", "p.q.C");
         assertTrue("Package isSealed returns wrong boolean", p.isSealed());
     }
@@ -304,10 +275,6 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#isSealed(java.net.URL)
      */
     public void test_isSealedLjava_net_URL() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_c.jar", "p.C");
         assertFalse("Package isSealed returns wrong boolean (1)", p
                 .isSealed(new URL("file:/" + resPath + "/")));
@@ -319,20 +286,12 @@ public class PackageTest extends junit.f
      * @tests java.lang.Package#toString()
      */
     public void test_toString() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Package p = getTestPackage("hyts_c.jar", "p.C");
         assertTrue("Package toString returns wrong string", p.toString()
                 .length() > 0);
     }
     
     public void test_SealedPackage_forName() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         Support_Resources.copyFile(resources, "Package", "hyts_c.jar");
         Support_Resources.copyFile(resources, "Package", "hyts_d.jar");
         Support_Resources.copyFile(resources, "Package", "hyts_d1.jar");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.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/lang/SecurityManager2Test.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/lang/SecurityManager2Test.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java Sat Jun  5 08:34:57 2010
@@ -20,15 +20,10 @@ import java.security.Permission;
 
 import junit.framework.TestCase;
 import tests.support.Support_Exec;
-import tests.support.Support_Excludes;
 
 public class SecurityManager2Test extends TestCase {
 
     public void test_SecurityManager_via_SystemProperty() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String[] arg = new String[] {
                 "-Djava.security.manager=" + MySecurityManager.class.getName(),
                 TestForSystemProperty.class.getName() };

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.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/ExcludedProxyTest.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/ExcludedProxyTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java Sat Jun  5 08:34:57 2010
@@ -30,7 +30,6 @@ import java.net.URLConnection;
 import tests.support.Support_Configuration;
 import tests.support.resource.Support_Resources;
 import junit.framework.TestCase;
-import tests.support.Support_Excludes;
 
 /*
  * This test is designed for collecting all the testcases which needs a proxy
@@ -44,10 +43,6 @@ public class ExcludedProxyTest extends T
      * @tests java.net.HttpURLConnection#usingProxy()
      */
     public void test_usingProxy() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             System.setProperty("http.proxyHost",
                     Support_Configuration.ProxyServerTestHost);
@@ -122,10 +117,6 @@ public class ExcludedProxyTest extends T
      * @tests java.net.SocketImpl#SocketImpl()
      */
     public void test_Constructor() {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         try {
             try {
                 System.setProperty("socksProxyHost",
@@ -166,10 +157,6 @@ public class ExcludedProxyTest extends T
      * @tests java.net.URL#openConnection(Proxy)
      */
     public void test_openConnectionLjava_net_Proxy() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         SocketAddress addr1 = new InetSocketAddress(
                 Support_Configuration.ProxyServerTestHost, 808);
         SocketAddress addr2 = new InetSocketAddress(

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=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/InetAddressTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/InetAddressTest.java Sat Jun  5 08:34:57 2010
@@ -32,7 +32,6 @@ 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 {
     
@@ -135,7 +134,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByName(String)
      */
     public void test_getByNameUnknownHostException() {
-
         // Related to HARMONY-5784
 
         // loop a few times to flex the negative cache paths
@@ -153,7 +151,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#equals(java.lang.Object)
      */
     public void test_equalsLjava_lang_Object() throws Exception {
-
         // Test for method boolean java.net.InetAddress.equals(java.lang.Object)
         InetAddress ia1 = InetAddress
                 .getByName(Support_Configuration.InetTestAddress);
@@ -167,7 +164,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getAddress()
      */
     public void test_getAddress() throws UnknownHostException {
-
         // Test for method byte [] java.net.InetAddress.getAddress()
         try {
             InetAddress ia = InetAddress
@@ -191,7 +187,6 @@ public class InetAddressTest extends jun
      */
     @SuppressWarnings("nls")
     public void test_getAllByNameLjava_lang_String() throws Exception {
-
         // Test for method java.net.InetAddress []
         // java.net.InetAddress.getAllByName(java.lang.String)
         InetAddress[] all = InetAddress
@@ -245,7 +240,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByName(java.lang.String)
      */
     public void test_getByNameLjava_lang_String() throws Exception {
-
         // Test for method java.net.InetAddress
         // java.net.InetAddress.getByName(java.lang.String)
         InetAddress ia2 = InetAddress
@@ -276,7 +270,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getHostAddress()
      */
     public void test_getHostAddress() throws Exception {
-
         // Test for method java.lang.String
         // java.net.InetAddress.getHostAddress()
         InetAddress ia2 = InetAddress
@@ -291,7 +284,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getHostName()
      */
     public void test_getHostName() throws Exception {
-
         // Test for method java.lang.String java.net.InetAddress.getHostName()
         InetAddress ia = InetAddress
                 .getByName(Support_Configuration.InetTestIP);
@@ -323,13 +315,6 @@ public class InetAddressTest extends jun
             System.setSecurityManager(oldman);
         }
 
-        if (Support_Excludes.isExcluded()) {
-            // These thread-safety tests fail intermittently on several
-            // unix platforms
-            // There seems to be no relevant jira for this issue
-            return;
-        }
-
         // Make sure there is no caching
         String originalPropertyValue = System
                 .getProperty("networkaddress.cache.ttl");
@@ -391,7 +376,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getLocalHost()
      */
     public void test_getLocalHost() throws Exception {
-
         // Test for method java.net.InetAddress
         // java.net.InetAddress.getLocalHost()
 
@@ -408,7 +392,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getLocalHost()
      */
     public void test_getLocalHost_extended() throws Exception {
-
         class Inet_SecurityManager extends SecurityManager {
             @Override
             public void checkConnect(String host, int port) {
@@ -438,7 +421,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#hashCode()
      */
     public void test_hashCode() {
-
         // Test for method int java.net.InetAddress.hashCode()
         try {
             InetAddress host = InetAddress
@@ -455,7 +437,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isMulticastAddress()
      */
     public void test_isMulticastAddress() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertTrue(ia2.isMulticastAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -466,7 +447,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isAnyLocalAddress()
      */
     public void test_isAnyLocalAddress() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isAnyLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -477,7 +457,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLinkLocalAddress()
      */
     public void test_isLinkLocalAddress() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isLinkLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -488,7 +467,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLoopbackAddress()
      */
     public void test_isLoopbackAddress() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isLoopbackAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -501,7 +479,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isLoopbackAddress()
      */
     public void test_isSiteLocalAddress() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isSiteLocalAddress());
         ia2 = InetAddress.getByName("localhost");
@@ -518,7 +495,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isMCGlobal()/isMCLinkLocal/isMCNodeLocal/isMCOrgLocal/isMCSiteLocal
      */
     public void test_isMCVerify() throws UnknownHostException {
-
         InetAddress ia2 = InetAddress.getByName("239.255.255.255");
         assertFalse(ia2.isMCGlobal());
         assertFalse(ia2.isMCLinkLocal());
@@ -549,7 +525,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#toString()
      */
     public void test_toString() throws Exception {
-
         // Test for method java.lang.String java.net.InetAddress.toString()
         InetAddress ia2 = InetAddress
                 .getByName(Support_Configuration.InetTestIP);
@@ -565,7 +540,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByAddress(java.lang.String, byte[])
      */
     public void test_getByAddressLjava_lang_String$B() {
-
         // Check an IPv4 address with an IPv6 hostname
         byte ipAddress[] = { 127, 0, 0, 1 };
         String addressStr = "::1";
@@ -593,7 +567,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getCanonicalHostName()
      */
     public void test_getCanonicalHostName() throws Exception {
-
         InetAddress theAddress = null;
         theAddress = InetAddress.getLocalHost();
         assertTrue("getCanonicalHostName returned a zero length string ",
@@ -619,7 +592,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#isReachableI
      */
     public void test_isReachableI() throws Exception {
-
         InetAddress ia = Inet4Address.getByName("127.0.0.1");
         assertTrue(ia.isReachable(10000));
         ia = Inet4Address.getByName("127.0.0.1");
@@ -691,7 +663,6 @@ public class InetAddressTest extends jun
     
     // Regression Test for Harmony-2290
     public void test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface() throws IOException {
-
         final int TTL = 20;
         final int TIME_OUT = 3000;
         
@@ -729,6 +700,7 @@ public class InetAddressTest extends jun
      * @tests serialization/deserialization compatibility.
      */
     public void testSerializationSelf() throws Exception {
+
         SerializationTest.verifySelf(InetAddress.getByName("localhost"),
                 COMPARATOR);
     }
@@ -737,6 +709,7 @@ public class InetAddressTest extends jun
      * @tests serialization/deserialization compatibility with RI.
      */
     public void testSerializationCompatibility() throws Exception {
+
         SerializationTest.verifyGolden(this,
                 InetAddress.getByName("localhost"), COMPARATOR);
     }
@@ -745,7 +718,6 @@ public class InetAddressTest extends jun
      * @tests java.net.InetAddress#getByAddress(byte[])
      */
     public void test_getByAddress() {
-
         // Regression for HARMONY-61
         try {
             InetAddress.getByAddress(null);



Mime
View raw message