X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fcommonauth%2Fkafka%2Fbase%2Fauthorization%2FCadi3AAFProviderTest.java;h=1a2bd95cc47039f85ebed23aec45a8258d35e1a1;hb=6345f40c1f562d5422ee45eca363a882e5c49456;hp=fbe1e5915dff3b8858e7ea21fa9628f0326c53b8;hpb=b01a7330883cbd5bce618ea44ea0f86ce6332729;p=dmaap%2Fkafka11aaf.git

diff --git a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java b/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java
index fbe1e59..1a2bd95 100644
--- a/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java
+++ b/src/test/java/org/onap/dmaap/commonauth/kafka/base/authorization/Cadi3AAFProviderTest.java
@@ -22,6 +22,7 @@ package org.onap.dmaap.commonauth.kafka.base.authorization;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.mockito.Mockito.when;
 
@@ -31,16 +32,28 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.PropAccess;
+import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.aaf.cadi.aaf.v2_0.AAFAuthn;
+import org.onap.aaf.cadi.aaf.v2_0.AAFConHttp;
+import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLur;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore({"javax.net.ssl.*", "javax.security.auth.*", "jdk.internal.reflect.*"})
 public class Cadi3AAFProviderTest {
 
 	public Cadi3AAFProvider cadi3AAFProvider;
 
 	@Mock
 	private static AAFAuthn<?> aafAuthn;
+	
+	@Mock
+	private static AAFConHttp aafCon;
+	
+	@Mock
+	private static AbsAAFLur<AAFPermission> aafLur;
 
 	@Mock
 	private static PropAccess access;
@@ -48,29 +61,36 @@ public class Cadi3AAFProviderTest {
 	@Before
 	public void setUp() throws Exception {
 		MockitoAnnotations.initMocks(this);
+		System.setProperty("enableCadi", "true");
+		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
+		cadi3AAFProvider = new Cadi3AAFProvider();
 	}
 
 	@Test
 	public void testHasPermission() {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		cadi3AAFProvider = new Cadi3AAFProvider();
 		assertFalse(cadi3AAFProvider.hasPermission("userID", "permission", "instance", "action"));
 	}
 
+	@Test
+	public void testHasAdminPermission() {
+		assertEquals(cadi3AAFProvider.hasPermission("admin", "permission", "instance", "action"), true);
+	}
+	
 	@Test(expected = NullPointerException.class)
 	public void tesAuthenticate() throws Exception {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		cadi3AAFProvider = new Cadi3AAFProvider();
+		System.setProperty("enableCadi", "true");
 		when(aafAuthn.validate("userId", "password")).thenReturn("valid");
 		assertEquals(cadi3AAFProvider.authenticate("userId", "password"), "valid");
 	}
 
 	@Test
-	public void tesAuthenticateadmin() throws Exception {
-		System.setProperty("CADI_PROPERTIES", "src/test/resources/cadi.properties");
-		cadi3AAFProvider = new Cadi3AAFProvider();
-		when(aafAuthn.validate("admin", "password")).thenReturn("valid");
-		assertNull(cadi3AAFProvider.authenticate("admin", "password"));
+	public void tesAuthenticateAdmin() throws Exception {
+		assertNull(cadi3AAFProvider.authenticate("kafkaUsername", "apiKey"));
 	}
-
+	
+	@Test
+	public void tesAuthenticateAdminwtWrongCred() throws Exception {
+		assertNotNull(cadi3AAFProvider.authenticate("kafkaUsername", "api"));
+	}
+	
 }