X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcontroller%2FDictionaryImportControllerTest.java;h=6a28c271ad444cd8292a2ec01515ef4544f0352e;hb=b6d9063e06ab8cdf2d97fc75810792659344e4a8;hp=7c1c507c2ec2b468c1b62203f304b61162d5777b;hpb=c8bed1e392b935ec50aaeeb5fb82d25a9568b790;p=policy%2Fengine.git

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 7c1c507c2..6a28c271a 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
@@ -42,15 +42,15 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.dao.CommonClassDao;
 import org.springframework.mock.web.MockHttpServletResponse;
 
-public class DictionaryImportControllerTest  extends Mockito{
+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");
@@ -59,7 +59,7 @@ public class DictionaryImportControllerTest  extends Mockito{
 		controller = new DictionaryImportController(); 
 		new DictionaryImportController(commonClassDao);
 		request = Mockito.mock(HttpServletRequest.class);
-		response =  new MockHttpServletResponse();
+		response =  new MockHttpServletResponse();	
 	}
 	
 	@Test
@@ -70,7 +70,7 @@ public class DictionaryImportControllerTest  extends Mockito{
 		//test valid name
 		assertTrue(cotroller.isValidDictionaryName("ActionList"));
 	}
-	
+
 	@Test
 	public void testImportDictionaryData() throws ServletException, IOException{
 		List<String> fileNames = new ArrayList<>();
@@ -78,6 +78,7 @@ public class DictionaryImportControllerTest  extends Mockito{
 		fileNames.add("ActionPolicyDictionary.csv");
 		fileNames.add("OnapName.csv");
 		fileNames.add("MSPolicyDictionary.csv");
+		fileNames.add("OptimizationPolicyDictionary.csv");
 		fileNames.add("ClosedLoopService.csv");
 		fileNames.add("ClosedLoopSite.csv");
 		fileNames.add("VarbindDictionary.csv");
@@ -113,7 +114,7 @@ public class DictionaryImportControllerTest  extends Mockito{
 		}
 		when(request.getParameter("dictionaryName")).thenReturn("WrongName");
 		controller.importDictionaryData(request, response);
-		assertTrue(HttpServletResponse.SC_OK == response.getStatus());
+		assertTrue(HttpServletResponse.SC_BAD_REQUEST == response.getStatus());
 		
 		when(request.getParameter("dictionaryName")).thenReturn("");
 		controller.importDictionaryData(request, response);