diff options
Diffstat (limited to 'pki/base/common/test/com')
19 files changed, 425 insertions, 463 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 aa01ff63..ac5fe224 100644 --- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java @@ -75,8 +75,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { public void setId(String id) throws EBaseException { } - public void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + public void init(ISubsystem owner, IConfigStore config) throws EBaseException { } public void startup() throws EBaseException { @@ -191,13 +190,11 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public String getUserMessage(Locale locale, String msgID, String p1, - String p2) { + public String getUserMessage(Locale locale, String msgID, String p1, String p2) { return null; } - public String getUserMessage(Locale locale, String msgID, String p1, - String p2, String p3) { + public String getUserMessage(Locale locale, String msgID, String p1, String p2, String p3) { return null; } @@ -221,33 +218,27 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4) { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4, String p5) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5) { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4, String p5, String p6) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6) { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4, String p5, String p6, String p7) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7) { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4, String p5, String p6, String p7, String p8) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8) { return null; } - public String getLogMessage(String msgID, String p1, String p2, String p3, - String p4, String p5, String p6, String p7, String p8, String p9) { + public String getLogMessage(String msgID, String p1, String p2, String p3, String p4, String p5, String p6, String p7, String p8, String p9) { return null; } @@ -255,8 +246,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, - BigInteger crlNumber, Long crlSize, Date thisUpdate, Date nextUpdate) { + public ICRLIssuingPointRecord createCRLIssuingPointRecord(String id, BigInteger crlNumber, Long crlSize, Date thisUpdate, Date nextUpdate) { return null; } @@ -264,26 +254,21 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public String getFingerPrint(Certificate cert) - throws CertificateEncodingException, NoSuchAlgorithmException { + public String getFingerPrint(Certificate cert) throws CertificateEncodingException, NoSuchAlgorithmException { return null; } - public String getFingerPrints(Certificate cert) - throws NoSuchAlgorithmException, CertificateEncodingException { + public String getFingerPrints(Certificate cert) throws NoSuchAlgorithmException, CertificateEncodingException { return null; }/* - * Returns the finger print of the given certificate. - * - * @param certDer DER byte array of certificate - * - * @return finger print of certificate - */ - - public String getFingerPrints(byte[] certDer) - throws NoSuchAlgorithmException { - return null; - } + * Returns the finger print of the given certificate. +* +* @param certDer DER byte array of certificate +* @return finger print of certificate +*/ +public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { + return null; +} public IRepositoryRecord createRepositoryRecord() { return null; @@ -329,13 +314,11 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public ILdapConnInfo getLdapConnInfo(IConfigStore config) - throws EBaseException, ELdapException { + public ILdapConnInfo getLdapConnInfo(IConfigStore config) throws EBaseException, ELdapException { return null; } - public LDAPSSLSocketFactoryExt getLdapJssSSLSocketFactory( - String certNickname) { + public LDAPSSLSocketFactoryExt getLdapJssSSLSocketFactory(String certNickname) { return null; } @@ -351,9 +334,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public LDAPConnection getBoundConnection(String host, int port, - int version, LDAPSSLSocketFactoryExt fac, String bindDN, - String bindPW) throws LDAPException { + public LDAPConnection getBoundConnection(String host, int port, int version, LDAPSSLSocketFactoryExt fac, String bindDN, String bindPW) throws LDAPException { return null; } @@ -466,80 +447,61 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - public ObjectIdentifier checkOID(String attrName, String value) - throws EBaseException { + public ObjectIdentifier checkOID(String attrName, String value) throws EBaseException { return null; } - public GeneralName form_GeneralNameAsConstraints(String generalNameChoice, - String value) throws EBaseException { + public GeneralName form_GeneralNameAsConstraints(String generalNameChoice, String value) throws EBaseException { return null; } - public GeneralName form_GeneralName(String generalNameChoice, String value) - throws EBaseException { + public GeneralName form_GeneralName(String generalNameChoice, String value) throws EBaseException { return null; } - public void getGeneralNameConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + public void getGeneralNameConfigDefaultParams(String name, boolean isValueConfigured, Vector params) { } - public void getGeneralNamesConfigDefaultParams(String name, - boolean isValueConfigured, Vector params) { + public void getGeneralNamesConfigDefaultParams(String name, boolean isValueConfigured, Vector params) { } - public void getGeneralNameConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + public void getGeneralNameConfigExtendedPluginInfo(String name, boolean isValueConfigured, Vector info) { } - public void getGeneralNamesConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector info) { + public void getGeneralNamesConfigExtendedPluginInfo(String name, boolean isValueConfigured, Vector info) { } - public IGeneralNamesConfig createGeneralNamesConfig(String name, - IConfigStore config, boolean isValueConfigured, - boolean isPolicyEnabled) throws EBaseException { + public IGeneralNamesConfig createGeneralNamesConfig(String name, IConfigStore config, boolean isValueConfigured, boolean isPolicyEnabled) throws EBaseException { return null; } - public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig( - String name, IConfigStore config, boolean isValueConfigured, - boolean isPolicyEnabled) throws EBaseException { + public IGeneralNameAsConstraintsConfig createGeneralNameAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured, boolean isPolicyEnabled) throws EBaseException { return null; } - public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig( - String name, IConfigStore config, boolean isValueConfigured, - boolean isPolicyEnabled) throws EBaseException { + public IGeneralNamesAsConstraintsConfig createGeneralNamesAsConstraintsConfig(String name, IConfigStore config, boolean isValueConfigured, boolean isPolicyEnabled) throws EBaseException { return null; } public void getSubjAltNameConfigDefaultParams(String name, Vector params) { } - public void getSubjAltNameConfigExtendedPluginInfo(String name, - Vector params) { + public void getSubjAltNameConfigExtendedPluginInfo(String name, Vector params) { } - public ISubjAltNameConfig createSubjAltNameConfig(String name, - IConfigStore config, boolean isValueConfigured) - throws EBaseException { + public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException { return null; } - public IHttpConnection getHttpConnection(IRemoteAuthority authority, - ISocketFactory factory) { + public IHttpConnection getHttpConnection(IRemoteAuthority authority, ISocketFactory factory) { return null; } - public IHttpConnection getHttpConnection(IRemoteAuthority authority, - ISocketFactory factory, int timeout) { + public IHttpConnection getHttpConnection(IRemoteAuthority authority, ISocketFactory factory, int timeout) { return null; } - public IResender getResender(IAuthority authority, String nickname, - IRemoteAuthority remote, int interval) { + public IResender getResender(IAuthority authority, String nickname, IRemoteAuthority remote, int interval) { return null; } @@ -557,8 +519,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { return false; } - public IConfigStore createFileConfigStore(String path) - throws EBaseException { + public IConfigStore createFileConfigStore(String path) throws EBaseException { return null; } @@ -578,8 +539,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { return false; } - public void setListOfVerifiedCerts(int size, long interval, - long unknownStateInterval) { + public void setListOfVerifiedCerts(int size, long interval, long unknownStateInterval) { } public void forceShutdown() { @@ -600,34 +560,34 @@ public class CMSEngineDefaultStub implements ICMSEngine { return null; } - @Override - public String getEEClientAuthSSLPort() { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean verifySystemCerts() { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean verifySystemCertByTag(String tag) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean verifySystemCertByNickname(String nickname, - String certificateUsage) { - // TODO Auto-generated method stub - return false; - } - - @Override - public CertificateUsage getCertificateUsage(String certusage) { - // TODO Auto-generated method stub - return null; - } + @Override + public String getEEClientAuthSSLPort() { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean verifySystemCerts() { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean verifySystemCertByTag(String tag) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean verifySystemCertByNickname(String nickname, + String certificateUsage) { + // TODO Auto-generated method stub + return false; + } + + @Override + public CertificateUsage getCertificateUsage(String certusage) { + // TODO Auto-generated method stub + return null; + } } 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 65e973be..3f83b3b0 100644 --- a/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java +++ b/pki/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java @@ -48,7 +48,7 @@ public class AuthTokenTest extends CMSBaseTestCase { assertEquals("value", authToken.mAttrs.get("key")); assertEquals("value", authToken.getInString("key")); - assertFalse(authToken.set("key", (String) null)); + assertFalse(authToken.set("key", (String)null)); } public void testGetSetByteArray() { @@ -62,7 +62,7 @@ public class AuthTokenTest extends CMSBaseTestCase { byte[] retval = authToken.getInByteArray("key"); assertEquals(data, retval); - assertFalse(authToken.set("key2", (byte[]) null)); + assertFalse(authToken.set("key2", (byte[])null)); } public void testGetSetInteger() { @@ -75,12 +75,15 @@ public class AuthTokenTest extends CMSBaseTestCase { authToken.set("key2", "value"); assertNull(authToken.getInInteger("key2")); - assertFalse(authToken.set("key3", (Integer) null)); + assertFalse(authToken.set("key3", (Integer)null)); } public void testGetSetBigIntegerArray() { - BigInteger[] data = new BigInteger[] { new BigInteger("111111111"), - new BigInteger("222222222"), new BigInteger("333333333") }; + BigInteger[] data = new BigInteger[] { + new BigInteger("111111111"), + new BigInteger("222222222"), + new BigInteger("333333333") + }; authToken.set("key", data); assertEquals("111111111,222222222,333333333", authToken.mAttrs.get("key")); @@ -99,11 +102,11 @@ public class AuthTokenTest extends CMSBaseTestCase { assertNull(authToken.getInBigIntegerArray("key3")); // corner case test - authToken.set("key", ","); + authToken.set("key",","); retval = authToken.getInBigIntegerArray("key"); assertNull(retval); - assertFalse(authToken.set("key4", (BigInteger[]) null)); + assertFalse(authToken.set("key4", (BigInteger[])null)); } public void testGetSetDate() { @@ -120,11 +123,13 @@ public class AuthTokenTest extends CMSBaseTestCase { authToken.set("key3", "oops"); assertNull(authToken.getInDate("key3")); - assertFalse(authToken.set("key4", (Date) null)); + assertFalse(authToken.set("key4", (Date)null)); } public void testGetSetStringArray() throws IOException { - String[] value = new String[] { "eenie", "meenie", "miny", "moe" }; + String[] value = new String[] { + "eenie", "meenie", "miny", "moe" + }; assertFalse(cmsStub.bToACalled); authToken.set("key", value); @@ -140,15 +145,16 @@ public class AuthTokenTest extends CMSBaseTestCase { assertEquals(value[3], retval[3]); // illegal value parsing - authToken.set("key2", new byte[] { 1, 2, 3, 4 }); + authToken.set("key2", new byte[] { 1, 2, 3, 4}); assertNull(authToken.getInStringArray("key2")); + DerOutputStream out = new DerOutputStream(); out.putPrintableString("testing"); authToken.set("key3", out.toByteArray()); assertNull(authToken.getInStringArray("key3")); - assertFalse(authToken.set("key4", (String[]) null)); + assertFalse(authToken.set("key4", (String[])null)); } public void testGetSetCert() throws CertificateException { @@ -164,7 +170,7 @@ public class AuthTokenTest extends CMSBaseTestCase { assertNotNull(retval); assertEquals(cert, retval); - assertFalse(authToken.set("key2", (X509CertImpl) null)); + assertFalse(authToken.set("key2", (X509CertImpl)null)); } public void testGetSetCertExts() throws IOException { @@ -185,13 +191,13 @@ public class AuthTokenTest extends CMSBaseTestCase { assertNotNull(retval); assertEquals(1, retval.size()); - assertFalse(authToken.set("key3", (CertificateExtensions) null)); + assertFalse(authToken.set("key3", (CertificateExtensions)null)); } public void testGetSetCertificates() throws CertificateException { X509CertImpl cert1 = getFakeCert(); X509CertImpl cert2 = getFakeCert(); - X509CertImpl[] certArray = new X509CertImpl[] { cert1, cert2 }; + X509CertImpl[] certArray = new X509CertImpl[] {cert1, cert2}; Certificates certs = new Certificates(certArray); assertFalse(cmsStub.bToACalled); @@ -208,12 +214,15 @@ public class AuthTokenTest extends CMSBaseTestCase { assertEquals(cert1, retCerts[0]); assertEquals(cert2, retCerts[1]); - assertFalse(authToken.set("key2", (Certificates) null)); + assertFalse(authToken.set("key2", (Certificates)null)); } public void testGetSetByteArrayArray() { - byte[][] value = new byte[][] { new byte[] { 1, 2, 3, 4 }, - new byte[] { 12, 13, 14 }, new byte[] { 50, -12, 0, 100 } }; + byte[][] value = new byte[][] { + new byte[] { 1, 2, 3, 4 }, + new byte[] {12, 13, 14}, + new byte[] { 50, -12, 0, 100} + }; assertFalse(cmsStub.bToACalled); assertTrue(authToken.set("key", value)); @@ -231,15 +240,15 @@ public class AuthTokenTest extends CMSBaseTestCase { } } - assertFalse(authToken.set("key2", (byte[][]) null)); + assertFalse(authToken.set("key2", (byte[][])null)); } /** * CMSMemoryStub - * + * * This class is used to help test methods that rely on setting and then - * getting a value out. It assumes BtoA is always called first, stores the - * value passed in, and then returns that value for BtoA. + * getting a value out. It assumes BtoA is always called first, stores + * the value passed in, and then returns that value for BtoA. */ class CMSMemoryStub extends CMSEngineDefaultStub { boolean bToACalled = false; diff --git a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java b/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java index 547277fb..b7772bb2 100644 --- a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java @@ -15,63 +15,49 @@ public class LoggerDefaultStub implements ILogger { public void log(int evtClass, int source, int level, String msg) { } - public void log(int evtClass, Properties props, int source, int level, - String msg) { + public void log(int evtClass, Properties props, int source, int level, String msg) { } - public void log(int evtClass, int source, int level, String msg, - Object param) { + public void log(int evtClass, int source, int level, String msg, Object param) { } - public void log(int evtClass, int source, int level, String msg, - Object params[]) { + public void log(int evtClass, int source, int level, String msg, Object params[]) { } - public void log(int evtClass, Properties props, int source, String msg, - Object param) { + public void log(int evtClass, Properties props, int source, String msg, Object param) { } - public void log(int evtClass, Properties props, int source, int level, - String msg, Object param) { + public void log(int evtClass, Properties props, int source, int level, String msg, Object param) { } - public void log(int evtClass, Properties prop, int source, int level, - String msg, Object params[]) { + public void log(int evtClass, Properties prop, int source, int level, String msg, Object params[]) { } public void log(int evtClass, int source, String msg, boolean multiline) { } - public void log(int evtClass, Properties props, int source, String msg, - boolean multiline) { + public void log(int evtClass, Properties props, int source, String msg, boolean multiline) { } - public void log(int evtClass, int source, int level, String msg, - boolean multiline) { + public void log(int evtClass, int source, int level, String msg, boolean multiline) { } - public void log(int evtClass, Properties props, int source, int level, - String msg, boolean multiline) { + public void log(int evtClass, Properties props, int source, int level, String msg, boolean multiline) { } - public void log(int evtClass, int source, int level, String msg, - Object param, boolean multiline) { + public void log(int evtClass, int source, int level, String msg, Object param, boolean multiline) { } - public void log(int evtClass, Properties props, int source, String msg, - Object param, boolean multiline) { + public void log(int evtClass, Properties props, int source, String msg, Object param, boolean multiline) { } - public void log(int evtClass, Properties props, int source, int level, - String msg, Object param, boolean multiline) { + public void log(int evtClass, Properties props, int source, int level, String msg, Object param, boolean multiline) { } - public void log(int evtClass, Properties prop, int source, int level, - String msg, Object params[], boolean multiline) { + public void log(int evtClass, Properties prop, int source, int level, String msg, Object params[], boolean multiline) { } - - public ILogEvent create(int evtClass, Properties prop, int source, - int level, String msg, Object params[], boolean multiline) { + + public ILogEvent create(int evtClass, Properties prop, int source, int level, String msg, Object params[], boolean multiline) { return null; } 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 feaae1ce..28ea1669 100644 --- a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java +++ b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java @@ -37,30 +37,26 @@ public class AgentApprovalsTest extends CMSBaseTestCase { Vector stringVector = agentApprovals.toStringVector(); assertNotNull(stringVector); assertEquals(3, stringVector.size()); - assertEquals( - approval1.getDate().getTime() + ";" + approval1.getUserName(), + assertEquals(approval1.getDate().getTime() + ";" + approval1.getUserName(), stringVector.get(0)); - assertEquals( - approval2.getDate().getTime() + ";" + approval2.getUserName(), + assertEquals(approval2.getDate().getTime() + ";" + approval2.getUserName(), stringVector.get(1)); - assertEquals( - approval3.getDate().getTime() + ";" + approval3.getUserName(), + assertEquals(approval3.getDate().getTime() + ";" + approval3.getUserName(), stringVector.get(2)); - AgentApprovals approvals = AgentApprovals - .fromStringVector(stringVector); + AgentApprovals approvals = AgentApprovals.fromStringVector(stringVector); assertNotNull(approvals); assertEquals(3, approvals.mVector.size()); - AgentApproval approval = (AgentApproval) approvals.mVector.get(0); + AgentApproval approval = (AgentApproval)approvals.mVector.get(0); assertEquals(approval1.getUserName(), approval.getUserName()); assertEquals(approval1.getDate(), approval.getDate()); - approval = (AgentApproval) approvals.mVector.get(1); + approval = (AgentApproval)approvals.mVector.get(1); assertEquals(approval2.getUserName(), approval.getUserName()); assertEquals(approval2.getDate(), approval.getDate()); - approval = (AgentApproval) approvals.mVector.get(2); + approval = (AgentApproval)approvals.mVector.get(2); assertEquals(approval3.getUserName(), approval.getUserName()); assertEquals(approval3.getDate(), approval.getDate()); 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 699a924d..3fd6a96f 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java @@ -40,7 +40,7 @@ public class CertRecordListTest extends CMSBaseTestCase { return new TestSuite(CertRecordListTest.class); } - public void testProcessCertRecordsUsesSize() throws EBaseException { + public void testProcessCertRecordsUsesSize() throws EBaseException { DBVirtualListStub dbList = new DBVirtualListStub(); dbList.size = 5; @@ -57,6 +57,7 @@ public class CertRecordListTest extends CMSBaseTestCase { assertEquals(7, dbList.lastIndexGetElementAtCalledWith); } + public class DBVirtualListStub extends DBVirtualListDefaultStub { public int size = 0; public int getElementAtCallCount = 0; 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 bb8236d7..2095e162 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java @@ -17,16 +17,15 @@ import com.netscape.certsrv.dbs.IFilterConverter; */ public class DBRegistryDefaultStub implements IDBRegistry { - public void registerObjectClass(String className, String ldapNames[]) - throws EDBException { + + public void registerObjectClass(String className, String ldapNames[]) throws EDBException { } public boolean isObjectClassRegistered(String className) { return false; } - public void registerAttribute(String ufName, IDBAttrMapper mapper) - throws EDBException { + public void registerAttribute(String ufName, IDBAttrMapper mapper) throws EDBException { } public boolean isAttributeRegistered(String ufName) { @@ -40,21 +39,18 @@ public class DBRegistryDefaultStub implements IDBRegistry { return null; } - public String getFilter(String filter, IFilterConverter c) - throws EBaseException { + public String getFilter(String filter, IFilterConverter c) throws EBaseException { return null; } - public void mapObject(IDBObj parent, String name, Object obj, - LDAPAttributeSet attrs) throws EBaseException { + public void mapObject(IDBObj parent, String name, Object obj, LDAPAttributeSet attrs) throws EBaseException { } public String[] getLDAPAttributes(String attrs[]) throws EBaseException { return new String[0]; } - public LDAPAttributeSet createLDAPAttributeSet(IDBObj obj) - throws EBaseException { + public LDAPAttributeSet createLDAPAttributeSet(IDBObj obj) throws EBaseException { return null; } @@ -69,8 +65,7 @@ public class DBRegistryDefaultStub implements IDBRegistry { public void setId(String id) throws EBaseException { } - public void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + public void init(ISubsystem owner, IConfigStore config) throws EBaseException { } public void startup() throws EBaseException { 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 c33dbbaf..7b4681e5 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java @@ -39,11 +39,9 @@ public class DBRegistryTest extends CMSBaseTestCase { // of a long chain of initialization calls. extAttrMapper = new DBDynAttrMapperStub(); try { - registry.registerObjectClass( - requestRecordStub.getClass().getName(), - new String[] { "ocvalue" }); - registry.registerAttribute(IRequestRecord.ATTR_EXT_DATA, - extAttrMapper); + registry.registerObjectClass(requestRecordStub.getClass().getName(), + new String[] {"ocvalue"} ); + registry.registerAttribute(IRequestRecord.ATTR_EXT_DATA, extAttrMapper); registry.registerAttribute(IRequestRecord.ATTR_SOURCE_ID, new StringMapper("sourceIdOut")); registry.registerDynamicMapper(extAttrMapper); @@ -66,9 +64,13 @@ public class DBRegistryTest extends CMSBaseTestCase { assertTrue(extAttrMapper.mapObjectCalled); } - public void testGetLDAPAttributesForExtData() throws EBaseException { - String inAttrs[] = new String[] { "extData-foo", "extData-foo12", - "EXTDATA-bar;baz", IRequestRecord.ATTR_SOURCE_ID }; + public void testGetLDAPAttributesForExtData() throws EBaseException { + String inAttrs[] = new String[] { + "extData-foo", + "extData-foo12", + "EXTDATA-bar;baz", + IRequestRecord.ATTR_SOURCE_ID + }; String outAttrs[] = registry.getLDAPAttributes(inAttrs); assertTrue(TestHelper.contains(outAttrs, inAttrs[0])); @@ -77,10 +79,9 @@ public class DBRegistryTest extends CMSBaseTestCase { assertTrue(TestHelper.contains(outAttrs, "sourceIdOut")); try { - registry.getLDAPAttributes(new String[] { "badattr" }); + registry.getLDAPAttributes(new String[] {"badattr"}); fail("Should not be able to map badattr"); - } catch (EBaseException e) { /* good */ - } + } catch (EBaseException e) { /* good */ } } public void testCreateLDAPAttributeSet() throws EBaseException { @@ -108,6 +109,7 @@ public class DBRegistryTest extends CMSBaseTestCase { assertTrue(extAttrMapper.mapLDAPAttrsCalled); } + class DBSubsystemStub extends DBSubsystemDefaultStub { DBRegistry registry; @@ -116,23 +118,25 @@ public class DBRegistryTest extends CMSBaseTestCase { } } + class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { boolean mapObjectCalled = false; Object mapObjectCalledWithObject = null; boolean mapLDAPAttrsCalled = false; public boolean supportsLDAPAttributeName(String attrName) { - return (attrName != null) - && attrName.toLowerCase().startsWith("extdata-"); + return (attrName != null) && + attrName.toLowerCase().startsWith("extdata-"); } - public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, - String name, IDBObj parent) throws EBaseException { + public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, String name, IDBObj parent) throws EBaseException { mapLDAPAttrsCalled = true; } public void mapObjectToLDAPAttributeSet(IDBObj parent, String name, - Object obj, LDAPAttributeSet attrs) throws EBaseException { + Object obj, + LDAPAttributeSet attrs) + throws EBaseException { mapObjectCalled = true; mapObjectCalledWithObject = obj; } @@ -142,10 +146,10 @@ public class DBRegistryTest extends CMSBaseTestCase { /* * This class is purposefully placed outside the test because - * DBRegistry.createObject() calls Class.newInstance() to create this stub. This - * fails if the class is nested. + * DBRegistry.createObject() calls Class.newInstance() to create + * this stub. This fails if the class is nested. */ -class RequestRecordStub extends RequestRecordDefaultStub { + class RequestRecordStub extends RequestRecordDefaultStub { /** * 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 d7c5a94a..aef21db1 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSSessionDefaultStub.java @@ -40,44 +40,35 @@ public class DBSSessionDefaultStub implements IDBSSession { public void modify(String name, ModificationSet mods) throws EBaseException { } - public IDBSearchResults search(String base, String filter) - throws EBaseException { + public IDBSearchResults search(String base, String filter) throws EBaseException { return null; } - public IDBSearchResults search(String base, String filter, int maxSize) - throws EBaseException { + public IDBSearchResults search(String base, String filter, int maxSize) throws EBaseException { return null; } - public IDBSearchResults search(String base, String filter, int maxSize, - int timeLimit) throws EBaseException { + public IDBSearchResults search(String base, String filter, int maxSize, int timeLimit) throws EBaseException { return null; } - public IDBSearchResults search(String base, String filter, String attrs[]) - throws EBaseException { + public IDBSearchResults search(String base, String filter, String attrs[]) throws EBaseException { return null; } - public IDBVirtualList createVirtualList(String base, String filter, - String attrs[]) throws EBaseException { + public IDBVirtualList createVirtualList(String base, String filter, String attrs[]) throws EBaseException { return null; } - public LDAPSearchResults persistentSearch(String base, String filter, - String attrs[]) throws EBaseException { + public LDAPSearchResults persistentSearch(String base, String filter, String attrs[]) throws EBaseException { return null; } - public IDBVirtualList createVirtualList(String base, String filter, - String attrs[], String sortKey, int pageSize) throws EBaseException { + public IDBVirtualList createVirtualList(String base, String filter, String attrs[], String sortKey, int pageSize) throws EBaseException { return null; } - public IDBVirtualList createVirtualList(String base, String filter, - String attrs[], String startFrom, String sortKey, int pageSize) - throws EBaseException { + public IDBVirtualList createVirtualList(String base, String filter, String attrs[], String startFrom, String sortKey, int pageSize) throws EBaseException { return null; } } 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 9f1a87ae..68f24d50 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java @@ -17,6 +17,7 @@ import com.netscape.certsrv.dbs.IDBSubsystem; */ public class DBSubsystemDefaultStub implements IDBSubsystem { + public String getBaseDN() { return null; } @@ -69,8 +70,7 @@ public class DBSubsystemDefaultStub implements IDBSubsystem { public void setId(String id) throws EBaseException { } - public void init(ISubsystem owner, IConfigStore config) - throws EBaseException { + public void init(ISubsystem owner, IConfigStore config) throws EBaseException { } public void startup() throws EBaseException { @@ -83,91 +83,91 @@ public class DBSubsystemDefaultStub implements IDBSubsystem { return null; } - @Override - public void setMaxSerialConfig(int repo, String serial) - throws EBaseException { - // TODO Auto-generated method stub - - } - - @Override - public void setMinSerialConfig(int repo, String serial) - throws EBaseException { - // TODO Auto-generated method stub - - } - - @Override - public void setNextMaxSerialConfig(int repo, String serial) - throws EBaseException { - // TODO Auto-generated method stub - - } - - @Override - public void setNextMinSerialConfig(int repo, String serial) - throws EBaseException { - // TODO Auto-generated method stub - - } - - @Override - public String getMinSerialConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getMaxSerialConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getNextMaxSerialConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getNextMinSerialConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getLowWaterMarkConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getIncrementConfig(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getNextRange(int repo) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean hasRangeConflict(int repo) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean getEnableSerialMgmt() { - // TODO Auto-generated method stub - return false; - } - - @Override - public void setEnableSerialMgmt(boolean value) throws EBaseException { - // TODO Auto-generated method stub - - } + @Override + public void setMaxSerialConfig(int repo, String serial) + throws EBaseException { + // TODO Auto-generated method stub + + } + + @Override + public void setMinSerialConfig(int repo, String serial) + throws EBaseException { + // TODO Auto-generated method stub + + } + + @Override + public void setNextMaxSerialConfig(int repo, String serial) + throws EBaseException { + // TODO Auto-generated method stub + + } + + @Override + public void setNextMinSerialConfig(int repo, String serial) + throws EBaseException { + // TODO Auto-generated method stub + + } + + @Override + public String getMinSerialConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getMaxSerialConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getNextMaxSerialConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getNextMinSerialConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getLowWaterMarkConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getIncrementConfig(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getNextRange(int repo) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean hasRangeConflict(int repo) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean getEnableSerialMgmt() { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setEnableSerialMgmt(boolean value) throws EBaseException { + // TODO Auto-generated method stub + + } } diff --git a/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java index 294ae1df..45fda77d 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBVirtualListDefaultStub.java @@ -22,11 +22,11 @@ import com.netscape.certsrv.dbs.IDBVirtualList; import com.netscape.certsrv.dbs.IElementProcessor; /** - * A default stub ojbect for tests to extend. This class helps test avoid the - * problem of test stubs having to implement a new stub method every time the - * interface changes. It also makes the tests clearer by not cluttered them with - * empty methods. - * + * A default stub ojbect for tests to extend. + * This class helps test avoid the problem of test stubs having to + * implement a new stub method every time the interface changes. + * It also makes the tests clearer by not cluttered them with empty methods. + * * Do not put any behaviour in this class. */ public class DBVirtualListDefaultStub implements IDBVirtualList { @@ -73,7 +73,7 @@ public class DBVirtualListDefaultStub implements IDBVirtualList { } public void processElements(int startidx, int endidx, IElementProcessor ep) - throws EBaseException { + throws EBaseException { } public int getSelectedIndex() { 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 3149f0bc..d68fbde8 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/DBDynAttrMapperDefaultStub.java @@ -20,16 +20,13 @@ public class DBDynAttrMapperDefaultStub implements IDBDynAttrMapper { return null; } - public void mapObjectToLDAPAttributeSet(IDBObj parent, String name, - Object obj, LDAPAttributeSet attrs) throws EBaseException { + public void mapObjectToLDAPAttributeSet(IDBObj parent, String name, Object obj, LDAPAttributeSet attrs) throws EBaseException { } - public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, - String name, IDBObj parent) throws EBaseException { + public void mapLDAPAttributeSetToObject(LDAPAttributeSet attrs, String name, IDBObj parent) throws EBaseException { } - public String mapSearchFilter(String name, String op, String value) - throws EBaseException { + public String mapSearchFilter(String name, String op, String value) throws EBaseException { return null; } } 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 f8a94eb4..2a9a2ef0 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java @@ -36,7 +36,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { public void testSupportLDAPAttributeName() { assertNotNull(mapper); - + assertTrue(mapper.supportsLDAPAttributeName("extData-green")); assertTrue(mapper.supportsLDAPAttributeName("EXTDATA-green")); assertTrue(mapper.supportsLDAPAttributeName("extData-foo;0")); @@ -122,8 +122,8 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { mapper.mapObjectToLDAPAttributeSet(null, null, extAttrsHash, attrs); assertEquals(1, attrs.size()); - assertEquals(ExtAttrDynMapper.extAttrPrefix + "foo--003b", attrs - .elementAt(0).getName()); + assertEquals(ExtAttrDynMapper.extAttrPrefix + "foo--003b", + attrs.elementAt(0).getName()); String vals[] = attrs.elementAt(0).getStringValueArray(); assertEquals(1, vals.length); assertEquals("bar", vals[0]); @@ -143,8 +143,8 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { LDAPAttribute attrBaz = attrs.elementAt(0); LDAPAttribute attrBim = attrs.elementAt(1); // swap attributes if necessary - if (attrBaz.getName().equals( - ExtAttrDynMapper.extAttrPrefix + "top--003bkey;bi--003bm")) { + if (attrBaz.getName().equals(ExtAttrDynMapper.extAttrPrefix + + "top--003bkey;bi--003bm")) { attrBaz = attrs.elementAt(1); attrBim = attrs.elementAt(0); } @@ -164,16 +164,17 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { assertTrue(attrBim.hasSubtype("bi--003bm")); } + public void testMapLDAPAttributeSetToObject() throws EBaseException { // // Test simple key-value pairs // LDAPAttributeSet attrs = new LDAPAttributeSet(); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "o--003bkey1", "val1")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "o--003bkey1", "val1")); attrs.add(new LDAPAttribute("junk", "junkval")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix + "okey2", - "val2")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "okey2", "val2")); RequestRecordStub requestRecord = new RequestRecordStub(); @@ -181,8 +182,8 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { requestRecord); assertEquals(1, requestRecord.setCallCounter); - Hashtable extData = (Hashtable) requestRecord.extAttrData - .get(IRequestRecord.ATTR_EXT_DATA); + Hashtable extData = (Hashtable)requestRecord.extAttrData.get( + IRequestRecord.ATTR_EXT_DATA); assertNotNull(extData); assertEquals(2, extData.keySet().size()); @@ -195,16 +196,16 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { // Test subkeys // attrs = new LDAPAttributeSet(); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "o--003bkey1;i--003bkey11", "val11")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - .toUpperCase() + "o--003bkey1;ikey12", "val12")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "o--003bkey1;ikey13", "val13")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "okey2;ikey21", "val21")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "okey2;ikey22", "val22")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "o--003bkey1;i--003bkey11", "val11")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix.toUpperCase() + "o--003bkey1;ikey12", "val12")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "o--003bkey1;ikey13", "val13")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "okey2;ikey21", "val21")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "okey2;ikey22", "val22")); attrs.add(new LDAPAttribute("foo", "bar")); requestRecord = new RequestRecordStub(); @@ -213,27 +214,27 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { requestRecord); assertEquals(1, requestRecord.setCallCounter); - extData = (Hashtable) requestRecord.extAttrData - .get(IRequestRecord.ATTR_EXT_DATA); + extData = (Hashtable)requestRecord.extAttrData.get( + IRequestRecord.ATTR_EXT_DATA); assertNotNull(extData); assertTrue(extData.containsKey("o;key1")); - Hashtable okey1Data = (Hashtable) extData.get("o;key1"); + Hashtable okey1Data = (Hashtable)extData.get("o;key1"); assertEquals(3, okey1Data.keySet().size()); assertTrue(okey1Data.containsKey("i;key11")); - assertEquals("val11", (String) okey1Data.get("i;key11")); + assertEquals("val11", (String)okey1Data.get("i;key11")); assertTrue(okey1Data.containsKey("ikey12")); - assertEquals("val12", (String) okey1Data.get("ikey12")); + assertEquals("val12", (String)okey1Data.get("ikey12")); assertTrue(okey1Data.containsKey("ikey13")); - assertEquals("val13", (String) okey1Data.get("ikey13")); + assertEquals("val13", (String)okey1Data.get("ikey13")); assertTrue(extData.containsKey("okey2")); - Hashtable okey2Data = (Hashtable) extData.get("okey2"); + Hashtable okey2Data = (Hashtable)extData.get("okey2"); assertEquals(2, okey2Data.keySet().size()); assertTrue(okey2Data.containsKey("ikey21")); - assertEquals("val21", (String) okey2Data.get("ikey21")); + assertEquals("val21", (String)okey2Data.get("ikey21")); assertTrue(okey2Data.containsKey("ikey22")); - assertEquals("val22", (String) okey2Data.get("ikey22")); + assertEquals("val22", (String)okey2Data.get("ikey22")); assertFalse(extData.containsKey("foo")); @@ -241,16 +242,16 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { // test illegal data combination // attrs = new LDAPAttributeSet(); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix + "okey1", - "val11")); - attrs.add(new LDAPAttribute(ExtAttrDynMapper.extAttrPrefix - + "okey1;ikey12", "val12")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "okey1", "val11")); + attrs.add(new LDAPAttribute( + ExtAttrDynMapper.extAttrPrefix + "okey1;ikey12", "val12")); requestRecord = new RequestRecordStub(); try { - mapper.mapLDAPAttributeSetToObject(attrs, - IRequestRecord.ATTR_EXT_DATA, requestRecord); + mapper.mapLDAPAttributeSetToObject(attrs, IRequestRecord.ATTR_EXT_DATA, + requestRecord); fail("Should have thrown EBaseException on illegal data"); } catch (EBaseException e) { // good @@ -258,6 +259,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { } + class RequestRecordStub extends RequestRecordDefaultStub { /** * @@ -266,6 +268,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { Hashtable extAttrData = new Hashtable(); int setCallCounter = 0; + public void set(String name, Object o) { setCallCounter++; if (IRequestRecord.ATTR_EXT_DATA.equals(name)) { 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 829b06ad..f00eb8a7 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -235,8 +235,7 @@ public class RequestDefaultStub implements IRequest { return false; } - public boolean getExtDataInBoolean(String prefix, String type, - boolean defVal) { + public boolean getExtDataInBoolean(String prefix, String type, boolean defVal) { return false; } 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 d69ac6a5..4ae5be9a 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java @@ -41,7 +41,7 @@ public class RequestQueueTest extends CMSBaseTestCase { } class RequestStub extends RequestDefaultStub { - String[] keys = new String[] { "key1", "key2" }; + String[] keys = new String[] {"key1", "key2"}; boolean getExtDataKeysCalled = false; public Enumeration getExtDataKeys() { 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 e8227871..ba3689fb 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java @@ -57,7 +57,7 @@ public class RequestRecordTest extends CMSBaseTestCase { public void testGetElements() { assertTrue(TestHelper.enumerationContains(requestRecord.getElements(), - IRequestRecord.ATTR_EXT_DATA)); + IRequestRecord.ATTR_EXT_DATA)); } public void testAddExtData() throws EBaseException { @@ -69,7 +69,7 @@ public class RequestRecordTest extends CMSBaseTestCase { requestRecord.add(request); - assertEquals(request.mExtData, requestRecord.mExtData); + assertEquals(request.mExtData, requestRecord.mExtData); assertNotSame(request.mExtData, requestRecord.mExtData); } @@ -83,6 +83,7 @@ public class RequestRecordTest extends CMSBaseTestCase { requestRecord.set(IRequestRecord.ATTR_EXT_DATA, extData); requestRecord.mRequestType = "foo"; + requestRecord.read(new RequestModDefaultStub(), request); // the request stores other attributes inside its mExtData when some @@ -111,13 +112,14 @@ public class RequestRecordTest extends CMSBaseTestCase { assertTrue(db.registry.extAttrMapper instanceof ExtAttrDynMapper); assertTrue(db.registry.registerObjectClassCalled); - assertTrue(TestHelper.contains( - db.registry.registerObjectClassLdapNames, "extensibleObject")); - + assertTrue(TestHelper.contains(db.registry.registerObjectClassLdapNames, + "extensibleObject")); + assertTrue(db.registry.registerDynamicMapperCalled); assertTrue(db.registry.dynamicMapper instanceof ExtAttrDynMapper); } + class ModificationSetStub extends ModificationSet { public boolean addCalledWithExtData = false; public Object addExtDataObject = null; @@ -130,14 +132,17 @@ public class RequestRecordTest extends CMSBaseTestCase { } } + class DBSubsystemStub extends DBSubsystemDefaultStub { DBRegistryStub registry = new DBRegistryStub(); + public IDBRegistry getRegistry() { return registry; } } + class DBRegistryStub extends DBRegistryDefaultStub { boolean registerCalledWithExtAttr = false; IDBAttrMapper extAttrMapper = null; @@ -148,14 +153,12 @@ public class RequestRecordTest extends CMSBaseTestCase { private boolean registerDynamicMapperCalled = false; private IDBDynAttrMapper dynamicMapper; - public void registerObjectClass(String className, String ldapNames[]) - throws EDBException { + public void registerObjectClass(String className, String ldapNames[]) throws EDBException { registerObjectClassCalled = true; registerObjectClassLdapNames = ldapNames; } - public void registerAttribute(String ufName, IDBAttrMapper mapper) - throws EDBException { + public void registerAttribute(String ufName, IDBAttrMapper mapper) throws EDBException { if (IRequestRecord.ATTR_EXT_DATA.equals(ufName)) { registerCalledWithExtAttr = true; extAttrMapper = mapper; 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 d791f3b8..40009631 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -87,8 +87,8 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("UPPER", "CASE"); assertEquals("CASE", request.mExtData.get("upper")); - - assertFalse(request.setExtData("key", (String) null)); + + assertFalse(request.setExtData("key", (String)null)); } public void testVerifyValidExtDataHashtable() { @@ -131,8 +131,8 @@ public class RequestTest extends CMSBaseTestCase { valueHash.put("", "value"); assertFalse(request.setExtData("topkey2", valueHash)); - - assertFalse(request.setExtData("topkey3", (Hashtable) null)); + + assertFalse(request.setExtData("topkey3", (Hashtable)null)); } public void testGetExtDataInString() { @@ -173,10 +173,8 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("FOO", "val1"); request.setExtData("bar", new Hashtable()); - assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), - "foo")); - assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), - "bar")); + assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), "foo")); + assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), "bar")); } public void testSetExtDataSubkeyValue() { @@ -215,9 +213,9 @@ public class RequestTest extends CMSBaseTestCase { assertFalse(value.containsKey("")); // Illegal values - assertFalse(request.setExtData((String) null, "b", "c")); - assertFalse(request.setExtData("a", (String) null, "c")); - assertFalse(request.setExtData("a", "b", (String) null)); + assertFalse(request.setExtData((String)null, "b", "c")); + assertFalse(request.setExtData("a", (String)null, "c")); + assertFalse(request.setExtData("a", "b", (String)null)); } public void testGetExtDataSubkeyValue() { @@ -225,7 +223,7 @@ public class RequestTest extends CMSBaseTestCase { value.put("subkey", "value"); request.setExtData("topkey", value); - + assertEquals("value", request.getExtDataInString("topkey", "SUBKEY")); assertNull(request.getExtDataInString("badkey", "subkey")); assertNull(request.getExtDataInString("topkey", "badkey")); @@ -237,18 +235,22 @@ public class RequestTest extends CMSBaseTestCase { assertNotNull(request.mExtData.get("foo")); assertEquals("234", request.mExtData.get("foo")); - assertEquals(new Integer(234), request.getExtDataInInteger("foo")); + assertEquals(new Integer(234), + request.getExtDataInInteger("foo")); request.setExtData("strkey", "bar"); assertNull(request.getExtDataInInteger("strkey")); assertNull(request.getExtDataInInteger("notfound")); - assertFalse(request.setExtData("key", (Integer) null)); + assertFalse(request.setExtData("key", (Integer)null)); } public void testGetSetExtDataIntegerArray() { - Integer[] data = new Integer[] { new Integer(5), new Integer(23), - new Integer(12) }; + Integer[] data = new Integer[] { + new Integer(5), + new Integer(23), + new Integer(12) + }; assertTrue(request.setExtData("topkey1", data)); Integer[] retval = request.getExtDataInIntegerArray("topkey1"); assertEquals(3, retval.length); @@ -263,7 +265,7 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("topkey2", hashValue); assertNull(request.getExtDataInIntegerArray("topkey2")); - assertFalse(request.setExtData("key", (Integer[]) null)); + assertFalse(request.setExtData("key", (Integer[])null)); } public void testGetSetExtDataBigInteger() { @@ -279,12 +281,15 @@ public class RequestTest extends CMSBaseTestCase { assertNull(request.getExtDataInBigInteger("strkey")); assertNull(request.getExtDataInBigInteger("notfound")); - assertFalse(request.setExtData("key", (BigInteger) null)); + assertFalse(request.setExtData("key", (BigInteger)null)); } public void testGetSetExtDataBigIntegerArray() { - BigInteger[] data = new BigInteger[] { new BigInteger("111111111"), - new BigInteger("222222222"), new BigInteger("333333333") }; + BigInteger[] data = new BigInteger[] { + new BigInteger("111111111"), + new BigInteger("222222222"), + new BigInteger("333333333") + }; assertTrue(request.setExtData("topkey1", data)); BigInteger[] retval = request.getExtDataInBigIntegerArray("topkey1"); assertEquals(3, retval.length); @@ -299,7 +304,7 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("topkey2", hashValue); assertNull(request.getExtDataInBigIntegerArray("topkey2")); - assertFalse(request.setExtData("key", (BigInteger[]) null)); + assertFalse(request.setExtData("key", (BigInteger[])null)); } public void testSetExtDataThrowable() { @@ -309,7 +314,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals(e.toString(), request.mExtData.get("key")); - assertFalse(request.setExtData("key", (Throwable) null)); + assertFalse(request.setExtData("key", (Throwable)null)); } public void testGetSetByteArray() { @@ -325,7 +330,7 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(cmsStub.aToBCalled); assertEquals(data, out); - assertFalse(request.setExtData("key", (byte[]) null)); + assertFalse(request.setExtData("key", (byte[])null)); } public void testGetSetCert() throws CertificateException { @@ -340,16 +345,19 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(cmsStub.aToBCalled); assertEquals(cert, retval); - assertFalse(request.setExtData("key", (X509CertImpl) null)); + assertFalse(request.setExtData("key", (X509CertImpl)null)); } public void testGetSetCertArray() throws CertificateException { // this test is also pretty weak, but fortunately relies on the // building blocks. - X509CertImpl[] vals = new X509CertImpl[] { getFakeCert(), getFakeCert() }; + X509CertImpl[] vals = new X509CertImpl[] { + getFakeCert(), + getFakeCert() + }; assertTrue(request.setExtData("key", vals)); - Hashtable hashVals = (Hashtable) request.mExtData.get("key"); + Hashtable hashVals = (Hashtable)request.mExtData.get("key"); assertEquals(2, hashVals.keySet().size()); assertFalse(cmsStub.aToBCalled); @@ -360,15 +368,15 @@ public class RequestTest extends CMSBaseTestCase { assertEquals(vals[0], retval[0]); assertEquals(vals[1], retval[1]); - assertFalse(request.setExtData("key", (X509CertImpl[]) null)); + assertFalse(request.setExtData("key", (X509CertImpl[])null)); } public void testGetSetStringArray() { - String[] value = new String[] { "blue", "green", "red", "orange" }; + String[] value = new String[] {"blue", "green", "red", "orange"}; assertTrue(request.setExtData("key", value)); assertTrue(request.mExtData.containsKey("key")); - Hashtable hashValue = (Hashtable) request.mExtData.get("key"); + Hashtable hashValue = (Hashtable)request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -409,7 +417,7 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("cory", hashValue); assertNull(request.getExtDataInStringArray("cory")); - assertFalse(request.setExtData("key", (String[]) null)); + assertFalse(request.setExtData("key", (String[])null)); } @@ -423,7 +431,7 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(request.setExtData("key", stringVector)); assertTrue(request.mExtData.containsKey("key")); - Hashtable hashValue = (Hashtable) request.mExtData.get("key"); + Hashtable hashValue = (Hashtable)request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -447,7 +455,7 @@ public class RequestTest extends CMSBaseTestCase { request.setExtData("cory", hashValue); assertNull(request.getExtDataInStringVector("cory")); - assertFalse(request.setExtData("key", (Vector) null)); + assertFalse(request.setExtData("key", (Vector)null)); } public void testGetSetCertInfo() { @@ -464,22 +472,24 @@ public class RequestTest extends CMSBaseTestCase { request.getExtDataInCertInfo("key"); assertTrue(cmsStub.aToBCalled); - assertFalse(request.setExtData("key", (X509CertInfo) null)); + assertFalse(request.setExtData("key", (X509CertInfo)null)); } public void testGetSetCertInfoArray() { - X509CertInfo[] vals = new X509CertInfoStub[] { new X509CertInfoStub(), - new X509CertInfoStub() }; + X509CertInfo[] vals = new X509CertInfoStub[] { + new X509CertInfoStub(), + new X509CertInfoStub() + }; assertTrue(request.setExtData("key", vals)); - Hashtable hashVals = (Hashtable) request.mExtData.get("key"); + Hashtable hashVals = (Hashtable)request.mExtData.get("key"); assertEquals(2, hashVals.keySet().size()); assertFalse(cmsStub.aToBCalled); request.getExtDataInCertInfoArray("key"); assertTrue(cmsStub.aToBCalled); - assertFalse(request.setExtData("key", (X509CertInfo[]) null)); + assertFalse(request.setExtData("key", (X509CertInfo[])null)); } public void testGetBoolean() { @@ -517,17 +527,19 @@ public class RequestTest extends CMSBaseTestCase { public void testGetSetRevokedCertArray() { RevokedCertImpl[] vals = new RevokedCertImplStub[] { - new RevokedCertImplStub(), new RevokedCertImplStub() }; + new RevokedCertImplStub(), + new RevokedCertImplStub() + }; assertTrue(request.setExtData("key", vals)); - Hashtable hashVals = (Hashtable) request.mExtData.get("key"); + Hashtable hashVals = (Hashtable)request.mExtData.get("key"); assertEquals(2, hashVals.keySet().size()); assertFalse(cmsStub.aToBCalled); request.getExtDataInCertInfoArray("key"); assertTrue(cmsStub.aToBCalled); - assertFalse(request.setExtData("key", (RevokedCertImpl[]) null)); + assertFalse(request.setExtData("key", (RevokedCertImpl[])null)); } public void testGetSetCertExts() throws IOException { @@ -548,23 +560,22 @@ public class RequestTest extends CMSBaseTestCase { assertNotNull(retval); assertEquals(1, retval.size()); - assertFalse(request.setExtData("key", (CertificateExtensions) null)); + assertFalse(request.setExtData("key", (CertificateExtensions)null)); } public void testGetSetCertSubjectName() throws IOException { - CertificateSubjectName name = new CertificateSubjectName(new X500Name( - "cn=kevin")); + CertificateSubjectName name = new CertificateSubjectName( + new X500Name("cn=kevin")); assertTrue(request.setExtData("key", name)); assertTrue(request.mExtData.containsKey("key")); - CertificateSubjectName retval = request - .getExtDataInCertSubjectName("key"); + CertificateSubjectName retval = request.getExtDataInCertSubjectName("key"); assertNotNull(retval); // the 'CN=' is uppercased at some point - assertEquals("cn=kevin", retval.get(CertificateSubjectName.DN_NAME) - .toString().toLowerCase()); + assertEquals("cn=kevin", + retval.get(CertificateSubjectName.DN_NAME).toString().toLowerCase()); - assertFalse(request.setExtData("key", (CertificateSubjectName) null)); + assertFalse(request.setExtData("key", (CertificateSubjectName)null)); } public void testGetSetAuthToken() { @@ -582,15 +593,15 @@ public class RequestTest extends CMSBaseTestCase { assertEquals(token.getInString("key2"), retval.getInString("key2")); assertEquals(token.getInInteger("key3"), retval.getInInteger("key3")); - assertFalse(request.setExtData("key", (AuthToken) null)); + assertFalse(request.setExtData("key", (AuthToken)null)); } - + /** * CMSMemoryStub - * + * * This class is used to help test methods that rely on setting and then - * getting a value out. It assumes BtoA is always called first, stores the - * value passed in, and then returns that value for BtoA. + * getting a value out. It assumes BtoA is always called first, stores + * the value passed in, and then returns that value for BtoA. */ class CMSMemoryStub extends CMSEngineDefaultStub { boolean bToACalled = false; @@ -622,8 +633,7 @@ public class RequestTest extends CMSBaseTestCase { public X509CertInfoStub() { } - public byte[] getEncodedInfo(boolean ignoreCache) - throws CertificateEncodingException { + public byte[] getEncodedInfo(boolean ignoreCache) throws CertificateEncodingException { getEncodedCalled = true; return new byte[] {}; } @@ -636,6 +646,7 @@ public class RequestTest extends CMSBaseTestCase { private static final long serialVersionUID = -9088436260566619005L; boolean getEncodedCalled = false; + public byte[] getEncoded() throws CRLException { getEncodedCalled = true; return new byte[] {}; 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 b635c45f..7e1978e1 100644 --- a/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java +++ b/pki/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java @@ -18,9 +18,9 @@ import com.netscape.cmscore.dbs.DBSubsystem; import com.netscape.cmscore.dbs.DBSubsystemDefaultStub; /** - * The base class for all CMS unit tests. This sets up some basic stubs that - * allow unit tests to work without bumping into uninitialized subsystems (like - * the CMS logging system). + * The base class for all CMS unit tests. This sets up some basic stubs + * that allow unit tests to work without bumping into uninitialized subsystems + * (like the CMS logging system). */ public abstract class CMSBaseTestCase extends TestCase { CMSEngineStub engine; @@ -55,26 +55,28 @@ public abstract class CMSBaseTestCase extends TestCase { public abstract void cmsTestTearDown(); public X509CertImpl getFakeCert() throws CertificateException { - byte[] certData = new byte[] { 48, -126, 1, 18, 48, -127, -67, -96, 3, - 2, 1, 2, 2, 1, 1, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, - 1, 4, 5, 0, 48, 18, 49, 16, 48, 14, 6, 3, 85, 4, 3, 19, 7, 116, - 101, 115, 116, 105, 110, 103, 48, 30, 23, 13, 48, 55, 48, 55, - 49, 50, 49, 55, 51, 56, 51, 52, 90, 23, 13, 48, 55, 49, 48, 49, - 50, 49, 55, 51, 56, 51, 52, 90, 48, 18, 49, 16, 48, 14, 6, 3, - 85, 4, 3, 19, 7, 116, 101, 115, 116, 105, 110, 103, 48, 92, 48, - 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 1, 5, 0, 3, 75, 0, - 48, 72, 2, 65, 0, -65, 121, -119, -59, 105, 66, -122, -78, -30, - -64, 63, -47, 44, -48, -104, 103, -47, -108, 42, -38, 46, -8, - 32, 49, -29, -26, -112, -29, -86, 71, 24, -104, 78, -31, -75, - -128, 90, -92, -34, -51, -125, -13, 80, 101, -78, 39, -119, - -38, 117, 28, 67, -19, -71, -124, -85, 105, -53, -103, -59, - -67, -38, -83, 118, 65, 2, 3, 1, 0, 1, 48, 13, 6, 9, 42, -122, - 72, -122, -9, 13, 1, 1, 4, 5, 0, 3, 65, 0, -97, -62, 79, -28, - 124, -81, 98, 119, -85, -49, 62, -81, 46, -25, -29, 78, -40, - 118, -2, 114, -128, 74, -47, -68, 52, 11, -14, 30, -46, -95, - -26, -108, -19, 110, -63, -70, 61, -75, 64, 74, -33, -65, -96, - 120, -109, 37, 77, -76, 38, -114, 58, -80, -122, -39, -65, -31, - 37, -30, -126, 126, 17, -82, 92, 64, }; + byte[] certData = new byte[] { + 48, -126, 1, 18, 48, -127, -67, -96, 3, 2, 1, 2, 2, 1, + 1, 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 4, + 5, 0, 48, 18, 49, 16, 48, 14, 6, 3, 85, 4, 3, 19, + 7, 116, 101, 115, 116, 105, 110, 103, 48, 30, 23, 13, 48, 55, + 48, 55, 49, 50, 49, 55, 51, 56, 51, 52, 90, 23, 13, 48, + 55, 49, 48, 49, 50, 49, 55, 51, 56, 51, 52, 90, 48, 18, + 49, 16, 48, 14, 6, 3, 85, 4, 3, 19, 7, 116, 101, 115, + 116, 105, 110, 103, 48, 92, 48, 13, 6, 9, 42, -122, 72, -122, + -9, 13, 1, 1, 1, 5, 0, 3, 75, 0, 48, 72, 2, 65, + 0, -65, 121, -119, -59, 105, 66, -122, -78, -30, -64, 63, -47, 44, + -48, -104, 103, -47, -108, 42, -38, 46, -8, 32, 49, -29, -26, -112, + -29, -86, 71, 24, -104, 78, -31, -75, -128, 90, -92, -34, -51, -125, + -13, 80, 101, -78, 39, -119, -38, 117, 28, 67, -19, -71, -124, -85, + 105, -53, -103, -59, -67, -38, -83, 118, 65, 2, 3, 1, 0, 1, + 48, 13, 6, 9, 42, -122, 72, -122, -9, 13, 1, 1, 4, 5, + 0, 3, 65, 0, -97, -62, 79, -28, 124, -81, 98, 119, -85, -49, + 62, -81, 46, -25, -29, 78, -40, 118, -2, 114, -128, 74, -47, -68, + 52, 11, -14, 30, -46, -95, -26, -108, -19, 110, -63, -70, 61, -75, + 64, 74, -33, -65, -96, 120, -109, 37, 77, -76, 38, -114, 58, -80, + -122, -39, -65, -31, 37, -30, -126, 126, 17, -82, 92, 64, + }; return new X509CertImpl(certData); } diff --git a/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java b/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java index 1e9e7c91..cc19d8ab 100644 --- a/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java +++ b/pki/base/common/test/com/netscape/cmscore/test/TestHelper.java @@ -8,7 +8,7 @@ import java.util.Enumeration; public class TestHelper { public static boolean enumerationContains(Enumeration enumeration, - Object element) { + Object element) { while (enumeration.hasMoreElements()) { if (enumeration.nextElement().equals(element)) { return true; diff --git a/pki/base/common/test/com/netscape/test/TestListener.java b/pki/base/common/test/com/netscape/test/TestListener.java index 0f1ca283..af6c9bf7 100644 --- a/pki/base/common/test/com/netscape/test/TestListener.java +++ b/pki/base/common/test/com/netscape/test/TestListener.java @@ -118,9 +118,9 @@ public class TestListener extends RunListener { testSuiteElement.setAttribute("name", testSuiteName); testSuiteElement.setAttribute("timestamp", - dateFormat.format(new Date(testSuiteStartTime))); - testSuiteElement.setAttribute("hostname", InetAddress.getLocalHost() - .getHostName()); + dateFormat.format(new Date(testSuiteStartTime))); + testSuiteElement.setAttribute("hostname", + InetAddress.getLocalHost().getHostName()); // system properties Element propertiesElement = document.createElement("properties"); @@ -167,18 +167,21 @@ public class TestListener extends RunListener { Element systemOutElement = document.createElement("system-out"); testSuiteElement.appendChild(systemOutElement); - systemOutElement - .appendChild(document.createCDATASection(out.toString())); + systemOutElement.appendChild( + document.createCDATASection(out.toString()) + ); Element systemErrElement = document.createElement("system-err"); testSuiteElement.appendChild(systemErrElement); - systemErrElement - .appendChild(document.createCDATASection(err.toString())); + systemErrElement.appendChild( + document.createCDATASection(err.toString()) + ); // write to file - FileWriter fw = new FileWriter(reportsDir + File.separator + "TEST-" - + currentTestSuiteName + ".xml"); + FileWriter fw = new FileWriter( + reportsDir + File.separator + "TEST-" + currentTestSuiteName + ".xml" + ); StreamResult sr = new StreamResult(fw); DOMSource source = new DOMSource(document); trans.transform(source, sr); @@ -219,21 +222,23 @@ public class TestListener extends RunListener { failureElement.setAttribute("message", failure.getMessage()); failureElement.setAttribute("type", exceptionName); - Text messageElement = document.createTextNode(exceptionName + ": " - + failure.getMessage() + "\n"); + Text messageElement = document.createTextNode( + exceptionName + ": " +failure.getMessage() + "\n" + ); // print stack trace for (StackTraceElement element : exception.getStackTrace()) { - if (!element.getClassName().equals(description.getClassName())) - continue; + if (!element.getClassName().equals(description.getClassName())) continue; String source = "Unknown Source"; if (element.getFileName() != null && element.getLineNumber() >= 0) { source = element.getFileName() + ":" + element.getLineNumber(); } - messageElement.appendData("\tat " + element.getClassName() + "." - + element.getMethodName() + "(" + source + ")\n"); + messageElement.appendData("\tat " + + element.getClassName() + "." + element.getMethodName() + + "(" + source + ")\n" + ); } failureElement.appendChild(messageElement); |