Fixes/Refinements from Testing

Issue-ID: AAF-857
Change-Id: I2c5a542982b77011ad4ed5c41e08e045c83e2e3f
Signed-off-by: Instrumental <jonathan.gathman@att.com>

4 files changed, 11 insertions, 11 deletions

diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransImpl.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransImpl.java
index f4481ed4..af92e372 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransImpl.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransImpl.java
@@ -66,11 +66,12 @@ public class JU_AuthzTransImpl {
     public void setUp(){
         authzTransImpl = new AuthzTransImpl(authzEnvMock);
         req = mock(HttpServletRequest.class);
-        authzTransImpl.set(req);
+        res = mock(HttpServletResponse.class);
+        authzTransImpl.set(req,res);
         when(req.getParameter("request")).thenReturn("NotNull");
-        authzTransImpl.set(req);
+        authzTransImpl.set(req,res);
         when(req.getParameter("request")).thenReturn("");
-        authzTransImpl.set(req);    
+        authzTransImpl.set(req,res);    
     }
     
     @Test
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransOnlyFilter.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransOnlyFilter.java
index 091a3aa6..346ca48f 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransOnlyFilter.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_AuthzTransOnlyFilter.java
@@ -76,10 +76,7 @@ public class JU_AuthzTransOnlyFilter {
     public void testStart() throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         AuthzTransOnlyFilter aTF = new AuthzTransOnlyFilter(authzEnvMock);
         Class c = aTF.getClass();
-        Class[] cArg = new Class[2];
-        cArg[0] = AuthzTrans.class;
-        cArg[1] = ServletRequest.class;        //Steps to test a protected method
-        Method startMethod = c.getDeclaredMethod("start", cArg);
+        Method startMethod = c.getDeclaredMethod("start", new Class[] {AuthzTrans.class});
         startMethod.setAccessible(true);
         //startMethod.invoke(aTF, authzTransMock, servletRequestMock);
     }
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_NullTrans.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_NullTrans.java
index f67716fa..9c7212c2 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_NullTrans.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/env/test/JU_NullTrans.java
@@ -27,6 +27,7 @@ import static org.mockito.Mockito.mock;
 import java.security.Principal;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -157,7 +158,8 @@ public class JU_NullTrans {
     @Test
     public void testSet() {
         HttpServletRequest req = mock(HttpServletRequest.class);
-        AuthzTrans set = nullTrans.set(req);
+        HttpServletResponse res = mock(HttpServletResponse.class);
+        AuthzTrans set = nullTrans.set(req,res);
         Assert.assertNull(set);
     }
     
diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java
index 9b49216d..4972b572 100644
--- a/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java
+++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/server/test/JU_AbsServiceStarter.java
@@ -49,8 +49,8 @@ public class JU_AbsServiceStarter {
     
     private class AbsServiceStarterStub extends AbsServiceStarter {
 
-        public AbsServiceStarterStub(AbsService service) {
-            super(service);
+        public AbsServiceStarterStub(AbsService service, boolean secure) {
+            super(service,secure);
             // TODO Auto-generated constructor stub
         }
 
@@ -110,7 +110,7 @@ public class JU_AbsServiceStarter {
         prop.setLogLevel(Level.DEBUG);
         absServiceStub = new AbsServiceStub(prop, bEnv);
         
-        absServiceStarterStub = new AbsServiceStarterStub(absServiceStub);
+        absServiceStarterStub = new AbsServiceStarterStub(absServiceStub,true);
     }
     
 //    @Test