X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fservice%2FAdminRestServiceTest.java;h=b76658193a6876913904cb84b7bfa3e934f077fa;hb=107d91e51ada160bef2135b3fe356679167e1b3c;hp=0f99ff59a57a510c6005b11e6bccd0d7ffb84a01;hpb=cca85abfb66e0c280eff5ed2c7570941c2ed423e;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/src/test/java/org/onap/dmaap/service/AdminRestServiceTest.java b/src/test/java/org/onap/dmaap/service/AdminRestServiceTest.java
index 0f99ff5..b766581 100644
--- a/src/test/java/org/onap/dmaap/service/AdminRestServiceTest.java
+++ b/src/test/java/org/onap/dmaap/service/AdminRestServiceTest.java
@@ -20,36 +20,34 @@
 
  package org.onap.dmaap.service;
 
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+import static org.mockito.Matchers.any;
+
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.Vector;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.dmaap.dmf.mr.CambriaApiException;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.when;
-
+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
+import org.onap.dmaap.dmf.mr.service.AdminService;
+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
-
-import java.io.IOException;
-import java.util.Enumeration;
-import org.onap.dmaap.dmf.mr.service.AdminService;
 import com.att.nsa.configs.ConfigDbException;
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;
-import org.onap.dmaap.dmf.mr.beans.DMaaPContext;
-import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({ ServiceUtil.class })
@@ -145,9 +143,12 @@ public class AdminRestServiceTest {
 
 	@Test
 	public void testGetBlacklist() throws CambriaApiException, AccessDeniedException {
+		Vector headers = new Vector();
+		headers.add("Content-type");
+		Enumeration headerNms = headers.elements();
 
 		when(dmaapContext.getRequest()).thenReturn(httpServReq);
-		when(httpServReq.getHeaderNames()).thenReturn(headerNames);
+		when(httpServReq.getHeaderNames()).thenReturn(headerNms);
 		when(headerNames.nextElement()).thenReturn("key");
 		when(httpServReq.getHeader("key")).thenReturn("value");
 
@@ -155,37 +156,32 @@ public class AdminRestServiceTest {
 
 	}
 	
-	//@Test
+	@Test
 	public void testGetBlacklist_error() throws CambriaApiException, AccessDeniedException,IOException {
 		
-		PowerMockito.mockStatic(ServiceUtil.class);
-		PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);
-		PowerMockito.doThrow(new IOException("error")).when(adminService).getBlacklist(dmaaPContext);
+		PowerMockito.doThrow(new IOException("error")).when(adminService).getBlacklist(any(DMaaPContext.class));
 		when(dmaapContext.getRequest()).thenReturn(httpServReq);
 		when(httpServReq.getHeaderNames()).thenReturn(headerNames);
 		when(headerNames.nextElement()).thenReturn("key");
 		when(httpServReq.getHeader("key")).thenReturn("value");
-		when(headerNames.hasMoreElements()).thenReturn(false);
+
 		try {
 		adminRestService.getBlacklist();
 		}
 		catch (CambriaApiException e) {
 			assertTrue(true);
 		}
-
 	}
 	
-	////@Test
+	@Test
 	public void testGetBlacklist_error1() throws CambriaApiException, AccessDeniedException,IOException {
 		
-		PowerMockito.mockStatic(ServiceUtil.class);
-		PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);
-		PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).getBlacklist(dmaaPContext);
+		PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).getBlacklist(any(DMaaPContext.class));
 		when(dmaapContext.getRequest()).thenReturn(httpServReq);
 		when(httpServReq.getHeaderNames()).thenReturn(headerNames);
 		when(headerNames.nextElement()).thenReturn("key");
 		when(httpServReq.getHeader("key")).thenReturn("value");
-		when(headerNames.hasMoreElements()).thenReturn(false);
+
 		try {
 		adminRestService.getBlacklist();
 		}