diff options
Diffstat (limited to 'pki/base/common/test/com/netscape/cmscore')
15 files changed, 103 insertions, 91 deletions
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 |