harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r415555 [2/17] - in /incubator/harmony/enhanced/classlib/trunk/modules/security: make/common/ src/test/api/java.injected/java/security/acl/ src/test/api/java.injected/java/security/cert/ src/test/api/java.injected/java/security/interfaces/ ...
Date Tue, 20 Jun 2006 08:11:19 GMT
Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/IdentityScopeTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/IdentityScopeTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/IdentityScopeTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.Identity;
 import java.security.IdentityScope;
@@ -23,9 +23,9 @@
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import tests.api.java.security.IdentityTest.IdentitySubclass;
+import org.apache.harmony.security.tests.java.security.Identity2Test.IdentitySubclass;
 
-public class IdentityScopeTest extends junit.framework.TestCase {
+public class IdentityScope2Test extends junit.framework.TestCase {
 
 	static PublicKey pubKey;
     static {

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidAlgorithmParameterExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidAlgorithmParameterExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidAlgorithmParameterExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.InvalidAlgorithmParameterException;
 
-public class InvalidAlgorithmParameterExceptionTest extends
+public class InvalidAlgorithmParameterException2Test extends
 		junit.framework.TestCase {
 
 	/**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidKeyException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidKeyExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidKeyException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidKeyException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidKeyExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidKeyExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidKeyException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.InvalidKeyException;
 
-public class InvalidKeyExceptionTest extends junit.framework.TestCase {
+public class InvalidKeyException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.InvalidKeyException#InvalidKeyException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidParameterException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidParameterExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidParameterException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidParameterException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidParameterExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/InvalidParameterExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/InvalidParameterException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.InvalidParameterException;
 
-public class InvalidParameterExceptionTest extends junit.framework.TestCase {
+public class InvalidParameterException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.InvalidParameterException#InvalidParameterException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.KeyException;
 
-public class KeyExceptionTest extends junit.framework.TestCase {
+public class KeyException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.KeyException#KeyException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyFactoryTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyFactoryTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyFactoryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyFactory2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.InvalidKeyException;
 import java.security.KeyFactory;
@@ -34,7 +34,7 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-public class KeyFactoryTest extends junit.framework.TestCase {
+public class KeyFactory2Test extends junit.framework.TestCase {
 
 	private static final String KEYFACTORY_ID = "KeyFactory.";
 
@@ -366,7 +366,7 @@
 		Enumeration e = provider.keys();
 		while (e.hasMoreElements()) {
 			String algorithm = (String) e.nextElement();
-			if (algorithm.startsWith(KEYFACTORY_ID)) {
+			if (algorithm.startsWith(KEYFACTORY_ID) && !algorithm.contains(" ")) {
 				algs.addElement(algorithm.substring(KEYFACTORY_ID.length()));
 			}
 		}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyManagementException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyManagementExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyManagementException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyManagementException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyManagementExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyManagementExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyManagementException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.KeyManagementException;
 
-public class KeyManagementExceptionTest extends junit.framework.TestCase {
+public class KeyManagementException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.KeyManagementException#KeyManagementException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyPairGeneratorTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyPairGeneratorTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyPairGeneratorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java Tue Jun 20 01:11:04 2006
@@ -13,16 +13,19 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.math.BigInteger;
+import java.security.KeyPair;
 import java.security.KeyPairGenerator;
 import java.security.Provider;
 import java.security.SecureRandom;
 import java.security.Security;
 import java.security.spec.DSAParameterSpec;
+import java.security.interfaces.DSAPublicKey;
+import java.security.interfaces.DSAParams;
 
-public class KeyPairGeneratorTest extends junit.framework.TestCase {
+public class KeyPairGenerator4Test extends junit.framework.TestCase {
 
     /**
      * @tests java.security.KeyPairGenerator#genKeyPair()
@@ -97,14 +100,22 @@
         keyPair.initialize(1024, new SecureRandom());
     }
 
+
     /**
      * @tests java.security.KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec)
      */
     public void test_initializeLjava_security_spec_AlgorithmParameterSpec()
             throws Exception {
+        // create DSAParams
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
+        keyPairGenerator.initialize(1024);
+        DSAPublicKey key = (DSAPublicKey) keyPairGenerator.genKeyPair()
+                .getPublic();
+        DSAParams params = key.getParams();
+
         KeyPairGenerator keyPair = KeyPairGenerator.getInstance("DSA");
-        keyPair.initialize(new DSAParameterSpec(BigInteger.ONE, BigInteger.ONE,
-                BigInteger.ONE));
+        keyPair.initialize(new DSAParameterSpec(params.getP(), params.getQ(),
+                params.getG()));
     }
 
     /**
@@ -113,8 +124,15 @@
      */
     public void test_initializeLjava_security_spec_AlgorithmParameterSpecLjava_security_SecureRandom()
             throws Exception {
+        // create DSAParams
+        KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
+        keyPairGenerator.initialize(1024);
+        DSAPublicKey key = (DSAPublicKey) keyPairGenerator.genKeyPair()
+                .getPublic();
+        DSAParams params = key.getParams();
+
         KeyPairGenerator keyPair = KeyPairGenerator.getInstance("DSA");
-        keyPair.initialize(new DSAParameterSpec(BigInteger.ONE, BigInteger.ONE,
-                BigInteger.ONE), new SecureRandom());
+        keyPair.initialize(new DSAParameterSpec(params.getP(), params.getQ(),
+                params.getG()), new SecureRandom());
     }
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStore2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -37,7 +37,21 @@
 import tests.support.Support_TestProvider;
 import tests.support.resource.Support_Resources;
 
-public class KeyStoreTest extends junit.framework.TestCase {
+public class KeyStore2Test extends junit.framework.TestCase {
+    static PrivateKey privateKey;
+    static {
+        try {
+            KeyPairGenerator keyPairGenerator = KeyPairGenerator
+                    .getInstance("DSA");
+
+            SecureRandom secureRandom = new SecureRandom();
+            keyPairGenerator.initialize(1024, secureRandom);
+            KeyPair keyPair = keyPairGenerator.genKeyPair();
+            privateKey = keyPair.getPrivate();
+        } catch (Exception e) {
+            fail("initialization failed: " + e);
+        }
+    }
 
 	final char[] pssWord = { 'a', 'b', 'c' };
         private Provider support_TestProvider;
@@ -115,12 +129,10 @@
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
 		// alias 1
-		PublicKey pub = cert[0].getPublicKey();
 		keyTest.setCertificateEntry("alias1", cert[0]);
 
 		// alias 2
-		keyTest.setCertificateEntry("alias2", cert[0]);
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 
 		// alias 3
 		keyTest.setCertificateEntry("alias3", cert[1]);
@@ -248,11 +260,8 @@
 				+ "certificate was wrong", alias.equals("alias1"));
 
 		// key entry
-		PublicKey pub = cert[0].getPublicKey();
 
-		// If next line throws a NPE check that a full math implementation
-		// is being used.
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 		alias = keyTest.getCertificateAlias(cert[0]);
 		assertTrue("key entry - the alias returned for this "
 				+ "certificate was wrong", alias.equals("alias2"));
@@ -280,12 +289,10 @@
 		keyTest.load(null, null);
 
 		// alias 1
-		PublicKey pub = cert[0].getPublicKey();
 		keyTest.setCertificateEntry("alias1", cert[0]);
 
 		// alias 2
-		keyTest.setCertificateEntry("alias2", cert[0]);
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 
 		java.security.cert.Certificate[] certRes = keyTest
 				.getCertificateChain("alias2");
@@ -344,11 +351,7 @@
 		cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
-		KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
-		SecureRandom secureRandom = new SecureRandom();
-		keyPairGenerator.initialize(1024, secureRandom);
-		KeyPair keyPair = keyPairGenerator.genKeyPair();
-		PrivateKey privateKey = keyPair.getPrivate();
+
 		keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 		PrivateKey returnedKey = (PrivateKey) keyTest.getKey("alias2", pssWord);
 		byte[] retB = returnedKey.getEncoded();
@@ -411,12 +414,10 @@
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
 		// alias 1
-		PublicKey pub = cert[0].getPublicKey();
 		keyTest.setCertificateEntry("alias1", cert[0]);
 
 		// alias 2
-		keyTest.setCertificateEntry("alias2", cert[0]);
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 
 		assertTrue("isCertificateEntry method returns false for a certificate",
 				keyTest.isCertificateEntry("alias1") == true);
@@ -437,12 +438,10 @@
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
 		// alias 1
-		PublicKey pub = cert[0].getPublicKey();
 		keyTest.setCertificateEntry("alias1", cert[0]);
 
 		// alias 2
-		keyTest.setCertificateEntry("alias2", cert[0]);
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 
 		assertTrue("isKeyEntry method returns false for a certificate", keyTest
 				.isKeyEntry("alias2") == true);
@@ -522,7 +521,7 @@
 	public void test_setKeyEntryLjava_lang_String$B$Ljava_security_cert_Certificate()
 			throws Exception {
 
-		fail("Test hangs - requires a full math implementation ??");
+//		fail("Test hangs - requires a full math implementation ??");
 
 		// Test for method void
 		// java.security.KeyStore.setKeyEntry(java.lang.String, byte [],
@@ -534,13 +533,9 @@
 		cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
-		// generator
-		KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
-		SecureRandom secureRandom = new SecureRandom();
-		keyPairGenerator.initialize(1024, secureRandom);
-		KeyPair keyPair = keyPairGenerator.genKeyPair();
+
 		// set the same alias as keyEntry
-		keyTest.setKeyEntry("alias2", keyPair.getPrivate().getEncoded(), cert);
+		keyTest.setKeyEntry("alias2", privateKey.getEncoded(), cert);
 		assertTrue("the entry specified by the alias alias2 is not a keyEntry",
 				keyTest.isKeyEntry("alias2"));
 	}
@@ -562,12 +557,7 @@
 		cert[1] = (X509Certificate) cf.generateCertificate(certArray2);
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
-		// generator
-		KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA");
-		SecureRandom secureRandom = new SecureRandom();
-		keyPairGenerator.initialize(1024, secureRandom);
-		KeyPair keyPair = keyPairGenerator.genKeyPair();
-		PrivateKey privateKey = keyPair.getPrivate();
+
 		keyTest.setKeyEntry("alias3", privateKey, pssWord, cert);
 		assertTrue("the entry specified by the alias alias3 is not a keyEntry",
 				keyTest.isKeyEntry("alias3"));
@@ -586,12 +576,10 @@
 		KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType());
 		keyTest.load(null, null);
 		// alias 1
-		PublicKey pub = cert[0].getPublicKey();
 		keyTest.setCertificateEntry("alias1", cert[0]);
 
 		// alias 2
-		keyTest.setCertificateEntry("alias2", cert[0]);
-		keyTest.setKeyEntry("alias2", pub, pssWord, cert);
+        keyTest.setKeyEntry("alias2", privateKey, pssWord, cert);
 
 		// alias 3
 		keyTest.setCertificateEntry("alias3", cert[1]);
@@ -604,13 +592,13 @@
 	 * is called before a test is executed.
 	 */
 	protected void setUp() throws Exception {
-                super.setUp();
-		Security.addProvider(new Support_TestProvider());
-	}
-
-
-	protected void tearDown() throws Exception {
-                super.tearDown();
-		Security.removeProvider(support_TestProvider.getName());
-	}
+        super.setUp();
+        support_TestProvider = new Support_TestProvider();
+        Security.addProvider(support_TestProvider);
+    }
+
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        Security.removeProvider(support_TestProvider.getName());
+    }
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStoreException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStoreException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStoreException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/KeyStoreExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/KeyStoreException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.KeyStoreException;
 
-public class KeyStoreExceptionTest extends junit.framework.TestCase {
+public class KeyStoreException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.KeyStoreException#KeyStoreException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/MessageDigestTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/MessageDigestTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/MessageDigestTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/MessageDigest2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -28,7 +28,7 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
-public class MessageDigestTest extends junit.framework.TestCase {
+public class MessageDigest2Test extends junit.framework.TestCase {
 
 	private static final String MESSAGEDIGEST_ID = "MessageDigest.";
 
@@ -419,7 +419,7 @@
 		Enumeration e = provider.keys();
 		while (e.hasMoreElements()) {
 			String algorithm = (String) e.nextElement();
-			if (algorithm.startsWith(MESSAGEDIGEST_ID)) {
+			if (algorithm.startsWith(MESSAGEDIGEST_ID) && !algorithm.contains(" ")) {
 				algs.addElement(algorithm.substring(MESSAGEDIGEST_ID.length()));
 			}
 		}// end while

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchAlgorithmExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchAlgorithmExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchAlgorithmExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.NoSuchAlgorithmException;
 
-public class NoSuchAlgorithmExceptionTest extends junit.framework.TestCase {
+public class NoSuchAlgorithmException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.NoSuchAlgorithmException#NoSuchAlgorithmException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchProviderException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchProviderExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchProviderException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchProviderException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchProviderExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/NoSuchProviderExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/NoSuchProviderException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.NoSuchProviderException;
 
-public class NoSuchProviderExceptionTest extends junit.framework.TestCase {
+public class NoSuchProviderException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.NoSuchProviderException#NoSuchProviderException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permission2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permission2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permission2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permission2Test.java Tue Jun 20 01:11:04 2006
@@ -13,13 +13,13 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.Permission;
 import java.security.PermissionCollection;
 import java.security.SecurityPermission;
 
-public class PermissionTest extends junit.framework.TestCase {
+public class Permission2Test extends junit.framework.TestCase {
 	static class ConcretePermission extends Permission {
 		public ConcretePermission() {
 			super("noname");

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionsTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionsTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PermissionsTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java Tue Jun 20 01:11:04 2006
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.io.File;
 import java.io.FilePermission;
 import java.security.Permissions;
 import java.util.Enumeration;
 
-public class PermissionsTest extends junit.framework.TestCase {
+public class Permissions2Test extends junit.framework.TestCase {
 	FilePermission readAllFiles = new FilePermission("<<ALL FILES>>", "read");
 
 	FilePermission alsoReadAllFiles = new FilePermission("<<ALL FILES>>",

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Policy2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PolicyTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Policy2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Policy2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PolicyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Policy2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.AccessControlException;
 import java.security.CodeSource;
@@ -21,7 +21,7 @@
 import java.security.PermissionCollection;
 import java.security.Policy;
 
-public class PolicyTest extends junit.framework.TestCase {
+public class Policy2Test extends junit.framework.TestCase {
 
 	static class TestPolicy extends Policy {
 		public PermissionCollection getPermissions(CodeSource cs) {

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PrivilegedActionExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PrivilegedActionExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/PrivilegedActionExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.io.IOException;
 import java.security.PrivilegedActionException;
 
-public class PrivilegedActionExceptionTest extends junit.framework.TestCase {
+public class PrivilegedActionException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.PrivilegedActionException#PrivilegedActionException(java.lang.Exception)

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Provider2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.Provider;
 
-public class ProviderTest extends junit.framework.TestCase {
+public class Provider2Test extends junit.framework.TestCase {
 
 	class TestProvider extends Provider {
 		TestProvider(String name, double version, String info) {

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/ProviderException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/ProviderException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/ProviderException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/ProviderExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/ProviderException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.ProviderException;
 
-public class ProviderExceptionTest extends junit.framework.TestCase {
+public class ProviderException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.ProviderException#ProviderException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureClassLoader2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureClassLoaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureClassLoader2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureClassLoader2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureClassLoaderTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureClassLoaderTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureClassLoader2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,7 +28,7 @@
 
 import tests.support.Support_GetLocal;
 
-public class SecureClassLoaderTest extends junit.framework.TestCase {
+public class SecureClassLoader2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.SecureClassLoader#getPermissions(java.security.CodeSource)

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureRandomTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureRandomTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecureRandomTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecureRandom2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
@@ -21,7 +21,7 @@
 import java.security.SecureRandom;
 import java.security.Security;
 
-public class SecureRandomTest extends junit.framework.TestCase {
+public class SecureRandom2Test extends junit.framework.TestCase {
 
 	private static final byte[] SEED_BYTES = { (byte) 33, (byte) 15, (byte) -3,
 			(byte) 22, (byte) 77, (byte) -16, (byte) -33, (byte) 56 };

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Security2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.InvalidParameterException;
 import java.security.Provider;
@@ -28,7 +28,7 @@
 import tests.support.Support_ProviderTrust;
 import tests.support.Support_TestProvider;
 
-public class SecurityTest extends junit.framework.TestCase {
+public class Security2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.Security#getProperty(java.lang.String)
@@ -146,27 +146,6 @@
 
 		// exception case
 		assertNull(Security.getProvider("IDontExist"));
-	}
-
-	/**
-	 * This test has been written with the default Harmony security
-	 * configuration in mind. Recode or else exclude from run if using a
-	 * different providers configuration. i.e.
-	 * security.provider.1=org.apache.harmony.security.provider.cert.DRLCertFactory
-	 * security.provider.2=org.bouncycastle.jce.provider.BouncyCastleProvider
-	 * 
-	 * @tests java.security.Security#getProviders()
-	 */
-	public void test_getProviders() {
-		// Test for method java.security.Provider []
-		// java.security.Security.getProviders()
-		Provider provTest[] = Security.getProviders();
-		assertEquals("the number of providers is not 2 it was: "
-				+ provTest.length, 2, provTest.length);
-		assertEquals("the first provider should be DRLCertFactory", "DRLCertFactory", provTest[0]
-				.getName());
-		assertEquals("the second provider should be BC", "BC", provTest[1].getName()
-				);
 	}
 
 	/**

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityPermissionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityPermissionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SecurityPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.SecurityPermission;
 
-public class SecurityPermissionTest extends junit.framework.TestCase {
+public class SecurityPermission2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.SecurityPermission#SecurityPermission(java.lang.String)

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signature2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signature2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signature2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signature2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.math.BigInteger;
 import java.security.InvalidParameterException;
@@ -24,7 +24,7 @@
 import java.security.Signature;
 import java.security.spec.DSAParameterSpec;
 
-public class SignatureTest extends junit.framework.TestCase {
+public class Signature2Test extends junit.framework.TestCase {
 
 	private static final String MESSAGE = "abc";
     static KeyPair keys;

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignatureException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignatureException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignatureException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignatureExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/SignatureException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.SignatureException;
 
-public class SignatureExceptionTest extends junit.framework.TestCase {
+public class SignatureException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.SignatureException#SignatureException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signer2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignerTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signer2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signer2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignerTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/SignerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/Signer2Test.java Tue Jun 20 01:11:04 2006
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.IdentityScope;
 import java.security.KeyManagementException;
@@ -21,9 +21,9 @@
 import java.security.KeyPairGenerator;
 import java.security.Signer;
 
-import tests.api.java.security.IdentityScopeTest.IdentityScopeSubclass;
+import org.apache.harmony.security.tests.java.security.IdentityScope2Test.IdentityScopeSubclass;
 
-public class SignerTest extends junit.framework.TestCase {
+public class Signer2Test extends junit.framework.TestCase {
 
 	public class SignerImpl extends Signer {
 		public SignerImpl() {

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/UnrecoverableKeyExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/UnrecoverableKeyExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/UnrecoverableKeyExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 
-package tests.api.java.security;
+package org.apache.harmony.security.tests.java.security;
 
 import java.security.UnrecoverableKeyException;
 
-public class UnrecoverableKeyExceptionTest extends junit.framework.TestCase {
+public class UnrecoverableKeyException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.UnrecoverableKeyException#UnrecoverableKeyException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/AclNotFoundExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/AclNotFoundExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/AclNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,13 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
 
 import java.security.acl.AclNotFoundException;
 
-public class AclNotFoundExceptionTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class AclNotFoundException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.acl.AclNotFoundException#AclNotFoundException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/AclNotFoundExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/AclNotFoundExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/AclNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/AclNotFoundExceptionTest.java Tue Jun 20 01:11:04 2006
@@ -1,46 +1,48 @@
-/*
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
-* @author Aleksei Y. Semenov
-* @version $Revision$
-*/
-
-package java.security.acl;
-
-import junit.framework.TestCase;
-
-/**
- * TODO Put your class description here
- * 
- */
-
-public class AclNotFoundExceptionTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AclNotFoundExceptionTest.class);
-    }
-
-    /**
-     * check default constructor 
-     */    
-    public void testAclNotFoundException() {
-        assertNotNull(new AclNotFoundException());
-        assertNull(new AclNotFoundException().getMessage());
-        assertNull(new AclNotFoundException().getCause());
-    }
-
-}
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Aleksei Y. Semenov
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.acl;
+
+import java.security.acl.AclNotFoundException;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for AclNotFoundException.
+ * 
+ */
+
+public class AclNotFoundExceptionTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(AclNotFoundExceptionTest.class);
+    }
+
+    /**
+     * check default constructor 
+     */    
+    public void testAclNotFoundException() {
+        assertNotNull(new AclNotFoundException());
+        assertNull(new AclNotFoundException().getMessage());
+        assertNull(new AclNotFoundException().getCause());
+    }
+
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/LastOwnerExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/LastOwnerExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/LastOwnerExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,13 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
 
 import java.security.acl.LastOwnerException;
 
-public class LastOwnerExceptionTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class LastOwnerException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.acl.LastOwnerException#LastOwnerException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/LastOwnerExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/LastOwnerExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/LastOwnerExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/LastOwnerExceptionTest.java Tue Jun 20 01:11:04 2006
@@ -1,43 +1,45 @@
-/*
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
-* @author Aleksei Y. Semenov
-* @version $Revision$
-*/
-
-package java.security.acl;
-
-import junit.framework.TestCase;
-
-/**
- * TODO Put your class description here
- * 
- */
-
-public class LastOwnerExceptionTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(LastOwnerExceptionTest.class);
-    }
-
-    public void testLastOwnerException() {
-        assertNotNull(new LastOwnerException());
-        assertNull(new LastOwnerException().getMessage());
-        assertNull(new LastOwnerException().getCause());
-    }
-
-}
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Aleksei Y. Semenov
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.acl;
+
+import java.security.acl.LastOwnerException;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for LastOwnerException.
+ * 
+ */
+
+public class LastOwnerExceptionTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(LastOwnerExceptionTest.class);
+    }
+
+    public void testLastOwnerException() {
+        assertNotNull(new LastOwnerException());
+        assertNull(new LastOwnerException().getMessage());
+        assertNull(new LastOwnerException().getCause());
+    }
+
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerException2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/NotOwnerExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerException2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerException2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/NotOwnerExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/acl/NotOwnerExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerException2Test.java Tue Jun 20 01:11:04 2006
@@ -13,11 +13,13 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.acl;
+package org.apache.harmony.security.tests.java.security.acl;
 
 import java.security.acl.NotOwnerException;
 
-public class NotOwnerExceptionTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class NotOwnerException2Test extends junit.framework.TestCase {
 
 	/**
 	 * @tests java.security.acl.NotOwnerException#NotOwnerException()

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/NotOwnerExceptionTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/NotOwnerExceptionTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/acl/NotOwnerExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/acl/NotOwnerExceptionTest.java Tue Jun 20 01:11:04 2006
@@ -1,43 +1,45 @@
-/*
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-
-/**
-* @author Aleksei Y. Semenov
-* @version $Revision$
-*/
-
-package java.security.acl;
-
-import junit.framework.TestCase;
-
-/**
- * TODO Put your class description here
- * 
- */
-
-public class NotOwnerExceptionTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(NotOwnerExceptionTest.class);
-    }
-
-    public void testNotOwnerException() {
-        assertNotNull(new NotOwnerException());
-        assertNull(new NotOwnerException().getMessage());
-        assertNull(new NotOwnerException().getCause());
-    }
-
-}
+/*
+ *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+/**
+* @author Aleksei Y. Semenov
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.acl;
+
+import java.security.acl.NotOwnerException;
+
+import junit.framework.TestCase;
+
+/**
+ * Unit test for NotOwnerException.
+ * 
+ */
+
+public class NotOwnerExceptionTest extends TestCase {
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(NotOwnerExceptionTest.class);
+    }
+
+    public void testNotOwnerException() {
+        assertNotNull(new NotOwnerException());
+        assertNull(new NotOwnerException().getMessage());
+        assertNull(new NotOwnerException().getCause());
+    }
+
+}



Mime
View raw message