Java 4 compatibility fixes.

Author: dghgit

ant/jdk14.xml

@@ -136,10 +136,14 @@
             <fileset dir="pg/src/test/java">
                 <exclude name="**/keybox/**/*.java"/>
                 <exclude name="**/gpg/test/*.java"/>
+                <exclude name="**/api/test/*.java"/>
                 <exclude name="**/BcImplProviderTest.java"/>
                 <exclude name="**/OperatorJcajceTest.java"/>
                 <exclude name="**/AEADWithArgon2Test.java"/>
                 <exclude name="**/AEADProtectedPGPSecretKeyTest.java"/>
+                <exclude name="**/OpenPGPKeyEditorTest.java"/>
+                <exclude name="**/OpenPGPMessageGeneratorTest.java"/>
+                <exclude name="**/OpenPGPKeyReaderTest.java"/>
             </fileset>
             <fileset dir="pkix/src/test/java">
                 <exclude name="**/est/**/*.java"/>
@@ -161,6 +165,7 @@
 	    </fileset>
             <fileset dir="prov/src/test/java">
                 <exclude name="**/AEADTest.java"/>
+                <exclude name="**/PQCDHTest.java"/>
                 <exclude name="**/ECEncodingTest.java"/>
                 <exclude name="**/jce/provider/test/ChaCha20Poly1305Test.java"/>
                 <exclude name="**/DetDSATest.java"/>

pkix/src/test/java/org/bouncycastle/cert/test/SampleCredentials.java

@@ -20,7 +20,6 @@
 import org.bouncycastle.test.TestResourceFinder;
 import org.bouncycastle.util.io.pem.PemObject;
 import org.bouncycastle.util.io.pem.PemReader;
-import org.junit.Assert;
 
 public class SampleCredentials
 {
@@ -70,7 +69,10 @@ private static SampleCredentials load(String algorithm, String path, String name
             X509Certificate certificate = (X509Certificate)cf.generateCertificate(
                 new ByteArrayInputStream(pemCert.getContent()));
 
-            Assert.assertEquals(publicKey, certificate.getPublicKey());
+            if (!publicKey.equals(certificate.getPublicKey()))
+            {
+                throw new IllegalStateException("public key mismatch");
+            }
 
             return new SampleCredentials(keyPair, certificate);
         }

pkix/src/test/jdk1.4/org/bouncycastle/cert/test/AllTests.java

@@ -0,0 +1,101 @@
+package org.bouncycastle.cert.test;
+
+import java.security.Security;
+
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.test.PrintTestResult;
+import org.bouncycastle.util.test.SimpleTestResult;
+
+public class AllTests
+    extends TestCase
+{
+    public void setUp()
+    {
+        if (Security.getProvider("BC") == null)
+        {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+    }
+    
+    public void testSimpleTests()
+    {
+        org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[]
+        {
+            new AttrCertSelectorTest(),
+            new AttrCertTest(),
+            new CertPathLoopTest(),
+            new CertTest(),
+            new DANETest(),
+            new ExternalKeyTest(),
+            new GOST3410_2012CMSTest(),
+            new MLDSACredentialsTest(),
+            new PKCS10Test(),
+            new SLHDSACredentialsTest(),
+            new X509ExtensionUtilsTest(),
+        };
+
+        for (int i = 0; i != tests.length; i++)
+        {
+            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
+
+            if (!result.isSuccessful())
+            {
+                if (result.getException() != null)
+                {
+                    result.getException().printStackTrace();
+                }
+                fail(result.toString());
+            }
+        }
+    }
+
+    public static void main (String[] args)
+    {
+        PrintTestResult.printResult(junit.textui.TestRunner.run(suite()));
+    }
+
+    public static Test suite()
+    {
+        TestSuite suite = new TestSuite("Cert Tests");
+
+        if (Security.getProvider("BC") == null)
+        {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+
+        suite.addTestSuite(AllTests.class);
+        suite.addTestSuite(BcAttrCertSelectorTest.class);
+        suite.addTestSuite(BcAttrCertSelectorTest.class);
+        suite.addTestSuite(BcAttrCertTest.class);
+        suite.addTestSuite(BcCertTest.class);
+        suite.addTestSuite(BcPKCS10Test.class);
+        suite.addTestSuite(PQCPKCS10Test.class);
+        suite.addTest(ConverterTest.suite());
+
+        return new BCTestSetup(suite);
+    }
+
+    static class BCTestSetup
+        extends TestSetup
+    {
+        public BCTestSetup(Test test)
+        {
+            super(test);
+        }
+
+        protected void setUp()
+        {
+            Security.addProvider(new BouncyCastleProvider());
+        }
+
+        protected void tearDown()
+        {
+            Security.removeProvider("BC");
+        }
+    }
+
+}