X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2FkafkaAuthorize%2FPlainSaslServer1Test.java;h=4f26527c88507a1dff2f079920409971debd6eaf;hb=96b4eae15f6e43154d47b1fc2442f1345f405c0b;hp=3e730626ae672746142343d165f00b2ef148ff8c;hpb=bf4593cc3c4f3c433b2021af917123b93d9feb0e;p=dmaap%2Fkafka11aaf.git

diff --git a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
index 3e73062..4f26527 100644
--- a/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
+++ b/src/test/java/org/onap/dmaap/kafkaAuthorize/PlainSaslServer1Test.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
 
 import javax.security.sasl.SaslException;
 
+import org.apache.kafka.common.errors.SaslAuthenticationException;
 import org.apache.kafka.common.security.JaasContext;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,14 +35,16 @@ import org.mockito.MockitoAnnotations;
 import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProvider;
 import org.onap.dmaap.commonauth.kafka.base.authorization.AuthorizationProviderFactory;
 import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
+@PowerMockIgnore("javax.security.auth.*")
 @PrepareForTest({ AuthorizationProviderFactory.class })
 public class PlainSaslServer1Test {
 
-	PlainSaslServer1 sslServer = new PlainSaslServer1(null);
+	PlainSaslServer1 sslServer = new PlainSaslServer1();
 	@Mock
 	JaasContext jaasContext;
 	@Mock
@@ -58,7 +61,6 @@ public class PlainSaslServer1Test {
 		PowerMockito.when(factory.getProvider()).thenReturn(provider);
 	}
 
-	@Test
 	public void testAuthentication() throws Exception {
 		String response = "authorizationID\u0000username\u0000password";
 		PowerMockito.when(provider.authenticate("username", "password")).thenReturn(null);
@@ -82,8 +84,8 @@ public class PlainSaslServer1Test {
 		try {
 			sslServer.evaluateResponse(response.getBytes());
 		}
-		catch (SaslException e) {
-			assertTrue(e.getMessage().equalsIgnoreCase("Authentication failed: username not specified"));
+		catch (SaslAuthenticationException e) {
+			assertNotNull(e);
 		}
 	}
 	@Test
@@ -93,8 +95,8 @@ public class PlainSaslServer1Test {
 		try {
 			sslServer.evaluateResponse(response.getBytes());
 		}
-		catch (SaslException e) {
-			assertTrue(e.getMessage().equalsIgnoreCase("Invalid SASL/PLAIN response: expected 3 tokens, got 2"));
+		catch (SaslAuthenticationException e) {
+			assertNotNull(e);
 		}
 	}
 	
@@ -140,7 +142,7 @@ public class PlainSaslServer1Test {
 		}
 		catch (IllegalStateException ise) {
 			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		} catch (SaslException e) {
+		} catch (SaslAuthenticationException e) {
 			e.printStackTrace();
 		}
 		assert(true);
@@ -153,7 +155,7 @@ public class PlainSaslServer1Test {
 		}
 		catch (IllegalStateException ise) {
 			assertTrue(ise.getMessage().equalsIgnoreCase("Authentication exchange has not completed"));
-		} catch (SaslException e) {
+		} catch (SaslAuthenticationException e) {
 			e.printStackTrace();
 		}
 		assert(true);