testcases for code coverage 77/34377/1
authorSunil Unnava <su622b@att.com>
Wed, 7 Mar 2018 00:38:54 +0000 (19:38 -0500)
committerSunil Unnava <su622b@att.com>
Wed, 7 Mar 2018 00:39:05 +0000 (19:39 -0500)
Issue-ID: DMAAP-271
Change-Id: Ifacdeeaca0176bf3a5e509cb0d27e7ec1e89bd8c
Signed-off-by: Sunil Unnava <su622b@att.com>
src/main/java/com/att/nsa/dmaap/service/AdminRestService.java
src/main/java/com/att/nsa/dmaap/service/MMRestService.java
src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java [new file with mode: 0644]
src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java

index 5201dc8..2ab574d 100644 (file)
@@ -91,6 +91,8 @@ public class AdminRestService {
         */
        @Autowired
        private AdminService adminService;
+       
+       private DMaaPContext dmaaPContext;
 
        /**
         * Fetches a list of all the registered consumers along with their created
@@ -107,7 +109,7 @@ public class AdminRestService {
        public void getConsumerCache() throws CambriaApiException, AccessDeniedException {
                LOGGER.info("Fetching list of registered consumers.");
                try {
-                       adminService.showConsumerCache(getDMaaPContext());
+                       adminService.showConsumerCache(ServiceUtil.getDMaaPContext(configReader, request, response));
                        LOGGER.info("Fetching Consumer Cache Successfully");
                } catch (IOException e) {
                        LOGGER.error("Error while Fetching list of registered consumers : "
@@ -136,7 +138,7 @@ public class AdminRestService {
        public void dropConsumerCache() throws CambriaApiException, AccessDeniedException {
                LOGGER.info("Dropping consumer cache");
                try {
-                       adminService.dropConsumerCache(getDMaaPContext());
+                       adminService.dropConsumerCache(ServiceUtil.getDMaaPContext(configReader, request, response));
                        LOGGER.info("Dropping Consumer Cache successfully");
                } catch ( AccessDeniedException   excp) {
                        LOGGER.error("Error while dropConsumerCache : "
@@ -170,14 +172,14 @@ public class AdminRestService {
        public void getBlacklist() throws CambriaApiException {
                LOGGER.info("Fetching list of blacklist ips.");
                try {
-                       Enumeration headerNames = getDMaaPContext().getRequest().getHeaderNames();
+                       Enumeration headerNames = ServiceUtil.getDMaaPContext(configReader, request, response).getRequest().getHeaderNames();
                        while (headerNames.hasMoreElements()) {
                                String key = (String) headerNames.nextElement();
                                String value = request.getHeader(key);
                        
                        }
                        
-                       adminService.getBlacklist(getDMaaPContext());
+                       adminService.getBlacklist(ServiceUtil.getDMaaPContext(configReader, request, response));
                        LOGGER.info("Fetching list of blacklist ips Successfully");
                }catch ( AccessDeniedException   excp) {
                        LOGGER.error("Error while Fetching list  of blacklist ips : "
@@ -215,7 +217,7 @@ public class AdminRestService {
        {
                LOGGER.info("Adding ip to list of blacklist ips.");
                try {
-                       adminService.addToBlacklist(getDMaaPContext(), ip);
+                       adminService.addToBlacklist(ServiceUtil.getDMaaPContext(configReader, request, response), ip);
                        LOGGER.info("Fetching list of blacklist ips Successfully");
                } catch ( AccessDeniedException   excp) {
                        LOGGER.error("Error while blacklist : "
@@ -253,7 +255,7 @@ public class AdminRestService {
        public void removeFromBlacklist(@PathParam("ip") String ip) throws CambriaApiException, AccessDeniedException, ConfigDbException {
                LOGGER.info("Fetching list of blacklist ips.");
                try {
-                       adminService.removeFromBlacklist(getDMaaPContext(), ip);
+                       adminService.removeFromBlacklist(ServiceUtil.getDMaaPContext(configReader, request, response), ip);
                        LOGGER.info("Fetching list of blacklist ips Successfully");
                }catch ( AccessDeniedException   excp) {
                        LOGGER.error("Error while blacklist : "
@@ -278,16 +280,6 @@ public class AdminRestService {
                }
        }
 
-       /**
-        * Create a dmaap context
-        * @return DMaaPContext
-        */
-       private DMaaPContext getDMaaPContext() {
-               DMaaPContext dmaaPContext = new DMaaPContext();
-               dmaaPContext.setConfigReader(configReader);
-               dmaaPContext.setRequest(request);
-               dmaaPContext.setResponse(response);
-               return dmaaPContext;
-       }
+       
 
 }
index a715e1f..d90d832 100644 (file)
@@ -168,7 +168,7 @@ public class MMRestService {
                                        sendErrResponse(ctx, errorMessages.getIncorrectJson());
                                        LOGGER.error("JsonSyntaxException: ", ex);
                                }
-                               String name = createMirrorMaker.getCreateMirrorMaker().getName();
+                               String name =  createMirrorMaker.getCreateMirrorMaker()==null? "":createMirrorMaker.getCreateMirrorMaker().getName();
                                // send error message if it is not a CreateMirrorMaker request.
                                if (createMirrorMaker.getCreateMirrorMaker() == null) {
                                        sendErrResponse(ctx, "This is not a CreateMirrorMaker request. Please try again.");
@@ -318,8 +318,7 @@ public class MMRestService {
                                        LOGGER.error("JsonSyntaxException: ", ex);
 
                                }
-                               String name = updateMirrorMaker.getUpdateMirrorMaker().getName();
-
+                               String name =  updateMirrorMaker.getUpdateMirrorMaker()==null? "":updateMirrorMaker.getUpdateMirrorMaker().getName();
                                // send error message if it is not a UpdateMirrorMaker request.
                                if (updateMirrorMaker.getUpdateMirrorMaker() == null) {
                                        sendErrResponse(ctx, "This is not a UpdateMirrorMaker request. Please try again.");
diff --git a/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java b/src/main/java/com/att/nsa/dmaap/service/ServiceUtil.java
new file mode 100644 (file)
index 0000000..928ab9f
--- /dev/null
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+package com.att.nsa.dmaap.service;
+
+import com.att.nsa.cambria.beans.DMaaPContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.att.nsa.cambria.utils.ConfigurationReader;
+
+public class ServiceUtil {
+       private static DMaaPContext dmaaPContext;
+       
+       
+       public static DMaaPContext getDMaaPContext(ConfigurationReader configReader,HttpServletRequest request,HttpServletResponse response) {
+               dmaaPContext = new DMaaPContext();
+               dmaaPContext.setConfigReader(configReader);
+               dmaaPContext.setRequest(request);
+               dmaaPContext.setResponse(response);
+               return dmaaPContext;
+       }
+
+}
index d9b39dc..e9a14c7 100644 (file)
@@ -29,22 +29,32 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;\r
 import org.mockito.MockitoAnnotations;\r
 import com.att.nsa.cambria.CambriaApiException;\r
+\r
+import static org.junit.Assert.assertTrue;\r
 import static org.mockito.Mockito.when;\r
 \r
+import org.powermock.api.mockito.PowerMockito;\r
 import org.powermock.core.classloader.annotations.PrepareForTest;\r
 import org.powermock.modules.junit4.PowerMockRunner;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
+import javax.servlet.http.HttpServletResponse;\r
 \r
 import com.att.nsa.cambria.beans.DMaaPContext;\r
+\r
+import java.io.IOException;\r
 import java.util.Enumeration;\r
 import com.att.nsa.cambria.service.AdminService;\r
 import com.att.nsa.configs.ConfigDbException;\r
 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;\r
+import com.att.nsa.cambria.beans.DMaaPContext;\r
+import com.att.nsa.cambria.utils.ConfigurationReader;\r
+import org.powermock.core.classloader.annotations.PrepareForTest;\r
 \r
 @RunWith(PowerMockRunner.class)\r
+@PrepareForTest({ ServiceUtil.class })\r
 public class AdminRestServiceTest {\r
-       \r
+\r
        @InjectMocks\r
        AdminRestService adminRestService;\r
 \r
@@ -56,13 +66,20 @@ public class AdminRestServiceTest {
 \r
        @Mock\r
        HttpServletRequest httpServReq;\r
+       @Mock\r
+       private HttpServletResponse response;\r
 \r
        @Mock\r
        Enumeration headerNames;\r
+       @Mock\r
+       private DMaaPContext dmaaPContext;\r
+       @Mock\r
+       private ConfigurationReader configReader;\r
 \r
        @Before\r
        public void setUp() throws Exception {\r
                MockitoAnnotations.initMocks(this);\r
+\r
        }\r
 \r
        @After\r
@@ -75,10 +92,55 @@ public class AdminRestServiceTest {
 \r
        }\r
 \r
+       @Test\r
+       public void testGetConsumerCache_error() throws CambriaApiException, AccessDeniedException, IOException {\r
+\r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new IOException("error")).when(adminService).showConsumerCache(dmaaPContext);\r
+               try {\r
+                       adminRestService.getConsumerCache();\r
+               } catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
+\r
        @Test\r
        public void testDropConsumerCache() throws CambriaApiException, AccessDeniedException {\r
                adminRestService.dropConsumerCache();\r
 \r
+       }\r
+       \r
+       @Test\r
+       public void testDropConsumerCach_error() throws CambriaApiException, AccessDeniedException ,IOException{\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new IOException("error")).when(adminService).dropConsumerCache(dmaaPContext);\r
+               try {\r
+               adminRestService.dropConsumerCache();\r
+               }\r
+               catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+               \r
+\r
+       }\r
+       @Test\r
+       public void testDropConsumerCach_error1() throws CambriaApiException, AccessDeniedException,IOException {\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).dropConsumerCache(dmaaPContext);\r
+               try {\r
+               adminRestService.dropConsumerCache();\r
+               }\r
+               catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+               \r
+\r
        }\r
 \r
        @Test\r
@@ -92,6 +154,46 @@ public class AdminRestServiceTest {
                adminRestService.getBlacklist();\r
 \r
        }\r
+       \r
+       //@Test\r
+       public void testGetBlacklist_error() throws CambriaApiException, AccessDeniedException,IOException {\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new IOException("error")).when(adminService).getBlacklist(dmaaPContext);\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               when(httpServReq.getHeaderNames()).thenReturn(headerNames);\r
+               when(headerNames.nextElement()).thenReturn("key");\r
+               when(httpServReq.getHeader("key")).thenReturn("value");\r
+               when(headerNames.hasMoreElements()).thenReturn(false);\r
+               try {\r
+               adminRestService.getBlacklist();\r
+               }\r
+               catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
+       \r
+       ////@Test\r
+       public void testGetBlacklist_error1() throws CambriaApiException, AccessDeniedException,IOException {\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).getBlacklist(dmaaPContext);\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               when(httpServReq.getHeaderNames()).thenReturn(headerNames);\r
+               when(headerNames.nextElement()).thenReturn("key");\r
+               when(httpServReq.getHeader("key")).thenReturn("value");\r
+               when(headerNames.hasMoreElements()).thenReturn(false);\r
+               try {\r
+               adminRestService.getBlacklist();\r
+               }\r
+               catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
 \r
        @Test\r
        public void testAddToBlacklist() throws CambriaApiException, AccessDeniedException {\r
@@ -103,11 +205,90 @@ public class AdminRestServiceTest {
        }\r
        \r
        @Test\r
-       public void testRemoveFromBlacklist() throws CambriaApiException, AccessDeniedException, ConfigDbException {\r
+       public void testAddToBlacklist_error() throws CambriaApiException, AccessDeniedException, ConfigDbException,IOException {\r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).addToBlacklist(dmaaPContext,"120.120.120.120");\r
+\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               try {\r
+               adminRestService.addToBlacklist("120.120.120.120");\r
+               }catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
+       \r
+       @Test\r
+       public void testAddToBlacklist_error1() throws CambriaApiException, AccessDeniedException,IOException, ConfigDbException {\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new IOException("error")).when(adminService).addToBlacklist(dmaaPContext,"120.120.120.120");\r
+\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               try {\r
+               adminRestService.addToBlacklist("120.120.120.120");\r
+               }catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
+\r
+       @Test\r
+       public void testRemoveFromBlacklist() throws CambriaApiException, AccessDeniedException, ConfigDbException,IOException {\r
+\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+\r
+               adminRestService.removeFromBlacklist("120.120.120.120");\r
+\r
+       }\r
+       \r
+       @Test\r
+       public void testRemoveFromBlacklist_error() throws CambriaApiException, AccessDeniedException, ConfigDbException,IOException{\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new IOException("error")).when(adminService).removeFromBlacklist(dmaaPContext,"120.120.120.120");\r
+\r
+\r
+               when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               try {\r
+\r
+               adminRestService.removeFromBlacklist("120.120.120.120");\r
+               }catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+               catch (AccessDeniedException e) {\r
+                       assertTrue(true);\r
+               }\r
+               catch (ConfigDbException e) {\r
+                       assertTrue(true);\r
+               }\r
+\r
+       }\r
+       \r
+       @Test\r
+       public void testRemoveFromBlacklist_error1() throws CambriaApiException, AccessDeniedException, ConfigDbException,IOException {\r
+               \r
+               PowerMockito.mockStatic(ServiceUtil.class);\r
+               PowerMockito.when(ServiceUtil.getDMaaPContext(configReader, httpServReq, response)).thenReturn(dmaaPContext);\r
+               PowerMockito.doThrow(new AccessDeniedException("error")).when(adminService).removeFromBlacklist(dmaaPContext,"120.120.120.120");\r
+\r
 \r
                when(dmaapContext.getRequest()).thenReturn(httpServReq);\r
+               try {\r
 \r
                adminRestService.removeFromBlacklist("120.120.120.120");\r
+               }catch (CambriaApiException e) {\r
+                       assertTrue(true);\r
+               }\r
+               catch (AccessDeniedException e) {\r
+                       assertTrue(true);\r
+               }\r
+               catch (ConfigDbException e) {\r
+                       assertTrue(true);\r
+               }\r
 \r
        }\r
 \r
index d85ef9b..b25578c 100644 (file)
@@ -172,6 +172,63 @@ public class MMRestServiceTest {
                mmRestService.callCreateMirrorMaker(inputSteam);\r
                assertTrue(true);\r
 \r
+       }\r
+       @Test\r
+       public void testCallCreateMirrorMaker_error4() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
+                       TopicExistsException, JSONException, ConfigDbException {\r
+               prepareForTestCommon();\r
+\r
+               // String sampleJson = ""{ messageID:\"test\", createMirrorMaker: {\r
+               // name:\"test\", consumer:\"test\", producer:\"test\",\r
+               // whitelist:\"test\",status:\"test\" }}";\r
+               String sampleJson = "{ messageID:\"test\", createMirrorMaker: {   name:\"test@#\",   consumer:\"test\",  producer:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callCreateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+\r
+       }\r
+       @Test\r
+       public void testCallCreateMirrorMaker_3() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
+                       TopicExistsException, JSONException, ConfigDbException {\r
+               prepareForTestCommon();\r
+\r
+               // String sampleJson = ""{ messageID:\"test\", createMirrorMaker: {\r
+               // name:\"test\", consumer:\"test\", producer:\"test\",\r
+               // whitelist:\"test\",status:\"test\" }}";\r
+               String sampleJson = "{ messageID:\"test\", createMirrorMaker: {   name:\"\",   consumer:\"test\",  producer:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callCreateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+\r
+       }\r
+       @Test\r
+       public void testCallCreateMirrorMaker_error2() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
+                       TopicExistsException, JSONException, ConfigDbException {\r
+               prepareForTestCommon();\r
+\r
+               // String sampleJson = ""{ messageID:\"test\", createMirrorMaker: {\r
+               // name:\"test\", consumer:\"test\", producer:\"test\",\r
+               // whitelist:\"test\",status:\"test\" }}";\r
+               String sampleJson = "{ messageID:\"test\", createMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\",whitelist:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callCreateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+\r
+       }\r
+       \r
+       @Test\r
+       public void testCallCreateMirrorMaker_error1() throws DMaaPAccessDeniedException, CambriaApiException, IOException,\r
+                       TopicExistsException, JSONException, ConfigDbException {\r
+               prepareForTestCommon();\r
+\r
+               // String sampleJson = ""{ messageID:\"test\", createMirrorMaker: {\r
+               // name:\"test\", consumer:\"test\", producer:\"test\",\r
+               // whitelist:\"test\",status:\"test\" }}";\r
+               String sampleJson = "{ messageID:\"test\"}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callCreateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+\r
        }\r
 \r
        @Test\r
@@ -194,6 +251,43 @@ public class MMRestServiceTest {
                mmRestService.callUpdateMirrorMaker(inputSteam);\r
                assertTrue(true);\r
        }\r
+       \r
+       @Test\r
+       public void testCallUpdateMirrorMaker_error1() throws ConfigDbException, CambriaApiException {\r
+               prepareForTestCommon();\r
+\r
+               String sampleJson = "{ messageID:\"test@1\", updateMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callUpdateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+       }\r
+       @Test\r
+       public void testCallUpdateMirrorMaker_error2() throws ConfigDbException, CambriaApiException {\r
+               prepareForTestCommon();\r
+\r
+               String sampleJson = "{ messageID:\"test\", updateMirrorMaker: {   name:\"\",   consumer:\"test\",  producer:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callUpdateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+       }\r
+       @Test\r
+       public void testCallUpdateMirrorMaker_error3() throws ConfigDbException, CambriaApiException {\r
+               prepareForTestCommon();\r
+\r
+               String sampleJson = "{ messageID:\"test\", updateMirrorMaker: {   name:\"test\",   consumer:\"test\",  producer:\"test\",  whitelist:\"test\",status:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callUpdateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+       }\r
+       @Test\r
+       public void testCallUpdateMirrorMaker_error4() throws ConfigDbException, CambriaApiException {\r
+               prepareForTestCommon();\r
+\r
+               String sampleJson = "{ messageID:\"test\"}}";\r
+               InputStream inputSteam = new ByteArrayInputStream(sampleJson.getBytes());\r
+               mmRestService.callUpdateMirrorMaker(inputSteam);\r
+               assertTrue(true);\r
+       }\r
 \r
        @Test\r
        public void testCallDeleteMirrorMaker() throws ConfigDbException, CambriaApiException {\r