diff options
Diffstat (limited to 'pki/base/common/test/com/netscape')
4 files changed, 100 insertions, 64 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 ac5fe224..c01ec33e 100644 --- a/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java +++ b/pki/base/common/test/com/netscape/certsrv/app/CMSEngineDefaultStub.java @@ -126,11 +126,11 @@ public class CMSEngineDefaultStub implements ICMSEngine { return false; } - public Enumeration getSubsystemNames() { + public Enumeration <String> getSubsystemNames() { return null; } - public Enumeration getSubsystems() { + public Enumeration<ISubsystem> getSubsystems() { return null; } @@ -459,17 +459,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public void getGeneralNameConfigDefaultParams(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 getGeneralNamesConfigExtendedPluginInfo(String name, boolean isValueConfigured, Vector info) { - } public IGeneralNamesConfig createGeneralNamesConfig(String name, IConfigStore config, boolean isValueConfigured, boolean isPolicyEnabled) throws EBaseException { return null; @@ -483,11 +472,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public void getSubjAltNameConfigDefaultParams(String name, Vector params) { - } - - public void getSubjAltNameConfigExtendedPluginInfo(String name, Vector params) { - } public ISubjAltNameConfig createSubjAltNameConfig(String name, IConfigStore config, boolean isValueConfigured) throws EBaseException { return null; @@ -527,13 +511,6 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { return null; } - public IArgBlock createArgBlock(String realm, Hashtable httpReq) { - return null; - } - - public IArgBlock createArgBlock(Hashtable httpReq) { - return null; - } public boolean isRevoked(X509Certificate[] certificates) { return false; @@ -590,4 +567,59 @@ public String getFingerPrints(byte[] certDer) throws NoSuchAlgorithmException { // 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/cmscore/request/ExtDataHashtableTest.java b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java index 7569ff20..c349b73d 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java +++ b/pki/base/common/test/com/netscape/cmscore/request/ExtDataHashtableTest.java @@ -9,14 +9,14 @@ import com.netscape.cmscore.test.CMSBaseTestCase; public class ExtDataHashtableTest extends CMSBaseTestCase { - ExtDataHashtable hash; + ExtDataHashtable<String> hash; public ExtDataHashtableTest(String name) { super(name); } public void cmsTestSetUp() { - hash = new ExtDataHashtable(); + hash = new ExtDataHashtable<String>(); } public void cmsTestTearDown() { @@ -46,7 +46,7 @@ public class ExtDataHashtableTest extends CMSBaseTestCase { } public void testPutAll() { - Hashtable hash2 = new Hashtable(); + Hashtable<String, String> hash2 = new Hashtable<String, String>(); hash2.put("KEY1", "VAL1"); hash2.put("KEY2", "val2"); @@ -67,11 +67,11 @@ public class ExtDataHashtableTest extends CMSBaseTestCase { } public void testMapConstructor() { - Hashtable hash2 = new Hashtable(); + Hashtable<String, String> hash2 = new Hashtable<String, String>(); hash2.put("KEY1", "VAL1"); hash2.put("KEY2", "val2"); - hash = new ExtDataHashtable(hash2); + hash = new ExtDataHashtable<String>(hash2); assertTrue(hash.containsKey("key1")); assertEquals("VAL1", hash.get("key1")); 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 f00eb8a7..a835ba32 100644 --- a/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/pki/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -71,7 +71,7 @@ public class RequestDefaultStub implements IRequest { return null; } - public Enumeration getAttrNames() { + public Enumeration<String> getAttrNames() { return null; } @@ -103,7 +103,7 @@ public class RequestDefaultStub implements IRequest { return false; } - public boolean setExtData(String key, Hashtable value) { + public boolean setExtData(String key, Hashtable<String, ?> value) { return false; } @@ -115,11 +115,11 @@ public class RequestDefaultStub implements IRequest { return null; } - public Hashtable getExtDataInHashtable(String key) { + public <V> Hashtable<String, V> getExtDataInHashtable(String key){ return null; } - public Enumeration getExtDataKeys() { + public Enumeration<String> getExtDataKeys() { return null; } @@ -223,11 +223,11 @@ public class RequestDefaultStub implements IRequest { return new RevokedCertImpl[0]; } - public boolean setExtData(String key, Vector data) { + public boolean setExtData(String key, Vector<?> data) { return false; } - public Vector getExtDataInStringVector(String key) { + public Vector<String> getExtDataInStringVector(String key) { return 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 40009631..dd1a1612 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()); + request.mExtData.put("complex1", new Hashtable<String, Object> ()); assertTrue(request.isSimpleExtDataValue("simple1")); assertFalse(request.isSimpleExtDataValue("complex1")); @@ -91,7 +91,8 @@ public class RequestTest extends CMSBaseTestCase { assertFalse(request.setExtData("key", (String)null)); } - public void testVerifyValidExtDataHashtable() { + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void testVerifyValidExtDataHashtable() { Hashtable valueHash = new Hashtable(); valueHash.put("key1", "val1"); @@ -103,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)); @@ -112,15 +113,16 @@ public class RequestTest extends CMSBaseTestCase { } - public void testSetExtHashtableData() { - Hashtable valueHash = new Hashtable(); + @SuppressWarnings({ "unchecked", "rawtypes" }) + public void testSetExtHashtableData() { + Hashtable<String, String> valueHash = new Hashtable<String, String>(); valueHash.put("key1", "val1"); valueHash.put("KEY2", "val2"); request.setExtData("TOPKEY", valueHash); - Hashtable out = request.getExtDataInHashtable("topkey"); + Hashtable<String, ?> out = request.getExtDataInHashtable("topkey"); assertNotNull(out); assertTrue(out.containsKey("key1")); @@ -137,7 +139,7 @@ public class RequestTest extends CMSBaseTestCase { public void testGetExtDataInString() { request.mExtData.put("strkey", "strval"); - Hashtable hashValue = new Hashtable(); + Hashtable<String, String> hashValue = new Hashtable<String, String>(); hashValue.put("uh", "oh"); request.mExtData.put("hashkey", hashValue); @@ -150,11 +152,11 @@ public class RequestTest extends CMSBaseTestCase { public void testGetExtDataInHashtable() { request.mExtData.put("strkey", "strval"); - Hashtable hashValue = new Hashtable(); + Hashtable<String, String> hashValue = new Hashtable<String, String>(); hashValue.put("uh", "oh"); request.mExtData.put("hashkey", hashValue); - Hashtable out = request.getExtDataInHashtable("HASHKEY"); + Hashtable<?, ?> out = request.getExtDataInHashtable("HASHKEY"); assertNotNull(out); assertNull(request.getExtDataInHashtable("notfound")); assertNull(request.getExtDataInHashtable("strkey")); @@ -171,7 +173,7 @@ public class RequestTest extends CMSBaseTestCase { public void testGetExtDataKeys() { request.setExtData("FOO", "val1"); - request.setExtData("bar", new Hashtable()); + request.setExtData("bar", new Hashtable<String, Object>()); assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), "foo")); assertTrue(TestHelper.enumerationContains(request.getExtDataKeys(), "bar")); @@ -181,14 +183,14 @@ public class RequestTest extends CMSBaseTestCase { // creates hashtable first time assertNull(request.getExtDataInHashtable("topkey")); request.setExtData("TOPKEY", "SUBKEY", "value"); - Hashtable value = request.getExtDataInHashtable("topkey"); + Hashtable<String, String> value = request.getExtDataInHashtable("topkey"); assertNotNull(value); assertTrue(value.containsKey("subkey")); assertEquals("value", value.get("subkey")); // adds to existing hashtable assertNull(request.getExtDataInHashtable("topkey2")); - value = new Hashtable(); + value = new Hashtable<String, String>(); value.put("subkey2", "value2"); request.setExtData("topkey2", value); request.setExtData("TOPKEY2", "subkey3", "value3"); @@ -219,7 +221,7 @@ public class RequestTest extends CMSBaseTestCase { } public void testGetExtDataSubkeyValue() { - Hashtable value = new Hashtable(); + Hashtable<String, String> value = new Hashtable<String, String>(); value.put("subkey", "value"); request.setExtData("topkey", value); @@ -259,7 +261,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals(data[2], retval[2]); // invalid conversion - Hashtable hashValue = new Hashtable(); + Hashtable<String, String> hashValue = new Hashtable<String, String>(); hashValue.put("0", "5"); hashValue.put("1", "bar"); request.setExtData("topkey2", hashValue); @@ -298,7 +300,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals(data[2], retval[2]); // invalid conversion - Hashtable hashValue = new Hashtable(); + Hashtable<String, String> hashValue = new Hashtable<String, String>(); hashValue.put("0", "5"); hashValue.put("1", "bar"); request.setExtData("topkey2", hashValue); @@ -357,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); @@ -376,7 +378,8 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(request.setExtData("key", value)); assertTrue(request.mExtData.containsKey("key")); - Hashtable hashValue = (Hashtable)request.mExtData.get("key"); + @SuppressWarnings("unchecked") + Hashtable<String, String> hashValue = (Hashtable<String, String>)request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -394,7 +397,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals("orange", retval[3]); // Try with sparse input - hashValue = new Hashtable(); + hashValue = new Hashtable<String, String>(); hashValue.put("0", "square"); hashValue.put("4", "triangle"); hashValue.put("6", "octogon"); @@ -411,7 +414,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals("octogon", retval[6]); // invalid conversion - hashValue = new Hashtable(); + hashValue = new Hashtable<String, String>(); hashValue.put("0", "foo"); hashValue.put("badkey", "bar"); request.setExtData("cory", hashValue); @@ -422,7 +425,7 @@ public class RequestTest extends CMSBaseTestCase { } public void testGetSetStringVector() { - Vector stringVector = new Vector(); + Vector<String> stringVector = new Vector<String>(); stringVector.add("blue"); stringVector.add("green"); stringVector.add("red"); @@ -431,7 +434,8 @@ public class RequestTest extends CMSBaseTestCase { assertTrue(request.setExtData("key", stringVector)); assertTrue(request.mExtData.containsKey("key")); - Hashtable hashValue = (Hashtable)request.mExtData.get("key"); + @SuppressWarnings("unchecked") + Hashtable<String, String> hashValue = (Hashtable<String, String>)request.mExtData.get("key"); assertTrue(hashValue.containsKey("0")); assertTrue(hashValue.containsKey("1")); assertTrue(hashValue.containsKey("2")); @@ -441,7 +445,7 @@ public class RequestTest extends CMSBaseTestCase { assertEquals("red", hashValue.get("2")); assertEquals("orange", hashValue.get("3")); - Vector retval = request.getExtDataInStringVector("key"); + Vector<String> retval = request.getExtDataInStringVector("key"); assertEquals(4, retval.size()); assertEquals("blue", retval.elementAt(0)); assertEquals("green", retval.elementAt(1)); @@ -449,13 +453,13 @@ public class RequestTest extends CMSBaseTestCase { assertEquals("orange", retval.elementAt(3)); // invalid conversion - hashValue = new Hashtable(); + hashValue = new Hashtable<String, String>(); hashValue.put("0", "foo"); hashValue.put("badkey", "bar"); request.setExtData("cory", hashValue); assertNull(request.getExtDataInStringVector("cory")); - assertFalse(request.setExtData("key", (Vector)null)); + assertFalse(request.setExtData("key", (Vector<?>)null)); } public void testGetSetCertInfo() { @@ -482,7 +486,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); @@ -493,7 +497,7 @@ public class RequestTest extends CMSBaseTestCase { } public void testGetBoolean() { - Hashtable hashValue = new Hashtable(); + Hashtable<String, String> hashValue = new Hashtable<String, String>(); hashValue.put("one", "false"); hashValue.put("two", "true"); hashValue.put("three", "on"); @@ -532,7 +536,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); |