harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r373789 [3/9] - in /incubator/harmony/enhanced/classlib/trunk/modules/security2/test: common/unit/java/security/ common/unit/java/security/cert/ common/unit/java/security/interfaces/ common/unit/java/security/spec/ common/unit/javax/crypto/...
Date Tue, 31 Jan 2006 11:04:50 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.ProviderException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>ProviderException</code> class constructors and methods.
  * 
  */
-public class ProviderExceptionTest extends PerformanceTest {
+public class ProviderExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testProviderException01() {
         ProviderException tE = new ProviderException();
-        assertTrue(errNotExc, tE instanceof ProviderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         ProviderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new ProviderException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof ProviderException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testProviderException03() {
         String msg = null;
         ProviderException tE = new ProviderException(msg);
-        assertTrue(errNotExc, tE instanceof ProviderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -134,7 +130,6 @@
     public void testProviderException04() {
         Throwable cause = null;
         ProviderException tE = new ProviderException(cause);
-        assertTrue(errNotExc, tE instanceof ProviderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -151,7 +146,6 @@
      */
     public void testProviderException05() {
         ProviderException tE = new ProviderException(tCause);
-        assertTrue(errNotExc, tE instanceof ProviderException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -175,7 +169,6 @@
      */
     public void testProviderException06() {
         ProviderException tE = new ProviderException(null, null);
-        assertTrue(errNotExc, tE instanceof ProviderException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -194,8 +187,6 @@
         ProviderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new ProviderException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof ProviderException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -214,7 +205,6 @@
      */
     public void testProviderException08() {
         ProviderException tE = new ProviderException(null, tCause);
-        assertTrue(errNotExc, tE instanceof ProviderException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -240,8 +230,6 @@
         ProviderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new ProviderException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof ProviderException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -263,4 +251,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderServiceTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderServiceTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderServiceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderServiceTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.util.HashMap;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>Provider.Service</code> constructor and methods
  * 
  */
-public class ProviderServiceTest extends PerformanceTest {
+public class ProviderServiceTest extends TestCase {
 
 	public void testService() {
 		Provider p = new MyProvider();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java Tue Jan 31 03:01:12 2006
@@ -31,7 +31,7 @@
 import java.util.Map.Entry;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.test.TestUtils;
 
 
@@ -39,7 +39,7 @@
  * Tests for <code>Provider</code> constructor and methods
  * 
  */
-public class ProviderTest extends PerformanceTest {
+public class ProviderTest extends TestCase {
 
     Provider p;
     

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PublicKeyTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PublicKeyTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PublicKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PublicKeyTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.PublicKey;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * 
  */
 
-public class PublicKeyTest extends PerformanceTest {
+public class PublicKeyTest extends TestCase {
 
 
     /**
@@ -66,4 +66,4 @@
             return serialVersionUID;
         }        
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureClassLoaderTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureClassLoaderTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureClassLoaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureClassLoaderTest.java Tue Jan 31 03:01:12 2006
@@ -26,7 +26,7 @@
 import java.nio.ByteBuffer;
 import java.security.cert.Certificate;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -34,7 +34,7 @@
  * 
  */
 
-public class SecureClassLoaderTest extends PerformanceTest {
+public class SecureClassLoaderTest extends TestCase {
     /**
      * Entry point for stand alone runs.
      * 
@@ -227,4 +227,4 @@
         Class klass = ldr.defineClass(null, bbuf, null);
         assertEquals(klass.getName(), klassName);
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest1.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest1.java Tue Jan 31 03:01:12 2006
@@ -21,13 +21,13 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>SecureRandom</code> constructor and methods
  * 
  */
-public class SecureRandomTest1 extends PerformanceTest {
+public class SecureRandomTest1 extends TestCase {
 
 	/**
 	 * SRProvider

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest2.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest2.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.util.Random;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * Tests for internal Secure Random implementation based on Random
  * 
  */
-public class SecureRandomTest2 extends PerformanceTest {
+public class SecureRandomTest2 extends TestCase {
 	
 	/**
 	 * Registered providers

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityPermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityPermissionTest.java Tue Jan 31 03:01:12 2006
@@ -21,13 +21,13 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>SecurityPermission</code>
  * 
  */
-public class SecurityPermissionTest extends PerformanceTest {
+public class SecurityPermissionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(SecurityPermissionTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java Tue Jan 31 03:01:12 2006
@@ -26,14 +26,14 @@
 import java.util.Set;
 
 import org.apache.harmony.security.TestKeyPair;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>Security</code> constructor and methods
  * 
  */
-public class SecurityTest extends PerformanceTest {
+public class SecurityTest extends TestCase {
 
     public final void testMixed() {
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.SignatureException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>SignatureException</code> class constructors and methods.
  * 
  */
-public class SignatureExceptionTest extends PerformanceTest {
+public class SignatureExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testSignatureException01() {
         SignatureException tE = new SignatureException();
-        assertTrue(errNotExc, tE instanceof SignatureException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         SignatureException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new SignatureException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof SignatureException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testSignatureException03() {
         String msg = null;
         SignatureException tE = new SignatureException(msg);
-        assertTrue(errNotExc, tE instanceof SignatureException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -135,7 +131,6 @@
     public void testSignatureException04() {
         Throwable cause = null;
         SignatureException tE = new SignatureException(cause);
-        assertTrue(errNotExc, tE instanceof SignatureException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -152,7 +147,6 @@
      */
     public void testSignatureException05() {
         SignatureException tE = new SignatureException(tCause);
-        assertTrue(errNotExc, tE instanceof SignatureException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -176,7 +170,6 @@
      */
     public void testSignatureException06() {
         SignatureException tE = new SignatureException(null, null);
-        assertTrue(errNotExc, tE instanceof SignatureException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -195,8 +188,6 @@
         SignatureException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new SignatureException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof SignatureException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -215,7 +206,6 @@
      */
     public void testSignatureException08() {
         SignatureException tE = new SignatureException(null, tCause);
-        assertTrue(errNotExc, tE instanceof SignatureException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -241,8 +231,6 @@
         SignatureException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new SignatureException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof SignatureException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -264,4 +252,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest1.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest1.java Tue Jan 31 03:01:12 2006
@@ -21,13 +21,13 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>Signature</code> constructor and methods
  * 
  */
-public class SignatureTest1 extends PerformanceTest {
+public class SignatureTest1 extends TestCase {
 
 	/*
 	 * Class under test for Object clone()

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest2.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest2.java Tue Jan 31 03:01:12 2006
@@ -21,13 +21,13 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>Signature</code> constructor and methods
  * 
  */
-public class SignatureTest2 extends PerformanceTest {
+public class SignatureTest2 extends TestCase {
 
 	/**
 	 * Provider

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java Tue Jan 31 03:01:12 2006
@@ -26,14 +26,14 @@
 import java.util.Properties;
 
 import org.apache.harmony.security.TestKeyPair;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>SignedObject</code> constructor and methods
  * 
  */
-public class SignedObjectTest extends PerformanceTest {
+public class SignedObjectTest extends TestCase {
 
 	public void testSignedObject() {
 		Signature sig = null;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java Tue Jan 31 03:01:12 2006
@@ -22,7 +22,7 @@
 package java.security;
 
 import org.apache.harmony.security.*;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 
@@ -31,7 +31,7 @@
  * 
  */
 
-public class SignerTest extends PerformanceTest {
+public class SignerTest extends TestCase {
 
     public static class MySecurityManager extends SecurityManager {
         public Permissions denied = new Permissions(); 
@@ -71,18 +71,18 @@
      * verify  Signer.toString()
      */
     public void testToString() throws Exception {
-//        java.util.Enumeration e = IdentityScope.getSystemScope().identities();
-//        while(e.hasMoreElements())  System.out.println(e.nextElement());
-        
         Signer s1 = new SignerStub("testToString1");
-        logln(s1.toString());
+        s1.toString();
+
         Signer s2 = new SignerStub("testToString2", IdentityScope.getSystemScope());
-        logln(s2.toString());
+        s2.toString();
+
         KeyPair kp = new KeyPair(new PublicKeyStub("public", "SignerTest.testToString", null), new PrivateKeyStub("private", "SignerTest.testToString", null));
         s1.setKeyPair(kp);
-        logln(s1.toString());
+        s1.toString();
+
         s2.setKeyPair(kp);
-        logln(s2.toString());
+        s2.toString();
     }
 
     /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/TimestampTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/TimestampTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/TimestampTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/TimestampTest.java Tue Jan 31 03:01:12 2006
@@ -25,7 +25,7 @@
 import java.util.Date;
 
 import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -33,7 +33,7 @@
  * 
  */
 
-public class TimestampTest extends PerformanceTest {
+public class TimestampTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(TimestampTest.class);
@@ -112,4 +112,4 @@
         new Timestamp(now, cpath).toString();
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -21,14 +21,14 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>UnrecoverableEntryException</code> class
  * 
  */
 
-public class UnrecoverableEntryExceptionTest extends PerformanceTest {
+public class UnrecoverableEntryExceptionTest extends TestCase {
 
     /**
      * Constructor for UnrecoverableEntryExceptionTest.
@@ -85,4 +85,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.UnrecoverableKeyException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * methods.
  * 
  */
-public class UnrecoverableKeyExceptionTest extends PerformanceTest {
+public class UnrecoverableKeyExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -79,7 +79,6 @@
      */
     public void testUnrecoverableKeyException01() {
         UnrecoverableKeyException tE = new UnrecoverableKeyException();
-        assertTrue(errNotExc, tE instanceof UnrecoverableKeyException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -98,8 +97,6 @@
         UnrecoverableKeyException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new UnrecoverableKeyException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof UnrecoverableKeyException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -119,7 +116,6 @@
     public void testUnrecoverableKeyException03() {
         String msg = null;
         UnrecoverableKeyException tE = new UnrecoverableKeyException(msg);
-        assertTrue(errNotExc, tE instanceof UnrecoverableKeyException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -129,4 +125,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionCollectionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionCollectionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionCollectionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.util.*;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * 
  */
 
-public class UnresolvedPermissionCollectionTest extends PerformanceTest {
+public class UnresolvedPermissionCollectionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(UnresolvedPermissionCollectionTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionTest.java Tue Jan 31 03:01:12 2006
@@ -21,14 +21,14 @@
 
 package java.security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>UnresolvedPermission</code> class fields and methods
  * 
  */
 
-public class UnresolvedPermissionTest extends PerformanceTest {
+public class UnresolvedPermissionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(UnresolvedPermissionTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.cert.CRLException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>CRLException</code> class constructors and methods.
  * 
  */
-public class CRLExceptionTest extends PerformanceTest {
+public class CRLExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCRLException01() {
         CRLException tE = new CRLException();
-        assertTrue(errNotExc, tE instanceof CRLException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CRLException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CRLException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CRLException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testCRLException03() {
         String msg = null;
         CRLException tE = new CRLException(msg);
-        assertTrue(errNotExc, tE instanceof CRLException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -134,7 +130,6 @@
     public void testCRLException04() {
         Throwable cause = null;
         CRLException tE = new CRLException(cause);
-        assertTrue(errNotExc, tE instanceof CRLException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -150,7 +145,6 @@
      */
     public void testCRLException05() {
         CRLException tE = new CRLException(tCause);
-        assertTrue(errNotExc, tE instanceof CRLException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -174,7 +168,6 @@
      */
     public void testCRLException06() {
         CRLException tE = new CRLException(null, null);
-        assertTrue(errNotExc, tE instanceof CRLException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -193,8 +186,6 @@
         CRLException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CRLException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CRLException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -213,7 +204,6 @@
      */
     public void testCRLException08() {
         CRLException tE = new CRLException(null, tCause);
-        assertTrue(errNotExc, tE instanceof CRLException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -239,8 +229,6 @@
         CRLException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CRLException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CRLException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -262,4 +250,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLTest.java Tue Jan 31 03:01:12 2006
@@ -22,14 +22,14 @@
 package java.security.cert;
 
 import org.apache.harmony.security.cert.MyCRL;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>java.security.cert.CRL</code> fields and methods
  * 
  */
-public class CRLTest extends PerformanceTest {
+public class CRLTest extends TestCase {
 
     /*
      * @see TestCase#setUp()

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder1Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder1Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder1Test.java Tue Jan 31 03:01:12 2006
@@ -28,7 +28,7 @@
 import java.security.Security;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 
@@ -38,7 +38,7 @@
  * 
  */
 
-public class CertPathBuilder1Test extends PerformanceTest {
+public class CertPathBuilder1Test extends TestCase {
 
     /**
      * Constructor for CertPathBuilderTests.
@@ -381,4 +381,4 @@
     public myCertPathBuilder(CertPathBuilderSpi spi, Provider prov, String type) {
         super(spi, prov, type);
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder2Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder2Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder2Test.java Tue Jan 31 03:01:12 2006
@@ -28,7 +28,7 @@
 import java.security.Security;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -36,7 +36,7 @@
  * 
  */
 
-public class CertPathBuilder2Test extends PerformanceTest {
+public class CertPathBuilder2Test extends TestCase {
     private static final String defaultAlg = "CertPB";
     private static final String CertPathBuilderProviderClass = "java.security.cert.MyCertPathBuilderSpi";
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.cert.CertPathBuilderException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * methods.
  * 
  */
-public class CertPathBuilderExceptionTest extends PerformanceTest {
+public class CertPathBuilderExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -79,7 +79,6 @@
      */
     public void testCertPathBuilderException01() {
         CertPathBuilderException tE = new CertPathBuilderException();
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -98,8 +97,6 @@
         CertPathBuilderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathBuilderException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathBuilderException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -119,7 +116,6 @@
     public void testCertPathBuilderException03() {
         String msg = null;
         CertPathBuilderException tE = new CertPathBuilderException(msg);
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -137,7 +133,6 @@
     public void testCertPathBuilderException04() {
         Throwable cause = null;
         CertPathBuilderException tE = new CertPathBuilderException(cause);
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -154,7 +149,6 @@
      */
     public void testCertPathBuilderException05() {
         CertPathBuilderException tE = new CertPathBuilderException(tCause);
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -178,7 +172,6 @@
      */
     public void testCertPathBuilderException06() {
         CertPathBuilderException tE = new CertPathBuilderException(null, null);
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -197,8 +190,6 @@
         CertPathBuilderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathBuilderException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathBuilderException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -217,7 +208,6 @@
      */
     public void testCertPathBuilderException08() {
         CertPathBuilderException tE = new CertPathBuilderException(null, tCause);
-        assertTrue(errNotExc, tE instanceof CertPathBuilderException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -243,8 +233,6 @@
         CertPathBuilderException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathBuilderException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathBuilderException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -266,4 +254,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathTest.java Tue Jan 31 03:01:12 2006
@@ -22,14 +22,14 @@
 package java.security.cert;
 
 import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>CertPath</code> fields and methods
  * 
  */
-public class CertPathTest extends PerformanceTest {
+public class CertPathTest extends TestCase {
     /**
      * Meaningless cert path encoding just for testing purposes
      */
@@ -70,7 +70,7 @@
     public final void testHashCode() {
         CertPath cp1 = new MyCertPath(testEncoding);
         CertPath cp2 = new MyCertPath(testEncoding);
-        logln(getName() + ": " + cp1.hashCode());
+
         assertTrue(cp1.hashCode() == cp2.hashCode());
     }
 
@@ -138,9 +138,7 @@
      */
     public final void testToString() {
         CertPath cp1 = new MyCertPath(testEncoding);
-        String rep = cp1.toString(); 
-        logln(getName() + ": " + rep);
-        assertTrue(rep != null);
+        assertNotNull(cp1.toString());
     }
 
     //

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator1Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator1Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator1Test.java Tue Jan 31 03:01:12 2006
@@ -29,7 +29,7 @@
 
 import org.apache.harmony.security.SpiEngUtils;
 import org.apache.harmony.security.cert.MyCertPath;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 
@@ -40,7 +40,7 @@
  * 
  */
 
-public class CertPathValidator1Test extends PerformanceTest {
+public class CertPathValidator1Test extends TestCase {
 
     /**
      * Constructor for CertPathValidatorTests.
@@ -409,4 +409,4 @@
     public Object clone() {
         return new invalidParams();
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator2Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator2Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator2Test.java Tue Jan 31 03:01:12 2006
@@ -28,7 +28,7 @@
 import java.security.Security;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -36,7 +36,7 @@
  * 
  */
 
-public class CertPathValidator2Test extends PerformanceTest {
+public class CertPathValidator2Test extends TestCase {
     private static final String defaultAlg = "CertPB";
     
     public static final String CertPathValidatorProviderClass = "java.security.cert.MyCertPathValidatorSpi";

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator3Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator3Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator3Test.java Tue Jan 31 03:01:12 2006
@@ -30,14 +30,14 @@
 import org.apache.harmony.security.SpiEngUtils;
 import org.apache.harmony.security.cert.MyCertPath;
 import org.apache.harmony.security.cert.TestUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for <code>CertPathValidator</code> class  methods.
  * 
  */
 
-public class CertPathValidator3Test extends PerformanceTest {
+public class CertPathValidator3Test extends TestCase {
 
     /**
      * Constructor for CertPathValidatorTests.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -24,7 +24,7 @@
 import java.security.cert.CertPathValidatorException;
 import java.security.cert.CertPath;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -32,7 +32,7 @@
  * methods.
  * 
  */
-public class CertPathValidatorExceptionTest extends PerformanceTest {
+public class CertPathValidatorExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -80,7 +80,6 @@
      */
     public void testCertPathValidatorException01() {
         CertPathValidatorException tE = new CertPathValidatorException();
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -99,8 +98,6 @@
         CertPathValidatorException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathValidatorException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathValidatorException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -120,7 +117,6 @@
     public void testCertPathValidatorException03() {
         String msg = null;
         CertPathValidatorException tE = new CertPathValidatorException(msg);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -138,7 +134,6 @@
     public void testCertPathValidatorException04() {
         Throwable cause = null;
         CertPathValidatorException tE = new CertPathValidatorException(cause);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -155,7 +150,6 @@
      */
     public void testCertPathValidatorException05() {
         CertPathValidatorException tE = new CertPathValidatorException(tCause);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -180,7 +174,6 @@
     public void testCertPathValidatorException06() {
         CertPathValidatorException tE = new CertPathValidatorException(null,
                 null);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -199,8 +192,6 @@
         CertPathValidatorException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathValidatorException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathValidatorException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -220,7 +211,6 @@
     public void testCertPathValidatorException08() {
         CertPathValidatorException tE = new CertPathValidatorException(null,
                 tCause);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -246,8 +236,6 @@
         CertPathValidatorException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertPathValidatorException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertPathValidatorException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -280,7 +268,6 @@
     public void testCertPathValidatorException10() {
         CertPathValidatorException tE = new CertPathValidatorException(null,
                 null, null, -1);
-        assertTrue(errNotExc, tE instanceof CertPathValidatorException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         assertNull("getCertPath() must return null", tE.getCertPath());
@@ -301,13 +288,11 @@
      * IllegalArgumentException
      */
     public void testCertPathValidatorException11() {
-        CertPathValidatorException tE;
         int[] indx = { 0, 1, 100, Integer.MAX_VALUE, Integer.MIN_VALUE };
         for (int j = 0; j < indx.length; j++) {
             for (int i = 0; i < msgs.length; i++) {
                 try {
-                    tE = new CertPathValidatorException(msgs[i], tCause, null,
-                            indx[j]);
+                    new CertPathValidatorException(msgs[i], tCause, null, indx[j]);
                     fail("Error. IllegalArgumentException was not thrown as expected. "
                             + " msg: "
                             + msgs[i]
@@ -331,8 +316,6 @@
         for (int i = 0; i < msgs.length; i++) {
             try {
                 tE = new CertPathValidatorException(msgs[i], tCause, null, -1);
-                assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(
-                        ")"), tE instanceof CertPathValidatorException);
                 String getM = tE.getMessage();
                 String toS = tCause.toString();
                 if (msgs[i].length() > 0) {
@@ -370,7 +353,6 @@
      * certPath.getCertificates().size() throws: IndexOutOfBoundsException
      */
     public void testCertPathValidatorException13() {
-        CertPathValidatorException tE;
         myCertPath mcp = new myCertPath("X.509", "");
         CertPath cp = mcp.get("X.509");
         int[] indx = { -2, -100, 0, 1, 100, Integer.MAX_VALUE,
@@ -378,8 +360,7 @@
         for (int j = 0; j < indx.length; j++) {
             for (int i = 0; i < msgs.length; i++) {
                 try {
-                    tE = new CertPathValidatorException(msgs[i], tCause, cp,
-                            indx[j]);
+                    new CertPathValidatorException(msgs[i], tCause, cp, indx[j]);
                     fail("IndexOutOfBoundsException was not thrown as expected. "
                             + " msg: "
                             + msgs[i]
@@ -405,8 +386,6 @@
         for (int i = 0; i < msgs.length; i++) {
             try {
                 tE = new CertPathValidatorException(msgs[i], tCause, cp, -1);
-                assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(
-                        ")"), tE instanceof CertPathValidatorException);
                 String getM = tE.getMessage();
                 String toS = tCause.toString();
                 if (msgs[i].length() > 0) {
@@ -438,4 +417,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore1Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore1Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore1Test.java Tue Jan 31 03:01:12 2006
@@ -29,7 +29,7 @@
 import java.util.Collection;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 
@@ -39,7 +39,7 @@
  * 
  */
 
-public class CertStore1Test extends PerformanceTest {
+public class CertStore1Test extends TestCase {
 
     /**
      * Constructor for CertStoreTests.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore2Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore2Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore2Test.java Tue Jan 31 03:01:12 2006
@@ -29,7 +29,7 @@
 import java.util.Collection;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -37,7 +37,7 @@
  * 
  */
 
-public class CertStore2Test extends PerformanceTest {
+public class CertStore2Test extends TestCase {
     private static final String defaultAlg = "CertStore";
     private static final String CertStoreProviderClass = "java.security.cert.MyCertStoreSpi";
 
@@ -310,4 +310,4 @@
             return null;
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.cert.CertStoreException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>CertStoreException</code> class constructors and methods.
  * 
  */
-public class CertStoreExceptionTest extends PerformanceTest {
+public class CertStoreExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertStoreException01() {
         CertStoreException tE = new CertStoreException();
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertStoreException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertStoreException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertStoreException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testCertStoreException03() {
         String msg = null;
         CertStoreException tE = new CertStoreException(msg);
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -135,7 +131,6 @@
     public void testCertStoreException04() {
         Throwable cause = null;
         CertStoreException tE = new CertStoreException(cause);
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -152,7 +147,6 @@
      */
     public void testCertStoreException05() {
         CertStoreException tE = new CertStoreException(tCause);
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -176,7 +170,6 @@
      */
     public void testCertStoreException06() {
         CertStoreException tE = new CertStoreException(null, null);
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -195,8 +188,6 @@
         CertStoreException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertStoreException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertStoreException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -215,7 +206,6 @@
      */
     public void testCertStoreException08() {
         CertStoreException tE = new CertStoreException(null, tCause);
-        assertTrue(errNotExc, tE instanceof CertStoreException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -241,8 +231,6 @@
         CertStoreException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertStoreException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertStoreException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -264,4 +252,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreSpiTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreSpiTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreSpiTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreSpiTest.java Tue Jan 31 03:01:12 2006
@@ -24,7 +24,7 @@
 
 import java.security.InvalidAlgorithmParameterException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -34,7 +34,7 @@
  * 
  */
 
-public class CertStoreSpiTest extends PerformanceTest {
+public class CertStoreSpiTest extends TestCase {
 
     /**
      * Constructor for CertStoreSpiTest.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.cert.CertificateEncodingException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * methods.
  * 
  */
-public class CertificateEncodingExceptionTest extends PerformanceTest {
+public class CertificateEncodingExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -79,7 +79,6 @@
      */
     public void testCertificateEncodingException01() {
         CertificateEncodingException tE = new CertificateEncodingException();
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -98,8 +97,6 @@
         CertificateEncodingException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateEncodingException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateEncodingException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -119,7 +116,6 @@
     public void testCertificateEncodingException03() {
         String msg = null;
         CertificateEncodingException tE = new CertificateEncodingException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -138,7 +134,6 @@
         Throwable cause = null;
         CertificateEncodingException tE = new CertificateEncodingException(
                 cause);
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -156,7 +151,6 @@
     public void testCertificateEncodingException05() {
         CertificateEncodingException tE = new CertificateEncodingException(
                 tCause);
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -181,7 +175,6 @@
     public void testCertificateEncodingException06() {
         CertificateEncodingException tE = new CertificateEncodingException(
                 null, null);
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -200,8 +193,6 @@
         CertificateEncodingException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateEncodingException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateEncodingException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -221,7 +212,6 @@
     public void testCertificateEncodingException08() {
         CertificateEncodingException tE = new CertificateEncodingException(
                 null, tCause);
-        assertTrue(errNotExc, tE instanceof CertificateEncodingException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -247,8 +237,6 @@
         CertificateEncodingException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateEncodingException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateEncodingException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -270,4 +258,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.cert.CertificateException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>CertificateException</code> class constructors and methods.
  * 
  */
-public class CertificateExceptionTest extends PerformanceTest {
+public class CertificateExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertificateException01() {
         CertificateException tE = new CertificateException();
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertificateException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -118,7 +115,6 @@
     public void testCertificateException03() {
         String msg = null;
         CertificateException tE = new CertificateException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -136,7 +132,6 @@
     public void testCertificateException04() {
         Throwable cause = null;
         CertificateException tE = new CertificateException(cause);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -153,7 +148,6 @@
      */
     public void testCertificateException05() {
         CertificateException tE = new CertificateException(tCause);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -177,7 +171,6 @@
      */
     public void testCertificateException06() {
         CertificateException tE = new CertificateException(null, null);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -196,8 +189,6 @@
         CertificateException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -216,7 +207,6 @@
      */
     public void testCertificateException08() {
         CertificateException tE = new CertificateException(null, tCause);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -242,8 +232,6 @@
         CertificateException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -265,4 +253,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.cert.CertificateExpiredException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class CertificateExpiredExceptionTest extends PerformanceTest {
+public class CertificateExpiredExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertificateExpiredException01() {
         CertificateExpiredException tE = new CertificateExpiredException();
-        assertTrue(errNotExc, tE instanceof CertificateExpiredException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertificateExpiredException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateExpiredException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateExpiredException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -118,7 +115,6 @@
     public void testCertificateExpiredException03() {
         String msg = null;
         CertificateExpiredException tE = new CertificateExpiredException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateExpiredException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -128,4 +124,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory1Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory1Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory1Test.java Tue Jan 31 03:01:12 2006
@@ -36,7 +36,7 @@
 import org.apache.harmony.security.SpiEngUtils;
 import org.apache.harmony.security.cert.MyCertPath;
 import org.apache.harmony.security.cert.MyCertificate;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -44,7 +44,7 @@
  * 
  */
 
-public class CertificateFactory1Test extends PerformanceTest {
+public class CertificateFactory1Test extends TestCase {
 
     /**
      * Constructor for CertificateFactoryTests.
@@ -114,8 +114,6 @@
         for (int i = 0; i < validValues.length; i++) {
             CertificateFactory certF = CertificateFactory
                     .getInstance(validValues[i]);
-            assertTrue("Not CertificateFactory object",
-                    certF instanceof CertificateFactory);
             assertEquals("Incorrect type: ", validValues[i], certF.getType());
         }
     }
@@ -213,8 +211,6 @@
         for (int i = 0; i < validValues.length; i++) {
             certF = CertificateFactory.getInstance(validValues[i],
                     defaultProviderName);
-            assertTrue("Not CertificateFactory object",
-                    certF instanceof CertificateFactory);
             assertEquals("Incorrect type", certF.getType(), validValues[i]);
             assertEquals("Incorrect provider name", certF.getProvider()
                     .getName(), defaultProviderName);
@@ -286,8 +282,6 @@
         for (int i = 0; i < validValues.length; i++) {
             certF = CertificateFactory.getInstance(validValues[i],
                     defaultProvider);
-            assertTrue("Not CertificateFactory object",
-                    certF instanceof CertificateFactory);
             assertEquals("Incorrect provider", certF.getProvider(),
                     defaultProvider);
             assertEquals("Incorrect type", certF.getType(), validValues[i]);
@@ -314,7 +308,7 @@
             String s1 = (String) it1.next();
             boolean yesNo = false;
             while (it2.hasNext()) {
-                if (s1.equals((String) it2.next())) {
+                if (s1.equals(it2.next())) {
                     yesNo = true;
                     break;
                 }
@@ -330,7 +324,7 @@
             String s1 = (String) it1.next();
             boolean yesNo = false;
             while (it2.hasNext()) {
-                if (s1.equals((String) it2.next())) {
+                if (s1.equals(it2.next())) {
                     yesNo = true;
                     break;
                 }
@@ -358,10 +352,8 @@
         CertificateFactory[] certFs = initCertFs();
         assertNotNull("CertificateFactory objects were not created", certFs);
         byte [] bb = {};
-        InputStream is = (InputStream) new ByteArrayInputStream(bb);
-        Certificate cer;
+        InputStream is = new ByteArrayInputStream(bb);
         Collection colCer;
-        CRL crl;
         Collection colCrl;
         for (int i = 0; i < certFs.length; i++) {
             try {
@@ -370,20 +362,19 @@
             } catch (CertificateException e) {
             } catch (NullPointerException e) {
             }
-            is = (InputStream) new ByteArrayInputStream(bb);
+            is = new ByteArrayInputStream(bb);
             try {
                 certFs[i].generateCertificates(null);
                 fail("generateCertificates must throw CertificateException or NullPointerException when input stream is null");
             } catch (CertificateException e) {
             } catch (NullPointerException e) {
             }
-            is = (InputStream) new ByteArrayInputStream(bb);
+            is = new ByteArrayInputStream(bb);
             try {
-                cer = certFs[i].generateCertificate(is);
-                logln("generateCertificate(..) returns certificate: " + cer);
+                certFs[i].generateCertificate(is);
             } catch (CertificateException e) {
             }
-            is = (InputStream) new ByteArrayInputStream(bb);
+            is = new ByteArrayInputStream(bb);
             try {
                 colCer = certFs[i].generateCertificates(is);
                 if (colCer != null) {
@@ -394,8 +385,7 @@
         }
         for (int i = 0; i < certFs.length; i++) {
             try {
-                crl = certFs[i].generateCRL(null);
-                logln("generateCRL(..) returns from null stream CRL: " + crl);
+                certFs[i].generateCRL(null);
             } catch (CRLException e) {
             } catch (NullPointerException e) {
             }
@@ -407,13 +397,12 @@
             } catch (CRLException e) {
             } catch (NullPointerException e) {
             }
-            is = (InputStream) new ByteArrayInputStream(bb);
+            is = new ByteArrayInputStream(bb);
             try {
-                 crl = certFs[i].generateCRL(is);
-                 logln("generateCRL(..) returns from empty stream CRL: " + crl);
+                 certFs[i].generateCRL(is);
             } catch (CRLException e) {
             }
-            is = (InputStream) new ByteArrayInputStream(bb);
+            is = new ByteArrayInputStream(bb);
             try {
                 certFs[i].generateCRLs(is);
                 colCrl = certFs[i].generateCRLs(null);
@@ -504,8 +493,7 @@
         CertificateFactory[] certFs = initCertFs();
         assertNotNull("CertificateFactory objects were not created", certFs);
         InputStream is1 = null;
-        InputStream is2 = (InputStream) new ByteArrayInputStream(new byte[10]);
-        String provider = null;
+        InputStream is2 = new ByteArrayInputStream(new byte[10]);
 
         for (int i = 0; i < certFs.length; i++) {
             try {
@@ -595,7 +583,6 @@
         CertificateFactory[] certFs = initCertFs();
         assertNotNull("CertificateFactory objects were not created", certFs);
         List list = null;
-        String provider = null;
         for (int i = 0; i < certFs.length; i++) {
             try {
                 certFs[i].generateCertPath(list);
@@ -619,7 +606,7 @@
         }
         CertificateFactory[] certFs = initCertFs();
         assertNotNull("CertificateFactory objects were not created", certFs); 
-        List list = (List) new Vector();
+        List list = new Vector();
         for (int i = 0; i < certFs.length; i++) {
             CertPath cp = certFs[i].generateCertPath(list);
             List list1 = cp.getCertificates();
@@ -641,7 +628,7 @@
         CertificateFactory[] certFs = initCertFs();
         assertNotNull("CertificateFactory objects were not created", certFs);
         MyCertificate ms = createMC();
-        List list = (List) new Vector();
+        List list = new Vector();
         list.add(ms);
         for (int i = 0; i < certFs.length; i++) {
             try {
@@ -665,7 +652,6 @@
         CertificateFactorySpi spi = new MyCertificateFactorySpi(); 
         CertificateFactory cf = new myCertificateFactory(spi, defaultProvider,
                 defaultType);
-        assertTrue("Not CertificateFactory object", cf instanceof CertificateFactory);
         assertEquals("Incorrect type", cf.getType(), defaultType);
         assertEquals("Incorrect provider", cf.getProvider(), defaultProvider);
         try {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory2Test.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory2Test.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory2Test.java Tue Jan 31 03:01:12 2006
@@ -32,7 +32,7 @@
 import java.util.List;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -40,7 +40,7 @@
  * 
  */
 
-public class CertificateFactory2Test extends PerformanceTest {
+public class CertificateFactory2Test extends TestCase {
     private static final String defaultAlg = "CertFac";
     private static final String CertificateFactoryProviderClass = "java.security.cert.MyCertificateFactorySpi";
     
@@ -341,4 +341,4 @@
         IllegalArgumentException, CRLException {
         GetInstance03(false);   
     }
-}
\ No newline at end of file
+}



Mime
View raw message