Fixes for NULL_RETURNS Coverity Issues - Part 2

3 files changed, 11 insertions, 7 deletions

diff --git a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
index fab809bad..370973f0a 100644
--- a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
+++ b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java
@@ -109,7 +109,7 @@ public class AuthTokenTest extends CMSBaseTestCase {
         assertFalse(authToken.set("key4", (BigInteger[]) null));
     }
 
-    public void testGetSetDate() {
+    public void testGetSetDate() throws Exception {
         Date value = new Date();
         authToken.set("key", value);
         assertEquals(String.valueOf(value.getTime()),
@@ -118,6 +118,9 @@ public class AuthTokenTest extends CMSBaseTestCase {
 
         authToken.set("key2", "234567");
         Date retval = authToken.getInDate("key2");
+        if (retval == null) {
+            throw new Exception("Unable to get key2 as Date");
+        }
         assertEquals(234567L, retval.getTime());
 
         authToken.set("key3", "oops");
@@ -137,6 +140,9 @@ public class AuthTokenTest extends CMSBaseTestCase {
 
         assertFalse(cmsStub.aToBCalled);
         String[] retval = authToken.getInStringArray("key");
+        if (retval == null) {
+            throw new IOException("Unable to get key as String Array");
+        }
         assertTrue(cmsStub.aToBCalled);
         assertEquals(4, retval.length);
         assertEquals(value[0], retval[0]);
@@ -193,7 +199,7 @@ public class AuthTokenTest extends CMSBaseTestCase {
         assertFalse(authToken.set("key3", (CertificateExtensions) null));
     }
 
-    public void testGetSetCertificates() throws CertificateException {
+    public void testGetSetCertificates() throws CertificateException, IOException {
         X509CertImpl cert1 = getFakeCert();
         X509CertImpl cert2 = getFakeCert();
         X509CertImpl[] certArray = new X509CertImpl[] { cert1, cert2 };
@@ -216,7 +222,7 @@ public class AuthTokenTest extends CMSBaseTestCase {
         assertFalse(authToken.set("key2", (Certificates) null));
     }
 
-    public void testGetSetByteArrayArray() {
+    public void testGetSetByteArrayArray() throws IOException {
         byte[][] value = new byte[][] {
                 new byte[] { 1, 2, 3, 4 },
                 new byte[] { 12, 13, 14 },
diff --git a/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java b/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
index fe19159d5..396121b29 100644
--- a/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
+++ b/base/common/test/com/netscape/cmscore/dbs/DBSubsystemDefaultStub.java
@@ -7,7 +7,6 @@ import netscape.ldap.LDAPConnection;
 import com.netscape.certsrv.base.EBaseException;
 import com.netscape.certsrv.base.IConfigStore;
 import com.netscape.certsrv.base.ISubsystem;
-import com.netscape.certsrv.dbs.EDBException;
 import com.netscape.certsrv.dbs.IDBRegistry;
 import com.netscape.certsrv.dbs.IDBSSession;
 import com.netscape.certsrv.dbs.IDBSubsystem;
@@ -25,7 +24,7 @@ public class DBSubsystemDefaultStub implements IDBSubsystem {
         return null;
     }
 
-    public IDBSSession createSession() throws EDBException {
+    public IDBSSession createSession() {
         return null;
     }
 
diff --git a/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java b/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
index d3971afd4..007ccafcb 100644
--- a/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
+++ b/base/common/test/com/netscape/cmscore/test/CMSBaseTestCase.java
@@ -7,7 +7,6 @@ import netscape.security.x509.X509CertImpl;
 
 import com.netscape.certsrv.app.CMSEngineDefaultStub;
 import com.netscape.certsrv.apps.CMS;
-import com.netscape.certsrv.dbs.EDBException;
 import com.netscape.certsrv.dbs.IDBRegistry;
 import com.netscape.certsrv.dbs.IDBSSession;
 import com.netscape.certsrv.logging.ILogger;
@@ -88,7 +87,7 @@ public abstract class CMSBaseTestCase extends TestCase {
     }
 
     class DBSubsystemStub extends DBSubsystemDefaultStub {
-        public IDBSSession createSession() throws EDBException {
+        public IDBSSession createSession() {
             return session;
         }