X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Ftest%2FXACMLPAPTest.java;h=717266264423062cba692378987941068883c722;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=c444596908cca93b67eca03610fb1adfcbdabd20;hpb=9ffce7748d288fde9e55d92367a858020e5a32fc;p=policy%2Fengine.git 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 c44459690..717266264 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 @@ -35,18 +35,25 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.EntityTransaction; +import javax.persistence.Persistence; import javax.servlet.ServletConfig; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.tomcat.dbcp.dbcp2.BasicDataSource; import org.hibernate.SessionFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; +import org.onap.policy.common.ia.IntegrityAuditProperties; 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; @@ -73,8 +80,8 @@ import org.springframework.orm.hibernate4.LocalSessionFactoryBuilder; import com.mockrunner.mock.web.MockServletInputStream; - public class XACMLPAPTest { + private static final Log logger = LogFactory.getLog(XACMLPAPTest.class); private static final String ENVIRONMENT_HEADER = "Environment"; private List headers = new ArrayList<>(); @@ -86,6 +93,48 @@ public class XACMLPAPTest { private SessionFactory sessionFactory; private CommonClassDao commonClassDao; + private static final String DEFAULT_DB_DRIVER = "org.h2.Driver"; + private static final String DEFAULT_DB_USER = "sa"; + private static final String DEFAULT_DB_PWD = ""; + + @Before + public void setUpDB() throws Exception { + logger.info("setUpDB: Entering"); + + Properties properties = new Properties(); + properties.put(IntegrityAuditProperties.DB_DRIVER, XACMLPAPTest.DEFAULT_DB_DRIVER); + properties.put(IntegrityAuditProperties.DB_URL, "jdbc:h2:file:./sql/xacmlTest"); + properties.put(IntegrityAuditProperties.DB_USER, XACMLPAPTest.DEFAULT_DB_USER); + properties.put(IntegrityAuditProperties.DB_PWD, XACMLPAPTest.DEFAULT_DB_PWD); + properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA"); + properties.put(IntegrityAuditProperties.NODE_TYPE, "pap"); + + //Clean the iaTest DB table for IntegrityAuditEntity entries + cleanDb("testPapPU", properties); + + logger.info("setUpDB: Exiting"); + } + + public void cleanDb(String persistenceUnit, Properties properties){ + logger.debug("cleanDb: enter"); + + EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit, properties); + + EntityManager em = emf.createEntityManager(); + // Start a transaction + EntityTransaction et = em.getTransaction(); + + et.begin(); + + // Clean up the DB + em.createQuery("Delete from IntegrityAuditEntity").executeUpdate(); + + // commit transaction + et.commit(); + em.close(); + logger.debug("cleanDb: exit"); + } + @Before public void setUp() throws ServletException { httpServletRequest = Mockito.mock(HttpServletRequest.class); @@ -335,7 +384,7 @@ public class XACMLPAPTest { template.setUserCreatedBy(userInfo); String rule = "package com.sample;\n" + "import com.sample.DroolsTest.Message;\n" - + "declare PapParams\n" + + "declare Params\n" + "samPoll : int\n" + "value : String\n" + "end\n" @@ -535,166 +584,166 @@ public class XACMLPAPTest { @Test public void testCommonCreateDictionary() throws IOException, SQLException, ServletException { - new DictionaryController(commonClassDao); - new ActionPolicyDictionaryController(commonClassDao); - new SafePolicyController(commonClassDao); - new DescriptiveDictionaryController(commonClassDao); - List object = new ArrayList<>(); + new DictionaryController(commonClassDao); + new ActionPolicyDictionaryController(commonClassDao); + new SafePolicyController(commonClassDao); + new DescriptiveDictionaryController(commonClassDao); + List 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); + 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); + 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); + 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 { @@ -715,7 +764,7 @@ public class XACMLPAPTest { setDBDao(); } - private void setDBDao() throws SQLException { + public void setDBDao() throws SQLException { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName("org.h2.Driver"); // In-memory DB for testing @@ -741,23 +790,23 @@ 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()); - } + 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