summaryrefslogtreecommitdiffstats
path: root/pki/base/common/test
diff options
context:
space:
mode:
Diffstat (limited to 'pki/base/common/test')
-rw-r--r--pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java80
-rw-r--r--pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java26
-rw-r--r--pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java5
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java3
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java10
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java18
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java12
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java7
-rw-r--r--pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java8
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java7
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java8
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java12
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java22
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java4
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java11
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java23
-rw-r--r--pki/base/common/test/com/netscape/cmscore/request/RequestTest.java40
-rw-r--r--pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java9
18 files changed, 168 insertions, 137 deletions
diff --git a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
index fff90ed8..ac5fe224 100644
--- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
+++ b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java
@@ -1,49 +1,69 @@
package com.netscape.certsrv.app;
+import java.math.BigInteger;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.X509CRL;
+import java.security.cert.X509Certificate;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.Vector;
+
+import netscape.ldap.LDAPConnection;
+import netscape.ldap.LDAPException;
+import netscape.ldap.LDAPSSLSocketFactoryExt;
+import netscape.security.util.ObjectIdentifier;
+import netscape.security.x509.Extension;
+import netscape.security.x509.GeneralName;
+import netscape.security.x509.X509CertInfo;
+
+import org.mozilla.jss.CryptoManager.CertificateUsage;
+import org.mozilla.jss.util.PasswordCallback;
+
+import com.netscape.certsrv.acls.EACLsException;
+import com.netscape.certsrv.acls.IACL;
import com.netscape.certsrv.apps.ICMSEngine;
import com.netscape.certsrv.apps.ICommandQueue;
-import com.netscape.certsrv.base.*;
-import com.netscape.certsrv.logging.ILogger;
-import com.netscape.certsrv.request.IRequest;
-import com.netscape.certsrv.acls.IACL;
-import com.netscape.certsrv.acls.EACLsException;
+import com.netscape.certsrv.authority.IAuthority;
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.base.IArgBlock;
+import com.netscape.certsrv.base.ICRLPrettyPrint;
+import com.netscape.certsrv.base.ICertPrettyPrint;
+import com.netscape.certsrv.base.IConfigStore;
+import com.netscape.certsrv.base.IExtPrettyPrint;
+import com.netscape.certsrv.base.IPrettyPrintFormat;
+import com.netscape.certsrv.base.ISecurityDomainSessionTable;
+import com.netscape.certsrv.base.ISubsystem;
+import com.netscape.certsrv.ca.ICRLIssuingPoint;
+import com.netscape.certsrv.connector.IHttpConnection;
+import com.netscape.certsrv.connector.IPKIMessage;
+import com.netscape.certsrv.connector.IRemoteAuthority;
+import com.netscape.certsrv.connector.IRequestEncoder;
+import com.netscape.certsrv.connector.IResender;
import com.netscape.certsrv.dbs.crldb.ICRLIssuingPointRecord;
import com.netscape.certsrv.dbs.repository.IRepositoryRecord;
-import com.netscape.certsrv.connector.*;
-import com.netscape.certsrv.ca.ICRLIssuingPoint;
-import com.netscape.certsrv.ldap.ILdapConnInfo;
import com.netscape.certsrv.ldap.ELdapException;
import com.netscape.certsrv.ldap.ILdapAuthInfo;
import com.netscape.certsrv.ldap.ILdapConnFactory;
+import com.netscape.certsrv.ldap.ILdapConnInfo;
+import com.netscape.certsrv.logging.ILogger;
+import com.netscape.certsrv.notification.IEmailFormProcessor;
+import com.netscape.certsrv.notification.IEmailResolver;
+import com.netscape.certsrv.notification.IEmailResolverKeys;
+import com.netscape.certsrv.notification.IEmailTemplate;
+import com.netscape.certsrv.notification.IMailNotification;
import com.netscape.certsrv.password.IPasswordCheck;
-import com.netscape.certsrv.notification.*;
-import com.netscape.certsrv.policy.IGeneralNamesConfig;
import com.netscape.certsrv.policy.IGeneralNameAsConstraintsConfig;
import com.netscape.certsrv.policy.IGeneralNamesAsConstraintsConfig;
+import com.netscape.certsrv.policy.IGeneralNamesConfig;
import com.netscape.certsrv.policy.ISubjAltNameConfig;
-import com.netscape.certsrv.authority.IAuthority;
+import com.netscape.certsrv.request.IRequest;
import com.netscape.cmsutil.net.ISocketFactory;
import com.netscape.cmsutil.password.IPasswordStore;
-import java.util.*;
-import java.math.BigInteger;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.security.cert.X509CRL;
-import java.security.NoSuchAlgorithmException;
-
-import netscape.security.x509.Extension;
-import netscape.security.x509.X509CertInfo;
-import netscape.security.x509.GeneralName;
-import netscape.security.util.ObjectIdentifier;
-import netscape.ldap.LDAPSSLSocketFactoryExt;
-import netscape.ldap.LDAPConnection;
-import netscape.ldap.LDAPException;
-
-import org.mozilla.jss.CryptoManager.CertificateUsage;
-import org.mozilla.jss.util.PasswordCallback;
-
/**
* Default engine stub for testing.
*/
diff --git a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
index 0df5ac1a..3f83b3b0 100644
--- a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
+++ b/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
@@ -1,25 +1,23 @@
package com.netscape.certsrv.authentication;
-import com.netscape.cmscore.test.CMSBaseTestCase;
-import com.netscape.certsrv.app.CMSEngineDefaultStub;
-import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.usrgrp.Certificates;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
+import java.io.IOException;
import java.math.BigInteger;
-import java.util.Hashtable;
-import java.util.Date;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
-import java.io.IOException;
+import java.util.Date;
-import netscape.security.x509.X509CertImpl;
-import netscape.security.x509.CertificateExtensions;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import netscape.security.util.DerOutputStream;
import netscape.security.x509.BasicConstraintsExtension;
+import netscape.security.x509.CertificateExtensions;
import netscape.security.x509.PKIXExtensions;
-import netscape.security.util.DerValue;
-import netscape.security.util.DerOutputStream;
+import netscape.security.x509.X509CertImpl;
+
+import com.netscape.certsrv.app.CMSEngineDefaultStub;
+import com.netscape.certsrv.apps.CMS;
+import com.netscape.certsrv.usrgrp.Certificates;
+import com.netscape.cmscore.test.CMSBaseTestCase;
public class AuthTokenTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
index 222944a7..28ea1669 100644
--- a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
+++ b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java
@@ -1,10 +1,11 @@
package com.netscape.certsrv.request;
-import com.netscape.cmscore.test.CMSBaseTestCase;
+import java.util.Vector;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import java.util.Vector;
+import com.netscape.cmscore.test.CMSBaseTestCase;
public class AgentApprovalsTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
index 2d419b72..3fd6a96f 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java
@@ -17,7 +17,8 @@
// --- END COPYRIGHT BLOCK ---
package com.netscape.cmscore.dbs;
-import junit.framework.*;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.dbs.IElementProcessor;
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
index b533475a..2095e162 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java
@@ -1,10 +1,16 @@
package com.netscape.cmscore.dbs;
+import netscape.ldap.LDAPAttributeSet;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.ISubsystem;
-import com.netscape.certsrv.dbs.*;
-import netscape.ldap.LDAPAttributeSet;
+import com.netscape.certsrv.dbs.EDBException;
+import com.netscape.certsrv.dbs.IDBAttrMapper;
+import com.netscape.certsrv.dbs.IDBDynAttrMapper;
+import com.netscape.certsrv.dbs.IDBObj;
+import com.netscape.certsrv.dbs.IDBRegistry;
+import com.netscape.certsrv.dbs.IFilterConverter;
/**
* A default stub ojbect for tests to extend.
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
index 6517c6bf..e18cbf8a 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java
@@ -1,22 +1,22 @@
package com.netscape.cmscore.dbs;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import netscape.ldap.LDAPAttribute;
+import netscape.ldap.LDAPAttributeSet;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.dbs.EDBException;
import com.netscape.certsrv.dbs.IDBObj;
import com.netscape.certsrv.dbs.IDBRegistry;
import com.netscape.certsrv.request.IRequestRecord;
import com.netscape.cmscore.request.DBDynAttrMapperDefaultStub;
-import com.netscape.cmscore.request.RequestRecord;
import com.netscape.cmscore.test.CMSBaseTestCase;
import com.netscape.cmscore.test.TestHelper;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import netscape.ldap.LDAPAttributeSet;
-import netscape.ldap.LDAPAttribute;
-
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.Arrays;
public class DBRegistryTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
index d5a6088d..aef21db1 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java
@@ -1,11 +1,15 @@
package com.netscape.cmscore.dbs;
-import com.netscape.certsrv.dbs.*;
+import netscape.ldap.LDAPSearchResults;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.ISubsystem;
-import com.netscape.certsrv.base.IConfigStore;
-import netscape.ldap.LDAPAttributeSet;
-import netscape.ldap.LDAPSearchResults;
+import com.netscape.certsrv.dbs.EDBException;
+import com.netscape.certsrv.dbs.IDBObj;
+import com.netscape.certsrv.dbs.IDBSSession;
+import com.netscape.certsrv.dbs.IDBSearchResults;
+import com.netscape.certsrv.dbs.IDBVirtualList;
+import com.netscape.certsrv.dbs.ModificationSet;
/**
* A default stub ojbect for tests to extend.
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
index 15b26599..68f24d50 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
@@ -1,5 +1,9 @@
package com.netscape.cmscore.dbs;
+import java.math.BigInteger;
+
+import netscape.ldap.LDAPConnection;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.base.IConfigStore;
import com.netscape.certsrv.base.ISubsystem;
@@ -7,9 +11,6 @@ import com.netscape.certsrv.dbs.EDBException;
import com.netscape.certsrv.dbs.IDBRegistry;
import com.netscape.certsrv.dbs.IDBSSession;
import com.netscape.certsrv.dbs.IDBSubsystem;
-import netscape.ldap.LDAPConnection;
-
-import java.math.BigInteger;
/**
* A default stub ojbect for tests to extend.
diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
index ad0572aa..edb703b1 100644
--- a/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/dbs/RequestRecordDefaultStub.java
@@ -1,11 +1,11 @@
package com.netscape.cmscore.dbs;
-import com.netscape.certsrv.request.IRequestRecord;
-import com.netscape.certsrv.request.RequestId;
+import java.util.Enumeration;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.dbs.IDBObj;
-
-import java.util.Enumeration;
+import com.netscape.certsrv.request.IRequestRecord;
+import com.netscape.certsrv.request.RequestId;
/**
* Default stub for RequestRecord tests.
diff --git a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
index 3beda6a9..d68fbde8 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java
@@ -1,11 +1,12 @@
package com.netscape.cmscore.request;
+import java.util.Enumeration;
+
+import netscape.ldap.LDAPAttributeSet;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.dbs.IDBDynAttrMapper;
import com.netscape.certsrv.dbs.IDBObj;
-import netscape.ldap.LDAPAttributeSet;
-
-import java.util.Enumeration;
/**
* Default testing stub for the IRequest interface.
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
index 4c8aadda..a72b10de 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java
@@ -1,14 +1,14 @@
package com.netscape.cmscore.request;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Hashtable;
-import netscape.ldap.LDAPAttributeSet;
+import junit.framework.Test;
+import junit.framework.TestSuite;
import netscape.ldap.LDAPAttribute;
+import netscape.ldap.LDAPAttributeSet;
+
import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.request.IRequestRecord;
import com.netscape.certsrv.request.RequestId;
diff --git a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
index 177ccbbc..7569ff20 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java
@@ -1,17 +1,11 @@
package com.netscape.cmscore.request;
-import com.netscape.cmscore.test.CMSBaseTestCase;
-import com.netscape.cmscore.dbs.RequestRecordDefaultStub;
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.request.IRequestRecord;
-import com.netscape.certsrv.request.RequestId;
+import java.util.Hashtable;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import java.util.*;
-
-import netscape.ldap.LDAPAttributeSet;
-import netscape.ldap.LDAPAttribute;
+import com.netscape.cmscore.test.CMSBaseTestCase;
public class ExtDataHashtableTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
index 88440536..f00eb8a7 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java
@@ -1,23 +1,23 @@
package com.netscape.cmscore.request;
-import com.netscape.certsrv.request.IRequest;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.certsrv.request.RequestStatus;
-import com.netscape.certsrv.base.IAttrSet;
-import com.netscape.certsrv.authentication.IAuthToken;
-
+import java.math.BigInteger;
import java.util.Date;
import java.util.Enumeration;
-import java.util.Locale;
import java.util.Hashtable;
+import java.util.Locale;
import java.util.Vector;
-import java.math.BigInteger;
-import netscape.security.x509.X509CertImpl;
-import netscape.security.x509.X509CertInfo;
-import netscape.security.x509.RevokedCertImpl;
import netscape.security.x509.CertificateExtensions;
import netscape.security.x509.CertificateSubjectName;
+import netscape.security.x509.RevokedCertImpl;
+import netscape.security.x509.X509CertImpl;
+import netscape.security.x509.X509CertInfo;
+
+import com.netscape.certsrv.authentication.IAuthToken;
+import com.netscape.certsrv.base.IAttrSet;
+import com.netscape.certsrv.request.IRequest;
+import com.netscape.certsrv.request.RequestId;
+import com.netscape.certsrv.request.RequestStatus;
/**
* Default testing stub for the IRequest interface.
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
index 648f019f..730928bd 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/RequestModDefaultStub.java
@@ -1,11 +1,11 @@
package com.netscape.cmscore.request;
+import java.util.Date;
+
import com.netscape.certsrv.request.IRequest;
import com.netscape.certsrv.request.RequestStatus;
import com.netscape.certsrv.request.ldap.IRequestMod;
-import java.util.Date;
-
/**
* Default testing stub for the IRequest interface.
*/
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
index 02ffbc6b..4ae5be9a 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java
@@ -1,13 +1,14 @@
package com.netscape.cmscore.request;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import com.netscape.cmscore.test.CMSBaseTestCase;
-import com.netscape.certsrv.base.EBaseException;
-import java.util.Enumeration;
-import java.util.Arrays;
-import java.util.Collections;
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.cmscore.test.CMSBaseTestCase;
public class RequestQueueTest extends CMSBaseTestCase {
RequestStub request;
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
index 40f90a0d..ba3689fb 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java
@@ -1,17 +1,22 @@
package com.netscape.cmscore.request;
-import com.netscape.certsrv.request.IRequestRecord;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.certsrv.base.EBaseException;
-import com.netscape.certsrv.dbs.*;
-import com.netscape.cmscore.test.TestHelper;
-import com.netscape.cmscore.test.CMSBaseTestCase;
-import com.netscape.cmscore.dbs.DBSubsystemDefaultStub;
-import com.netscape.cmscore.dbs.DBRegistryDefaultStub;
+import java.util.Hashtable;
+
import junit.framework.Test;
import junit.framework.TestSuite;
-import java.util.Hashtable;
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.dbs.EDBException;
+import com.netscape.certsrv.dbs.IDBAttrMapper;
+import com.netscape.certsrv.dbs.IDBDynAttrMapper;
+import com.netscape.certsrv.dbs.IDBRegistry;
+import com.netscape.certsrv.dbs.ModificationSet;
+import com.netscape.certsrv.request.IRequestRecord;
+import com.netscape.certsrv.request.RequestId;
+import com.netscape.cmscore.dbs.DBRegistryDefaultStub;
+import com.netscape.cmscore.dbs.DBSubsystemDefaultStub;
+import com.netscape.cmscore.test.CMSBaseTestCase;
+import com.netscape.cmscore.test.TestHelper;
public class RequestRecordTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java
index 31046943..a088f0b4 100644
--- a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java
+++ b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java
@@ -1,34 +1,32 @@
package com.netscape.cmscore.request;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import java.util.Hashtable;
-import java.util.Vector;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.security.cert.CRLException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
-import java.security.cert.CRLException;
-import java.math.BigInteger;
-import java.io.IOException;
+import java.util.Hashtable;
+import java.util.Vector;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+import netscape.security.x509.BasicConstraintsExtension;
+import netscape.security.x509.CertificateExtensions;
+import netscape.security.x509.CertificateSubjectName;
+import netscape.security.x509.PKIXExtensions;
+import netscape.security.x509.RevokedCertImpl;
+import netscape.security.x509.X500Name;
+import netscape.security.x509.X509CertImpl;
+import netscape.security.x509.X509CertInfo;
-import com.netscape.certsrv.request.RequestId;
-import com.netscape.certsrv.base.EBaseException;
import com.netscape.certsrv.app.CMSEngineDefaultStub;
-import com.netscape.certsrv.logging.ILogger;
import com.netscape.certsrv.apps.CMS;
import com.netscape.certsrv.authentication.AuthToken;
import com.netscape.certsrv.authentication.IAuthToken;
-import com.netscape.certsrv.usrgrp.Certificates;
-import com.netscape.cmscore.test.TestHelper;
+import com.netscape.certsrv.base.EBaseException;
+import com.netscape.certsrv.request.RequestId;
import com.netscape.cmscore.test.CMSBaseTestCase;
-import netscape.security.x509.X509CertImpl;
-import netscape.security.x509.X509CertInfo;
-import netscape.security.x509.RevokedCertImpl;
-import netscape.security.x509.CertificateExtensions;
-import netscape.security.x509.BasicConstraintsExtension;
-import netscape.security.x509.PKIXExtensions;
-import netscape.security.x509.CertificateSubjectName;
-import netscape.security.x509.X500Name;
+import com.netscape.cmscore.test.TestHelper;
public class RequestTest extends CMSBaseTestCase {
diff --git a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java b/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
index 14ed7209..7e1978e1 100644
--- a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
+++ b/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
@@ -1,5 +1,10 @@
package com.netscape.cmscore.test;
+import java.security.cert.CertificateException;
+
+import junit.framework.TestCase;
+import netscape.security.x509.X509CertImpl;
+
import com.netscape.certsrv.app.CMSEngineDefaultStub;
import com.netscape.certsrv.apps.CMS;
import com.netscape.certsrv.dbs.EDBException;
@@ -11,10 +16,6 @@ import com.netscape.cmscore.dbs.DBRegistryDefaultStub;
import com.netscape.cmscore.dbs.DBSSessionDefaultStub;
import com.netscape.cmscore.dbs.DBSubsystem;
import com.netscape.cmscore.dbs.DBSubsystemDefaultStub;
-import junit.framework.TestCase;
-import netscape.security.x509.X509CertImpl;
-
-import java.security.cert.CertificateException;
/**
* The base class for all CMS unit tests. This sets up some basic stubs