X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Ftest%2FJU_ServiceImpl_createUserCred.java;h=00da6b4c369a4bcea4ca5f010351f9bac07fcf7f;hb=d41b490db09178a9da02cd20f6d2368b38ca6475;hp=1e4e9719f82e9eb9293a88e06cd759e43aa0ed4c;hpb=b3814beaec2b6f439ffb7af1594e70b5339a9e5f;p=aaf%2Fauthz.git

diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/test/JU_ServiceImpl_createUserCred.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/test/JU_ServiceImpl_createUserCred.java
index 1e4e9719..00da6b4c 100644
--- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/test/JU_ServiceImpl_createUserCred.java
+++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/test/JU_ServiceImpl_createUserCred.java
@@ -25,7 +25,6 @@ import static org.mockito.Mockito.*;
 
 import java.nio.ByteBuffer;
 import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
 import java.util.GregorianCalendar;
 import java.util.List;
 
@@ -33,16 +32,17 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
+import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.onap.aaf.auth.dao.CachedDAO;
 import org.onap.aaf.auth.dao.cass.CredDAO;
 import org.onap.aaf.auth.dao.cass.UserRoleDAO;
+
+import org.onap.aaf.auth.dao.hl.Question;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.cadi.Hash;
 import org.onap.aaf.cadi.util.FQI;
-import org.onap.aaf.misc.env.Trans;
 
 import aaf.v2_0.CredRequest;
 import junit.framework.Assert;
@@ -68,7 +68,7 @@ public class JU_ServiceImpl_createUserCred extends JU_BaseServiceImpl  {
 		when(org.getIdentity(trans, cr.getId())).thenReturn(orgIdentity);
 		when(orgIdentity.isFound()).thenReturn(true);
 		final String ns = "org.onap.sample";
-	    when(question.userRoleDAO().read(trans, fqi, ns+".owner")).thenReturn(Result.ok(listOf(urData(fqi,ns,"owner",100))));
+		whenRole(trans, fqi, ns, "owner", false, 100);
 	    when(question.nsDAO().read(trans, ns)).thenReturn(Result.ok(nsData(ns)));
 	    when(question.credDAO().readID(trans, cr.getId())).thenReturn(Result.ok(emptyList(CredDAO.Data.class)));
 	    when(question.credDAO().create(any(AuthzTrans.class), any(CredDAO.Data.class) )).thenReturn(Result.ok(credDataFound(cr,100)));
@@ -89,9 +89,9 @@ public class JU_ServiceImpl_createUserCred extends JU_BaseServiceImpl  {
 		when(org.getIdentity(trans, cr.getId())).thenReturn(orgIdentity);
 		when(orgIdentity.isFound()).thenReturn(true);
 		final String ns = "org.onap.sample";
-	    when(question.userRoleDAO().read(trans, fqi, ns+".owner")).thenReturn(Result.ok(emptyList(UserRoleDAO.Data.class)));
-	    when(question.userRoleDAO().read(trans, fqi, ns+".admin")).thenReturn(Result.ok(listOf(urData(fqi,ns,"admin",100))));
-	    when(question.nsDAO().read(trans, ns)).thenReturn(Result.ok(nsData(ns)));
+		whenRole(trans,fqi,ns,"owner",false, 100);
+		whenRole(trans,fqi,ns,"admin",true, 100);
+ 	    when(question.nsDAO().read(trans, ns)).thenReturn(Result.ok(nsData(ns)));
 	    when(question.credDAO().readID(trans, cr.getId())).thenReturn(Result.ok(emptyList(CredDAO.Data.class)));
 	    when(question.credDAO().create(any(AuthzTrans.class), any(CredDAO.Data.class) )).thenReturn(Result.ok(credDataFound(cr,100)));
 	    when(question.credDAO().readNS(trans, ns)).thenReturn(Result.ok(listOf(credDataFound(cr,100))));