X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fenv%2Ftest%2FJU_AuthzTransImpl.java;h=8e6d5028f037be4fe2e58c242d958152002dd73f;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=317fb94aaf4622868f804c0e5ea4e7edc5ea064d;hpb=ccd363f92f74fe7c4fdadb2d4e8dea77a1e44718;p=aaf%2Fauthz.git

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 317fb94a..8e6d5028 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
@@ -50,120 +50,120 @@ import junit.framework.Assert;
 @RunWith(PowerMockRunner.class)
 public class JU_AuthzTransImpl {
 
-	AuthzTransImpl authzTransImpl;
-	@Mock
-	AuthzEnv authzEnvMock;
-	AuthzTransImpl trans1;
-	
-	private Organization org=null;
-	private AuthzTransImpl mockAuthzTransImpl;
-	private static HttpServletRequest req;
-	private static HttpServletResponse res;
-	private Lur lur1 = mock(Lur.class);
-	
-	@Before
-	public void setUp(){
-		authzTransImpl = new AuthzTransImpl(authzEnvMock);
-		req = mock(HttpServletRequest.class);
-		authzTransImpl.set(req);
-		when(req.getParameter("request")).thenReturn("NotNull");
-		authzTransImpl.set(req);
-		when(req.getParameter("request")).thenReturn("");
-		authzTransImpl.set(req);	
-	}
-	
-	@Test
-	public void testOrg() {
-		Organization result=null;
-		result = authzTransImpl.org();
-		OrganizationFactory test = mock(OrganizationFactory.class);
-		//result = OrganizationFactory.obtain(authzTransImpl.env(), authzTransImpl.user());
-		authzTransImpl.org();
-		//when(test).thenReturn(null);
-		//assertTrue(true);	
-	}
-	
-	@Mock
-	LogTarget logTargetMock;
-	
-	@Test
-	public void testLogAuditTrail(){
-		
-		when(logTargetMock.isLoggable()).thenReturn(false);
-		authzTransImpl.logAuditTrail(logTargetMock);
-		when(logTargetMock.isLoggable()).thenReturn(true);
-		Env delegate = mock(Env.class);
-		//when(logTargetMock.isLoggable()).thenReturn(true);//TODO: Figure this out
-		//authzTransImpl.logAuditTrail(logTargetMock);
-	}
-	
-//	@Test							//TODO:Fix this AAF-111
-//	public void testSetUser() {
-//		Principal user = mock(Principal.class);
-//		authzTransImpl.setUser(user);
-//		Principal user1 = authzTransImpl.getUserPrincipal();
-//		String username = user1.getName();
-//		Assert.assertNotNull(user1);
-//	}
-	
-//	@Test							//TODO:Fix this AAF-111
-//	public void testUser() {
-//		Assert.assertEquals("n/a", authzTransImpl.user());
-//		Principal user = mock(Principal.class); //Unsure how to modify name
-//		when(user.toString()).thenReturn("name");
-//		when(user.getName()).thenReturn("name");
-//		authzTransImpl.setUser(user);
-//		Assert.assertEquals("name", authzTransImpl.user());
-//	}
-//	
-	@Test
-	public void testRequested() {
-		REQD_TYPE user = REQD_TYPE.move;
-		REQD_TYPE user1 = REQD_TYPE.future;
-		HttpServletRequest req = mock(HttpServletRequest.class);
-		String p = user1.name();
-		boolean boolUser = authzTransImpl.requested(user);
-		Assert.assertEquals(false, boolUser);
-		Assert.assertNotNull(p);
-		authzTransImpl.requested(user,true);
-		when(authzTransImpl.requested(user)).thenReturn(null);
-		Assert.assertEquals(true, authzTransImpl.requested(user));
-	/*	String p1 = req.getParameter(user1.name());  //unable to access private method call in all instances
-		when(req.getParameter(user1.name())).thenReturn("test");
-		authzTransImpl.requested(user,false);
-		*/
-		
-		
-	}
-	
-	@Test
-	public void testFish() {
-		mockAuthzTransImpl = mock(AuthzTransImpl.class);
-		Permission p = mock(Permission.class);
-		authzTransImpl.fish(p);
-		String str = "Test";
-		lur1.createPerm(str);
-		when(p.match(p)).thenReturn(true);
-		authzTransImpl.setLur(lur1);
-		authzTransImpl.fish(p);
-	}
-	
-	@Test
-	public void testSetVariables() { //TODO: refactor this better
-		Assert.assertNull(authzTransImpl.agent());
-		Assert.assertNull(authzTransImpl.ip());
-		Assert.assertNull(authzTransImpl.path());
-		Assert.assertNotNull(authzTransImpl.port());
-		Assert.assertNull(authzTransImpl.meth());
-		Assert.assertNull(authzTransImpl.getUserPrincipal());
-		Assert.assertNotNull(authzTransImpl.user());
-	}
-	
-	@Test
-	public void testNow() {
-		Date date = authzTransImpl.now();
-		Assert.assertEquals(date,authzTransImpl.now());
-		when(authzTransImpl.now()).thenReturn(null);
-	}
-	
+    AuthzTransImpl authzTransImpl;
+    @Mock
+    AuthzEnv authzEnvMock;
+    AuthzTransImpl trans1;
+    
+    private Organization org=null;
+    private AuthzTransImpl mockAuthzTransImpl;
+    private static HttpServletRequest req;
+    private static HttpServletResponse res;
+    private Lur lur1 = mock(Lur.class);
+    
+    @Before
+    public void setUp(){
+        authzTransImpl = new AuthzTransImpl(authzEnvMock);
+        req = mock(HttpServletRequest.class);
+        authzTransImpl.set(req);
+        when(req.getParameter("request")).thenReturn("NotNull");
+        authzTransImpl.set(req);
+        when(req.getParameter("request")).thenReturn("");
+        authzTransImpl.set(req);    
+    }
+    
+    @Test
+    public void testOrg() {
+        Organization result=null;
+        result = authzTransImpl.org();
+        OrganizationFactory test = mock(OrganizationFactory.class);
+        //result = OrganizationFactory.obtain(authzTransImpl.env(), authzTransImpl.user());
+        authzTransImpl.org();
+        //when(test).thenReturn(null);
+        //assertTrue(true);    
+    }
+    
+    @Mock
+    LogTarget logTargetMock;
+    
+    @Test
+    public void testLogAuditTrail(){
+        
+        when(logTargetMock.isLoggable()).thenReturn(false);
+        authzTransImpl.logAuditTrail(logTargetMock);
+        when(logTargetMock.isLoggable()).thenReturn(true);
+        Env delegate = mock(Env.class);
+        //when(logTargetMock.isLoggable()).thenReturn(true);//TODO: Figure this out
+        //authzTransImpl.logAuditTrail(logTargetMock);
+    }
+    
+//    @Test                            //TODO:Fix this AAF-111
+//    public void testSetUser() {
+//        Principal user = mock(Principal.class);
+//        authzTransImpl.setUser(user);
+//        Principal user1 = authzTransImpl.getUserPrincipal();
+//        String username = user1.getName();
+//        Assert.assertNotNull(user1);
+//    }
+    
+//    @Test                            //TODO:Fix this AAF-111
+//    public void testUser() {
+//        Assert.assertEquals("n/a", authzTransImpl.user());
+//        Principal user = mock(Principal.class); //Unsure how to modify name
+//        when(user.toString()).thenReturn("name");
+//        when(user.getName()).thenReturn("name");
+//        authzTransImpl.setUser(user);
+//        Assert.assertEquals("name", authzTransImpl.user());
+//    }
+//    
+    @Test
+    public void testRequested() {
+        REQD_TYPE user = REQD_TYPE.move;
+        REQD_TYPE user1 = REQD_TYPE.future;
+        HttpServletRequest req = mock(HttpServletRequest.class);
+        String p = user1.name();
+        boolean boolUser = authzTransImpl.requested(user);
+        Assert.assertEquals(false, boolUser);
+        Assert.assertNotNull(p);
+        authzTransImpl.requested(user,true);
+        when(authzTransImpl.requested(user)).thenReturn(null);
+        Assert.assertEquals(true, authzTransImpl.requested(user));
+    /*    String p1 = req.getParameter(user1.name());  //unable to access private method call in all instances
+        when(req.getParameter(user1.name())).thenReturn("test");
+        authzTransImpl.requested(user,false);
+        */
+        
+        
+    }
+    
+    @Test
+    public void testFish() {
+        mockAuthzTransImpl = mock(AuthzTransImpl.class);
+        Permission p = mock(Permission.class);
+        authzTransImpl.fish(p);
+        String str = "Test";
+        lur1.createPerm(str);
+        when(p.match(p)).thenReturn(true);
+        authzTransImpl.setLur(lur1);
+        authzTransImpl.fish(p);
+    }
+    
+    @Test
+    public void testSetVariables() { //TODO: refactor this better
+        Assert.assertNull(authzTransImpl.agent());
+        Assert.assertNull(authzTransImpl.ip());
+        Assert.assertNull(authzTransImpl.path());
+        Assert.assertNotNull(authzTransImpl.port());
+        Assert.assertNull(authzTransImpl.meth());
+        Assert.assertNull(authzTransImpl.getUserPrincipal());
+        Assert.assertNotNull(authzTransImpl.user());
+    }
+    
+    @Test
+    public void testNow() {
+        Date date = authzTransImpl.now();
+        Assert.assertEquals(date,authzTransImpl.now());
+        when(authzTransImpl.now()).thenReturn(null);
+    }
+    
 }