Added Junits for Policy PAP-REST

Issue-ID: POLICY-600
Change-Id: I1d42a3a880c9d81115d48794a77fadb89562e136
Signed-off-by: rb7147 <rb7147@att.com>

3 files changed, 299 insertions, 13 deletions

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
index 53616aa7f..c44459690 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/test/XACMLPAPTest.java
@@ -22,6 +22,7 @@ package org.onap.policy.pap.test;
 
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.mockito.Mockito.when;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -47,13 +48,21 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
+import org.onap.policy.pap.xacml.rest.controller.ActionPolicyDictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.ClosedLoopDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DecisionPolicyDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DescriptiveDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.DictionaryController;
 import org.onap.policy.pap.xacml.rest.controller.FirewallDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.MicroServiceDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.PolicyScopeDictionaryController;
+import org.onap.policy.pap.xacml.rest.controller.SafePolicyController;
 import org.onap.policy.pap.xacml.rest.daoimpl.CommonClassDaoImpl;
 import org.onap.policy.pap.xacml.rest.policycontroller.PolicyCreation;
 import org.onap.policy.pap.xacml.rest.util.DictionaryUtils;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.Category;
 import org.onap.policy.rest.jpa.PolicyEditorScopes;
 import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.utils.PolicyUtils;
@@ -75,6 +84,7 @@ public class XACMLPAPTest {
     private ServletConfig servletConfig;
     private XACMLPapServlet pap;
     private SessionFactory sessionFactory;
+    private CommonClassDao commonClassDao;
 
     @Before
     public void setUp() throws ServletException {
@@ -90,7 +100,7 @@ public class XACMLPAPTest {
                 .thenReturn("src/test/resources/xacml.pap.properties");
         pap = new XACMLPapServlet();
         pap.init(servletConfig);
-        CommonClassDao commonClassDao = Mockito.mock(CommonClassDao.class);
+        commonClassDao = Mockito.mock(CommonClassDao.class);
         new DictionaryUtils(commonClassDao);
         DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
         Mockito.mock(DictionaryUtils.class);  
@@ -523,6 +533,170 @@ public class XACMLPAPTest {
         Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
     }
     
+    @Test
+    public void testCommonCreateDictionary() throws IOException, SQLException, ServletException {
+    	new DictionaryController(commonClassDao);
+    	new ActionPolicyDictionaryController(commonClassDao);
+    	new SafePolicyController(commonClassDao);
+    	new DescriptiveDictionaryController(commonClassDao);
+    	List<Object> object = new ArrayList<>();
+        object.add(new Category());
+        when(commonClassDao.getDataById(Category.class, "shortName", "resource")).thenReturn(object);
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	String json = "{\"dictionaryFields\": {\"onapName\": \"testMMRestAPI1\",\"description\": \"testing update response message\"}}";
+    	dictionaryTestSetup(false, "OnapName", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\": {\"xacmlId\": \"testMMRestAPI1\",\"datatypeBean\": {\"shortName\": \"string\"}, \"description\": \"testing update\",\"priority\": \"High\",\"userDataTypeValues\": [{\"attributeValues\": \"testAttr\"}, {\"attributeValues\": \"testAttr2\"}, {\"attributeValues\": \"testAttr3\"}]}}";
+    	dictionaryTestSetup(false, "Attribute", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"attributeName\":\"TestMMrestAPI1\",\"type\":\"REST\",\"url\":\"testsomeurl.com\",\"method\":\"GET\",\"description\":\"test create\",\"body\":\"Testing Create\",\"headers\":[{\"option\":\"test1\",\"number\":\"test\"},{\"option\":\"test2\",\"number\":\"test\"}]}}";
+    	dictionaryTestSetup(false, "Action", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"scopeName\":\"testMMRestAPI1\",\"description\":\"test\",\"attributes\":[{\"option\":\"test1\",\"number\":\"test\"},{\"option\":\"test2\",\"number\":\"test\"}]}}";
+    	dictionaryTestSetup(false, "DescriptiveScope", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"riskName\":\"testMMrestAPI1\",\"description\":\"test\"}}";
+    	dictionaryTestSetup(false, "RiskType", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testMMrestAPI1\",\"message\":\"test\",\"riskType\":\"testMMrestAPI1\"}}";
+    	dictionaryTestSetup(false, "SafePolicyWarning", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    }
+    
+    @Test
+    public void testDecisionCreateDictionary() throws IOException, SQLException, ServletException {
+    	new DecisionPolicyDictionaryController(commonClassDao);
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	String json = "{\"dictionaryFields\":{\"xacmlId\":\"testMMRestAPI1\",\"datatypeBean\":{\"shortName\":\"string\"},\"description\":\"test\",\"priority\":\"High\"}}";
+    	dictionaryTestSetup(false, "Settings", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"bbid\":\"BB1\",\"workstep\":\"1\",\"treatments\":\"Manual Handling,Abort,Retry\"}}";
+    	dictionaryTestSetup(false, "RainyDayTreatments", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    }
+    
+    @Test
+    public void testMSCreateDictionary() throws IOException, SQLException, ServletException {
+    	new MicroServiceDictionaryController(commonClassDao);
+    	new PolicyScopeDictionaryController(commonClassDao);
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	String json = "{\"dictionaryFields\":{\"name\":\"testMMrestAPI1\",\"descriptionValue\":\"test\"}}";
+    	dictionaryTestSetup(false, "MicroServiceLocation", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testMMrestAPI1\",\"descriptionValue\":\"test\"}}";
+    	dictionaryTestSetup(false, "MicroServiceConfigName", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testMMrestAPI1\",\"description\":\"test\"}}";
+    	dictionaryTestSetup(false, "DCAEUUID", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testApiANY\",\"descriptionValue\":\"default test\"}}";
+    	dictionaryTestSetup(false, "PolicyScopeService", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testApiANY\",\"descriptionValue\":\"default test\"}}";
+    	dictionaryTestSetup(false, "PolicyScopeResource", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testApiANY\",\"descriptionValue\":\"default test\"}}";
+    	dictionaryTestSetup(false, "PolicyScopeType", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"name\":\"testApiANY\",\"descriptionValue\":\"default test\"}}";
+    	dictionaryTestSetup(false, "PolicyScopeClosedLoop", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    	
+    	httpServletRequest = Mockito.mock(HttpServletRequest.class);
+    	httpServletResponse = Mockito.mock(MockHttpServletResponse.class);
+    	json = "{\"dictionaryFields\":{\"groupName\":\"testMMrestAPI1\",\"description\":\"testing\"},\"groupPolicyScopeListData1\":{\"resource\":\"ANY\",\"type\":\"ANY\",\"service\":\"ANY\",\"closedloop\":\"ANY\"}}";
+    	dictionaryTestSetup(false, "GroupPolicyScopeList", json);
+    	// send Request to PAP
+    	pap.service(httpServletRequest, httpServletResponse);
+    	// Verify 
+    	Mockito.verify(httpServletResponse).setStatus(HttpServletResponse.SC_OK);
+    }
+    
     private void dictionaryTestSetup(Boolean updateFlag, String dictionaryType, String json) throws IOException, SQLException {
         Mockito.when(httpServletRequest.getHeader(ENVIRONMENT_HEADER)).thenReturn("DEVL");
         Mockito.when(httpServletRequest.getHeader("ClientScope")).thenReturn("dictionaryItem");
@@ -566,6 +740,27 @@ public class XACMLPAPTest {
     }
 
     @Test
+    public void getDictionary() throws ServletException, IOException{
+    	String[] dictionarys = new String[]{"Attribute", "OnapName", "Action", "BRMSParamTemplate","VSCLAction"
+    			,"VNFType","PEPOptions","Varbind","Service","Site", "Settings", "RainyDayTreatments",
+    			"DescriptiveScope", "ActionList", "ProtocolList", "Zone", "SecurityZone",
+    			"PrefixList", "AddressGroup", "ServiceGroup", "ServiceList", "TermList",
+    			"MicroServiceLocation", "MicroServiceConfigName", "DCAEUUID", "MicroServiceModels",
+    			"PolicyScopeService", "PolicyScopeResource", "PolicyScopeType", "PolicyScopeClosedLoop",
+    			"GroupPolicyScopeList", "RiskType", "SafePolicyWarning", "MicroServiceDictionary"};
+    	for(String dictionary : dictionarys){
+    		httpServletRequest = Mockito.mock(HttpServletRequest.class);
+        	httpServletResponse = new MockHttpServletResponse();
+        	Mockito.when(httpServletRequest.getHeader(ENVIRONMENT_HEADER)).thenReturn("DEVL");
+        	Mockito.when(httpServletRequest.getMethod()).thenReturn("GET");
+        	Mockito.when(httpServletRequest.getParameter("apiflag")).thenReturn("api");
+        	Mockito.when(httpServletRequest.getParameter("dictionaryType")).thenReturn(dictionary);
+        	pap.service(httpServletRequest, httpServletResponse);
+        	assertTrue(HttpServletResponse.SC_OK == httpServletResponse.getStatus());
+    	}
+    }
+    
+    @Test
     public void testDummy() throws ServletException, IOException {
 
         Mockito.when(httpServletRequest.getMethod()).thenReturn("POST");
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
index e8d602ce5..7c1c507c2 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DictionaryImportControllerTest.java
@@ -20,20 +20,46 @@
 package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertTrue;
-import org.onap.policy.pap.xacml.rest.controller.DictionaryImportController;
-import org.junit.After;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.dao.CommonClassDao;
+import org.springframework.mock.web.MockHttpServletResponse;
 
-public class DictionaryImportControllerTest {
+public class DictionaryImportControllerTest  extends Mockito{
 	
 	private static Logger logger = FlexLogger.getLogger(DictionaryImportController.class);
 
+	private static CommonClassDao commonClassDao;
+	private HttpServletRequest request = null;
+	private HttpServletResponse response = null;
+	private DictionaryImportController controller = null;
+	
 	@Before
 	public void setUp() throws Exception {
 		logger.info("setUp: Entering");
+		commonClassDao = Mockito.mock(CommonClassDao.class);
+		doNothing().when(commonClassDao).save(new Object());
+		controller = new DictionaryImportController(); 
+		new DictionaryImportController(commonClassDao);
+		request = Mockito.mock(HttpServletRequest.class);
+		response =  new MockHttpServletResponse();
 	}
 	
 	@Test
@@ -45,8 +71,69 @@ public class DictionaryImportControllerTest {
 		assertTrue(cotroller.isValidDictionaryName("ActionList"));
 	}
 	
-	@After
-	 public void destroy(){
-
-	 }
+	@Test
+	public void testImportDictionaryData() throws ServletException, IOException{
+		List<String> fileNames = new ArrayList<>();
+		fileNames.add("Attribute.csv");
+		fileNames.add("ActionPolicyDictionary.csv");
+		fileNames.add("OnapName.csv");
+		fileNames.add("MSPolicyDictionary.csv");
+		fileNames.add("ClosedLoopService.csv");
+		fileNames.add("ClosedLoopSite.csv");
+		fileNames.add("VarbindDictionary.csv");
+		fileNames.add("BRMSParamDictionary.csv");
+		fileNames.add("BRMSControllerDictionary.csv");
+		fileNames.add("BRMSDependencyDictionary.csv");
+		fileNames.add("PrefixList.csv");
+		fileNames.add("SecurityZone.csv");
+		fileNames.add("ServiceList.csv");
+		fileNames.add("ServiceGroup.csv");
+		fileNames.add("AddressGroup.csv");
+		fileNames.add("ProtocolList.csv");
+		fileNames.add("TermList.csv");
+		fileNames.add("SearchCriteria.csv");
+		fileNames.add("VNFType.csv");
+		fileNames.add("VSCLAction.csv");
+		fileNames.add("PEPOptions.csv");
+		fileNames.add("Settings.csv");
+		fileNames.add("Zone.csv");
+		fileNames.add("ActionList.csv");
+		for(int i =0; i < fileNames.size(); i++){
+			File file = new File("src/test/resources/dictionaryImport/"+fileNames.get(i));
+			try(FileInputStream targetStream = new FileInputStream(file)){
+				PushPolicyControllerTest pushController = new PushPolicyControllerTest();
+				when(request.getInputStream()).thenReturn(pushController.getInputStream(getBytes(targetStream)));
+				when(request.getParameter("userId")).thenReturn("demo");
+				when(request.getParameter("dictionaryName")).thenReturn(fileNames.get(i));
+				controller.importDictionaryData(request, response);
+				assertTrue(HttpServletResponse.SC_OK == response.getStatus());
+			} catch (IOException e) {
+				fail();
+			}
+		}
+		when(request.getParameter("dictionaryName")).thenReturn("WrongName");
+		controller.importDictionaryData(request, response);
+		assertTrue(HttpServletResponse.SC_OK == response.getStatus());
+		
+		when(request.getParameter("dictionaryName")).thenReturn("");
+		controller.importDictionaryData(request, response);
+		assertTrue(HttpServletResponse.SC_BAD_REQUEST == response.getStatus());
+		
+		when(request.getInputStream()).thenReturn(null);
+		when(request.getParameter("dictionaryName")).thenReturn("Attribute.csv");
+		controller.importDictionaryData(request, response);
+		assertTrue(HttpServletResponse.SC_INTERNAL_SERVER_ERROR == response.getStatus());
+	}
+	
+	public static byte[] getBytes(InputStream is) throws IOException {
+		int len;
+		int size = 1024;
+		byte[] buf;
+		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+		buf = new byte[size];
+		while ((len = is.read(buf, 0, size)) != -1)
+			bos.write(buf, 0, len);
+		buf = bos.toByteArray();
+		return buf;
+	}
 }
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
index 48af2442c..7d23475a1 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/SafePolicyControllerTest.java
@@ -22,6 +22,7 @@ package org.onap.policy.pap.xacml.rest.controller;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.io.BufferedReader;
@@ -36,6 +37,7 @@ import org.junit.Test;
 import org.mockito.Mockito;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.pap.xacml.rest.util.DictionaryUtils;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.RiskType;
 import org.onap.policy.rest.jpa.SafePolicyWarning;
@@ -57,20 +59,22 @@ public class SafePolicyControllerTest {
 	public void setUp() throws Exception {
 		logger.info("setUp: Entering");
 		commonClassDao = Mockito.mock(CommonClassDao.class);
-		
+
 		data = new ArrayList<>();
 		data.add("Test");
-		
+
 		userInfo = new UserInfo();
 		userInfo.setUserLoginId("Test");
 		userInfo.setUserName("Test");
-	
+
 		doNothing().when(commonClassDao).delete(new RiskType());
 		doNothing().when(commonClassDao).save(new RiskType());
-		
+
 		controller = new SafePolicyController();
 		controller.setCommonClassDao(commonClassDao);
-		
+		new DictionaryUtils(commonClassDao);
+		DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
+		mock(DictionaryUtils.class);
 		request = Mockito.mock(HttpServletRequest.class);
 		response =  new MockHttpServletResponse();  
 		logger.info("setUp: exit");