harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r373789 [1/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
Author: tellison
Date: Tue Jan 31 03:01:12 2006
New Revision: 373789

URL: http://svn.apache.org/viewcvs?rev=373789&view=rev
Log:
Enhancement for HARMONY-55 (remove PerformanceTest from hierarchy of unit tests in security2)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AccessControlExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GeneralSecurityExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GuardedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidParameterExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSBuilderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSCallbackHandlerProtectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSPasswordProtectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSPrivateKeyEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSSecretKeyEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KSTrustedCertificateEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyManagementExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairGeneratorTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyPairTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyStoreTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/KeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MessageDigestSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MessageDigestTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/MessageDigestTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/NoSuchAlgorithmExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/NoSuchProviderExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PermissionCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PermissionsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PrivateKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProtectionDomainTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderServiceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/ProviderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/PublicKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureClassLoaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecureRandomTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SecurityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignatureTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignedObjectTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/SignerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/TimestampTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableEntryExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnrecoverableKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionCollectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/UnresolvedPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CRLTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilder2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathBuilderExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidator3Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertPathValidatorExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStore2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertStoreSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateEncodingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory1Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory2Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactory3Test.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateFactorySpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateNotYetValidExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateParsingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CertificateTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/CollectionCertStoreParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/LDAPCertStoreParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PKIXBuilderParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PKIXCertPathBuilderResultTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PKIXCertPathCheckerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PKIXCertPathValidatorResultTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PKIXParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/PolicyQualifierInfoTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/cert/TrustAnchorTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/DSAPrivateKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/DSAPublicKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/ECPrivateKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/ECPublicKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/RSAPrivateCrtKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/RSAPrivateKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/interfaces/RSAPublicKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/DSAParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/DSAPrivateKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/DSAPublicKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECFieldF2mTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECFieldFpTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECGenParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECPointTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECPrivateKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/ECPublicKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/EllipticCurveTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/EncodedKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/InvalidKeySpecExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/InvalidParameterSpecExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/MGF1ParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/PKCS8EncodedKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/PSSParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAKeyGenParameterSpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAOtherPrimeInfoTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAPrivateCrtKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAPrivateKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/RSAPublicKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/spec/X509EncodedKeySpecTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/BadPaddingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/CipherSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/EncryptedPrivateKeyInfoTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ExemptionMechanismTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/IllegalBlockSizeExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyAgreementTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/KeyGeneratorTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/MacTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NoSuchPaddingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/NullCipherTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactorySpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyFactoryTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/SecretKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/ShortBufferExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPrivateKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/DHPublicKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/crypto/interfaces/PBEKeyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ServerSocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/SocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/CertPathTrustManagerParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLServerSocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/DefaultSSLSocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HandshakeCompletedEventTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/HttpsURLConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyManagerFactorySpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/KeyStoreBuilderParametersTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLContextSpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLEngineResultTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLHandshakeExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLKeyExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLProtocolExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLServerSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSessionBindingEventTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketFactoryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/SSLSocketTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/TrustManagerFactorySpiTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/net/ssl/X509ExtendedKeyManagerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/AuthPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/DestroyFailedExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/PrivateCredentialPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ChoiceCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/ConfirmationCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/LanguageCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/NameCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/PasswordCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextInputCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/TextOutputCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/DelegationPermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/kerberos/ServicePermissionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountLockedExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/AccountNotFoundExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/ConfigurationTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/CredentialNotFoundExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/FailedLoginExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginContextTest_1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/auth/login/LoginExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateEncodingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslExceptionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest1.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyParserTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/EngineTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/PolicyUtilsTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/ServicesTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SecurityTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SerializationTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/TestUtils.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/ietf/jgss/GSSManagerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/linux/unit/org/apache/harmony/security/x/security/auth/module/UnixLoginModuleTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/security2/test/windows/unit/org/apache/harmony/security/x/security/auth/module/NTLoginModuleTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AccessControlExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AccessControlExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AccessControlExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AccessControlExceptionTest.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;
 
 /**
  * Unit test for AccessControlException.
  */
 
-public class AccessControlExceptionTest extends PerformanceTest {
+public class AccessControlExceptionTest extends TestCase {
 
     /**
      * Entry point for standalone run.
@@ -63,4 +63,4 @@
         AccessControlException ex = new AccessControlException("001", perm);
         assertSame(ex.getPermission(), perm);
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTests.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTests.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTests.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorSpiTests.java Tue Jan 31 03:01:12 2006
@@ -24,7 +24,7 @@
 
 import java.security.spec.AlgorithmParameterSpec;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -33,7 +33,7 @@
  * 
  */
 
-public class AlgorithmParameterGeneratorSpiTests extends PerformanceTest {
+public class AlgorithmParameterGeneratorSpiTests extends TestCase {
 
     /**
      * Constructor for CertPathBuilderTests.
@@ -77,4 +77,4 @@
         } catch (IllegalArgumentException e) {
         }        
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest1.java Tue Jan 31 03:01:12 2006
@@ -24,7 +24,7 @@
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -33,7 +33,7 @@
  * 
  */
 
-public class AlgorithmParameterGeneratorTest1 extends PerformanceTest {
+public class AlgorithmParameterGeneratorTest1 extends TestCase {
     /**
      * Constructor for AlgorithmParameterGeneratorTests.
      * 
@@ -122,8 +122,6 @@
         AlgorithmParameterGenerator apg;
         for (int i = 0; i < algs.length; i++) {
             apg = AlgorithmParameterGenerator.getInstance(algs[i]);
-            assertTrue("Not AlgorithmParameterGenerator object",
-                    apg instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", apg.getAlgorithm(), algs[i]);
         }
     }
@@ -225,8 +223,6 @@
         for (int i = 0; i < algs.length; i++) {
             apg = AlgorithmParameterGenerator.getInstance(algs[i],
                     validProviderName);
-            assertTrue("Not AlgorithmParameterGenerator object",
-                    apg instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", algs[i], apg.getAlgorithm());
             assertEquals("Incorrect provider", apg.getProvider().getName(),
                     validProviderName);
@@ -298,8 +294,6 @@
         for (int i = 0; i < algs.length; i++) {
             apg = AlgorithmParameterGenerator.getInstance(algs[i],
                     validProvider);
-            assertTrue("Not AlgorithmParameterGenerator object",
-                    apg instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", apg.getAlgorithm(), algs[i]);
             assertEquals("Incorrect provider", apg.getProvider(), validProvider);
         }
@@ -319,8 +313,6 @@
                 .getInstance(validAlgName);
         apg.init(512);
         AlgorithmParameters ap = apg.generateParameters();
-        assertTrue("Not AlgorithmParameters object",
-                ap instanceof AlgorithmParameters);
         assertEquals("Incorrect algorithm", ap.getAlgorithm().toUpperCase(),
                 apg.getAlgorithm().toUpperCase());
     }
@@ -330,7 +322,7 @@
      * <code>init(int size, SecureRandom random<code> methods
      * Assertion: throws InvalidParameterExceptiom when size is incorrect
      */
-    public void testAlgorithmParameterGenerator11() {        
+    public void testAlgorithmParameterGenerator11() throws InvalidParameterException {        
         if (!DSASupported) {
             fail(validAlgName + " algorithm is not supported");
             return;
@@ -340,35 +332,15 @@
         AlgorithmParameterGenerator[] apgs = createAPGen();
         assertNotNull("AlgorithmParameterGenerator objects were not created",
                 apgs);
+
         for (int i = 0; i < apgs.length; i++) {
             for (int j = 0; j < keys.length; j++) {
-              
-                try {
-                    apgs[i].init(keys[j]);
-                    logln("Ignore key: " + Integer.toString(keys[j]));
-                } catch (InvalidParameterException e) {                    
-                }
-                try {
-                    apgs[i].init(keys[j], random);
-                    logln("Ignore key: " + Integer.toString(keys[j])+ " when random is not null");
-                } catch (InvalidParameterException e) {                    
-                }
-                try {
-                    apgs[i].init(keys[j], null);
-                    logln("Ignore key: " + Integer.toString(keys[j])+ " when random is null");
-                } catch (InvalidParameterException e) {                    
-                }
-            }
-            try {
-                apgs[i].init(1024);
-            } catch (InvalidParameterException e) {
-                fail("Unexpected InvalidParameterException was thrown");                
-            }
-            try {
-                apgs[i].init(1024, random);
-            } catch (InvalidParameterException e) {
-                fail("Unexpected InvalidParameterException was thrown");                                
+                apgs[i].init(keys[j]);
+                apgs[i].init(keys[j], random);
+                apgs[i].init(keys[j], null);
             }
+            apgs[i].init(1024);
+            apgs[i].init(1024, random);
         }
     }
     
@@ -409,7 +381,6 @@
         AlgorithmParameterGeneratorSpi spi = new MyAlgorithmParameterGeneratorSpi();
         AlgorithmParameterGenerator apg = 
                 new myAlgPG(spi, validProvider, validAlgName);
-        assertTrue("Not CertStore object", apg instanceof AlgorithmParameterGenerator);
         assertEquals("Incorrect algorithm", apg.getAlgorithm(), validAlgName);
         assertEquals("Incorrect provider",apg.getProvider(),validProvider);
         try {
@@ -419,7 +390,6 @@
         }
         
         apg = new myAlgPG(null, null, null);
-        assertTrue("Not CertStore object", apg instanceof AlgorithmParameterGenerator);
         assertNull("Incorrect algorithm", apg.getAlgorithm());
         assertNull("Incorrect provider", apg.getProvider());
         try {
@@ -440,4 +410,4 @@
     public myAlgPG(AlgorithmParameterGeneratorSpi 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/java/security/AlgorithmParameterGeneratorTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParameterGeneratorTest2.java Tue Jan 31 03:01:12 2006
@@ -28,7 +28,7 @@
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -36,7 +36,7 @@
  * methods.
  */
 
-public class AlgorithmParameterGeneratorTest2 extends PerformanceTest {
+public class AlgorithmParameterGeneratorTest2 extends TestCase {
     
     private static final String AlgorithmParameterGeneratorProviderClass = "java.security.MyAlgorithmParameterGeneratorSpi";
 
@@ -138,8 +138,6 @@
         AlgorithmParameterGenerator apG;
         for (int i = 0; i < validValues.length; i++) {
             apG = AlgorithmParameterGenerator.getInstance(validValues[i]);
-            assertTrue("Not instanceof AlgorithmParameterGenerator object",
-                    apG instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", apG.getAlgorithm(),
                     validValues[i]);
             assertEquals("Incorrect provider", apG.getProvider(), mProv);
@@ -200,8 +198,6 @@
         for (int i = 0; i < validValues.length; i++) {
             apG = AlgorithmParameterGenerator.getInstance(validValues[i], mProv
                     .getName());
-            assertTrue("Not instanceof AlgorithmParameterGenerator object",
-                    apG instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", apG.getAlgorithm(),
                     validValues[i]);
             assertEquals("Incorrect provider", apG.getProvider().getName(),
@@ -248,8 +244,6 @@
         AlgorithmParameterGenerator apG;
         for (int i = 0; i < validValues.length; i++) {
             apG = AlgorithmParameterGenerator.getInstance(validValues[i], mProv);
-            assertTrue("Not instanceof AlgorithmParameterGenerator object",
-                    apG instanceof AlgorithmParameterGenerator);
             assertEquals("Incorrect algorithm", apG.getAlgorithm(),
                     validValues[i]);
             assertEquals("Incorrect provider", apG.getProvider(), mProv);
@@ -268,4 +262,4 @@
             return type;
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParametersTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParametersTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParametersTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AlgorithmParametersTest.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>AlgorithmParameters</code> class constructors and
  * methods.
  * 
  */
-public class AlgorithmParametersTest extends PerformanceTest {
+public class AlgorithmParametersTest extends TestCase {
 
 	/**
 	 * Provider

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionCollectionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionCollectionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionCollectionTest.java Tue Jan 31 03:01:12 2006
@@ -24,7 +24,7 @@
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -32,7 +32,7 @@
  * 
  */
 
-public class AllPermissionCollectionTest extends PerformanceTest {
+public class AllPermissionCollectionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(AllPermissionCollectionTest.class);
@@ -113,4 +113,4 @@
             fail("should throw NoSuchElementException");
         } catch (NoSuchElementException ok) {}
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/AllPermissionTest.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>AllPermission</code>
  * 
  */
-public class AllPermissionTest extends PerformanceTest {
+public class AllPermissionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(AllPermissionTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionCollectionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionCollectionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionCollectionTest.java Tue Jan 31 03:01:12 2006
@@ -31,7 +31,7 @@
 import java.util.Collection;
 import java.util.Enumeration;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -39,7 +39,7 @@
  * 
  */
 
-public class BasicPermissionCollectionTest extends PerformanceTest {
+public class BasicPermissionCollectionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(BasicPermissionCollectionTest.class);
@@ -217,4 +217,4 @@
         f.setAccessible(true);
         f.set(obj, newval);
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/BasicPermissionTest.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>BasicPermission</code>
  * 
  */
 
-public class BasicPermissionTest extends PerformanceTest {
+public class BasicPermissionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(BasicPermissionTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSignerTest.java Tue Jan 31 03:01:12 2006
@@ -25,14 +25,14 @@
 import java.util.Date;
 
 import org.apache.harmony.security.TestCertUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Unit test for CodeSigner. 
  */
 
-public class CodeSignerTest extends PerformanceTest {
+public class CodeSignerTest extends TestCase {
 
     /**
      * Entry point for standalone runs.
@@ -137,4 +137,4 @@
         new CodeSigner(cpath, ts).toString();
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/CodeSourceTest.java Tue Jan 31 03:01:12 2006
@@ -36,7 +36,7 @@
 import javax.security.auth.x500.X500Principal;
 
 import org.apache.harmony.security.TestCertUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -44,7 +44,7 @@
  * 
  */
 
-public class CodeSourceTest extends PerformanceTest {
+public class CodeSourceTest extends TestCase {
     /**
      * 
      * Entry point for standalone runs.
@@ -791,4 +791,4 @@
         assertFalse(thizCS.implies(thatCS));
         assertFalse(thatCS.implies(thizCS));
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.DigestException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class DigestExceptionTest extends PerformanceTest {
+public class DigestExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testDigestException01() {
         DigestException tE = new DigestException();
-        assertTrue(errNotExc, tE instanceof DigestException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         DigestException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new DigestException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof DigestException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testDigestException03() {
         String msg = null;
         DigestException tE = new DigestException(msg);
-        assertTrue(errNotExc, tE instanceof DigestException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -134,7 +130,6 @@
     public void testDigestException04() {
         Throwable cause = null;
         DigestException tE = new DigestException(cause);
-        assertTrue(errNotExc, tE instanceof DigestException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -150,7 +145,6 @@
      */
     public void testDigestException05() {
         DigestException tE = new DigestException(tCause);
-        assertTrue(errNotExc, tE instanceof DigestException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -174,7 +168,6 @@
      */
     public void testDigestException06() {
         DigestException tE = new DigestException(null, null);
-        assertTrue(errNotExc, tE instanceof DigestException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -193,8 +186,6 @@
         DigestException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new DigestException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof DigestException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -213,7 +204,6 @@
      */
     public void testDigestException08() {
         DigestException tE = new DigestException(null, tCause);
-        assertTrue(errNotExc, tE instanceof DigestException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -239,8 +229,6 @@
         DigestException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new DigestException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof DigestException);
             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/DigestInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestInputStreamTest.java Tue Jan 31 03:01:12 2006
@@ -32,13 +32,13 @@
 import java.util.Arrays;
 
 import org.apache.harmony.security.MDGoldenData;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for fields and methods of class <code>DigestInputStream</code>
  * 
  */
-public class DigestInputStreamTest extends PerformanceTest {
+public class DigestInputStreamTest extends TestCase {
 
     /**
      * Message digest algorithm name used during testing
@@ -232,9 +232,7 @@
      * <code>InputStream</code> not set. <code>read()</code> must
      * not work
      */
-    public final void testRead04()
-        throws IOException {
-        boolean passed = false;
+    public final void testRead04() throws IOException {
         for (int ii=0; ii<algorithmName.length; ii++) {
             try {
                 MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
@@ -245,11 +243,11 @@
                         dis.read();
                     }
                 } catch (Exception e) {
-                    passed = true;
-                    logln(getName() + ": " + e);
+                    return;
                 }
-                assertTrue(passed);
-                return;
+
+                fail("InputStream not set. read() must not work");
+
             } catch (NoSuchAlgorithmException e) {
                 // allowed failure
             }
@@ -265,21 +263,18 @@
      * <code>read()</code> must not work when digest
      * functionality is on
      */
-    public final void testRead05()
-        throws IOException {
-        boolean passed = false;
+    public final void testRead05() {
         InputStream is = new ByteArrayInputStream(myMessage);
         DigestInputStream dis = new DigestInputStream(is, null);
+
         // must result in an exception
         try {
             for (int i=0; i<MY_MESSAGE_LEN; i++) {
                 dis.read();
             }
+            fail("read() must not work when digest functionality is on");
         } catch (Exception e) {
-            passed = true;
-            logln(getName() + ": " + e);
         }
-        assertTrue(passed);
     }
 
     /**
@@ -590,9 +585,8 @@
                 MessageDigest md = MessageDigest.getInstance(algorithmName[ii]);
                 InputStream is = new ByteArrayInputStream(myMessage);
                 DigestInputStream dis = new DigestInputStream(is, md);
-                String rep = dis.toString();
-                logln(getName() + ": " + rep);
-                assertTrue(rep != null);
+
+                assertNotNull(dis.toString());
                 return;
             } catch (NoSuchAlgorithmException e) {
                 // allowed failure

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/DigestOutputStreamTest.java Tue Jan 31 03:01:12 2006
@@ -27,14 +27,14 @@
 import java.util.Arrays;
 
 import org.apache.harmony.security.MDGoldenData;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for fields and methods of class <code>DigestInputStream</code>
  * 
  */
-public class DigestOutputStreamTest extends PerformanceTest {
+public class DigestOutputStreamTest extends TestCase {
 
     /**
      * Message digest algorithm name used during testing
@@ -194,9 +194,7 @@
      * <code>OutputStream</code> not set. <code>write(int)</code> must
      * not work
      */
-    public final void testWriteint03()
-        throws IOException {
-        boolean passed = false;
+    public final void testWriteint03() throws IOException {
         for (int k=0; k<algorithmName.length; k++) {
             try {
                 MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
@@ -206,12 +204,10 @@
                     for (int i=0; i<MY_MESSAGE_LEN; i++) {
                         dos.write(myMessage[i]);
                     }
+                    fail("OutputStream not set. write(int) must not work");
                 } catch (Exception e) {
-                    passed = true;
-                    logln(getName() + ": " + e);
+                    return;
                 }
-                assertTrue(passed);
-                return;
             } catch (NoSuchAlgorithmException e) {
                 // allowed failure
             }
@@ -227,21 +223,19 @@
      * <code>write(int)</code> must not work when digest
      * functionality is on
      */
-    public final void testWriteint04()
-        throws IOException {
-        boolean passed = false;
+    public final void testWriteint04() throws IOException {
         OutputStream os = new ByteArrayOutputStream(MY_MESSAGE_LEN);
         DigestOutputStream dos = new DigestOutputStream(os, null);
+
         // must result in an exception
         try {
             for (int i=0; i<MY_MESSAGE_LEN; i++) {
                 dos.write(myMessage[i]);
             }
+            fail("OutputStream not set. write(int) must not work");
         } catch (Exception e) {
-            passed = true;
-            logln(getName() + ": " + e);
+            return;
         }
-        assertTrue(passed);
     }
 
     /**
@@ -253,8 +247,7 @@
      * <code>write(int)</code> must work when digest
      * functionality is off
      */
-    public final void testWriteint05()
-        throws IOException {
+    public final void testWriteint05() throws IOException {
         ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
         DigestOutputStream dos = new DigestOutputStream(bos, null);
         // set digest functionality to off
@@ -507,9 +500,8 @@
                 ByteArrayOutputStream bos = new ByteArrayOutputStream(MY_MESSAGE_LEN);
                 MessageDigest md = MessageDigest.getInstance(algorithmName[k]);
                 DigestOutputStream dos = new DigestOutputStream(bos, md);
-                String rep = dos.toString();
-                logln(getName() + ": " + rep);
-                assertTrue(rep != null);
+
+                assertNotNull(dos.toString());
                 return;
             } catch (NoSuchAlgorithmException e) {
                 // allowed failure

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GeneralSecurityExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GeneralSecurityExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GeneralSecurityExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GeneralSecurityExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.GeneralSecurityException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * methods.
  * 
  */
-public class GeneralSecurityExceptionTest extends PerformanceTest {
+public class GeneralSecurityExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -79,7 +79,6 @@
      */
     public void testGeneralSecurityException01() {
         GeneralSecurityException tE = new GeneralSecurityException();
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -98,8 +97,6 @@
         GeneralSecurityException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new GeneralSecurityException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof GeneralSecurityException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -119,7 +116,6 @@
     public void testGeneralSecurityException03() {
         String msg = null;
         GeneralSecurityException tE = new GeneralSecurityException(msg);
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -137,7 +133,6 @@
     public void testGeneralSecurityException04() {
         Throwable cause = null;
         GeneralSecurityException tE = new GeneralSecurityException(cause);
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -154,7 +149,6 @@
      */
     public void testGeneralSecurityException05() {
         GeneralSecurityException tE = new GeneralSecurityException(tCause);
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -178,7 +172,6 @@
      */
     public void testGeneralSecurityException06() {
         GeneralSecurityException tE = new GeneralSecurityException(null, null);
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -197,8 +190,6 @@
         GeneralSecurityException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new GeneralSecurityException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof GeneralSecurityException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -217,7 +208,6 @@
      */
     public void testGeneralSecurityException08() {
         GeneralSecurityException tE = new GeneralSecurityException(null, tCause);
-        assertTrue(errNotExc, tE instanceof GeneralSecurityException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -243,8 +233,6 @@
         GeneralSecurityException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new GeneralSecurityException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof GeneralSecurityException);
             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/GuardedObjectTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GuardedObjectTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GuardedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/GuardedObjectTest.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>GuardedObject</code>
  * 
  */
 
-public class GuardedObjectTest extends PerformanceTest {
+public class GuardedObjectTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(GuardedObjectTest.class);
@@ -67,4 +67,4 @@
             assertEquals(message, ok.getMessage());
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityScopeTest.java Tue Jan 31 03:01:12 2006
@@ -22,7 +22,7 @@
 package java.security;
 
 import org.apache.harmony.security.IdentityScopeStub;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -30,7 +30,7 @@
  * 
  */
 
-public class IdentityScopeTest extends PerformanceTest {
+public class IdentityScopeTest extends TestCase {
 
     public static class MySecurityManager extends SecurityManager {
         public Permissions denied = new Permissions(); 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/IdentityTest.java Tue Jan 31 03:01:12 2006
@@ -26,14 +26,14 @@
 import org.apache.harmony.security.CertificateStub;
 import org.apache.harmony.security.IdentityStub;
 import org.apache.harmony.security.PublicKeyStub;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for class Identity
  * 
  */
 
-public class IdentityTest extends PerformanceTest {
+public class IdentityTest extends TestCase {
 
     public static class MySecurityManager extends SecurityManager {
         public Permissions denied = new Permissions(); 
@@ -113,8 +113,8 @@
      */
     public void testToString2() {    
         assertNotNull(new IdentityStub("testToString2").toString());
-        logln(new IdentityStub("testToString2").toString());
     }
+
     /**
      * verify Identity() creates instance
      */
@@ -306,10 +306,10 @@
      * verify Identity.toString(boolean) return string represenation of identity
      */
     public void testToStringboolean() throws Exception {
-        logln(new IdentityStub("aaa").toString(false));
-        logln(new IdentityStub("aaa2", IdentityScope.getSystemScope()).toString(false));
-        logln(new IdentityStub("bbb").toString(true));
-        logln(new IdentityStub("bbb2", IdentityScope.getSystemScope()).toString(true));
+        new IdentityStub("aaa").toString(false);
+        new IdentityStub("aaa2", IdentityScope.getSystemScope()).toString(false);
+        new IdentityStub("bbb").toString(true);
+        new IdentityStub("bbb2", IdentityScope.getSystemScope()).toString(true);
     }
 
     /**
@@ -319,8 +319,6 @@
        Identity i = new IdentityStub("testGetScope");
        assertNull(i.getScope());
        IdentityScope s = IdentityScope.getSystemScope();
-//       s.addIdentity(i);
-//       assertSame(s, i.getScope());
        
        Identity i2 = new IdentityStub("testGetScope2", s);
        assertSame(s, i2.getScope());
@@ -351,7 +349,7 @@
      */
     public void testSetPublicKey2() throws Exception {
         Identity i2 = new IdentityStub("testSetPublicKey2_2", IdentityScope.getSystemScope());
-        PublicKey pk = new PublicKeyStub("kkk", "testSetPublicKey2", new byte[]{1,2,3,4,5});
+        new PublicKeyStub("kkk", "testSetPublicKey2", new byte[]{1,2,3,4,5});
         try {
             i2.setPublicKey(null);
             //fail("KeyManagementException should be thrown - key is null");            
@@ -430,8 +428,6 @@
     public void testGetInfo() {
         
         Identity i = new IdentityStub("testGetInfo");
-        //assertNull(i.getInfo());
-        logln("testGetInfo: "+i.getInfo());
         i.setInfo("some info");
         assertEquals("some info", i.getInfo());
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidAlgorithmParameterExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.InvalidAlgorithmParameterException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * constructors and methods.
  * 
  */
-public class InvalidAlgorithmParameterExceptionTest extends PerformanceTest {
+public class InvalidAlgorithmParameterExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -81,7 +81,6 @@
      */
     public void testInvalidAlgorithmParameterException01() {
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException();
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -100,8 +99,6 @@
         InvalidAlgorithmParameterException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidAlgorithmParameterException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidAlgorithmParameterException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -122,7 +119,6 @@
         String msg = null;
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(
                 msg);
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -141,7 +137,6 @@
         Throwable cause = null;
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(
                 cause);
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -159,7 +154,6 @@
     public void testInvalidAlgorithmParameterException05() {
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(
                 tCause);
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -185,7 +179,6 @@
     public void testInvalidAlgorithmParameterException06() {
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(
                 null, null);
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -205,8 +198,6 @@
         InvalidAlgorithmParameterException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidAlgorithmParameterException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidAlgorithmParameterException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -227,7 +218,6 @@
     public void testInvalidAlgorithmParameterException08() {
         InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(
                 null, tCause);
-        assertTrue(errNotExc, tE instanceof InvalidAlgorithmParameterException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -254,8 +244,6 @@
         InvalidAlgorithmParameterException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidAlgorithmParameterException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidAlgorithmParameterException);
             String getM = tE.getMessage();
             String toS = tCause.toString();
             if (msgs[i].length() > 0) {
@@ -277,4 +265,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidKeyExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidKeyExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidKeyExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidKeyExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import java.security.InvalidKeyException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>InvalidKeyException</code> class constructors and methods.
  * 
  */
-public class InvalidKeyExceptionTest extends PerformanceTest {
+public class InvalidKeyExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testInvalidKeyException01() {
         InvalidKeyException tE = new InvalidKeyException();
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         InvalidKeyException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidKeyException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidKeyException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -117,7 +114,6 @@
     public void testInvalidKeyException03() {
         String msg = null;
         InvalidKeyException tE = new InvalidKeyException(msg);
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -135,7 +131,6 @@
     public void testInvalidKeyException04() {
         Throwable cause = null;
         InvalidKeyException tE = new InvalidKeyException(cause);
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -152,7 +147,6 @@
      */
     public void testInvalidKeyException05() {
         InvalidKeyException tE = new InvalidKeyException(tCause);
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -176,7 +170,6 @@
      */
     public void testInvalidKeyException06() {
         InvalidKeyException tE = new InvalidKeyException(null, null);
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         assertNull("getMessage() must return null", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -195,8 +188,6 @@
         InvalidKeyException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidKeyException(msgs[i], null);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidKeyException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -215,7 +206,6 @@
      */
     public void testInvalidKeyException08() {
         InvalidKeyException tE = new InvalidKeyException(null, tCause);
-        assertTrue(errNotExc, tE instanceof InvalidKeyException);
         if (tE.getMessage() != null) {
             String toS = tCause.toString();
             String getM = tE.getMessage();
@@ -241,8 +231,6 @@
         InvalidKeyException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidKeyException(msgs[i], tCause);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidKeyException);
             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/InvalidParameterExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidParameterExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidParameterExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/java/security/InvalidParameterExceptionTest.java Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 
 import java.security.InvalidParameterException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * methods.
  * 
  */
-public class InvalidParameterExceptionTest extends PerformanceTest {
+public class InvalidParameterExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -79,7 +79,6 @@
      */
     public void testInvalidParameterException01() {
         InvalidParameterException tE = new InvalidParameterException();
-        assertTrue(errNotExc, tE instanceof InvalidParameterException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -98,8 +97,6 @@
         InvalidParameterException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new InvalidParameterException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof InvalidParameterException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -119,7 +116,6 @@
     public void testInvalidParameterException03() {
         String msg = null;
         InvalidParameterException tE = new InvalidParameterException(msg);
-        assertTrue(errNotExc, tE instanceof InvalidParameterException);
         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
+}



Mime
View raw message