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%2FXACMLPapServletTest.java;h=36d40278b21bef78bb1ac69a0fea5ca54c344a5d;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=3630889b0e676f80ad72bde25e004f892dfca7d2;hpb=e22a2b613bda0e683043ef870d6b16e5a7e04df7;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java index 3630889b0..36d40278b 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java @@ -26,44 +26,44 @@ import org.junit.Test; import org.onap.policy.pap.xacml.rest.XACMLPapServlet; public class XACMLPapServletTest { - @Test - public void testSetAndGet() { - String systemKey = "xacml.properties"; - String testVal = "testVal"; - XACMLPapServlet servlet = new XACMLPapServlet(); - - // Set the system property temporarily - String oldProperty = System.getProperty(systemKey); - System.setProperty(systemKey, "xacml.pap.properties"); - - assertNotNull(XACMLPapServlet.getConfigHome()); - assertNotNull(XACMLPapServlet.getActionHome()); - assertEquals(XACMLPapServlet.getPersistenceUnit(), "XACML-PAP-REST"); + @Test + public void testSetAndGet() { + String systemKey = "xacml.properties"; + String testVal = "testVal"; + XACMLPapServlet servlet = new XACMLPapServlet(); - //assertNull(XACMLPapServlet.getEmf()); - //assertNull(XACMLPapServlet.getPDPFile()); - //assertNull(XACMLPapServlet.getPAPEngine()); - //assertNull(servlet.getIa()); - - XACMLPapServlet.setPapDbDriver(testVal); - assertEquals(XACMLPapServlet.getPapDbDriver(), testVal); - XACMLPapServlet.setPapDbUrl(testVal); - assertEquals(XACMLPapServlet.getPapDbUrl(), testVal); - XACMLPapServlet.setPapDbUser(testVal); - assertEquals(XACMLPapServlet.getPapDbUser(), testVal); - XACMLPapServlet.setPapDbPassword(testVal); - assertEquals(XACMLPapServlet.getPapDbPassword(), testVal); - XACMLPapServlet.setMsOnapName(testVal); - assertEquals(XACMLPapServlet.getMsOnapName(), testVal); - XACMLPapServlet.setMsPolicyName(testVal); - assertEquals(XACMLPapServlet.getMsPolicyName(), testVal); - - // Restore the original system property - if (oldProperty != null) { - System.setProperty(systemKey, oldProperty); - } - else { - System.clearProperty(systemKey); - } - } + // Set the system property temporarily + String oldProperty = System.getProperty(systemKey); + System.setProperty(systemKey, "xacml.pap.properties"); + + assertNotNull(XACMLPapServlet.getConfigHome()); + assertNotNull(XACMLPapServlet.getActionHome()); + assertEquals(XACMLPapServlet.getPersistenceUnit(), "XACML-PAP-REST"); + + //assertNull(XACMLPapServlet.getEmf()); + //assertNull(XACMLPapServlet.getPDPFile()); + //assertNull(XACMLPapServlet.getPAPEngine()); + //assertNull(servlet.getIa()); + + XACMLPapServlet.setPapDbDriver(testVal); + assertEquals(XACMLPapServlet.getPapDbDriver(), testVal); + XACMLPapServlet.setPapDbUrl(testVal); + assertEquals(XACMLPapServlet.getPapDbUrl(), testVal); + XACMLPapServlet.setPapDbUser(testVal); + assertEquals(XACMLPapServlet.getPapDbUser(), testVal); + XACMLPapServlet.setPapDbPassword(testVal); + assertEquals(XACMLPapServlet.getPapDbPassword(), testVal); + XACMLPapServlet.setMsOnapName(testVal); + assertEquals(XACMLPapServlet.getMsOnapName(), testVal); + XACMLPapServlet.setMsPolicyName(testVal); + assertEquals(XACMLPapServlet.getMsPolicyName(), testVal); + + // Restore the original system property + if (oldProperty != null) { + System.setProperty(systemKey, oldProperty); + } + else { + System.clearProperty(systemKey); + } + } }