diff options
Diffstat (limited to 'pki/base/common/test/com/netscape')
15 files changed, 298 insertions, 313 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 c01ec33e..d2ba6c19 100644 --- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java @@ -126,7 +126,7 @@ public class CMSEngineDefaultStub implements ICMSEngine { return false; } - public Enumeration <String> getSubsystemNames() { + public Enumeration<String> getSubsystemNames() { return null; } @@ -261,14 +261,16 @@ public class CMSEngineDefaultStub implements ICMSEngine { 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; @@ -459,7 +461,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public IGeneralNamesConfig createGeneralNamesConfig(String name, IConfigStore config, boolean isValueConfigured, boolean isPolicyEnabled) throws EBaseException { return null; } @@ -472,7 +473,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException { return null; } @@ -511,7 +511,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public boolean isRevoked(X509Certificate[] certificates) { return false; } @@ -537,89 +536,89 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { 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 void getGeneralNameConfigDefaultParams(String name, - boolean isValueConfigured, Vector<String> params) { - // TODO Auto-generated method stub - - } - - @Override - public void getGeneralNamesConfigDefaultParams(String name, - boolean isValueConfigured, Vector<String> params) { - // TODO Auto-generated method stub - - } - - @Override - public void getGeneralNameConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector<String> info) { - // TODO Auto-generated method stub - - } - - @Override - public void getGeneralNamesConfigExtendedPluginInfo(String name, - boolean isValueConfigured, Vector<String> info) { - // TODO Auto-generated method stub - - } - - @Override - public void getSubjAltNameConfigDefaultParams(String name, - Vector<String> params) { - // TODO Auto-generated method stub - - } - - @Override - public void getSubjAltNameConfigExtendedPluginInfo(String name, - Vector<String> params) { - // TODO Auto-generated method stub - - } - - @Override - public IArgBlock createArgBlock(String realm, - Hashtable<String, String> httpReq) { - // TODO Auto-generated method stub - return null; - } - - @Override - public IArgBlock createArgBlock(Hashtable<String, String> httpReq) { - // 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; + } + + @Override + public void getGeneralNameConfigDefaultParams(String name, + boolean isValueConfigured, Vector<String> params) { + // TODO Auto-generated method stub + + } + + @Override + public void getGeneralNamesConfigDefaultParams(String name, + boolean isValueConfigured, Vector<String> params) { + // TODO Auto-generated method stub + + } + + @Override + public void getGeneralNameConfigExtendedPluginInfo(String name, + boolean isValueConfigured, Vector<String> info) { + // TODO Auto-generated method stub + + } + + @Override + public void getGeneralNamesConfigExtendedPluginInfo(String name, + boolean isValueConfigured, Vector<String> info) { + // TODO Auto-generated method stub + + } + + @Override + public void getSubjAltNameConfigDefaultParams(String name, + Vector<String> params) { + // TODO Auto-generated method stub + + } + + @Override + public void getSubjAltNameConfigExtendedPluginInfo(String name, + Vector<String> params) { + // TODO Auto-generated method stub + + } + + @Override + public IArgBlock createArgBlock(String realm, + Hashtable<String, String> httpReq) { + // TODO Auto-generated method stub + return null; + } + + @Override + public IArgBlock createArgBlock(Hashtable<String, String> httpReq) { + // 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 3f83b3b0..2b8c0c25 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,7 +75,7 @@ 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() { @@ -102,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() { @@ -123,7 +123,7 @@ 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 { @@ -145,16 +145,15 @@ 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 { @@ -170,7 +169,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 { @@ -191,13 +190,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); @@ -214,14 +213,14 @@ 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} + new byte[] { 12, 13, 14 }, + new byte[] { 50, -12, 0, 100 } }; assertFalse(cmsStub.bToACalled); @@ -240,15 +239,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 b7772bb2..a0ffe5e0 100644 --- a/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/logging/LoggerDefaultStub.java @@ -56,7 +56,7 @@ public class LoggerDefaultStub implements ILogger { 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) { 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 28ea1669..0cd27840 100644 --- a/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java +++ b/pki/base/common/test/com/netscape/certsrv/request/AgentApprovalsTest.java @@ -48,15 +48,15 @@ public class AgentApprovalsTest extends CMSBaseTestCase { 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 3fd6a96f..699a924d 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,7 +57,6 @@ 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 2095e162..9635129f 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryDefaultStub.java @@ -17,7 +17,6 @@ import com.netscape.certsrv.dbs.IFilterConverter; */ public class DBRegistryDefaultStub implements IDBRegistry { - public void registerObjectClass(String className, String ldapNames[]) throws EDBException { } 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 7b4681e5..c4564323 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java @@ -40,7 +40,7 @@ public class DBRegistryTest extends CMSBaseTestCase { extAttrMapper = new DBDynAttrMapperStub(); try { registry.registerObjectClass(requestRecordStub.getClass().getName(), - new String[] {"ocvalue"} ); + new String[] { "ocvalue" }); registry.registerAttribute(IRequestRecord.ATTR_EXT_DATA, extAttrMapper); registry.registerAttribute(IRequestRecord.ATTR_SOURCE_ID, new StringMapper("sourceIdOut")); @@ -64,7 +64,7 @@ public class DBRegistryTest extends CMSBaseTestCase { assertTrue(extAttrMapper.mapObjectCalled); } - public void testGetLDAPAttributesForExtData() throws EBaseException { + public void testGetLDAPAttributesForExtData() throws EBaseException { String inAttrs[] = new String[] { "extData-foo", "extData-foo12", @@ -79,9 +79,10 @@ 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 { @@ -109,7 +110,6 @@ public class DBRegistryTest extends CMSBaseTestCase { assertTrue(extAttrMapper.mapLDAPAttrsCalled); } - class DBSubsystemStub extends DBSubsystemDefaultStub { DBRegistry registry; @@ -118,7 +118,6 @@ public class DBRegistryTest extends CMSBaseTestCase { } } - class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { boolean mapObjectCalled = false; Object mapObjectCalledWithObject = null; @@ -146,10 +145,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/DBSubsystemDefaultStub.java b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java index 68f24d50..fe19159d 100644 --- a/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java @@ -17,7 +17,6 @@ import com.netscape.certsrv.dbs.IDBSubsystem; */ public class DBSubsystemDefaultStub implements IDBSubsystem { - public String getBaseDN() { return null; } @@ -83,91 +82,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 45fda77d..294ae1df 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/ExtAttrDynMapperTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java index f47cbe0a..a0ad0a8a 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java @@ -37,7 +37,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")); @@ -165,7 +165,6 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { assertTrue(attrBim.hasSubtype("bi--003bm")); } - public void testMapLDAPAttributeSetToObject() throws EBaseException { // // Test simple key-value pairs @@ -183,7 +182,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { requestRecord); assertEquals(1, requestRecord.setCallCounter); - Hashtable<?, ?> extData = (Hashtable<?, ?>)requestRecord.extAttrData.get( + Hashtable<?, ?> extData = (Hashtable<?, ?>) requestRecord.extAttrData.get( IRequestRecord.ATTR_EXT_DATA); assertNotNull(extData); @@ -215,27 +214,27 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { requestRecord); assertEquals(1, requestRecord.setCallCounter); - extData = (Hashtable<?, ?>)requestRecord.extAttrData.get( + 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")); @@ -260,13 +259,11 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { } - class RequestRecordStub extends RequestRecordDefaultStub { private static final long serialVersionUID = 4106967075497999274L; Hashtable<String, Object> extAttrData = new Hashtable<String, Object>(); 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 a835ba32..151f3d62 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -103,7 +103,7 @@ public class RequestDefaultStub implements IRequest { return false; } - public boolean setExtData(String key, Hashtable<String, ?> value) { + public boolean setExtData(String key, Hashtable<String, ?> value) { return false; } @@ -115,7 +115,7 @@ public class RequestDefaultStub implements IRequest { return null; } - public <V> Hashtable<String, V> getExtDataInHashtable(String key){ + public <V> Hashtable<String, V> getExtDataInHashtable(String key) { return null; } 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 4ae5be9a..d69ac6a5 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 ba3689fb..efdbfc20 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java @@ -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,7 +83,6 @@ 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 @@ -114,12 +113,11 @@ public class RequestRecordTest extends CMSBaseTestCase { assertTrue(db.registry.registerObjectClassCalled); 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; @@ -132,17 +130,14 @@ 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; 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 dd1a1612..8d5132d9 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -69,7 +69,7 @@ public class RequestTest extends CMSBaseTestCase { public void testIsSimpleExtDataValue() { request.mExtData.put("simple1", "foo"); - request.mExtData.put("complex1", new Hashtable<String, Object> ()); + request.mExtData.put("complex1", new Hashtable<String, Object>()); assertTrue(request.isSimpleExtDataValue("simple1")); assertFalse(request.isSimpleExtDataValue("complex1")); @@ -87,12 +87,12 @@ 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)); } @SuppressWarnings({ "rawtypes", "unchecked" }) - public void testVerifyValidExtDataHashtable() { + public void testVerifyValidExtDataHashtable() { Hashtable valueHash = new Hashtable(); valueHash.put("key1", "val1"); @@ -104,8 +104,8 @@ public class RequestTest extends CMSBaseTestCase { assertFalse(request.isValidExtDataHashtableValue(valueHash)); valueHash.clear(); - //valueHash.put(new Integer("0"), "bar"); - //assertFalse(request.isValidExtDataHashtableValue(valueHash)); + // valueHash.put(new Integer("0"), "bar"); + // assertFalse(request.isValidExtDataHashtableValue(valueHash)); valueHash.clear(); valueHash.put("okay", new Integer(5)); @@ -114,7 +114,7 @@ public class RequestTest extends CMSBaseTestCase { } @SuppressWarnings({ "unchecked", "rawtypes" }) - public void testSetExtHashtableData() { + public void testSetExtHashtableData() { Hashtable<String, String> valueHash = new Hashtable<String, String>(); valueHash.put("key1", "val1"); @@ -133,8 +133,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() { @@ -215,9 +215,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 +225,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")); @@ -244,7 +244,7 @@ public class RequestTest extends CMSBaseTestCase { assertNull(request.getExtDataInInteger("strkey")); assertNull(request.getExtDataInInteger("notfound")); - assertFalse(request.setExtData("key", (Integer)null)); + assertFalse(request.setExtData("key", (Integer) null)); } public void testGetSetExtDataIntegerArray() { @@ -267,7 +267,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() { @@ -283,7 +283,7 @@ 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() { @@ -306,7 +306,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() { @@ -316,7 +316,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() { @@ -332,7 +332,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 { @@ -347,7 +347,7 @@ 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 { @@ -359,7 +359,7 @@ public class RequestTest extends CMSBaseTestCase { }; 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); @@ -370,16 +370,16 @@ 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")); @SuppressWarnings("unchecked") - Hashtable<String, String> hashValue = (Hashtable<String, String>)request.mExtData.get("key"); + Hashtable<String, String> hashValue = (Hashtable<String, String>) request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -420,7 +420,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)); } @@ -435,7 +435,7 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(request.mExtData.containsKey("key")); @SuppressWarnings("unchecked") - Hashtable<String, String> hashValue = (Hashtable<String, String>)request.mExtData.get("key"); + Hashtable<String, String> hashValue = (Hashtable<String, String>) request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -459,7 +459,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() { @@ -476,7 +476,7 @@ 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() { @@ -486,14 +486,14 @@ public class RequestTest extends CMSBaseTestCase { }; 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() { @@ -536,14 +536,14 @@ public class RequestTest extends CMSBaseTestCase { }; 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 { @@ -564,7 +564,7 @@ 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 { @@ -576,10 +576,10 @@ public class RequestTest extends CMSBaseTestCase { CertificateSubjectName retval = request.getExtDataInCertSubjectName("key"); assertNotNull(retval); // the 'CN=' is uppercased at some point - assertEquals("cn=kevin", + 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() { @@ -597,15 +597,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; @@ -650,7 +650,6 @@ 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 7e1978e1..ab621847 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; @@ -56,26 +56,26 @@ public abstract class CMSBaseTestCase extends TestCase { 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, + 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); |