minor cleanups

Author: dghgit

mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java

@@ -46,10 +46,9 @@
 import org.bouncycastle.asn1.smime.SMIMECapability;
 import org.bouncycastle.asn1.smime.SMIMECapabilityVector;
 import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.bouncycastle.cert.X509AttributeCertificateHolder;
 import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaAttrCertStore;
 import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cert.jcajce.JcaX509AttributeCertificateHolder;
 import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
 import org.bouncycastle.cms.SignerInformation;
 import org.bouncycastle.cms.SignerInformationStore;
@@ -62,8 +61,8 @@
 import org.bouncycastle.mail.smime.util.CRLFOutputStream;
 import org.bouncycastle.mail.smime.util.FileBackedMimeBodyPart;
 import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
+import org.bouncycastle.util.CollectionStore;
 import org.bouncycastle.util.Store;
-import org.bouncycastle.x509.X509AttributeCertificate;
 
 public class NewSMIMESignedTest
     extends TestCase
@@ -808,9 +807,13 @@ public void testWithAttributeCertificate()
 
         gen.addCertificates(certs);
 
-        X509AttributeCertificate attrCert = CMSTestUtil.getAttributeCertificate();
+        X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate();
 
-        Store store = new JcaAttrCertStore(attrCert);
+        List attrCertList = new ArrayList();
+
+        attrCertList.add(attrCert);
+
+        Store store = new CollectionStore(attrCertList);
 
         gen.addAttributeCertificates(store);
 
@@ -822,7 +825,7 @@ public void testWithAttributeCertificate()
 
         Store attrCerts = s.getAttributeCertificates();
 
-        assertTrue(attrCerts.getMatches(null).contains(new JcaX509AttributeCertificateHolder(attrCert)));
+        assertTrue(attrCerts.getMatches(null).contains(attrCert));
     }
 
     private void rsaPSSTest(String digest, String digestOID)

mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java

@@ -49,6 +49,7 @@
 import org.bouncycastle.asn1.smime.SMIMECapability;
 import org.bouncycastle.asn1.smime.SMIMECapabilityVector;
 import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.bouncycastle.cert.X509AttributeCertificateHolder;
 import org.bouncycastle.cms.SignerInformation;
 import org.bouncycastle.cms.SignerInformationStore;
 import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
@@ -59,7 +60,6 @@
 import org.bouncycastle.mail.smime.util.CRLFOutputStream;
 import org.bouncycastle.mail.smime.util.FileBackedMimeBodyPart;
 import org.bouncycastle.util.Store;
-import org.bouncycastle.x509.X509AttributeCertificate;
 import org.bouncycastle.x509.X509CollectionStoreParameters;
 import org.bouncycastle.x509.X509Store;
 
@@ -756,7 +756,7 @@ public void testWithAttributeCertificate()
 
         gen.addCertificatesAndCRLs(certs);
 
-        X509AttributeCertificate attrCert = CMSTestUtil.getAttributeCertificate();
+        X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate();
 
         X509Store store = X509Store.getInstance("AttributeCertificate/Collection",
                                     new X509CollectionStoreParameters(Collections.singleton(attrCert)), "BC");