Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 27299 invoked from network); 31 Jan 2006 11:17:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Jan 2006 11:17:25 -0000 Received: (qmail 51095 invoked by uid 500); 31 Jan 2006 11:15:50 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 50813 invoked by uid 500); 31 Jan 2006 11:15:48 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 50769 invoked by uid 99); 31 Jan 2006 11:15:47 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jan 2006 03:15:47 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 31 Jan 2006 03:15:44 -0800 Received: (qmail 26256 invoked by uid 65534); 31 Jan 2006 11:15:23 -0000 Message-ID: <20060131111523.26236.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r373789 [8/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 -0000 To: harmony-commits@incubator.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java Tue Jan 31 03:01:12 2006 @@ -32,7 +32,7 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.harmony.security.SpiEngUtils; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; @@ -42,7 +42,7 @@ * */ -public class MacTest1 extends PerformanceTest { +public class MacTest1 extends TestCase { public static final String srvMac = "Mac"; @@ -139,7 +139,6 @@ Mac mac; for (int i = 0; i < validValues.length; i++) { mac = Mac.getInstance(validValues[i]); - assertTrue("Not Mac object", mac instanceof Mac); assertEquals("Incorrect algorithm", mac.getAlgorithm(), validValues[i]); } } @@ -218,7 +217,6 @@ Mac mac; for (int i = 0; i < validValues.length; i++) { mac = Mac.getInstance(validValues[i], defaultProviderName); - assertTrue("Not Mac object", mac instanceof Mac); assertEquals("Incorrect algorithm", mac.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", mac.getProvider().getName(), defaultProviderName); @@ -284,7 +282,6 @@ Mac mac; for (int i = 0; i < validValues.length; i++) { mac = Mac.getInstance(validValues[i], defaultProvider); - assertTrue("Not Mac object", mac instanceof Mac); assertEquals("Incorrect algorithm", mac.getAlgorithm(), validValues[i]); assertEquals("Incorrect provider", mac.getProvider(), defaultProvider); } @@ -548,12 +545,10 @@ for (int i = 0; i < macs.length; i++) { try { Mac mac1 = (Mac) macs[i].clone(); - assertTrue(mac1 instanceof Mac); assertEquals(mac1.getAlgorithm(), macs[i].getAlgorithm()); assertEquals(mac1.getProvider(), macs[i].getProvider()); assertFalse(macs[i].equals(mac1)); } catch (CloneNotSupportedException e) { - logln("clone() is not supported"); } } } @@ -577,19 +572,20 @@ byte [] b = {(byte)1, (byte)2, (byte)3, (byte)4, (byte)5}; SecretKeySpec sks = new SecretKeySpec(b, "SHA1"); DHGenParameterSpec algPS = new DHGenParameterSpec(1, 2); - byte [] bb1; - byte [] bb2; + for (int i = 0; i < macs.length; i++) { try { macs[i].init(sks, algPS); - logln("init(..) ignore incorrect AlgorithmParameterSpec parameter"); + fail("init(..) accepts incorrect AlgorithmParameterSpec parameter"); } catch (InvalidAlgorithmParameterException e) { } + try { macs[i].init(null, null); fail("InvalidKeyException must be thrown"); } catch (InvalidKeyException e) { } + try { macs[i].init(null); fail("InvalidKeyException must be thrown"); @@ -696,10 +692,6 @@ assertTrue("Object should not be equals", !macs[i].equals(res)); assertEquals("Incorrect class", macs[i].getClass(), res.getClass()); } catch (CloneNotSupportedException e) { - if (!(macs[i] instanceof Cloneable)) { - fail("Unexcpected CloneNotSupportedException was thrown"); - } - } } } @@ -768,7 +760,6 @@ } MacSpi spi = new MyMacSpi(); Mac mac = new myMac(spi, defaultProvider, defaultAlgorithm); - assertTrue("Not Mac object", mac instanceof Mac); assertEquals("Incorrect algorithm", mac.getAlgorithm(), defaultAlgorithm); assertEquals("Incorrect provider", mac.getProvider(), defaultProvider); @@ -780,7 +771,6 @@ assertEquals("Invalid mac length", mac.getMacLength(), 0); mac = new myMac(null, null, null); - assertTrue("Not Mac object", mac instanceof Mac); assertNull("Algorithm must be null", mac.getAlgorithm()); assertNull("Provider must be null", mac.getProvider()); try { @@ -813,4 +803,4 @@ String algorithm) { super(macSpi, provider, algorithm); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java Tue Jan 31 03:01:12 2006 @@ -34,7 +34,7 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.harmony.security.SpiEngUtils; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -42,7 +42,7 @@ * */ -public class MacTest2 extends PerformanceTest { +public class MacTest2 extends TestCase { private static final String defaultAlg = "MyMacProv"; @@ -292,4 +292,4 @@ return null; } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NoSuchPaddingExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NoSuchPaddingExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NoSuchPaddingExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NoSuchPaddingExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,7 +23,7 @@ import javax.crypto.NoSuchPaddingException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -31,7 +31,7 @@ * methods. * */ -public class NoSuchPaddingExceptionTest extends PerformanceTest { +public class NoSuchPaddingExceptionTest extends TestCase { public static void main(String[] args) { } @@ -79,7 +79,6 @@ */ public void testNoSuchPaddingException01() { NoSuchPaddingException tE = new NoSuchPaddingException(); - assertTrue(errNotExc, tE instanceof NoSuchPaddingException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -98,8 +97,6 @@ NoSuchPaddingException tE; for (int i = 0; i < msgs.length; i++) { tE = new NoSuchPaddingException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof NoSuchPaddingException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -119,7 +116,6 @@ public void testNoSuchPaddingException03() { String msg = null; NoSuchPaddingException tE = new NoSuchPaddingException(msg); - assertTrue(errNotExc, tE instanceof NoSuchPaddingException); 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/javax/crypto/NullCipherTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NullCipherTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NullCipherTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NullCipherTest.java Tue Jan 31 03:01:12 2006 @@ -23,7 +23,7 @@ import javax.crypto.spec.SecretKeySpec; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; import java.security.*; @@ -31,7 +31,7 @@ * * Tests for NullCipher */ -public class NullCipherTest extends PerformanceTest { +public class NullCipherTest extends TestCase { private Cipher c; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactorySpiTests.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactorySpiTests.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactorySpiTests.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactorySpiTests.java Tue Jan 31 03:01:12 2006 @@ -25,7 +25,7 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -33,7 +33,7 @@ * */ -public class SecretKeyFactorySpiTests extends PerformanceTest { +public class SecretKeyFactorySpiTests extends TestCase { /** * Constructor for SecretKeyfactorySpiTests. Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java Tue Jan 31 03:01:12 2006 @@ -33,7 +33,7 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.harmony.security.SpiEngUtils; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -41,7 +41,7 @@ * */ -public class SecretKeyFactoryTest1 extends PerformanceTest { +public class SecretKeyFactoryTest1 extends TestCase { public static final String srvSecretKeyFactory = "SecretKeyFactory"; @@ -457,4 +457,4 @@ public mySecretKeyFactory(SecretKeyFactorySpi spi, Provider prov, String alg) { super(spi, prov, alg); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java Tue Jan 31 03:01:12 2006 @@ -30,7 +30,7 @@ import java.security.spec.KeySpec; import org.apache.harmony.security.SpiEngUtils; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -38,7 +38,7 @@ * */ -public class SecretKeyFactoryTest2 extends PerformanceTest { +public class SecretKeyFactoryTest2 extends TestCase { private static final String defaultAlg = "MySecretKey"; private static final String SecretKeyFactoryProviderClass = "javax.crypto.MySecretKeyFactorySpi"; @@ -241,4 +241,4 @@ checkResult(skf); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.crypto.SecretKey; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SecretKey class field * */ -public class SecretKeyTest extends PerformanceTest { +public class SecretKeyTest extends TestCase { /** * Constructor for SecretKeyTest. @@ -65,4 +65,4 @@ return serialVersionUID; } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ShortBufferExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ShortBufferExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ShortBufferExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ShortBufferExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.crypto.ShortBufferException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for ShortBufferException class constructors and methods. * */ -public class ShortBufferExceptionTest extends PerformanceTest { +public class ShortBufferExceptionTest extends TestCase { public static void main(String[] args) { } @@ -78,7 +78,6 @@ */ public void testShortBufferException01() { ShortBufferException tE = new ShortBufferException(); - assertTrue(errNotExc, tE instanceof ShortBufferException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -97,8 +96,6 @@ ShortBufferException tE; for (int i = 0; i < msgs.length; i++) { tE = new ShortBufferException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof ShortBufferException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -118,7 +115,6 @@ public void testShortBufferException03() { String msg = null; ShortBufferException tE = new ShortBufferException(msg); - assertTrue(errNotExc, tE instanceof ShortBufferException); 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/javax/crypto/interfaces/DHPrivateKeyTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPrivateKeyTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPrivateKeyTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPrivateKeyTest.java Tue Jan 31 03:01:12 2006 @@ -24,7 +24,7 @@ import javax.crypto.interfaces.DHPrivateKey; import javax.crypto.spec.DHParameterSpec; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; import java.math.BigInteger; @@ -33,7 +33,7 @@ * Tests for DHPrivateKey class field * */ -public class DHPrivateKeyTest extends PerformanceTest { +public class DHPrivateKeyTest extends TestCase { /** * Constructor for DHPrivateKey. @@ -74,4 +74,4 @@ return null; } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPublicKeyTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPublicKeyTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPublicKeyTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPublicKeyTest.java Tue Jan 31 03:01:12 2006 @@ -26,14 +26,14 @@ import javax.crypto.interfaces.DHPublicKey; import javax.crypto.spec.DHParameterSpec; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for DHPublicKey class field * */ -public class DHPublicKeyTest extends PerformanceTest { +public class DHPublicKeyTest extends TestCase { public static void main(String[] args) { } @@ -90,4 +90,4 @@ return null; } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/PBEKeyTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/PBEKeyTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/PBEKeyTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/PBEKeyTest.java Tue Jan 31 03:01:12 2006 @@ -25,14 +25,14 @@ import javax.crypto.interfaces.PBEKey; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for PBEKey class field * */ -public class PBEKeyTest extends PerformanceTest { +public class PBEKeyTest extends TestCase { /** @@ -79,4 +79,4 @@ return new char[0]; } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ServerSocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ServerSocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ServerSocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ServerSocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -27,14 +27,14 @@ import java.net.SocketException; import java.net.UnknownHostException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for ServerSocketFactory class constructors and methods. */ -public class ServerSocketFactoryTest extends PerformanceTest { +public class ServerSocketFactoryTest extends TestCase { /* * Class under test for java.net.ServerSocket createServerSocket() */ Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/SocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/SocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/SocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/SocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -27,13 +27,13 @@ import java.net.SocketException; import java.net.UnknownHostException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SocketFactory class methods. */ -public class SocketFactoryTest extends PerformanceTest { +public class SocketFactoryTest extends TestCase { /* * Class under test for java.net.Socket createSocket() @@ -99,4 +99,4 @@ throw new IOException(); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/CertPathTrustManagerParametersTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/CertPathTrustManagerParametersTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/CertPathTrustManagerParametersTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/CertPathTrustManagerParametersTest.java Tue Jan 31 03:01:12 2006 @@ -22,7 +22,7 @@ import java.security.cert.CertPathParameters; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -30,7 +30,7 @@ * and methods. * */ -public class CertPathTrustManagerParametersTest extends PerformanceTest { +public class CertPathTrustManagerParametersTest extends TestCase { public void testCertPathTrustManagerParameters() { CertPathParameters parameters = new MyCertPathParameters(); @@ -46,4 +46,4 @@ public Object clone() { return new MyCertPathParameters(); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -24,14 +24,14 @@ import java.net.InetAddress; import java.net.SocketException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for DefaultSSLServerSocketFactory class constructors and methods. * */ -public class DefaultSSLServerSocketFactoryTest extends PerformanceTest { +public class DefaultSSLServerSocketFactoryTest extends TestCase { /* * Class under test for ServerSocket createServerSocket(int) Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLSocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLSocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLSocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLSocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -25,7 +25,7 @@ import java.net.Socket; import java.net.SocketException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -33,7 +33,7 @@ * methods. * */ -public class DefaultSSLSocketFactoryTest extends PerformanceTest { +public class DefaultSSLSocketFactoryTest extends TestCase { /* * Class under test for Socket createSocket(String, int) @@ -123,4 +123,4 @@ fail(e.toString()); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HandshakeCompletedEventTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HandshakeCompletedEventTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HandshakeCompletedEventTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HandshakeCompletedEventTest.java Tue Jan 31 03:01:12 2006 @@ -24,7 +24,7 @@ import java.io.IOException; import javax.net.SocketFactory; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; import java.net.ServerSocket; import java.security.cert.Certificate; @@ -34,7 +34,7 @@ * Tests for HandshakeCompletedEvent class constructors and methods. * */ -public class HandshakeCompletedEventTest extends PerformanceTest { +public class HandshakeCompletedEventTest extends TestCase { int port; @@ -159,4 +159,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HttpsURLConnectionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HttpsURLConnectionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HttpsURLConnectionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HttpsURLConnectionTest.java Tue Jan 31 03:01:12 2006 @@ -25,14 +25,14 @@ import java.security.cert.Certificate; import java.net.URL; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for HttpsURLConnection class constructors and methods. * */ -public class HttpsURLConnectionTest extends PerformanceTest { +public class HttpsURLConnectionTest extends TestCase { public final void testGetPeerPrincipal() { HttpsURLConnection con = new MyHttpsURLConnection(null); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyManagerFactorySpiTests.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyManagerFactorySpiTests.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyManagerFactorySpiTests.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyManagerFactorySpiTests.java Tue Jan 31 03:01:12 2006 @@ -28,7 +28,7 @@ import javax.net.ssl.KeyManagerFactorySpi; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -36,7 +36,7 @@ * */ -public class KeyManagerFactorySpiTests extends PerformanceTest { +public class KeyManagerFactorySpiTests extends TestCase { /** * Constructor for KeyManegerFactorySpiTests. Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyStoreBuilderParametersTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyStoreBuilderParametersTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyStoreBuilderParametersTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyStoreBuilderParametersTest.java Tue Jan 31 03:01:12 2006 @@ -26,7 +26,7 @@ import java.security.KeyStore; import java.security.KeyStoreException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -34,7 +34,7 @@ * methods. * */ -public class KeyStoreBuilderParametersTest extends PerformanceTest { +public class KeyStoreBuilderParametersTest extends TestCase { /* * Class under test for void KeyStoreBuilderParameters(KeyStore.Builder) @@ -111,4 +111,4 @@ throws KeyStoreException { return null; } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLContextSpiTests.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLContextSpiTests.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLContextSpiTests.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLContextSpiTests.java Tue Jan 31 03:01:12 2006 @@ -28,7 +28,7 @@ import javax.net.ssl.SSLContextSpi; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -36,7 +36,7 @@ * */ -public class SSLContextSpiTests extends PerformanceTest { +public class SSLContextSpiTests extends TestCase { /** * Constructor for SSLContextSpiTests. * @@ -97,4 +97,4 @@ assertNull("Not null result", sslConSpi.engineGetServerSessionContext()); assertNull("Not null result", sslConSpi.engineGetClientSessionContext()); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLEngineResultTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLEngineResultTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLEngineResultTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLEngineResultTest.java Tue Jan 31 03:01:12 2006 @@ -21,14 +21,14 @@ package javax.net.ssl; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Template tests for SSLEngineResult class * FIXME: uncommente these tests * */ -public class SSLEngineResultTest extends PerformanceTest { +public class SSLEngineResultTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(SSLEngineResultTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.net.ssl.SSLException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLException class constructors and methods. * */ -public class SSLExceptionTest extends PerformanceTest { +public class SSLExceptionTest extends TestCase { public static void main(String[] args) { } @@ -81,8 +81,6 @@ SSLException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -101,7 +99,6 @@ public void testSSLException02() { String msg = null; SSLException tE = new SSLException(msg); - assertTrue(errNotExc, tE instanceof SSLException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -118,7 +115,6 @@ public void testSSLException03() { Throwable cause = null; SSLException tE = new SSLException(cause); - assertTrue(errNotExc, tE instanceof SSLException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -134,7 +130,6 @@ */ public void testSSLException04() { SSLException tE = new SSLException(tCause); - assertTrue(errNotExc, tE instanceof SSLException); if (tE.getMessage() != null) { String toS = tCause.toString(); String getM = tE.getMessage(); @@ -162,7 +157,6 @@ */ public void testSSLException05() { SSLException tE = new SSLException(null, null); - assertTrue(errNotExc, tE instanceof SSLException); assertNull("getMessage() must return null", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -181,8 +175,6 @@ SSLException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLException(msgs[i], null); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -201,7 +193,6 @@ */ public void testSSLException07() { SSLException tE = new SSLException(null, tCause); - assertTrue(errNotExc, tE instanceof SSLException); if (tE.getMessage() != null) { String toS = tCause.toString(); String getM = tE.getMessage(); @@ -231,8 +222,6 @@ SSLException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLException(msgs[i], tCause); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLException); String getM = tE.getMessage(); String toS = tCause.toString(); if (msgs[i].length() > 0) { @@ -259,4 +248,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLHandshakeExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLHandshakeExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLHandshakeExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLHandshakeExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,7 +23,7 @@ import javax.net.ssl.SSLHandshakeException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -31,7 +31,7 @@ * methods. * */ -public class SSLHandshakeExceptionTest extends PerformanceTest { +public class SSLHandshakeExceptionTest extends TestCase { public static void main(String[] args) { } @@ -82,8 +82,6 @@ SSLHandshakeException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLHandshakeException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLHandshakeException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -103,7 +101,6 @@ public void testSSLHandshakeException02() { String msg = null; SSLHandshakeException tE = new SSLHandshakeException(msg); - assertTrue(errNotExc, tE instanceof SSLHandshakeException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -113,4 +110,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLKeyExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLKeyExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLKeyExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLKeyExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.net.ssl.SSLKeyException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLKeyException class constructors and methods. * */ -public class SSLKeyExceptionTest extends PerformanceTest { +public class SSLKeyExceptionTest extends TestCase { public static void main(String[] args) { } @@ -81,8 +81,6 @@ SSLKeyException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLKeyException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLKeyException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -101,7 +99,6 @@ public void testSSLKeyException02() { String msg = null; SSLKeyException tE = new SSLKeyException(msg); - assertTrue(errNotExc, tE instanceof SSLKeyException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -111,4 +108,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,7 +23,7 @@ import javax.net.ssl.SSLPeerUnverifiedException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** @@ -31,7 +31,7 @@ * methods. * */ -public class SSLPeerUnverifiedExceptionTest extends PerformanceTest { +public class SSLPeerUnverifiedExceptionTest extends TestCase { public static void main(String[] args) { } @@ -82,8 +82,6 @@ SSLPeerUnverifiedException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLPeerUnverifiedException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLPeerUnverifiedException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -103,7 +101,6 @@ public void testSSLPeerUnverifiedException02() { String msg = null; SSLPeerUnverifiedException tE = new SSLPeerUnverifiedException(msg); - assertTrue(errNotExc, tE instanceof SSLPeerUnverifiedException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -113,4 +110,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPermissionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPermissionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPermissionTest.java Tue Jan 31 03:01:12 2006 @@ -20,13 +20,13 @@ */ package javax.net.ssl; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLPermission class constructors. * */ -public class SSLPermissionTest extends PerformanceTest { +public class SSLPermissionTest extends TestCase { /* * Class under test for void SSLPermission(String) @@ -47,4 +47,4 @@ fail("null permission"); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLProtocolExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLProtocolExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLProtocolExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLProtocolExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.net.ssl.SSLProtocolException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLProtocolException class constructors and methods. * */ -public class SSLProtocolExceptionTest extends PerformanceTest { +public class SSLProtocolExceptionTest extends TestCase { public static void main(String[] args) { } @@ -81,8 +81,6 @@ SSLProtocolException tE; for (int i = 0; i < msgs.length; i++) { tE = new SSLProtocolException(msgs[i]); - assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"), - tE instanceof SSLProtocolException); assertEquals("getMessage() must return: ".concat(msgs[i]), tE .getMessage(), msgs[i]); assertNull("getCause() must return null", tE.getCause()); @@ -102,7 +100,6 @@ public void testSSLProtocolException02() { String msg = null; SSLProtocolException tE = new SSLProtocolException(msg); - assertTrue(errNotExc, tE instanceof SSLProtocolException); assertNull("getMessage() must return null.", tE.getMessage()); assertNull("getCause() must return null", tE.getCause()); try { @@ -112,4 +109,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -25,14 +25,14 @@ import java.security.Security; import java.net.SocketException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLSocketFactory class methods. * */ -public class SSLServerSocketFactoryTest extends PerformanceTest { +public class SSLServerSocketFactoryTest extends TestCase { private SSLServerSocketFactory customServerSocketFactory; @@ -92,4 +92,4 @@ } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import java.io.IOException; import java.net.InetAddress; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLServerSocket class constructors. * */ -public class SSLServerSocketTest extends PerformanceTest { +public class SSLServerSocketTest extends TestCase { /* * Class under test for void SSLServerSocket() Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSessionBindingEventTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSessionBindingEventTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSessionBindingEventTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSessionBindingEventTest.java Tue Jan 31 03:01:12 2006 @@ -26,14 +26,14 @@ import javax.security.cert.X509Certificate; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLSessionBindingEvent class constructors and methods. * */ -public class SSLSessionBindingEventTest extends PerformanceTest { +public class SSLSessionBindingEventTest extends TestCase { public final void testSSLSessionBindingEvent() { SSLSession ses = new MySSLSession(); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketFactoryTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketFactoryTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketFactoryTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketFactoryTest.java Tue Jan 31 03:01:12 2006 @@ -25,14 +25,14 @@ import java.security.Security; import java.net.SocketException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLSocketFactory class methods. * */ -public class SSLSocketFactoryTest extends PerformanceTest { +public class SSLSocketFactoryTest extends TestCase { private SSLSocketFactory customSocketFactory; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketTest.java Tue Jan 31 03:01:12 2006 @@ -25,14 +25,14 @@ import java.net.ServerSocket; import java.net.UnknownHostException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for SSLSocket class constructors. * */ -public class SSLSocketTest extends PerformanceTest { +public class SSLSocketTest extends TestCase { /* * Class under test for void SSLSocket() Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/TrustManagerFactorySpiTests.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/TrustManagerFactorySpiTests.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/TrustManagerFactorySpiTests.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/TrustManagerFactorySpiTests.java Tue Jan 31 03:01:12 2006 @@ -27,7 +27,7 @@ import javax.net.ssl.TrustManagerFactorySpi; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for TrustManagerFactorySpi class constructors and @@ -35,7 +35,7 @@ * */ -public class TrustManagerFactorySpiTests extends PerformanceTest { +public class TrustManagerFactorySpiTests extends TestCase { /** * Constructor for TrustManegerFactorySpiTests. * @@ -97,4 +97,4 @@ mfp = (ManagerFactoryParameters) new MyTrustManagerFactorySpi.Parameters(kStore); kmfSpi.engineInit(mfp); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/X509ExtendedKeyManagerTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/X509ExtendedKeyManagerTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/X509ExtendedKeyManagerTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/X509ExtendedKeyManagerTest.java Tue Jan 31 03:01:12 2006 @@ -28,14 +28,14 @@ import javax.net.ssl.X509ExtendedKeyManager; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for X509ExtendedKeyManager class constructors and methods. * */ -public class X509ExtendedKeyManagerTest extends PerformanceTest { +public class X509ExtendedKeyManagerTest extends TestCase { public final void testChooseEngineClientAlias() { X509ExtendedKeyManager km = new MyX509ExtendedKeyManager(); @@ -103,4 +103,4 @@ return null; } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/AuthPermissionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/AuthPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/AuthPermissionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/AuthPermissionTest.java Tue Jan 31 03:01:12 2006 @@ -21,12 +21,12 @@ package javax.security.auth; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests AuthPermission class */ -public class AuthPermissionTest extends PerformanceTest { +public class AuthPermissionTest extends TestCase { private AuthPermission ap; private AuthPermission ap1; @@ -95,4 +95,4 @@ assertEquals("createLoginContext.name",ap1.getName()); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/DestroyFailedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/DestroyFailedExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/DestroyFailedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/DestroyFailedExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests DestroyFailedException class */ -public class DestroyFailedExceptionTest extends PerformanceTest { +public class DestroyFailedExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(DestroyFailedExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PolicyTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PolicyTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PolicyTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PolicyTest.java Tue Jan 31 03:01:12 2006 @@ -33,14 +33,14 @@ import java.security.cert.Certificate; import java.util.Enumeration; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; import org.apache.harmony.security.test.SecurityChecker; /** * Tests Policy class */ -public class PolicyTest extends PerformanceTest { +public class PolicyTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(PolicyTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java Tue Jan 31 03:01:12 2006 @@ -27,13 +27,13 @@ import java.security.Principal; import java.util.HashSet; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests PrivateCredentialPermission class implementation. */ -public class PrivateCredentialPermissionTest extends PerformanceTest { +public class PrivateCredentialPermissionTest extends TestCase { private PrivateCredentialPermission p_that = null; @@ -57,14 +57,6 @@ } /** - * number of iterations in performance mode - * @see org.apache.harmony.security.test.PerformanceTest#getRepeatCount() - */ - public long getRepeatCount() { - return 100000; - } - - /** * [C1 P1 "duke"] implies [C1 P1 "duke" P2 "nuke"]. */ public final void testImplies_01() { @@ -930,4 +922,4 @@ (byte) 0x3b, (byte) 0x78, (byte) 0x70, (byte) 0x74, (byte) 0x00, (byte) 0x01, (byte) 0x62, (byte) 0x74, (byte) 0x00, (byte) 0x01, (byte) 0x63, (byte) 0x78 }; -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ChoiceCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ChoiceCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ChoiceCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ChoiceCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests ChoiceCallback class */ -public class ChoiceCallbackTest extends PerformanceTest { +public class ChoiceCallbackTest extends TestCase { ChoiceCallback cb; @@ -147,4 +147,4 @@ assertEquals(5, cb.getSelectedIndexes()[0]); } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ConfirmationCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ConfirmationCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ConfirmationCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ConfirmationCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests ConfirmationCallback class */ -public class ConfirmationCallbackTest extends PerformanceTest { +public class ConfirmationCallbackTest extends TestCase { ConfirmationCallback cc; int mt[] = { ConfirmationCallback.INFORMATION, @@ -272,4 +272,4 @@ } catch (ArrayIndexOutOfBoundsException e){} } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/LanguageCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/LanguageCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/LanguageCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/LanguageCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -24,13 +24,13 @@ import java.util.Locale; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests LanguageCallback class */ -public class LanguageCallbackTest extends PerformanceTest { +public class LanguageCallbackTest extends TestCase { LanguageCallback lc; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/NameCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/NameCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/NameCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/NameCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests NameCallback class */ -public class NameCallbackTest extends PerformanceTest { +public class NameCallbackTest extends TestCase { NameCallback nc; @@ -74,4 +74,4 @@ } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/PasswordCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/PasswordCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/PasswordCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/PasswordCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -22,13 +22,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests PasswordCallback class */ -public class PasswordCallbackTest extends PerformanceTest { +public class PasswordCallbackTest extends TestCase { PasswordCallback pc; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextInputCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextInputCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextInputCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextInputCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests TextInputCallback class */ -public class TextInputCallbackTest extends PerformanceTest { +public class TextInputCallbackTest extends TestCase { TextInputCallback text = null; @@ -85,4 +85,4 @@ } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextOutputCallbackTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextOutputCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextOutputCallbackTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextOutputCallbackTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests TextOutputCallback class */ -public class TextOutputCallbackTest extends PerformanceTest { +public class TextOutputCallbackTest extends TestCase { TextOutputCallback text = null; @@ -85,4 +85,4 @@ } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -22,13 +22,13 @@ package javax.security.auth.callback; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests UnsupportedCallbackException class */ -public class UnsupportedCallbackExceptionTest extends PerformanceTest { +public class UnsupportedCallbackExceptionTest extends TestCase { NameCallback nc = new NameCallback("prompt"); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java Tue Jan 31 03:01:12 2006 @@ -31,13 +31,13 @@ import java.util.Enumeration; import java.util.NoSuchElementException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests DelegationPermission class implementation. */ -public class DelegationPermissionTest extends PerformanceTest { +public class DelegationPermissionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(DelegationPermissionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java Tue Jan 31 03:01:12 2006 @@ -29,14 +29,14 @@ import java.util.Enumeration; import java.util.NoSuchElementException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests ServicePermission class implementation. */ -public class ServicePermissionTest extends PerformanceTest { +public class ServicePermissionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(ServicePermissionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests AccountException class */ -public class AccountExceptionTest extends PerformanceTest { +public class AccountExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(AccountExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExpiredExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExpiredExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExpiredExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExpiredExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,14 +21,14 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests AccountExpiredException class */ -public class AccountExpiredExceptionTest extends PerformanceTest { +public class AccountExpiredExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(AccountExpiredExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountLockedExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountLockedExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountLockedExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountLockedExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests AccountLockedException class */ -public class AccountLockedExceptionTest extends PerformanceTest { +public class AccountLockedExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(AccountLockedExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountNotFoundExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountNotFoundExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountNotFoundExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountNotFoundExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests AccountNotFoundException class */ -public class AccountNotFoundExceptionTest extends PerformanceTest { +public class AccountNotFoundExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(AccountNotFoundExceptionTest.class); @@ -74,4 +74,4 @@ e.getClass().getName()); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/ConfigurationTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/ConfigurationTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/ConfigurationTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/ConfigurationTest.java Tue Jan 31 03:01:12 2006 @@ -26,13 +26,13 @@ import javax.security.auth.AuthPermission; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests Configuration class */ -public class ConfigurationTest extends PerformanceTest { +public class ConfigurationTest extends TestCase { /** * Easy the SecurityManager class @@ -164,4 +164,4 @@ (oldProvider == null) ? "" : oldProvider); } } -} \ No newline at end of file +} Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests CredentialException class */ -public class CredentialExceptionTest extends PerformanceTest { +public class CredentialExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(CredentialExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExpiredExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExpiredExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExpiredExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExpiredExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests CredentialExpiredException class */ -public class CredentialExpiredExceptionTest extends PerformanceTest { +public class CredentialExpiredExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(CredentialExpiredException.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialNotFoundExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialNotFoundExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialNotFoundExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialNotFoundExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,13 +21,13 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests CredentialNotFoundException class */ -public class CredentialNotFoundExceptionTest extends PerformanceTest { +public class CredentialNotFoundExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(CredentialNotFoundExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/FailedLoginExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/FailedLoginExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/FailedLoginExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/FailedLoginExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,12 +21,12 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests FailedLoginException class */ -public class FailedLoginExceptionTest extends PerformanceTest { +public class FailedLoginExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(FailedLoginExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginContextTest_1.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginContextTest_1.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginContextTest_1.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginContextTest_1.java Tue Jan 31 03:01:12 2006 @@ -50,13 +50,13 @@ import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Unit tests for LoginContext */ -public class LoginContextTest_1 extends PerformanceTest { +public class LoginContextTest_1 extends TestCase { private static final String CONFIG_NAME = "testConfiguration"; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -21,12 +21,12 @@ package javax.security.auth.login; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests LoginException class */ -public class LoginExceptionTest extends PerformanceTest { +public class LoginExceptionTest extends TestCase { public static void main(String[] args) { junit.textui.TestRunner.run(LoginExceptionTest.class); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java Tue Jan 31 03:01:12 2006 @@ -23,14 +23,14 @@ import javax.security.cert.CertificateEncodingException; -import org.apache.harmony.security.test.PerformanceTest; +import junit.framework.TestCase; /** * Tests for DigestException class constructors and methods. * */ -public class CertificateEncodingExceptionTest extends PerformanceTest { +public class CertificateEncodingExceptionTest extends TestCase { public static void main(String[] args) { } @@ -78,7 +78,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 { @@ -97,8 +96,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()); @@ -118,7 +115,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 { @@ -128,4 +124,4 @@ } } -} \ No newline at end of file +}