Added Junits for ONAP-PAP-REST

Cleaned up unused imports.
Cleaned up unused code.
Added Junits for Dictionary controllers.

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

3 files changed, 904 insertions, 0 deletions

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryControllerTest.java
new file mode 100644
index 000000000..0191acf23
--- /dev/null
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ActionPolicyDictionaryControllerTest.java
@@ -0,0 +1,157 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2018 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 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.when;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.onap.policy.rest.jpa.ActionPolicyDict;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+public class ActionPolicyDictionaryControllerTest {
+
+	private static Logger logger = FlexLogger.getLogger(ActionPolicyDictionaryControllerTest.class);
+	private static CommonClassDao commonClassDao;
+	private String jsonString = null;
+	private HttpServletRequest request = null;
+	private ActionPolicyDictionaryController controller = null;
+	private MockHttpServletResponse response = null;
+
+	@Before
+	public void setUp() throws Exception {
+		logger.info("setUp: Entering");
+		commonClassDao = Mockito.mock(CommonClassDao.class);
+		List<String>  data = new ArrayList<>();
+		List<Object>  objectData = new ArrayList<>();
+		data.add("Test");
+		
+		UserInfo userInfo = new UserInfo();
+		userInfo.setUserLoginId("Test");
+		userInfo.setUserName("Test");
+		
+		ActionPolicyDict actionData = new ActionPolicyDict();
+		actionData.setAttributeName("Test");
+		assertTrue("Test".equals(actionData.getAttributeName()));
+		actionData.setBody("Test");
+		assertTrue("Test".equals(actionData.getBody()));
+		actionData.setCreatedDate(new Date());
+		assertTrue(actionData.getCreatedDate()!= null);
+		actionData.setModifiedDate(new Date());
+		assertTrue(actionData.getModifiedDate()!= null);
+		actionData.setHeader("Test");
+		assertTrue("Test".equals(actionData.getHeader()));
+		actionData.setMethod("POST");
+		assertTrue("POST".equals(actionData.getMethod()));
+		actionData.setType("Test");
+		assertTrue("Test".equals(actionData.getType()));
+		actionData.setUrl("http://test.com");
+		assertTrue("http://test.com".equals(actionData.getUrl()));
+		actionData.setUserCreatedBy(userInfo);
+		assertTrue(actionData.getUserCreatedBy()!= null);
+		actionData.setUserModifiedBy(userInfo);
+		assertTrue(actionData.getUserModifiedBy()!= null);
+		
+		objectData.add(actionData);
+		when(commonClassDao.getDataByColumn(ActionPolicyDict.class, "attributeName")).thenReturn(data);
+		when(commonClassDao.getData(ActionPolicyDict.class)).thenReturn(objectData);
+		doNothing().when(commonClassDao).delete(new ActionPolicyDict());
+		doNothing().when(commonClassDao).save(new ActionPolicyDict());
+		controller = new ActionPolicyDictionaryController();
+		controller.setCommonClassDao(commonClassDao);
+		request = Mockito.mock(HttpServletRequest.class);
+		response =  new MockHttpServletResponse();  
+		logger.info("setUp: exit");
+	}
+	
+	@Test
+	public void testGetActionEntitybyName(){
+		controller.getActionEntitybyName(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("actionPolicyDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetActionPolicyDictionaryEntityData(){
+		controller.getActionPolicyDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("actionPolicyDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testSaveActionPolicyDictionary(){
+		jsonString = "{\"actionPolicyDictionaryData\":{\"attributeName\":\"Test\",\"body\":\"{}\",\"description\":\"test\",\"headers\":[{\"$$hashKey\":\"object:548\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"method\":\"GET\",\"type\":\"REST\",\"url\":\"http://test.com\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveActionPolicyDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("actionPolicyDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateActionPolicyDictionary(){
+		jsonString = "{\"actionPolicyDictionaryData\":{\"id\":1,\"attributeName\":\"Test\",\"body\":\"{}\",\"description\":\"test\",\"headers\":[{\"$$hashKey\":\"object:548\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"method\":\"GET\",\"type\":\"REST\",\"url\":\"http://test.com\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveActionPolicyDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("actionPolicyDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveActionPolicyDictionary(){
+		jsonString = "{\"data\":{\"$$hashKey\":\"uiGrid-003S\",\"attributeName\":\"Test\",\"body\":\"{}\",\"createdDate\":1518195117000,\"description\":\"test\",\"header\":\"test=12\",\"id\":1,\"method\":\"GET\",\"modifiedDate\":1518195489000,\"type\":\"REST\",\"url\":\"http://test.com\",\"userCreatedBy\":{\"userLoginId\":\"demo\",\"userName\":\"Demo\"},\"userModifiedBy\":{\"userLoginId\":\"demo\",\"userName\":\"Demo\"}}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeActionPolicyDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("actionPolicyDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+}
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java
new file mode 100644
index 000000000..d1af82c93
--- /dev/null
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/ClosedLoopDictionaryControllerTest.java
@@ -0,0 +1,584 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2018 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 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.when;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.onap.policy.rest.jpa.ClosedLoopD2Services;
+import org.onap.policy.rest.jpa.ClosedLoopSite;
+import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.rest.jpa.VNFType;
+import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VarbindDictionary;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+public class ClosedLoopDictionaryControllerTest {
+	
+	private static Logger logger = FlexLogger.getLogger(ClosedLoopDictionaryControllerTest.class);
+	private static CommonClassDao commonClassDao;
+	private String jsonString = null;
+	private HttpServletRequest request = null;
+	private ClosedLoopDictionaryController controller = null;
+	private MockHttpServletResponse response = null;
+	private UserInfo userInfo;
+	private List<String>  data;
+
+	@Before
+	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 VSCLAction());
+		doNothing().when(commonClassDao).save(new VSCLAction());
+		
+		controller = new ClosedLoopDictionaryController();
+		controller.setCommonClassDao(commonClassDao);
+		
+		request = Mockito.mock(HttpServletRequest.class);
+		response =  new MockHttpServletResponse();  
+		logger.info("setUp: exit");
+	}
+	
+	public List<Object> testVSCLAction(){
+		List<Object>  objectData = new ArrayList<>();
+		
+		VSCLAction data = new VSCLAction();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setVsclaction("Test");
+		assertTrue("Test".equals(data.getVsclaction()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+		
+		return objectData;
+	}
+	
+	public List<Object> testVNFType(){
+		List<Object>  objectData = new ArrayList<>();
+		
+		VNFType data = new VNFType();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setVnftype("Test");
+		assertTrue("Test".equals(data.getVnftype()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+		
+		return objectData;
+	}
+	
+	public List<Object> testPEPOptions(){
+		List<Object>  objectData = new ArrayList<>();
+
+		PEPOptions data = new PEPOptions();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setPepName("Test");
+		assertTrue("Test".equals(data.getPepName()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+
+		return objectData;
+	}
+	
+	public List<Object> testVarbindDictionary(){
+		List<Object>  objectData = new ArrayList<>();
+
+		VarbindDictionary data = new VarbindDictionary();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setVarbindName("Test");
+		assertTrue("Test".equals(data.getVarbindName()));
+		data.setVarbindDescription("Test");
+		assertTrue("Test".equals(data.getVarbindDescription()));
+		data.setVarbindOID("Test");
+		assertTrue("Test".equals(data.getVarbindOID()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+
+		return objectData;
+	}
+	
+	public List<Object> testClosedLoopD2Services(){
+		List<Object>  objectData = new ArrayList<>();
+
+		ClosedLoopD2Services data = new ClosedLoopD2Services();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setServiceName("Test");
+		assertTrue("Test".equals(data.getServiceName()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+
+		return objectData;
+	}
+	
+	
+	public List<Object> testClosedLoopSite(){
+		List<Object>  objectData = new ArrayList<>();
+
+		ClosedLoopSite data = new ClosedLoopSite();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setSiteName("Test");
+		assertTrue("Test".equals(data.getSiteName()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+
+		return objectData;
+	}
+	
+	@Test
+	public void testGetVSCLActionDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(VSCLAction.class, "vsclaction")).thenReturn(data);
+		controller.getVSCLActionDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vsclActionDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetVSCLActionDictionaryEntityData(){
+		when(commonClassDao.getData(VSCLAction.class)).thenReturn(testVSCLAction());
+		controller.getVSCLActionDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vsclActionDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetVNFTypeDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(VNFType.class, "vnftype")).thenReturn(data);
+		controller.getVNFTypeDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vnfTypeDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetVNFTypeDictionaryEntityData(){
+		when(commonClassDao.getData(VNFType.class)).thenReturn(testVNFType());
+		controller.getVNFTypeDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vnfTypeDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetPEPOptionsDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(PEPOptions.class, "pepName")).thenReturn(data);
+		controller.getPEPOptionsDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("pepOptionsDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetPEPOptionsDictionaryEntityData(){
+		when(commonClassDao.getData(PEPOptions.class)).thenReturn(testPEPOptions());
+		controller.getPEPOptionsDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("pepOptionsDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetVarbindDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(VarbindDictionary.class, "varbindName")).thenReturn(data);
+		controller.getVarbindDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("varbindDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetVarbindDictionaryEntityData(){
+		when(commonClassDao.getData(VarbindDictionary.class)).thenReturn(testVarbindDictionary());
+		controller.getVarbindDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("varbindDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetClosedLoopServiceDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(ClosedLoopD2Services.class, "serviceName")).thenReturn(data);
+		controller.getClosedLoopServiceDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopServiceDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetClosedLoopServiceDictionaryEntityData(){
+		when(commonClassDao.getData(ClosedLoopD2Services.class)).thenReturn(testClosedLoopD2Services());
+		controller.getClosedLoopServiceDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopServiceDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetClosedLoopSiteDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(ClosedLoopSite.class, "siteName")).thenReturn(data);
+		controller.getClosedLoopSiteDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopSiteDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetClosedLoopSiteDictionaryEntityData(){
+		when(commonClassDao.getData(ClosedLoopSite.class)).thenReturn(testClosedLoopSite());
+		controller.getClosedLoopSiteDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopSiteDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testSaveVSCLAction(){
+		jsonString = "{\"userid\":\"demo\",\"vsclActionDictionaryData\":{\"description\":\"test\",\"vsclaction\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVSCLAction(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vsclActionDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateVSCLAction(){
+		jsonString = "{\"userid\":\"demo\",\"vsclActionDictionaryData\":{\"id\":1,\"description\":\"test\",\"vsclaction\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVSCLAction(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vsclActionDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveVSCLAction(){
+		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"vsclaction\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeVSCLAction(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vsclActionDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testSaveVnfType(){
+		jsonString = "{\"userid\":\"demo\",\"vnfTypeDictionaryData\":{\"description\":\"test\",\"vnftype\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVnfType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vnfTypeDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateVnfType(){
+		jsonString = "{\"userid\":\"demo\",\"vnfTypeDictionaryData\":{\"id\":1,\"description\":\"test\",\"vnftype\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVnfType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vnfTypeDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveVnfType(){
+		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"vnftype\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeVnfType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("vnfTypeDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testSavePEPOptions(){
+		jsonString = "{\"pepOptionsDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"pepName\":\"Test\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.savePEPOptions(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("pepOptionsDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdatePEPOptions(){
+		jsonString = "{\"pepOptionsDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"pepName\":\"Test\",\"id\":1},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.savePEPOptions(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("pepOptionsDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemovePEPOptions(){
+		jsonString = "{\"data\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"pepName\":\"Test\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removePEPOptions(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("pepOptionsDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testSaveServiceType(){
+		jsonString = "{\"userid\":\"demo\",\"closedLoopServiceDictionaryData\":{\"description\":\"test\",\"serviceName\":\"Test\",\"id\":1}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveServiceType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopServiceDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateServiceType(){
+		jsonString = "{\"userid\":\"demo\",\"closedLoopServiceDictionaryData\":{\"id\":1,\"description\":\"test\",\"serviceName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveServiceType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopServiceDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveServiceType(){
+		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"serviceName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeServiceType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopServiceDictionaryData"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testSaveSiteType(){
+		jsonString = "{\"userid\":\"demo\",\"closedLoopSiteDictionaryData\":{\"description\":\"test\",\"siteName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveSiteType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopSiteDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateSiteType(){
+		jsonString = "{\"userid\":\"demo\",\"closedLoopSiteDictionaryData\":{\"id\":1,\"description\":\"test\",\"siteName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveSiteType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopSiteDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveSiteType(){
+		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"siteName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeSiteType(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("closedLoopSiteDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testSaveVarbind(){
+		jsonString = "{\"userid\":\"demo\",\"varbindDictionaryData\":{\"description\":\"test\",\"varbindName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVarbind(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("varbindDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateVarbind(){
+		jsonString = "{\"userid\":\"demo\",\"varbindDictionaryData\":{\"id\":1,\"description\":\"test\",\"varbindName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveVarbind(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("varbindDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveVarbind(){
+		jsonString = "{\"userid\":\"demo\",\"data\":{\"id\":1,\"description\":\"test\",\"varbindName\":\"Test\"}}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeVarbind(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("varbindDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+}
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java
new file mode 100644
index 000000000..185410532
--- /dev/null
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/controller/DescriptiveDictionaryControllerTest.java
@@ -0,0 +1,163 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * Copyright (C) 2018 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 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.when;
+
+import java.io.BufferedReader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.onap.policy.rest.jpa.DescriptiveScope;
+import org.onap.policy.rest.jpa.UserInfo;
+import org.springframework.mock.web.MockHttpServletResponse;
+
+public class DescriptiveDictionaryControllerTest {
+	
+	private static Logger logger = FlexLogger.getLogger(DescriptiveDictionaryControllerTest.class);
+	private static CommonClassDao commonClassDao;
+	private String jsonString = null;
+	private HttpServletRequest request = null;
+	private DescriptiveDictionaryController controller = null;
+	private MockHttpServletResponse response = null;
+	private UserInfo userInfo;
+	private List<String>  data;
+
+	@Before
+	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 DescriptiveScope());
+		doNothing().when(commonClassDao).save(new DescriptiveScope());
+		
+		controller = new DescriptiveDictionaryController();
+		controller.setCommonClassDao(commonClassDao);
+		
+		request = Mockito.mock(HttpServletRequest.class);
+		response =  new MockHttpServletResponse();  
+		logger.info("setUp: exit");
+	}
+	
+	public List<Object> testDescriptiveScope(){
+		List<Object>  objectData = new ArrayList<>();
+		
+		DescriptiveScope data = new DescriptiveScope();
+		data.setId(1);
+		assertTrue(1 == data.getId());
+		data.setScopeName("Test");
+		assertTrue("Test".equals(data.getScopeName()));
+		data.setDescription("Test");
+		assertTrue("Test".equals(data.getDescription()));
+		data.setSearch("Test");
+		assertTrue("Test".equals(data.getSearch()));
+		data.setCreatedDate(new Date());
+		assertTrue(data.getCreatedDate()!= null);
+		data.setModifiedDate(new Date());
+		assertTrue(data.getModifiedDate()!= null);
+		data.setUserCreatedBy(userInfo);
+		assertTrue(data.getUserCreatedBy()!= null);
+		data.setUserModifiedBy(userInfo);
+		assertTrue(data.getUserModifiedBy()!= null);
+		objectData.add(data);
+		
+		return objectData;
+	}
+	
+	@Test
+	public void testGetDescriptiveDictionaryByNameEntityData(){
+		when(commonClassDao.getDataByColumn(DescriptiveScope.class, "descriptiveScopeName")).thenReturn(data);
+		controller.getDescriptiveDictionaryByNameEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testGetDescriptiveDictionaryEntityData(){
+		when(commonClassDao.getData(DescriptiveScope.class)).thenReturn(testDescriptiveScope());
+		controller.getDescriptiveDictionaryEntityData(response);
+		try {
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+		} catch (Exception e) {
+			fail();
+			logger.error(e.getMessage(),e);
+		}
+	}
+	
+	@Test
+	public void testSaveDescriptiveDictionary(){
+		jsonString = "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"search\":\"Test\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveDescriptiveDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testUpdateDescriptiveDictionary(){
+		jsonString = "{\"descriptiveScopeDictionaryData\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"id\":1,\"search\":\"Test\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.saveDescriptiveDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+	
+	@Test
+	public void testRemoveDescriptiveDictionary(){
+		jsonString = "{\"data\":{\"attributes\":[{\"$$hashKey\":\"object:257\",\"id\":\"choice1\",\"number\":\"12\",\"option\":\"test\"}],\"description\":\"test\",\"descriptiveScopeName\":\"Test\",\"id\":1,\"search\":\"Test\"},\"userid\":\"demo\"}";
+		try(BufferedReader br = new BufferedReader(new StringReader(jsonString))){
+			when(request.getReader()).thenReturn(br);
+			controller.removeDescriptiveDictionary(request, response);
+			assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("descriptiveScopeDictionaryDatas"));
+		}catch(Exception e){
+			logger.error("Exception"+ e);
+		} 
+	}
+}
\ No newline at end of file