Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 66 insertions, 55 deletions

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[] {};