harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948377 [8/21] - in /harmony/enhanced/java/branches/mrh: classlib/make/ classlib/modules/accessibility/make/ classlib/modules/annotation/make/ classlib/modules/applet/make/ classlib/modules/archive/make/ classlib/modules/archive/src/test/ja...
Date Wed, 26 May 2010 09:31:15 GMT
Modified: harmony/enhanced/java/branches/mrh/classlib/modules/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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -55,6 +55,7 @@ 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 {
 
@@ -80,6 +81,10 @@ 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"));
@@ -92,6 +97,10 @@ public void testDocFlavor() {
 }
 
 public void testSimpleDoc() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("SimpleDoc class testing...");
     
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -120,6 +129,10 @@ public void testSimpleDoc() {
 }
 
 public void testDefaultPrintService() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     boolean flg = false;
 
     startTest("PrintService class testing...");
@@ -152,6 +165,10 @@ public void testDefaultPrintService() {
 }
 
 public void testPrintJob() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("PrintJob class testing...");
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
     PrintRequestAttributeSet printRequestSet = 
@@ -167,6 +184,10 @@ public void testPrintJob() {
 }
 
 public void testStreamServiceFactory() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("StreamPrintServiceFactory class testing...");
     boolean flg = false;
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -196,6 +217,10 @@ public void testStreamServiceFactory() {
 }
 
 public void testStreamPrintService() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("StreamPrintService class testing...");
     
     DocFlavor flavor = DocFlavor.INPUT_STREAM.GIF;
@@ -228,6 +253,10 @@ 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'};
@@ -270,6 +299,10 @@ public void testStreamServicePrinting() 
 }
 
 public void testHashDocAttributeSet() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("HashDocAttributeSet class testing...");
 
     DocAttributeSet set1 = new HashDocAttributeSet();
@@ -312,6 +345,10 @@ public void testHashDocAttributeSet() {
 }
 
 public void testHashPrintJobAttributeSet() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("HashPrintJobAttributeSet class testing...");
 
     PrintJobAttributeSet set1 = new HashPrintJobAttributeSet();
@@ -354,6 +391,10 @@ public void testHashPrintJobAttributeSet
 }
 
 public void testHashPrintRequestAttributeSet() {
+    if (Support_Excludes.isExcluded()) {
+        return;
+    }
+
     startTest("HashPrintRequestAttributeSet class testing...");
 
     Copies copies = new Copies(2);
@@ -393,6 +434,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@
 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -37,6 +37,7 @@ import org.apache.harmony.rmi.test.TestO
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
+import tests.support.Support_Excludes;
 
 
 /**
@@ -95,6 +96,10 @@ 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,
@@ -109,6 +114,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -35,6 +35,7 @@ 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 {
 
@@ -70,6 +71,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -23,9 +23,14 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -33,7 +33,7 @@
 
     <target name="test-module"
             depends="-test-module,-test-module-impl" />
-    <target name="-test-module" depends="test-jre-vm-info">
+    <target name="-test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -47,6 +47,7 @@ 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;
@@ -159,6 +160,10 @@ 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
@@ -197,6 +202,10 @@ 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");
@@ -221,6 +230,10 @@ 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");
@@ -255,6 +268,10 @@ 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");
@@ -289,6 +306,10 @@ 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();
@@ -323,6 +344,10 @@ 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());
@@ -337,6 +362,10 @@ 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)
@@ -353,6 +382,10 @@ 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();
@@ -391,6 +424,10 @@ 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",
@@ -404,6 +441,10 @@ 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");
@@ -416,6 +457,10 @@ 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");
@@ -440,6 +485,10 @@ 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");
@@ -464,6 +513,10 @@ 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();
@@ -504,6 +557,10 @@ 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)
@@ -532,6 +589,10 @@ 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
@@ -558,6 +619,10 @@ 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 [])
@@ -578,6 +643,10 @@ 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");
@@ -600,6 +669,10 @@ 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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,7 +31,7 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -31,11 +31,11 @@
 
     <target name="test" depends="test-module" />
 
-    <target name="test-module" depends="test-jre-vm-info">
+    <target name="test-module">
         <convert-test-as-class from="test.case" to="converted.tc.class" />
         <run-hdk-tests module="swing" jar="swing_tests.jar">
             <junit-elements>
-                <jvmarg value="-Xbootclasspath/a:swing_tests.jar${path.separator}../junit.jar"/>
+                <jvmarg value="-Xbootclasspath/a:swing_tests.jar${path.separator}../junit.jar${path.separator}../support.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=948377&r1=948376&r2=948377&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 Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ 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;
@@ -92,6 +93,10 @@ 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);
@@ -135,6 +140,10 @@ 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);
@@ -194,6 +203,10 @@ 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(

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultCellEditorTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import java.util.Arrays;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.table.BasicSwingTableTestCase;
+import tests.support.Support_Excludes;
 
 public class DefaultCellEditorTest extends BasicSwingTableTestCase {
     private DefaultCellEditor editor;
@@ -41,6 +42,10 @@ public class DefaultCellEditorTest exten
     }
 
     public void testDefaultCellEditor() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JTextField field = new JTextField();
         editor = new DefaultCellEditor(field);
         assertEquals(field, editor.editorComponent);
@@ -51,6 +56,10 @@ public class DefaultCellEditorTest exten
 
     @SuppressWarnings("deprecation")
     public void testEditorDelegate_TextField() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JTextField field = new JTextField();
         editor = new DefaultCellEditor(field);
         assertTrue(Arrays.asList(field.getActionListeners()).contains(editor.delegate));
@@ -99,6 +108,10 @@ public class DefaultCellEditorTest exten
     }
 
     public void testEditorDelegate_CheckBox() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JCheckBox check = new JCheckBox();
         editor = new DefaultCellEditor(check);
         assertTrue(Arrays.asList(check.getActionListeners()).contains(editor.delegate));
@@ -141,6 +154,10 @@ public class DefaultCellEditorTest exten
     }
 
     public void testEditorDelegate_ComboBox() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComboBox cb = new JComboBox();
         editor = new DefaultCellEditor(cb);
         assertTrue(Arrays.asList(cb.getActionListeners()).contains(editor.delegate));
@@ -191,12 +208,20 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComboBox cb = new JComboBox();
         editor = new DefaultCellEditor(cb);
         assertEquals(cb, editor.getComponent());
     }
 
     public void testGetSetClickCountToStart() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(2, editor.getClickCountToStart());
         editor = new DefaultCellEditor(new JCheckBox());
@@ -210,6 +235,10 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetTreeCellEditorComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(editor.getComponent(), editor.getTreeCellEditorComponent(new JTree(),
                 "any", false, false, false, 0));
@@ -217,6 +246,10 @@ public class DefaultCellEditorTest exten
     }
 
     public void testGetTableCellEditorComponent() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         editor = new DefaultCellEditor(new JTextField());
         assertEquals(editor.getComponent(), editor.getTableCellEditorComponent(new JTable(),
                 "any", false, 0, 0));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/DefaultComboBoxModelTest.java Wed May 26 09:31:07 2010
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Vector;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
+import tests.support.Support_Excludes;
 
 public class DefaultComboBoxModelTest extends SwingTestCase {
     private DefaultComboBoxModel model;
@@ -48,6 +49,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testDefaultComboBoxModel() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, model.getSize());
         assertNull(model.getSelectedItem());
         assertEquals(0, listener.getEvents().size());
@@ -70,6 +75,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testAddElement() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, model.getSize());
         assertNull(model.getSelectedItem());
         model.addElement("1");
@@ -86,6 +95,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetElementAt() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(model.getElementAt(0));
         model.addElement("a");
         model.addElement("b");
@@ -95,6 +108,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetIndexOf() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(-1, model.getIndexOf("a"));
         model.addElement("a");
         model.addElement("b");
@@ -105,6 +122,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetSize() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals(0, model.getSize());
         model.addElement("a");
         assertEquals(1, model.getSize());
@@ -113,6 +134,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testInsertElementAt() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testExceptionalCase(new ExceptionalCase() {
             @Override
             public void exceptionalAction() throws Exception {
@@ -130,6 +155,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveAllElements() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         model.addElement("a");
         model.addElement("b");
         model.addElement("c");
@@ -141,6 +170,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveElement() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         model.removeElement("a");
         assertEquals(0, model.getSize());
         assertEquals(0, listener.getEvents().size());
@@ -155,6 +188,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testRemoveElementAt() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         testExceptionalCase(new ExceptionalCase() {
             @Override
             public void exceptionalAction() throws Exception {
@@ -181,6 +218,10 @@ public class DefaultComboBoxModelTest ex
     }
 
     public void testGetSetSelectedItem() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(model.getSelectedItem());
         model.setSelectedItem("3");
         assertEquals("3", model.getSelectedItem());

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/InputMapTest.java Wed May 26 09:31:07 2010
@@ -27,6 +27,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import tests.support.Support_Excludes;
 
 public class InputMapTest extends SwingTestCase {
     protected InputMap map;
@@ -57,6 +58,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testPut() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         map.put(keyStroke1, "1");
@@ -73,6 +78,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testGet() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         assertNull(map.get(keyStroke1));
@@ -99,6 +108,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testRemove() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         map.put(keyStroke1, "1");
@@ -114,6 +127,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testKeys() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
@@ -145,6 +162,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testAllKeys() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_3, 0);
@@ -178,6 +199,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testSetGetParent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         InputMap parent1 = new InputMap();
         InputMap parent2 = new InputMap();
         InputMap parent3 = null;
@@ -191,6 +216,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testClear() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, 0);
         assertTrue(map.size() == 0);
@@ -206,6 +235,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         KeyStroke keyStroke3 = KeyStroke.getKeyStroke(KeyEvent.VK_3, 0);
@@ -223,6 +256,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testWriteObject() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         ByteArrayOutputStream output = new ByteArrayOutputStream();
         ObjectOutputStream so = new ObjectOutputStream(output);
         so.writeObject(map);
@@ -231,6 +268,10 @@ public class InputMapTest extends SwingT
     }
 
     public void testReadObject() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         KeyStroke keyStroke1 = KeyStroke.getKeyStroke(KeyEvent.VK_1, 0);
         KeyStroke keyStroke2 = KeyStroke.getKeyStroke(KeyEvent.VK_2, 0);
         Object object1 = "object1";

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JCheckBoxMenuItemTest.java Wed May 26 09:31:07 2010
@@ -22,6 +22,7 @@ package javax.swing;
 import java.awt.event.ActionEvent;
 import javax.accessibility.AccessibleRole;
 import javax.swing.JToggleButton.ToggleButtonModel;
+import tests.support.Support_Excludes;
 
 public class JCheckBoxMenuItemTest extends JMenuItemTest {
     @Override
@@ -40,6 +41,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem()'
      */
     public void testJCheckBoxMenuItem() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertFalse(menuItem.isSelected());
         assertTrue("default buttonModel ", button.getModel() instanceof ToggleButtonModel);
         assertNull("icon ", button.getIcon());
@@ -55,6 +60,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(Icon)'
      */
     public void testJCheckBoxMenuItemIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = createNewIcon();
         menuItem = new JCheckBoxMenuItem(icon);
         assertTrue("default buttonModel ", button.getModel() instanceof ToggleButtonModel);
@@ -71,6 +80,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String)'
      */
     public void testJCheckBoxMenuItemString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text);
         assertFalse(menuItem.isSelected());
@@ -87,6 +100,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String, Icon)'
      */
     public void testJCheckBoxMenuItemStringIcon() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = createNewIcon();
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text, icon);
@@ -105,6 +122,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(Action)'
      */
     public void testJCheckBoxMenuItemAction() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         final String command = "dnammoc";
         final KeyStroke accelerator = KeyStroke.getKeyStroke('a');
         class MyAction extends AbstractAction {
@@ -159,6 +180,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.JCheckBoxMenuItem(String, Icon, boolean)'
      */
     public void testJCheckBoxMenuItemStringIconBoolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Icon icon = createNewIcon();
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text, icon, true);
@@ -180,6 +205,10 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         boolean assertedValue = (menuItem.getAccessibleContext() != null && menuItem
                 .getAccessibleContext().getClass().getName().equals(
                         "javax.swing.JCheckBoxMenuItem$AccessibleJCheckBoxMenuItem"));
@@ -193,6 +222,10 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetUIClassID() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("CheckBoxMenuItemUI", menuItem.getUIClassID());
     }
 
@@ -201,6 +234,10 @@ public class JCheckBoxMenuItemTest exten
      */
     @Override
     public void testGetSelectedObjects() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         String text = "texttext";
         menuItem = new JCheckBoxMenuItem(text);
         assertNull(((JCheckBoxMenuItem) menuItem).getSelectedObjects());
@@ -213,6 +250,10 @@ public class JCheckBoxMenuItemTest exten
      * Test method for 'javax.swing.JCheckBoxMenuItem.getState()'
      */
     public void testGetSetState() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("default Selected", ((JCheckBoxMenuItem) menuItem).getState(), menuItem
                 .isSelected());
         menuItem.setSelected(true);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDesktopPaneTest.java Wed May 26 09:31:07 2010
@@ -26,6 +26,7 @@ import javax.accessibility.AccessibleCon
 import javax.accessibility.AccessibleRole;
 import javax.swing.plaf.ComponentUI;
 import javax.swing.plaf.basic.BasicDesktopPaneUI;
+import tests.support.Support_Excludes;
 
 public class JDesktopPaneTest extends SwingTestCase {
     /*
@@ -82,6 +83,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for boolean isOpaque()
      */
     public void testIsOpaque() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("always returns true", desktop.isOpaque());
         desktop.setOpaque(false);
         assertTrue("always returns true", desktop.isOpaque());
@@ -91,6 +96,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for void updateUI()
      */
     public void testUpdateUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         desktop.updateUI();
         ComponentUI ui1 = desktop.getUI();
         ComponentUI ui2 = UIManager.getUI(desktop);
@@ -102,6 +111,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AccessibleContext c = desktop.getAccessibleContext();
         assertTrue("instanceof AccessibleJDesktopPane",
                 c instanceof JDesktopPane.AccessibleJDesktopPane);
@@ -112,11 +125,19 @@ public class JDesktopPaneTest extends Sw
      * Class under test for String paramString()
      */
     public void testParamString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestJDesktopPane desktop = new TestJDesktopPane();
         assertTrue(desktop.paramString() != null);
     }
 
     public void testJDesktopPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         desktop = new JDesktopPane();
         assertTrue(desktop.isFocusCycleRoot());
         assertFalse(desktop.isFocusTraversalPolicyProvider());
@@ -129,6 +150,10 @@ public class JDesktopPaneTest extends Sw
      *     DesktopPaneUI getUI()
      */
     public void testSetGetUI() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         BasicDesktopPaneUI ui = new BasicDesktopPaneUI();
         desktop.setUI(ui);
         assertTrue("UI is set", desktop.getUI() == ui);
@@ -140,6 +165,10 @@ public class JDesktopPaneTest extends Sw
      *     JInternalFrame getSelectedFrame()
      */
     public void testSetGetSelectedFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JInternalFrame f = new JInternalFrame();
         assertNull("null by default", desktop.getSelectedFrame());
         desktop.setSelectedFrame(f);
@@ -175,6 +204,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for JInternalFrame[] getAllFrames()
      */
     public void testGetAllFrames() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JInternalFrame[] frames = desktop.getAllFrames();
         assertTrue("empty array", frames.length == 0);
         addComponents();
@@ -186,6 +219,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for JInternalFrame[] getAllFramesInLayer(int)
      */
     public void testGetAllFramesInLayer() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JInternalFrame[] frames; // = desktop.getAllFramesInLayer(1);
         //assertTrue("empty array", frames.length == 0);
         addComponents();
@@ -211,6 +248,10 @@ public class JDesktopPaneTest extends Sw
      *     DesktopManager getDesktopManager()
      */
     public void testSetGetDesktopManager() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MyPropertyChangeListener l = new MyPropertyChangeListener();
         DesktopManager m = new DefaultDesktopManager();
         assertTrue("not null by default", desktop.getDesktopManager() != null);
@@ -226,6 +267,10 @@ public class JDesktopPaneTest extends Sw
      * Class under test for String getUIClassID()
      */
     public void testGetUIClassID() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("", desktop.getUIClassID() == "DesktopPaneUI");
     }
 
@@ -235,6 +280,10 @@ public class JDesktopPaneTest extends Sw
      *     int getDragMode()
      */
     public void testSetGetDragMode() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue("initial ok", desktop.getDragMode() == JDesktopPane.LIVE_DRAG_MODE);
         desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);
         assertTrue("set", desktop.getDragMode() == JDesktopPane.OUTLINE_DRAG_MODE);

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JDialogTest.java Wed May 26 09:31:07 2010
@@ -34,6 +34,7 @@ import java.beans.PropertyChangeListener
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleState;
+import tests.support.Support_Excludes;
 
 public class JDialogTest extends SwingTestCase {
     /*
@@ -133,6 +134,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog()
      */
     public void testJDialog() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         dialog = new JDialog();
         // title == null, isModal() == false
         checkDialogCorrectness(dialog, null, false);
@@ -142,6 +147,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void dialogInit()
      */
     public void testDialogInit() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         assertTrue("onwer is not null", dialog.getOwner() != null);
         assertTrue("rootPaneCheckingEnabled is true", dialog.isRootPaneCheckingEnabled());
@@ -177,6 +186,10 @@ public class JDialogTest extends SwingTe
      *     int getDefaultCloseOperation()
      */
     public void testSetGetDefaultCloseOperation() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // default value is JDialog.HIDE_ON_CLOSE
         assertEquals(WindowConstants.HIDE_ON_CLOSE, dialog.getDefaultCloseOperation());
         // test setting valid value
@@ -206,6 +219,10 @@ public class JDialogTest extends SwingTe
      *     static boolean isDefaultLookAndFeelDecorated()
      */
     public void testSetIsDefaultLookAndFeelDecorated() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // test for default value
         assertFalse(JDialog.isDefaultLookAndFeelDecorated());
         JDialog.setDefaultLookAndFeelDecorated(true);
@@ -220,6 +237,10 @@ public class JDialogTest extends SwingTe
      *     boolean isRootPaneCheckingEnabled()
      */
     public void testSetIsRootPaneCheckingEnabled() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         assertTrue("rootPaneCheckingEnabled is true by default", dialog
                 .isRootPaneCheckingEnabled());
@@ -232,6 +253,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String, boolean, GraphicsConfiguration)
      */
     public void testJDialogFrameStringbooleanGraphicsConfiguration() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame owner = new Frame();
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
@@ -261,6 +286,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String, boolean, GraphicsConfiguration)
      */
     public void testJDialogDialogStringbooleanGraphicsConfiguration() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Dialog owner = new Dialog(new Frame());
         final GraphicsConfiguration gc = GraphicsEnvironment.getLocalGraphicsEnvironment()
                 .getDefaultScreenDevice().getDefaultConfiguration();
@@ -283,6 +312,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String, boolean)
      */
     public void testJDialogFrameStringboolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame owner = new Frame();
         // test with corrent owner, correct title, modal == false
         dialog = new JDialog(owner, "Test JDialog", false);
@@ -308,6 +341,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, String)
      */
     public void testJDialogFrameString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame owner = new Frame();
         // test with corrent owner, correct title
         dialog = new JDialog(owner, "Test JDialog");
@@ -328,6 +365,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String, boolean)
      */
     public void testJDialogDialogStringboolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, correct title, modal == false
         dialog = new JDialog(owner, "Test JDialog", false);
@@ -351,6 +392,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, String)
      */
     public void testJDialogDialogString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, correct title
         dialog = new JDialog(owner, "Test JDialog");
@@ -369,6 +414,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame, boolean)
      */
     public void testJDialogFrameboolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame owner = new Frame();
         // test with corrent owner, modal == false
         dialog = new JDialog(owner, false);
@@ -390,6 +439,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Frame)
      */
     public void testJDialogFrame() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Frame owner = new Frame();
         // test with corrent owner
         dialog = new JDialog(owner);
@@ -406,6 +459,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog, boolean)
      */
     public void testJDialogDialogboolean() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner, modal == false
         dialog = new JDialog(owner, false);
@@ -424,6 +481,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void JDialog(Dialog)
      */
     public void testJDialogDialog() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         Dialog owner = new Dialog(new Frame());
         // test with corrent owner
         dialog = new JDialog(owner);
@@ -437,6 +498,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void addImpl(Component, Object, int)
      */
     public void testAddImpl() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         JComponent comp = new JPanel();
         // rootPaneCheckingEnabled is true, no exception since 1.5
@@ -471,6 +536,10 @@ public class JDialogTest extends SwingTe
      *     JRootPane getRootPane()
      */
     public void testSetGetRootPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         assertTrue("setRootPane() is called from the constructor", TestDialog.setRootPaneCalled);
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
@@ -489,6 +558,10 @@ public class JDialogTest extends SwingTe
      * Class under test for JRootPane createRootPane()
      */
     public void testCreateRootPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         assertTrue("createRootPane() is called from the constructor",
                 TestDialog.createRootPaneCalled);
@@ -502,6 +575,10 @@ public class JDialogTest extends SwingTe
      *     JMenuBar getJMenuBar()
      */
     public void testSetGetJMenuBarJMenuBar() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertNull(dialog.getJMenuBar());
         JMenuBar menuBar = new JMenuBar();
         dialog.setJMenuBar(menuBar);
@@ -516,6 +593,10 @@ public class JDialogTest extends SwingTe
      *     JLayeredPane getLayeredPane()
      */
     public void testSetGetLayeredPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("layeredPane", listener);
         JLayeredPane pane = new JLayeredPane();
@@ -541,6 +622,10 @@ public class JDialogTest extends SwingTe
      * Class under test for AccessibleContext getAccessibleContext()
      */
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         AccessibleContext c = dialog.getAccessibleContext();
         assertTrue("class is ok", c instanceof JDialog.AccessibleJDialog);
         assertTrue("AccessibleRole is ok", c.getAccessibleRole() == AccessibleRole.DIALOG);
@@ -562,6 +647,10 @@ public class JDialogTest extends SwingTe
      * Class under test for String paramString()
      */
     public void testParamString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         assertTrue("paramString() cannot return null", dialog.paramString() != null);
     }
@@ -570,6 +659,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void processWindowEvent(WindowEvent)
      */
     public void testProcessWindowEvent() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         dialog.setVisible(true);
         WindowEvent e = new WindowEvent(dialog, WindowEvent.WINDOW_CLOSING);
@@ -598,6 +691,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void setLayout(LayoutManager)
      */
     public void testSetLayout() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         TestDialog dialog = new TestDialog();
         LayoutManager contentLayout = dialog.getContentPane().getLayout();
         LayoutManager dialogLayout = dialog.getLayout();
@@ -634,6 +731,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void update(Graphics)
      */
     public void testUpdate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Note: painting code, cannot test
     }
 
@@ -643,6 +744,10 @@ public class JDialogTest extends SwingTe
      *     Container getContentPane()
      */
     public void testSetGetContentPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("contentPane", listener);
         JPanel pane = new JPanel();
@@ -670,6 +775,10 @@ public class JDialogTest extends SwingTe
      *     Component getGlassPane()
      */
     public void testSetGetGlassPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         MyPropertyChangeListener listener = new MyPropertyChangeListener();
         dialog.addPropertyChangeListener("glassPane", listener);
         JPanel pane = new JPanel();
@@ -695,6 +804,10 @@ public class JDialogTest extends SwingTe
      * Class under test for void remove(Component)
      */
     public void testRemove() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JComponent comp = new JPanel();
         dialog.getContentPane().add(comp);
         assertTrue("added to contentPane", dialog.isAncestorOf(comp));

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPaneTest.java Wed May 26 09:31:07 2010
@@ -44,6 +44,7 @@ import javax.swing.text.EditorKit;
 import javax.swing.text.Element;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyledEditorKit;
+import tests.support.Support_Excludes;
 
 //import javax.swing.text.html.HTMLEditorKit;
 //import javax.swing.text.rtf.RTFEditorKit;
@@ -192,6 +193,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetAccessibleContext() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -207,6 +212,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetPreferredSize() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (isHarmony()) {
             jep1.setMinimumSize(new Dimension(3, 3));
             JViewport parent = (JViewport) jep1.getParent();
@@ -217,10 +226,18 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetUIClassID() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("EditorPaneUI", jep.getUIClassID());
     }
 
     public void testGetScrollableTracksViewportWidthHeight() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JViewport parent = (JViewport) jep1.getParent();
         jep1.setMinimumSize(new Dimension(3, 3));
         Dimension minSize = jep1.getMinimumSize();
@@ -240,6 +257,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelection() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jep.setText("testReplaceSelection");
         jep.setSelectionStart(4);
         jep.setSelectionEnd(7);
@@ -263,6 +284,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelectionNotEditable() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         jep.setText("replaceSelectionNotEditable");
         jep.setEditable(false);
         jep.setSelectionStart(3);
@@ -273,6 +298,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReplaceSelectionWithAttributes() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -314,6 +343,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetText() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -374,6 +407,10 @@ public class JEditorPaneTest extends Swi
      assertNotSame(contentKit1, contentKit2);
      }*/
     public void testRegisterEditorKitForContentTypeStringString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         JEditorPane.registerEditorKitForContentType("text/test1",
                 "javax.swing.text.DefaultEditorKit");
         assertEquals("javax.swing.text.DefaultEditorKit", JEditorPane
@@ -393,6 +430,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testRegisterEditorKitForContentTypeStringStringClassLoader() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -419,11 +460,19 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPane() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         checkBaseValues("javax.swing.text.PlainDocument",
                 "javax.swing.JEditorPane$PlainEditorKit", "text/plain", null, jep);
     }
 
     public void testJEditorPaneString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -437,6 +486,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneStringString() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -447,6 +500,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneURL() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -460,6 +517,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testJEditorPaneJarHTML() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-4529
         URL jar = getClass().getResource("testhtml.jar");
         URL url = new URL("jar:" + jar + "!/index.html");
@@ -475,6 +536,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testAddRemoveGetHyperlinkListener() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         HyperlinkListener listener1 = new SimpleHyperlinkListener("1");
         HyperlinkListener listener2 = new SimpleHyperlinkListener("2");
         HyperlinkListener listener3 = new SimpleHyperlinkListener("3");
@@ -515,6 +580,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testCreateDefaultEditorKit() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         EditorKit kit1 = jep.createDefaultEditorKit();
         EditorKit kit2 = jep.createDefaultEditorKit();
         assertEquals("javax.swing.JEditorPane$PlainEditorKit", kit1.getClass().getName());
@@ -526,6 +595,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testFireHyperlinkUpdate() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         SimpleHyperlinkListener listener1 = new SimpleHyperlinkListener("1");
         SimpleHyperlinkListener listener2 = new SimpleHyperlinkListener("2");
         SimpleHyperlinkListener listener3 = new SimpleHyperlinkListener("3");
@@ -555,6 +628,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetPage1() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         SimplePropertyChangeListener listener = new SimplePropertyChangeListener();
         jep.addPropertyChangeListener(listener);
         assertNull(jep.getPage());
@@ -576,6 +653,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetGetPage2() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -602,6 +683,10 @@ public class JEditorPaneTest extends Swi
      }
      }*/
     public void testReadHTML() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -643,6 +728,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReadPlain() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         byte bytes[] = plainString.getBytes();
         ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
         try {
@@ -655,6 +744,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testReadRTF() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -678,9 +771,17 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testScrollToReference() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     public void testSetGetContentType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -732,6 +833,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testGetContentType() throws IOException {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression for HARMONY-4696
         checkContentType("txt", "text/plain");
         checkContentType("html", "text/html");
@@ -782,6 +887,10 @@ public class JEditorPaneTest extends Swi
      .getEditorKitClassNameForContentType(content));
      }*/
     public void testSetGetEditorKit() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         if (true) {
             throw new UnsupportedOperationException("Not implemented");
         }
@@ -839,16 +948,28 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testConstants() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("JEditorPane.honorDisplayProperties", JEditorPane.HONOR_DISPLAY_PROPERTIES);
         assertEquals("JEditorPane.w3cLengthUnits", JEditorPane.W3C_LENGTH_UNITS);
     }
 
     public void testPlainEditorKit() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         EditorKit kit = jep.getEditorKit();
         assertEquals(kit, kit.getViewFactory());
     }
 
     public void testGetEditorKitClassNameForContentType() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertEquals("javax.swing.JEditorPane$PlainEditorKit", JEditorPane
                 .getEditorKitClassNameForContentType("text/plain"));
         assertEquals("javax.swing.text.html.HTMLEditorKit", JEditorPane
@@ -866,6 +987,10 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testSetEditorKitForContentType() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         try {          
             JEditorPane ep = new JEditorPane();
             ep.setEditorKitForContentType("abc", null);
@@ -892,12 +1017,20 @@ public class JEditorPaneTest extends Swi
     }
 
     public void testIsFocusCycleRoot() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test for HARMONY-2573
         assertTrue(new JEditorPane().isFocusCycleRoot());
     }
 
     public void testCreateEditorKitForContentType() throws Exception {
 
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         // Regression test for HARMONY-3453, HARMONY-3454
         final ClassLoader classLoader1 = new ArrayClassLoader();
         final ClassLoader classLoader2 = new ArrayClassLoader();

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JEditorPane_AccessibleJEditorPaneHTMLTest.java Wed May 26 09:31:07 2010
@@ -19,6 +19,8 @@
  */
 package javax.swing;
 
+import tests.support.Support_Excludes;
+
 public class JEditorPane_AccessibleJEditorPaneHTMLTest extends SwingTestCase {
     JEditorPane jep;
 
@@ -46,15 +48,31 @@ public class JEditorPane_AccessibleJEdit
     }
 
     public void testGetAccessibleText() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         assertTrue(accessible.getAccessibleText() instanceof JEditorPane.JEditorPaneAccessibleHypertextSupport);
     }
 
     public void testGetAccessibleAt() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     public void testGetAccessibleChild(final int i) {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
 
     public void testGetAccessibleChildrenCount() {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
     }
-}
\ No newline at end of file
+}

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java?rev=948377&r1=948376&r2=948377&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java (original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/swing/src/test/api/java.injected/javax/swing/JFileChooserRTest.java Wed May 26 09:31:07 2010
@@ -21,6 +21,7 @@ package javax.swing;
 
 import java.io.File;
 import javax.swing.filechooser.FileFilter;
+import tests.support.Support_Excludes;
 
 public class JFileChooserRTest extends BasicSwingTestCase {
     private JFileChooser chooser;
@@ -40,6 +41,10 @@ public class JFileChooserRTest extends B
     }
 
     public void testAddChoosableFileFilter() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         FileFilter ff = new FileFilter() {
             @Override
             public boolean accept(File file) {
@@ -63,6 +68,10 @@ public class JFileChooserRTest extends B
     }
 
     public void testGetSetSelectedFile() throws Exception {
+        if (Support_Excludes.isExcluded()) {
+            return;
+        }
+
         propertyChangeController = new PropertyChangeController();
         chooser.addPropertyChangeListener(propertyChangeController);
         assertNull(chooser.getSelectedFile());



Mime
View raw message