X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fadmin%2FPolicyRestControllerTest.java;h=3e089e842c30bcfe7ddb1299b5016ae155451769;hb=6c6f1ee4a70d21df62d6db855a83adb50ec24ff4;hp=0a24713a655b082b0fd072050be52c00a8e5b9bd;hpb=b86c95c99240e8ed0ef91932a70ebed313dbd60c;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java
index 0a24713a6..3e089e842 100644
--- a/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java
+++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/admin/PolicyRestControllerTest.java
@@ -26,18 +26,21 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
-
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -46,7 +49,7 @@ import org.onap.policy.controller.PolicyController;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.ActionList;
 import org.onap.policy.rest.jpa.AddressGroup;
-import org.onap.policy.rest.jpa.FWTagPicker;
+import org.onap.policy.rest.jpa.FwTagPicker;
 import org.onap.policy.rest.jpa.GroupServiceList;
 import org.onap.policy.rest.jpa.PrefixList;
 import org.onap.policy.rest.jpa.SecurityZone;
@@ -170,7 +173,7 @@ public class PolicyRestControllerTest {
         ServiceList serviceList = new ServiceList();
         serviceList.setServiceName("Test");
         serviceList.setServiceType("SERVICE");
-        serviceList.setServiceTransProtocol("Test");
+        serviceList.setServiceTransportProtocol("Test");
         serviceList.setServiceAppProtocol("Test");
         serviceList.setServicePorts("8080");
         serviceListData.add(serviceList);
@@ -198,19 +201,19 @@ public class PolicyRestControllerTest {
         when(commonClassDao.getData(GroupServiceList.class)).thenReturn(serviceGroupData);
 
         tagListData = new ArrayList<>();
-        FWTagPicker fwPicker = new FWTagPicker();
+        FwTagPicker fwPicker = new FwTagPicker();
         fwPicker.setTagPickerName("Test");
         fwPicker.setTagValues("Test:8080");
         tagListData.add(fwPicker);
-        when(commonClassDao.getData(FWTagPicker.class)).thenReturn(tagListData);
+        when(commonClassDao.getData(FwTagPicker.class)).thenReturn(tagListData);
 
         termListData = new ArrayList<>();
         TermList termList = new TermList();
         termList.setTermName("Test");
-        termList.setFromZones("Test");
-        termList.setToZones("Test");
-        termList.setSrcIPList("Test");
-        termList.setDestIPList("Test");
+        termList.setFromZone("Test");
+        termList.setToZone("Test");
+        termList.setSrcIpList("Test");
+        termList.setDestIpList("Test");
         termList.setSrcPortList("Test");
         termList.setDestPortList("Test");
         termList.setAction("Test");
@@ -263,8 +266,8 @@ public class PolicyRestControllerTest {
         BufferedReader reader = new BufferedReader(new StringReader("{\"foo\":\"bar\"}"));
         Mockito.when(request.getReader()).thenReturn(reader);
         Mockito.when(request.getRequestURI()).thenReturn("/pap/foo/");
-        assertThatExceptionOfType(NullPointerException.class).isThrownBy(() ->
-            controller.searchPolicy(request, response));
+        assertThatExceptionOfType(NullPointerException.class)
+                .isThrownBy(() -> controller.searchPolicy(request, response));
     }
 
     @Test
@@ -292,4 +295,26 @@ public class PolicyRestControllerTest {
         String strReturn = controller.notifyOtherPapsToUpdateConfigurations("mode", "newName", "oldName");
         assertNull(strReturn);
     }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void testGetDictionaryController() throws IOException {
+        PolicyRestController controller = new PolicyRestController();
+        HttpServletRequest mockRequest = Mockito.mock(HttpServletRequest.class);
+        HttpServletResponse mockResponse = Mockito.mock(HttpServletResponse.class);
+        PrintWriter mockPrintWriter = Mockito.mock(PrintWriter.class);
+
+        when(mockRequest.getRequestURI()).thenReturn("//testRequestURI///getDictionary");
+        when(mockResponse.getWriter()).thenThrow(IOException.class);
+        controller.getDictionaryController(mockRequest, mockResponse);
+        verify(mockRequest, atLeast(1)).getRequestURI();
+        verify(mockResponse, atLeast(1)).getWriter();
+
+        reset(mockResponse);
+        when(mockRequest.getRequestURI()).thenReturn("testRequestURI///getDictionary");
+        when(mockResponse.getWriter()).thenReturn(mockPrintWriter);
+        controller.getDictionaryController(mockRequest, mockResponse);
+        verify(mockRequest, atLeast(1)).getRequestURI();
+        verify(mockResponse, atLeast(1)).getWriter();
+    }
 }