harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r415555 [10/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/cert/TrustAnchorTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.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/cert/TrustAnchorTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/TrustAnchorTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/TrustAnchorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/TrustAnchorTest.java Tue Jun 20 01:11:04 2006
@@ -19,11 +19,13 @@
 * @version $Revision$
 */
 
-package java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
 
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.PublicKey;
+import java.security.cert.TrustAnchor;
+import java.security.cert.X509Certificate;
 import java.security.spec.InvalidKeySpecException;
 import java.util.Arrays;
 
@@ -34,7 +36,6 @@
 
 import junit.framework.TestCase;
 
-
 /**
  * Unit tests for <code>TrustAnchor</code>
  */
@@ -50,353 +51,6 @@
         "C=Testland";
 
     /**
-     * Constructor for TrustAnchorTest.
-     * @param arg0
-     */
-    public TrustAnchorTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test #1 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: creates <code>TrustAnchor</code> instance<br>
-     * Test preconditions: valid parameters passed<br>
-     * Expected: must pass without any exceptions
-     */
-    public final void testTrustAnchorX509CertificatebyteArray01()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        // sub testcase 1
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            getFullEncoding());
-        // sub testcase 2
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            getEncodingPSOnly());
-        // sub testcase 3
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            getEncodingESOnly());
-        // sub testcase 4
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            getEncodingNoMinMax());
-    }
-
-    /**
-     * Test #2 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: creates <code>TrustAnchor</code> instance<br>
-     * Test preconditions: <code>null</code> as nameConstraints passed<br>
-     * Expected: must pass without any exceptions
-     */
-    public final void testTrustAnchorX509CertificatebyteArray02()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            null);        
-    }
-
-    /**
-     * Test #3 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: nameConstraints cloned by the constructor<br>
-     * Test preconditions: modify passed nameConstraints<br>
-     * Expected: modification must not change object internal state
-     */
-    public final void testTrustAnchorX509CertificatebyteArray03()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        byte[] nc = getEncodingPSOnly();
-        byte[] ncCopy = nc.clone();
-        // sub testcase 5 - nameConstraints can be null
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias),
-                ncCopy);
-        // modify
-        ncCopy[0]=(byte)0;
-        // check that above modification did not change
-        // object internal state
-        assertTrue(Arrays.equals(nc, ta.getNameConstraints()));
-    }
-
-    /**
-     * Test #4 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: <code>NullPointerException</code> if <code>X509Certificate</code>
-     * parameter is <code>null</code><br>
-     * Test preconditions: pass <code>null</code> as <code>X509Certificate</code><br>
-     * Expected: NullPointerException
-     */
-    public final void testTrustAnchorX509CertificatebyteArray04()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        try {
-            new TrustAnchor(null, getFullEncoding());
-            fail("NullPointerException has not been thrown");
-        } catch (NullPointerException ok) {
-        }
-    }
-
-    /**
-     * Test #5 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: <code>IllegalArgumentException</code> if nameConstraints
-     * parameter can not be decoded<br>
-     * Test preconditions: pass invalid nameConstraints encoding<br>
-     * Expected: IllegalArgumentException
-     */
-    public final void testTrustAnchorX509CertificatebyteArray05()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-
-        // sub testcase 1:
-        byte [] nameConstraints = getFullEncoding();
-        // corrupt encoding:
-        // set wrong root seq length
-        nameConstraints[2] = (byte)0x8d;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 2:
-        nameConstraints = getFullEncoding();
-        // corrupt encoding:
-        // set wrong root seq length
-        nameConstraints[2] = (byte)0x8b;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 3:
-        nameConstraints = getFullEncoding();
-        // corrupt encoding:
-        // remove right class from seq tag
-        nameConstraints[3] &= (byte)0x3f;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 4:
-        nameConstraints = getEncodingESOnly();
-        // corrupt encoding:
-        // set wrong tagged value (excludedSubtrees SEQ OF) tag [2]
-        nameConstraints[2] = (byte)0xa2;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 5:
-        nameConstraints = getEncodingESOnly();
-        // corrupt encoding:
-        // remove CONSTRUCTED flag from tagged value (excludedSubtrees SEQ OF) tag
-        nameConstraints[2] &= (byte)0xdf;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 6:
-        nameConstraints = getEncodingESOnly();
-        // corrupt encoding:
-        // set CONSTRUCTED flag for PROMITIVE tagged value tag
-        // (generalSubtree's 'base' as IA5String)
-        nameConstraints[5] |= (byte)0x20;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-
-        // sub testcase 7:
-        nameConstraints = getEncodingESOnly();
-        // corrupt encoding:
-        // remove scheme from URI
-        // (generalSubtree's 'base' as IA5String (uniformResourceIdentifier))
-        nameConstraints[12] = nameConstraints[13] = nameConstraints[14] =
-            (byte)0x6f;
-        try {
-            new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-    }
-
-    /**
-     * Test #6 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: creates <code>TrustAnchor</code> instance<br>
-     * Test preconditions: valid parameters passed (base as OID)<br>
-     * Expected: must pass without any exceptions
-     */
-    public final void testTrustAnchorX509CertificatebyteArray06()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        byte []  nameConstraints = getEncodingOid();
-        new TrustAnchor(
-            (X509Certificate)ks.getCertificate(certAlias),
-            nameConstraints);
-    }
-
-    /**
-     * Test #7 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: <code>IllegalArgumentException</code> if nameConstraints
-     * parameter can not be decoded<br>
-     * Test preconditions: pass invalid nameConstraints (OID) encoding<br>
-     * Expected: IllegalArgumentException
-     */
-    public final void testTrustAnchorX509CertificatebyteArray07()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        byte []  nameConstraints = getEncodingOid();
-        //corrupt Oid
-        nameConstraints[10]= (byte) 0xFF;
-        try {
-            new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias),
-                nameConstraints);
-            fail("IllegalArgumentException has not been thrown");
-        } catch (IllegalArgumentException ok) {
-        }
-    }
-
-    /**
-     * Test #8 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: <code>IllegalArgumentException</code> if nameConstraints
-     * parameter can not be decoded<br>
-     * Test preconditions: pass invalid nameConstraints encodings<br>
-     * Expected: IllegalArgumentException
-     */
-    public final void testTrustAnchorX509CertificatebyteArray08()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        // GeneralName tags for this test (1,2 and 3 are omitted)
-        byte[] generalNameTag = new byte[] {
-                (byte)0xa0,(byte)0xa4,(byte)0xa5,
-                (byte)0x86,(byte)0x87,(byte)0x88
-        };
-        // wrong (for above tags) nameConstraints encoding
-        byte[] wrongEncoding = new byte[] {
-                (byte)0x30,(byte)0x0c, // sequence + length
-                (byte)0xa1,(byte)0x0a, // excluded subtrees, tag, len
-                (byte)0x30,(byte)0x08, // sequence of, tag, len
-                (byte)0xa0, // element 6 - tag identifying GeneralName choice
-                (byte)0x03, // GeneralName length
-                (byte)0x01,(byte)0x01,(byte)0xff, // wrong GeneralName for any choice 
-                (byte)0x80,(byte)0x01,(byte)0x00 // minimum
-        };
-        for (int i=0; i<generalNameTag.length; i++) {
-            wrongEncoding[6] = generalNameTag[i];
-            try {
-                new TrustAnchor(
-                    (X509Certificate)ks.getCertificate(certAlias),
-                    wrongEncoding);
-                fail("IllegalArgumentException has not been thrown for tag " +
-                        (generalNameTag[i]&0xff));
-            } catch (IllegalArgumentException ok) {
-            }
-        }
-    }
-
-    /**
-     * Test #9 for <code>TrustAnchor(X509Certificate, byte[])</code> constructor<br> 
-     * Assertion: <code>IllegalArgumentException</code> if nameConstraints
-     * parameter can not be decoded<br>
-     * Test preconditions: pass valid and then invalid nameConstraints encodings
-     * (GeneralName choice is [0] OtherName)<br>
-     * Expected: no exception for valid encoding and IllegalArgumentException for invalid
-     * @throws KeyStoreException
-     */
-    public final void testTrustAnchorX509CertificatebyteArray09()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        byte[] encoding = new byte[] {
-                (byte)0x30,(byte)0x13,(byte)0xa1,(byte)0x11,
-                (byte)0x30,(byte)0x0f,(byte)0xa0,(byte)0x0a,
-                (byte)0x06,(byte)0x03,(byte)0x00,(byte)0x01,(byte)0x02,
-                (byte)0xA0,(byte)0x03,1,1,(byte)0xff, 
-                (byte)0x80,(byte)0x01,(byte)0x00
-        };
-        try {
-            new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias), encoding);
-        } catch (IllegalArgumentException failed) {
-            fail("valid encoding not accepted");
-        }
-        // now corrupt encoding: set OtherName value tag to 1 (must be 0)
-        encoding[13] = 1;
-        try {
-            new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias), encoding);
-            fail("invalid encoding accepted");
-        } catch (IllegalArgumentException ok) {
-        }
-    }
-    /**
      * Test #1 for <code>TrustAnchor(String, PublicKey, byte[])</code> constructor<br> 
      * Assertion: creates <code>TrustAnchor</code> instance<br>
      * Test preconditions: valid parameters passed<br>
@@ -608,35 +262,6 @@
     }
 
     /**
-     * Test for <code>getNameConstraints()</code> method<br> 
-     * Assertion: returns <code>nameConstraints</code> der encoding<br>
-     * Test preconditions: valid nameConstraints parameter passed (not null)<br>
-     * Expected: encoding passed to the ctor must match returned one<br>
-     * Assertion: returns new <code>nameConstraints</code> der encoding each time<br>
-     * Test preconditions: valid nameConstraints parameter passed (not null)<br>
-     * Expected: must return new reference each time called
-     */
-    public final void testGetNameConstraints()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "testca1";
-        byte[] nc = getFullEncoding();
-        // sub testcase 1
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias), nc);
-        byte[] ncRet = ta.getNameConstraints();
-        // assert 1
-        assertTrue(Arrays.equals(nc, ncRet));
-        assertNotSame(nc, ncRet);
-        // assert 2
-        assertNotSame(ncRet, ta.getNameConstraints());
-    }
-
-    /**
      * Test #1 for <code>getCAPublicKey()</code> method<br>
      *  
      * Assertion: returns most trusted CA public key</code><br>
@@ -658,29 +283,6 @@
         assertEquals("equals2", pk, ta.getCAPublicKey());
     }
 
-    /**
-     * Test #2 for <code>getCAName()</code> method<br>
-     *  
-     * Assertion: returns ... <code>null</code> if <code>TrustAnchor</code>
-     * was not specified as public key and CA name or CA principal pair<br>
-     * Test preconditions: test object is not specified as public key
-     * and CA name or CA principal pair<br>
-     * Expected: <code>null</code> as return value<br>
-     * @throws KeyStoreException
-     * 
-     */
-    public final void testGetCAPublicKey02()
-        throws InvalidKeySpecException, KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate("testca1"),
-                null);
-        assertNull(ta.getCAPublicKey());
-    }
 
     /**
      * Test #1 for <code>getCAName()</code> method<br>
@@ -708,51 +310,6 @@
      * Test #2 for <code>getCAName()</code> method<br>
      *  
      * Assertion: returns ... <code>null</code> if <code>TrustAnchor</code>
-     * was not specified as public key and CA name or CA principal pair<br>
-     * Test preconditions: test object is not specified as public key
-     * and CA name or CA principal pair<br>
-     * Expected: <code>null</code> as return value<br>
-     * @throws KeyStoreException
-     */
-    public final void testGetCAName02()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate("testca1"),
-                null);
-        assertNull(ta.getCAName());
-    }
-
-    /**
-     * Test #1 for <code>getCAName()</code> method<br>
-     *  
-     * Assertion: returns most trusted CA certificate<br>
-     * Test preconditions: valid certificate passed to the constructor<br>
-     * Expected: the same certificate must be returned by the method<br>
-     * @throws KeyStoreException
-     * 
-     */
-    public final void testGetTrustedCert01()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        X509Certificate cert =
-            (X509Certificate)ks.getCertificate("testca1");
-        TrustAnchor ta = new TrustAnchor(cert, null);
-        assertEquals(cert, ta.getTrustedCert());
-    }
-
-    /**
-     * Test #2 for <code>getCAName()</code> method<br>
-     *  
-     * Assertion: returns ... <code>null</code> if <code>TrustAnchor</code>
      * was not specified as trusted certificate<br>
      * Test preconditions: test object is not specified as trusted certificate<br>
      * Expected: <code>null</code> as return value<br>
@@ -797,71 +354,6 @@
         assertEquals("equals2", x500p, ta.getCA());
     }
 
-    /**
-     * Test #2 for <code>getCA()</code> method<br>
-     *  
-     * Assertion: returns ... <code>null</code> if <code>TrustAnchor</code>
-     * was not specified as public key and CA name or CA principal pair<br>
-     * Test preconditions: test object is not specified as public key
-     * and CA name or CA principal pair<br>
-     * Expected: <code>null</code> as return value<br>
-     * @throws KeyStoreException
-     */
-    public final void testGetCA02()
-        throws KeyStoreException {
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate("testca1"),
-                null);
-        assertNull(ta.getCA());
-    }
-
-    /**
-     * Test for <code>toString()</code> method<br>
-     *  
-     * Assertion: returns string representation of this <code>TrustAnchor</code>
-     * Test preconditions: several valid test objects created<br>
-     * Expected: method returns not <code>null</code> in all cases<br>
-     */
-    public final void testToString() throws Exception {
-
-        KeyStore ks = TestUtils.getKeyStore(true, TestUtils.TRUSTED);
-        if (ks == null) {
-            fail(getName() + ": not performed (could not create test KeyStore)");
-        }
-
-        String certAlias = "test";
-
-        // sub testcase 1
-        TrustAnchor ta = new TrustAnchor(
-                (X509Certificate)ks.getCertificate(certAlias),
-                getFullEncoding());
-
-        assertNotNull("#1", ta.toString());
-
-        PublicKey pk = new TestKeyPair(keyAlg).getPublic();
-
-
-        // sub testcase 2
-        ta = new TrustAnchor(validCaNameRfc2253, pk, getEncodingESOnly());
-
-        assertNotNull("#2", ta.toString());
-
-        // sub testcase 3
-        X500Principal x500p = new X500Principal(validCaNameRfc2253);
-        ta = new TrustAnchor(x500p, pk, getEncodingNoMinMax());
-
-        assertNotNull("#3", ta.toString());
-
-        // sub testcase 4
-        ta = new TrustAnchor(x500p, pk, null);
-        assertNotNull("#4", ta.toString());
-    }
-
     //
     // Private stuff
     //
@@ -1053,14 +545,4 @@
         };
     }
 
-    // Returns OID encoding
-    // (generated by own encoder class created durind test development)
-    private static final byte[] getEncodingOid() {
-        // DO NOT MODIFY!
-        return new byte[] {
-                (byte) 0x30, (byte) 0x09, (byte) 0xA0, (byte) 0x07, 
-                (byte) 0x30, (byte) 0x05, (byte) 0x88, (byte) 0x03, 
-                (byte) 0x2A, (byte) 0x03, (byte) 0x04 
-        };
-    }
 }

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRL2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLTest.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/cert/X509CRL2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRL2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRL2Test.java Tue Jun 20 01:11:04 2006
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
 
 import java.io.InputStream;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
@@ -24,7 +23,9 @@
 
 import tests.support.resource.Support_Resources;
 
-public class X509CRLTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class X509CRL2Test extends junit.framework.TestCase {
 
 	private X509Certificate pemCert = null;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntry2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLEntryTest.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/cert/X509CRLEntry2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntry2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLEntryTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CRLEntryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntry2Test.java Tue Jun 20 01:11:04 2006
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
 
 import java.io.InputStream;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
@@ -24,7 +23,9 @@
 
 import tests.support.resource.Support_Resources;
 
-public class X509CRLEntryTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class X509CRLEntry2Test extends junit.framework.TestCase {
 
 	private X509Certificate pemCert = null;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLEntryTest.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/cert/X509CRLEntryTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLEntryTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLEntryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLEntryTest.java Tue Jun 20 01:11:04 2006
@@ -1,172 +1,172 @@
-/*
- *  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 Alexander Y. Kleymenov
-* @version $Revision$
-*/
-
-package java.security.cert;
-
-import java.math.BigInteger;
-import java.security.cert.CRLException;
-import java.security.cert.X509CRLEntry;
-import java.util.Date;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- */
-
-public class X509CRLEntryTest extends TestCase {
-
-    X509CRLEntry tbt_crlentry;
-
-    /**
-     * The stub class used for testing of non abstract methods.
-     */
-    private class TBTCRLEntry extends X509CRLEntry {
-        public Set getNonCriticalExtensionOIDs() {
-            return null;
-        }
-
-        public Set getCriticalExtensionOIDs() {
-            return null;
-        }
-
-        public byte[] getExtensionValue(String oid) {
-            return null;
-        }
-
-        public boolean hasUnsupportedCriticalExtension() {
-            return false;
-        }
-
-        public byte[] getEncoded() throws CRLException {
-            return null;
-        }
-
-        public BigInteger getSerialNumber() {
-            return null;
-        }
-
-        public Date getRevocationDate() {
-            return null;
-        }
-
-        public boolean hasExtensions() {
-            return false;
-        }
-
-        public String toString() {
-            return null;
-        }
-    }
-
-    public X509CRLEntryTest() {
-        tbt_crlentry = new TBTCRLEntry() {
-            public byte[] getEncoded() throws CRLException {
-                return new byte[] {1, 2, 3};
-            }
-        };
-    }
-
-    /**
-     * equals(Object other) method testing. Tests the correctnel of equal
-     * operation: it should be reflexive, symmetric, transitive, consistent
-     * and should be false on null object.
-     */
-    public void testEquals() {
-        TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() {
-            public byte[] getEncoded() {
-                return new byte[] {1, 2, 3};
-            }
-        };
-
-        TBTCRLEntry tbt_crlentry_2 = new TBTCRLEntry() {
-            public byte[] getEncoded() {
-                return new byte[] {1, 2, 3};
-            }
-        };
-
-        TBTCRLEntry tbt_crlentry_3 = new TBTCRLEntry() {
-            public byte[] getEncoded() {
-                return new byte[] {3, 2, 1};
-            }
-        };
-
-        // checking for reflexive law:
-        assertTrue("The equivalence relation should be reflexive.",
-                                            tbt_crlentry.equals(tbt_crlentry));
-
-        assertEquals("The CRL Entries with equals encoded form should be equal",
-                                            tbt_crlentry, tbt_crlentry_1);
-        // checking for symmetric law:
-        assertTrue("The equivalence relation should be symmetric.",
-                                            tbt_crlentry_1.equals(tbt_crlentry));
-
-        assertEquals("The CRL Entries with equals encoded form should be equal",
-                                            tbt_crlentry_1, tbt_crlentry_2);
-        // checking for transitive law:
-        assertTrue("The equivalence relation should be transitive.",
-                                            tbt_crlentry.equals(tbt_crlentry_2));
-
-        assertFalse("Should not be equal to null object.",
-                                            tbt_crlentry.equals(null));
-
-        assertFalse("The CRL Entries with differing encoded form "
-                                            + "should not be equal.",
-                                            tbt_crlentry.equals(tbt_crlentry_3));
-        assertFalse("The CRL Entries should not be equals to the object "
-                                + "which is not an instance of X509CRLEntry.",
-                                            tbt_crlentry.equals(new Object()));
-    }
-
-    /**
-     * hashCode() method testing. Tests that for equal objects hash codes
-     * are equal.
-     */
-    public void testHashCode() {
-        TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() {
-            public byte[] getEncoded() {
-                return new byte[] {1, 2, 3};
-            }
-        };
-        assertTrue("Equal objects should have the same hash codes.",
-                        tbt_crlentry.hashCode() == tbt_crlentry_1.hashCode());
-    }
-
-    /**
-     * getCertificateIssuer() method testing. Tests if the method throws
-     * appropriate exception.
-     */
-    public void testGetCertificateIssuer() {
-        assertNull("The default implementation should return null.", 
-                tbt_crlentry.getCertificateIssuer());
-    }
-
-    public static Test suite() {
-        return new TestSuite(X509CRLEntryTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-}
-
+/*
+ *  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 Alexander Y. Kleymenov
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.cert;
+
+import java.math.BigInteger;
+import java.security.cert.CRLException;
+import java.security.cert.X509CRLEntry;
+import java.util.Date;
+import java.util.Set;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ */
+
+public class X509CRLEntryTest extends TestCase {
+
+    X509CRLEntry tbt_crlentry;
+
+    /**
+     * The stub class used for testing of non abstract methods.
+     */
+    private class TBTCRLEntry extends X509CRLEntry {
+        public Set getNonCriticalExtensionOIDs() {
+            return null;
+        }
+
+        public Set getCriticalExtensionOIDs() {
+            return null;
+        }
+
+        public byte[] getExtensionValue(String oid) {
+            return null;
+        }
+
+        public boolean hasUnsupportedCriticalExtension() {
+            return false;
+        }
+
+        public byte[] getEncoded() throws CRLException {
+            return null;
+        }
+
+        public BigInteger getSerialNumber() {
+            return null;
+        }
+
+        public Date getRevocationDate() {
+            return null;
+        }
+
+        public boolean hasExtensions() {
+            return false;
+        }
+
+        public String toString() {
+            return null;
+        }
+    }
+
+    public X509CRLEntryTest() {
+        tbt_crlentry = new TBTCRLEntry() {
+            public byte[] getEncoded() throws CRLException {
+                return new byte[] {1, 2, 3};
+            }
+        };
+    }
+
+    /**
+     * equals(Object other) method testing. Tests the correctnel of equal
+     * operation: it should be reflexive, symmetric, transitive, consistent
+     * and should be false on null object.
+     */
+    public void testEquals() {
+        TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() {
+            public byte[] getEncoded() {
+                return new byte[] {1, 2, 3};
+            }
+        };
+
+        TBTCRLEntry tbt_crlentry_2 = new TBTCRLEntry() {
+            public byte[] getEncoded() {
+                return new byte[] {1, 2, 3};
+            }
+        };
+
+        TBTCRLEntry tbt_crlentry_3 = new TBTCRLEntry() {
+            public byte[] getEncoded() {
+                return new byte[] {3, 2, 1};
+            }
+        };
+
+        // checking for reflexive law:
+        assertTrue("The equivalence relation should be reflexive.",
+                                            tbt_crlentry.equals(tbt_crlentry));
+
+        assertEquals("The CRL Entries with equals encoded form should be equal",
+                                            tbt_crlentry, tbt_crlentry_1);
+        // checking for symmetric law:
+        assertTrue("The equivalence relation should be symmetric.",
+                                            tbt_crlentry_1.equals(tbt_crlentry));
+
+        assertEquals("The CRL Entries with equals encoded form should be equal",
+                                            tbt_crlentry_1, tbt_crlentry_2);
+        // checking for transitive law:
+        assertTrue("The equivalence relation should be transitive.",
+                                            tbt_crlentry.equals(tbt_crlentry_2));
+
+        assertFalse("Should not be equal to null object.",
+                                            tbt_crlentry.equals(null));
+
+        assertFalse("The CRL Entries with differing encoded form "
+                                            + "should not be equal.",
+                                            tbt_crlentry.equals(tbt_crlentry_3));
+        assertFalse("The CRL Entries should not be equals to the object "
+                                + "which is not an instance of X509CRLEntry.",
+                                            tbt_crlentry.equals(new Object()));
+    }
+
+    /**
+     * hashCode() method testing. Tests that for equal objects hash codes
+     * are equal.
+     */
+    public void testHashCode() {
+        TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() {
+            public byte[] getEncoded() {
+                return new byte[] {1, 2, 3};
+            }
+        };
+        assertTrue("Equal objects should have the same hash codes.",
+                        tbt_crlentry.hashCode() == tbt_crlentry_1.hashCode());
+    }
+
+    /**
+     * getCertificateIssuer() method testing. Tests if the method throws
+     * appropriate exception.
+     */
+    public void testGetCertificateIssuer() {
+        assertNull("The default implementation should return null.", 
+                tbt_crlentry.getCertificateIssuer());
+    }
+
+    public static Test suite() {
+        return new TestSuite(X509CRLEntryTest.class);
+    }
+
+    public static void main(String[] args) {
+        junit.textui.TestRunner.run(suite());
+    }
+}
+

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.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/cert/X509CRLTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/cert/X509CRLTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509CRLTest.java Tue Jun 20 01:11:04 2006
@@ -19,7 +19,7 @@
 * @version $Revision$
 */
 
-package java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
 
 import java.math.BigInteger;
 import java.security.InvalidKeyException;
@@ -29,7 +29,10 @@
 import java.security.PublicKey;
 import java.security.SignatureException;
 import java.security.cert.CRLException;
+import java.security.cert.Certificate;
+import java.security.cert.X509CRL;
 import java.security.cert.X509CRLEntry;
+import java.security.cert.X509Certificate;
 import java.util.Date;
 import java.util.Set;
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509Certificate2Test.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CertificateTest.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/cert/X509Certificate2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509Certificate2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CertificateTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/tests/api/java/security/cert/X509CertificateTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/cert/X509Certificate2Test.java Tue Jun 20 01:11:04 2006
@@ -13,10 +13,9 @@
  * limitations under the License.
  */
 
-package tests.api.java.security.cert;
+package org.apache.harmony.security.tests.java.security.cert;
 
 import java.io.InputStream;
-import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
 import java.util.Iterator;
@@ -24,7 +23,9 @@
 
 import tests.support.resource.Support_Resources;
 
-public class X509CertificateTest extends junit.framework.TestCase {
+import junit.framework.TestCase;
+
+public class X509Certificate2Test extends junit.framework.TestCase {
 	private X509Certificate pemCert = null;
 
 	protected void setUp() throws Exception {

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPrivateKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPrivateKeyTest.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/interfaces/DSAPrivateKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPrivateKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPrivateKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPrivateKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPrivateKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,75 +1,76 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.DSAPrivateKey;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>DSAPrivateKey</code> class field
- * 
- */
-public class DSAPrivateKeyTest extends TestCase {
-
-    /**
-     * Constructor for DSAPrivateKeyTest.
-     * 
-     * @param arg0
-     */
-    public DSAPrivateKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkDSAPrivateKey k = new checkDSAPrivateKey();
-        assertEquals("Incorrect serialVerstionUID",
-                k.getSerVerUID(), //DSAPrivateKey.serialVersionUID 
-                7776497482533790279L);
-    }
-    
-    public class checkDSAPrivateKey implements DSAPrivateKey {
-        public String getAlgorithm() {
-            return "DSAPrivateKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-        public BigInteger getX() {
-            return null;
-        }
-        public DSAParams getParams() {
-            return null;
-        }        
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPrivateKey;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>DSAPrivateKey</code> class field
+ * 
+ */
+public class DSAPrivateKeyTest extends TestCase {
+
+    /**
+     * Constructor for DSAPrivateKeyTest.
+     * 
+     * @param arg0
+     */
+    public DSAPrivateKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkDSAPrivateKey k = new checkDSAPrivateKey();
+        assertEquals("Incorrect serialVerstionUID",
+                k.getSerVerUID(), //DSAPrivateKey.serialVersionUID 
+                7776497482533790279L);
+    }
+    
+    public class checkDSAPrivateKey implements DSAPrivateKey {
+        public String getAlgorithm() {
+            return "DSAPrivateKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+        public BigInteger getX() {
+            return null;
+        }
+        public DSAParams getParams() {
+            return null;
+        }        
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPublicKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPublicKeyTest.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/interfaces/DSAPublicKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPublicKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPublicKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/DSAPublicKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/DSAPublicKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,74 +1,75 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.DSAPublicKey;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>DSAPublicKey</code> class field
- * 
- */
-public class DSAPublicKeyTest extends TestCase {
-
-    /**
-     * Constructor for DSAPublicKeyTest.
-     * 
-     * @param arg0
-     */
-    public DSAPublicKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkDSAPublicKey k = new checkDSAPublicKey();
-        assertEquals("Incorrect serialVerstionUID",
-                k.getSerVerUID(), //DSAPublicKey.serialVersionUID 
-                1234526332779022332L);
-    }
-    public class checkDSAPublicKey implements DSAPublicKey {
-        public String getAlgorithm() {
-            return "DSAPublicKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-        public BigInteger getY() {
-            return null;
-        }
-        public DSAParams getParams() {
-            return null;
-        }        
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.DSAParams;
+import java.security.interfaces.DSAPublicKey;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>DSAPublicKey</code> class field
+ * 
+ */
+public class DSAPublicKeyTest extends TestCase {
+
+    /**
+     * Constructor for DSAPublicKeyTest.
+     * 
+     * @param arg0
+     */
+    public DSAPublicKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkDSAPublicKey k = new checkDSAPublicKey();
+        assertEquals("Incorrect serialVerstionUID",
+                k.getSerVerUID(), //DSAPublicKey.serialVersionUID 
+                1234526332779022332L);
+    }
+    public class checkDSAPublicKey implements DSAPublicKey {
+        public String getAlgorithm() {
+            return "DSAPublicKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+        public BigInteger getY() {
+            return null;
+        }
+        public DSAParams getParams() {
+            return null;
+        }        
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPrivateKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPrivateKeyTest.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/interfaces/ECPrivateKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPrivateKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPrivateKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPrivateKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPrivateKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,76 +1,76 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.ECPrivateKey;
-import java.security.spec.ECParameterSpec;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>ECPrivateKey</code> class field
- * 
- */
-public class ECPrivateKeyTest extends TestCase {
-
-    /**
-     * Constructor for ECPrivateKeyTest.
-     * 
-     * @param arg0
-     */
-    public ECPrivateKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkECPrivateKey k = new checkECPrivateKey();
-        assertEquals("Incorrect serialVerstionUID",
-                k.getSerVerUID(), //ECPrivateKey.serialVersionUID
-                -7896394956925609184L);
-    }
-    
-    public class checkECPrivateKey implements ECPrivateKey {
-        public String getAlgorithm() {
-            return "ECPrivateKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }        
-        public BigInteger getS() {
-            return null;
-        }
-        public ECParameterSpec getParams() {
-            return null;
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.ECPrivateKey;
+import java.security.spec.ECParameterSpec;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>ECPrivateKey</code> class field
+ * 
+ */
+public class ECPrivateKeyTest extends TestCase {
+
+    /**
+     * Constructor for ECPrivateKeyTest.
+     * 
+     * @param arg0
+     */
+    public ECPrivateKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkECPrivateKey k = new checkECPrivateKey();
+        assertEquals("Incorrect serialVerstionUID",
+                k.getSerVerUID(), //ECPrivateKey.serialVersionUID
+                -7896394956925609184L);
+    }
+    
+    public class checkECPrivateKey implements ECPrivateKey {
+        public String getAlgorithm() {
+            return "ECPrivateKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }        
+        public BigInteger getS() {
+            return null;
+        }
+        public ECParameterSpec getParams() {
+            return null;
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPublicKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPublicKeyTest.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/interfaces/ECPublicKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPublicKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPublicKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/ECPublicKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/ECPublicKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,75 +1,75 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.security.spec.ECPoint;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECParameterSpec;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>ECPublicKey</code> class field
- * 
- */
-public class ECPublicKeyTest extends TestCase {
-
-    /**
-     * Constructor for ECPublicKeyTest.
-     * 
-     * @param arg0
-     */
-    public ECPublicKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkECPublicKey key = new checkECPublicKey();
-        assertEquals("Incorrect serialVersionUID",
-                key.getSerVerUID(), // ECPublicKey.serialVersionUID
-                -3314988629879632826L);
-    }
-    public class checkECPublicKey implements ECPublicKey {
-        public String getAlgorithm() {
-            return "ECPublicKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }        
-        public ECPoint getW() {
-            return null;
-        }
-        public ECParameterSpec getParams() {
-            return null;
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.security.spec.ECPoint;
+import java.security.interfaces.ECPublicKey;
+import java.security.spec.ECParameterSpec;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>ECPublicKey</code> class field
+ * 
+ */
+public class ECPublicKeyTest extends TestCase {
+
+    /**
+     * Constructor for ECPublicKeyTest.
+     * 
+     * @param arg0
+     */
+    public ECPublicKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkECPublicKey key = new checkECPublicKey();
+        assertEquals("Incorrect serialVersionUID",
+                key.getSerVerUID(), // ECPublicKey.serialVersionUID
+                -3314988629879632826L);
+    }
+    public class checkECPublicKey implements ECPublicKey {
+        public String getAlgorithm() {
+            return "ECPublicKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }        
+        public ECPoint getW() {
+            return null;
+        }
+        public ECParameterSpec getParams() {
+            return null;
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.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/interfaces/RSAMultiPrimePrivateCrtKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,97 +1,97 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.RSAMultiPrimePrivateCrtKey;
-import java.security.spec.RSAOtherPrimeInfo;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>RSAMultiPrimePrivateCrtKey</code> class field
- * 
- */
-public class RSAMultiPrimePrivateCrtKeyTest extends TestCase {
-
-    /**
-     * Constructor for RSAMultiPrimePrivateCrtKeyTest.
-     * 
-     * @param arg0
-     */
-    public RSAMultiPrimePrivateCrtKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkCrtKey k = new checkCrtKey();
-        assertEquals("Incorrect serialVersionUID",
-                k.getSerVerUID(), //RSAMultiPrimePrivateCrtKey.serialVersionUID
-                618058533534628008L);
-    }
-    
-    public class checkCrtKey  implements RSAMultiPrimePrivateCrtKey {
-        public BigInteger getModulus() {
-            return null;
-        }
-        public BigInteger getPrivateExponent() {
-            return null;
-        }
-        public BigInteger getCrtCoefficient() {
-            return null;
-        }
-        public RSAOtherPrimeInfo[] getOtherPrimeInfo() {
-            return null;
-        }
-        public BigInteger getPrimeP() {
-            return null;
-        }
-        public BigInteger getPrimeQ() {
-            return null;
-        }
-        public BigInteger getPrimeExponentP() {
-            return null;
-        }
-        public BigInteger getPrimeExponentQ() {
-            return null;
-        }
-        public BigInteger getPublicExponent() {
-            return null;
-        }
-        public String getAlgorithm() {
-            return "ECPublicKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }        
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }        
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.RSAMultiPrimePrivateCrtKey;
+import java.security.spec.RSAOtherPrimeInfo;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>RSAMultiPrimePrivateCrtKey</code> class field
+ * 
+ */
+public class RSAMultiPrimePrivateCrtKeyTest extends TestCase {
+
+    /**
+     * Constructor for RSAMultiPrimePrivateCrtKeyTest.
+     * 
+     * @param arg0
+     */
+    public RSAMultiPrimePrivateCrtKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkCrtKey k = new checkCrtKey();
+        assertEquals("Incorrect serialVersionUID",
+                k.getSerVerUID(), //RSAMultiPrimePrivateCrtKey.serialVersionUID
+                618058533534628008L);
+    }
+    
+    public class checkCrtKey  implements RSAMultiPrimePrivateCrtKey {
+        public BigInteger getModulus() {
+            return null;
+        }
+        public BigInteger getPrivateExponent() {
+            return null;
+        }
+        public BigInteger getCrtCoefficient() {
+            return null;
+        }
+        public RSAOtherPrimeInfo[] getOtherPrimeInfo() {
+            return null;
+        }
+        public BigInteger getPrimeP() {
+            return null;
+        }
+        public BigInteger getPrimeQ() {
+            return null;
+        }
+        public BigInteger getPrimeExponentP() {
+            return null;
+        }
+        public BigInteger getPrimeExponentQ() {
+            return null;
+        }
+        public BigInteger getPublicExponent() {
+            return null;
+        }
+        public String getAlgorithm() {
+            return "ECPublicKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }        
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }        
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateCrtKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateCrtKeyTest.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/interfaces/RSAPrivateCrtKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateCrtKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateCrtKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateCrtKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateCrtKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,93 +1,93 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.RSAPrivateCrtKey;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>RSAPrivateCrtKey</code> class field
- * 
- */
-public class RSAPrivateCrtKeyTest extends TestCase {
-
-    /**
-     * Constructor for RSAPrivateCrtKeyTest.
-     * 
-     * @param arg0
-     */
-    public RSAPrivateCrtKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkRSAPrivateCrtKey key = new checkRSAPrivateCrtKey();
-        assertEquals("Incorrect serialVersionUID",
-                key.getSerVerUID(), //RSAPrivateCrtKey.serialVersionUID
-                -5682214253527700368L);
-    }
-    public class checkRSAPrivateCrtKey implements RSAPrivateCrtKey {
-        public String getAlgorithm() {
-            return "RSAPrivateCrtKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-        public BigInteger getCrtCoefficient() {
-            return null;
-        }
-        public BigInteger getPrimeP() {
-            return null;
-        }
-        public BigInteger getPrimeQ() {
-            return null;
-        }
-        public BigInteger getPrimeExponentP() {
-            return null;
-        }
-        public BigInteger getPrimeExponentQ() {
-            return null;
-        }
-        public BigInteger getPublicExponent() {
-            return null;
-        }
-        public BigInteger getModulus() {
-            return null;
-        }
-        public BigInteger getPrivateExponent() {
-            return null;
-        }
-        
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.RSAPrivateCrtKey;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>RSAPrivateCrtKey</code> class field
+ * 
+ */
+public class RSAPrivateCrtKeyTest extends TestCase {
+
+    /**
+     * Constructor for RSAPrivateCrtKeyTest.
+     * 
+     * @param arg0
+     */
+    public RSAPrivateCrtKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkRSAPrivateCrtKey key = new checkRSAPrivateCrtKey();
+        assertEquals("Incorrect serialVersionUID",
+                key.getSerVerUID(), //RSAPrivateCrtKey.serialVersionUID
+                -5682214253527700368L);
+    }
+    public class checkRSAPrivateCrtKey implements RSAPrivateCrtKey {
+        public String getAlgorithm() {
+            return "RSAPrivateCrtKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+        public BigInteger getCrtCoefficient() {
+            return null;
+        }
+        public BigInteger getPrimeP() {
+            return null;
+        }
+        public BigInteger getPrimeQ() {
+            return null;
+        }
+        public BigInteger getPrimeExponentP() {
+            return null;
+        }
+        public BigInteger getPrimeExponentQ() {
+            return null;
+        }
+        public BigInteger getPublicExponent() {
+            return null;
+        }
+        public BigInteger getModulus() {
+            return null;
+        }
+        public BigInteger getPrivateExponent() {
+            return null;
+        }
+        
+    }
+}

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateKeyTest.java (from r414728, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateKeyTest.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/interfaces/RSAPrivateKeyTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateKeyTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateKeyTest.java&r1=414728&r2=415555&rev=415555&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/interfaces/RSAPrivateKeyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java/org/apache/harmony/security/tests/java/security/interfaces/RSAPrivateKeyTest.java Tue Jun 20 01:11:04 2006
@@ -1,74 +1,74 @@
-/*
- *  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 Vera Y. Petrashkova
-* @version $Revision$
-*/
-
-package java.security.interfaces;
-
-
-import java.math.BigInteger;
-import java.security.interfaces.RSAPrivateKey;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for <code>RSAPrivateKey</code> class field
- * 
- */
-public class RSAPrivateKeyTest extends TestCase {
-
-    /**
-     * Constructor for RSAPrivateKeyTest.
-     * 
-     * @param arg0
-     */
-    public RSAPrivateKeyTest(String arg0) {
-        super(arg0);
-    }
-
-    /**
-     * Test for <code>serialVersionUID</code> field
-     */
-    public void testField() {
-        checkRSAPrivateKey key = new checkRSAPrivateKey();
-        assertEquals("Incorrect serialVersionUID",
-                key.getSerVerUID(), //RSAPrivateKey.serialVersionUID, 
-                5187144804936595022L);
-    }
-    public class checkRSAPrivateKey implements RSAPrivateKey {
-        public String getAlgorithm() {
-            return "RSAPrivateKey";
-        }
-        public String getFormat() {
-            return "Format";
-        }
-        public byte[] getEncoded() {
-            return new byte[0];
-        }
-        public long getSerVerUID() {
-            return serialVersionUID;
-        }
-        public BigInteger getPrivateExponent() {
-            return null;
-        }
-        public BigInteger getModulus() {
-            return null;
-        }
-    }
-}
+/*
+ *  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 Vera Y. Petrashkova
+* @version $Revision$
+*/
+
+package org.apache.harmony.security.tests.java.security.interfaces;
+
+
+import java.math.BigInteger;
+import java.security.interfaces.RSAPrivateKey;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests for <code>RSAPrivateKey</code> class field
+ * 
+ */
+public class RSAPrivateKeyTest extends TestCase {
+
+    /**
+     * Constructor for RSAPrivateKeyTest.
+     * 
+     * @param arg0
+     */
+    public RSAPrivateKeyTest(String arg0) {
+        super(arg0);
+    }
+
+    /**
+     * Test for <code>serialVersionUID</code> field
+     */
+    public void testField() {
+        checkRSAPrivateKey key = new checkRSAPrivateKey();
+        assertEquals("Incorrect serialVersionUID",
+                key.getSerVerUID(), //RSAPrivateKey.serialVersionUID, 
+                5187144804936595022L);
+    }
+    public class checkRSAPrivateKey implements RSAPrivateKey {
+        public String getAlgorithm() {
+            return "RSAPrivateKey";
+        }
+        public String getFormat() {
+            return "Format";
+        }
+        public byte[] getEncoded() {
+            return new byte[0];
+        }
+        public long getSerVerUID() {
+            return serialVersionUID;
+        }
+        public BigInteger getPrivateExponent() {
+            return null;
+        }
+        public BigInteger getModulus() {
+            return null;
+        }
+    }
+}



Mime
View raw message